TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-25 17:27:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix recover password button doesn't disappear

Browse Source
This commit is contained in:
Andrew 2024-05-05 00:09:22 +09:30
parent cb02def41d
commit 7832f13562
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/org/thoughtcrime/securesms/dms/NewMessageFragment.kt
View File

@ -31,7 +31,6 @@ import androidx.fragment.app.Fragment
import androidx.fragment.app.viewModels import androidx.fragment.app.viewModels
import androidx.lifecycle.lifecycleScope import androidx.lifecycle.lifecycleScope
import dagger.hilt.android.AndroidEntryPoint import dagger.hilt.android.AndroidEntryPoint
import kotlinx.coroutines.flow.filter
import kotlinx.coroutines.flow.filterIsInstance import kotlinx.coroutines.flow.filterIsInstance
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import network.loki.messenger.R import network.loki.messenger.R

14
app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt
View File

@ -118,12 +118,6 @@ class SettingsActivity : PassphraseRequiredActionBarActivity() {
super.onCreate(savedInstanceState, isReady) super.onCreate(savedInstanceState, isReady)
binding = ActivitySettingsBinding.inflate(layoutInflater) binding = ActivitySettingsBinding.inflate(layoutInflater)
setContentView(binding.root) setContentView(binding.root)
binding.composeView.setContent {
AppTheme {
Buttons()
}
}
} }
override fun onStart() { override fun onStart() {
@ -137,6 +131,12 @@ class SettingsActivity : PassphraseRequiredActionBarActivity() {
publicKeyTextView.text = hexEncodedPublicKey publicKeyTextView.text = hexEncodedPublicKey
versionTextView.text = String.format(getString(R.string.version_s), "${BuildConfig.VERSION_NAME} (${BuildConfig.VERSION_CODE})") versionTextView.text = String.format(getString(R.string.version_s), "${BuildConfig.VERSION_NAME} (${BuildConfig.VERSION_CODE})")
} }
binding.composeView.setContent {
AppTheme {
Buttons()
}
}
} }
private fun getDisplayName(): String = private fun getDisplayName(): String =
@ -379,7 +379,7 @@ class SettingsActivity : PassphraseRequiredActionBarActivity() {
return true return true
} }
} }
return false; return false
} }
} }