mirrors/element-android
1
0
Fork 0
mirror of https://github.com/element-hq/element-android synced 2024-11-28 13:38:49 +03:00
Code Issues Projects Releases Packages Wiki Activity

Pref is always visible and enabled

Browse source
This commit is contained in:
Benoit Marty 2020-07-11 13:24:10 +02:00
parent 7193db8344
commit 22959cddb2
1 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsSecurityPrivacyFragment.kt
View file

@ -43,7 +43,6 @@ import im.vector.riotx.core.intent.ExternalIntentData
import im.vector.riotx.core.intent.analyseIntent import im.vector.riotx.core.intent.analyseIntent
import im.vector.riotx.core.intent.getFilenameFromUri import im.vector.riotx.core.intent.getFilenameFromUri
import im.vector.riotx.core.platform.SimpleTextWatcher import im.vector.riotx.core.platform.SimpleTextWatcher
import im.vector.riotx.core.platform.VectorBaseActivity
import im.vector.riotx.core.preference.VectorPreference import im.vector.riotx.core.preference.VectorPreference
import im.vector.riotx.core.preference.VectorPreferenceCategory import im.vector.riotx.core.preference.VectorPreferenceCategory
import im.vector.riotx.core.utils.openFileSelection import im.vector.riotx.core.utils.openFileSelection
@ -139,9 +138,7 @@ class VectorSettingsSecurityPrivacyFragment @Inject constructor(
if (info.isCrossSigningEnabled && info.allPrivateKeysKnown) { if (info.isCrossSigningEnabled && info.allPrivateKeysKnown) {
// You can setup recovery! // You can setup recovery!
secureBackupCategory.isVisible = true secureBackupCategory.isVisible = true
secureBackupPreference.isVisible = true
secureBackupPreference.title = getString(R.string.settings_secure_backup_setup) secureBackupPreference.title = getString(R.string.settings_secure_backup_setup)
secureBackupPreference.isEnabled = true
secureBackupPreference.onPreferenceClickListener = Preference.OnPreferenceClickListener { secureBackupPreference.onPreferenceClickListener = Preference.OnPreferenceClickListener {
BootstrapBottomSheet.show(parentFragmentManager, initCrossSigningOnly = false, forceReset4S = false) BootstrapBottomSheet.show(parentFragmentManager, initCrossSigningOnly = false, forceReset4S = false)
true true
@ -160,7 +157,6 @@ class VectorSettingsSecurityPrivacyFragment @Inject constructor(
// Only option here is to create a new backup if you want? // Only option here is to create a new backup if you want?
// aka reset // aka reset
secureBackupCategory.isVisible = true secureBackupCategory.isVisible = true
secureBackupPreference.isVisible = true
secureBackupPreference.title = getString(R.string.settings_secure_backup_reset) secureBackupPreference.title = getString(R.string.settings_secure_backup_reset)
secureBackupPreference.onPreferenceClickListener = Preference.OnPreferenceClickListener { secureBackupPreference.onPreferenceClickListener = Preference.OnPreferenceClickListener {
BootstrapBottomSheet.show(parentFragmentManager, initCrossSigningOnly = false, forceReset4S = true) BootstrapBottomSheet.show(parentFragmentManager, initCrossSigningOnly = false, forceReset4S = true)
@ -170,11 +166,9 @@ class VectorSettingsSecurityPrivacyFragment @Inject constructor(
// megolm backup is available but we don't have key // megolm backup is available but we don't have key
// you could try to synchronize to get missing megolm key ? // you could try to synchronize to get missing megolm key ?
secureBackupCategory.isVisible = true secureBackupCategory.isVisible = true
secureBackupPreference.isVisible = true
secureBackupPreference.title = getString(R.string.settings_secure_backup_enter_to_setup) secureBackupPreference.title = getString(R.string.settings_secure_backup_enter_to_setup)
secureBackupPreference.isEnabled = true
secureBackupPreference.onPreferenceClickListener = Preference.OnPreferenceClickListener { secureBackupPreference.onPreferenceClickListener = Preference.OnPreferenceClickListener {
(requireActivity() as? VectorBaseActivity)?.let { vectorActivity.let {
it.navigator.requestSelfSessionVerification(it) it.navigator.requestSelfSessionVerification(it)
} }
true true
@ -186,11 +180,9 @@ class VectorSettingsSecurityPrivacyFragment @Inject constructor(
// there is a backup, but this session is not trusted, or is missing some secrets // there is a backup, but this session is not trusted, or is missing some secrets
// you should enter passphrase to get them or verify against another session // you should enter passphrase to get them or verify against another session
secureBackupCategory.isVisible = true secureBackupCategory.isVisible = true
secureBackupPreference.isVisible = true
secureBackupPreference.title = getString(R.string.settings_secure_backup_enter_to_setup) secureBackupPreference.title = getString(R.string.settings_secure_backup_enter_to_setup)
secureBackupPreference.isEnabled = true
secureBackupPreference.onPreferenceClickListener = Preference.OnPreferenceClickListener { secureBackupPreference.onPreferenceClickListener = Preference.OnPreferenceClickListener {
(requireActivity() as? VectorBaseActivity)?.let { vectorActivity.let {
it.navigator.requestSelfSessionVerification(it) it.navigator.requestSelfSessionVerification(it)
} }
true true