filippodb/SchildiChat-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup pref

Browse Source
This commit is contained in:
Benoit Marty 2020-07-11 13:13:08 +02:00
parent 6f4ea83fa9
commit 1afabb69c1
2 changed files with 25 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vector/src/main/java/im/vector/riotx/features/settings/VectorPreferences.kt
View File

@ -72,8 +72,6 @@ class VectorPreferences @Inject constructor(private val context: Context) {
const val SETTINGS_ALLOW_INTEGRATIONS_KEY = "SETTINGS_ALLOW_INTEGRATIONS_KEY" const val SETTINGS_ALLOW_INTEGRATIONS_KEY = "SETTINGS_ALLOW_INTEGRATIONS_KEY"
const val SETTINGS_INTEGRATION_MANAGER_UI_URL_KEY = "SETTINGS_INTEGRATION_MANAGER_UI_URL_KEY" const val SETTINGS_INTEGRATION_MANAGER_UI_URL_KEY = "SETTINGS_INTEGRATION_MANAGER_UI_URL_KEY"
const val SETTINGS_SECURE_MESSAGE_RECOVERY_PREFERENCE_KEY = "SETTINGS_SECURE_MESSAGE_RECOVERY_PREFERENCE_KEY" const val SETTINGS_SECURE_MESSAGE_RECOVERY_PREFERENCE_KEY = "SETTINGS_SECURE_MESSAGE_RECOVERY_PREFERENCE_KEY"
const val SETTINGS_CRYPTOGRAPHY_MANAGE_4S_CATEGORY_KEY = "SETTINGS_CRYPTOGRAPHY_MANAGE_4S_CATEGORY_KEY"
const val SETTINGS_SECURE_BACKUP_RECOVERY_PREFERENCE_KEY = "SETTINGS_SECURE_BACKUP_RECOVERY_PREFERENCE_KEY"
// const val SETTINGS_SECURE_BACKUP_RESET_PREFERENCE_KEY = "SETTINGS_SECURE_BACKUP_RESET_PREFERENCE_KEY" // const val SETTINGS_SECURE_BACKUP_RESET_PREFERENCE_KEY = "SETTINGS_SECURE_BACKUP_RESET_PREFERENCE_KEY"
// user // user

50
vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsSecurityPrivacyFragment.kt
View File

@ -111,10 +111,10 @@ class VectorSettingsSecurityPrivacyFragment @Inject constructor(
} }
private val secureBackupCategory by lazy { private val secureBackupCategory by lazy {
findPreference<VectorPreferenceCategory>(VectorPreferences.SETTINGS_CRYPTOGRAPHY_MANAGE_4S_CATEGORY_KEY) findPreference<VectorPreferenceCategory>("SETTINGS_CRYPTOGRAPHY_MANAGE_4S_CATEGORY_KEY")!!
} }
private val secureBackupPreference by lazy { private val secureBackupPreference by lazy {
findPreference<VectorPreference>(VectorPreferences.SETTINGS_SECURE_BACKUP_RECOVERY_PREFERENCE_KEY) findPreference<VectorPreference>("SETTINGS_SECURE_BACKUP_RECOVERY_PREFERENCE_KEY")!!
} }
// private val secureBackupResetPreference by lazy { // private val secureBackupResetPreference by lazy {
// findPreference<VectorPreference>(VectorPreferences.SETTINGS_SECURE_BACKUP_RESET_PREFERENCE_KEY) // findPreference<VectorPreference>(VectorPreferences.SETTINGS_SECURE_BACKUP_RESET_PREFERENCE_KEY)
@ -129,30 +129,30 @@ class VectorSettingsSecurityPrivacyFragment @Inject constructor(
} }
private fun refresh4SSection(state: SecretsSynchronisationInfo) { private fun refresh4SSection(state: SecretsSynchronisationInfo) {
secureBackupCategory?.isVisible = false secureBackupCategory.isVisible = false
// it's a lot of if / else if / else // it's a lot of if / else if / else
// But it's not yet clear how to manage all cases // But it's not yet clear how to manage all cases
if (!state.isCrossSigningEnabled) { if (!state.isCrossSigningEnabled) {
// There is not cross signing, so we can remove the section // There is not cross signing, so we can remove the section
} else { } else {
secureBackupCategory?.isVisible = true secureBackupCategory.isVisible = true
if (!state.isBackupSetup) { if (!state.isBackupSetup) {
if (state.isCrossSigningEnabled && state.allPrivateKeysKnown) { if (state.isCrossSigningEnabled && state.allPrivateKeysKnown) {
// You can setup recovery! // You can setup recovery!
secureBackupCategory?.isVisible = true secureBackupCategory.isVisible = true
secureBackupPreference?.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.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
} }
} else { } else {
// just hide all, you can't setup from here // just hide all, you can't setup from here
// you should synchronize to get gossips // you should synchronize to get gossips
secureBackupCategory?.isVisible = false secureBackupCategory.isVisible = false
} }
return return
} }
@ -164,38 +164,38 @@ class VectorSettingsSecurityPrivacyFragment @Inject constructor(
if (!state.megolmBackupAvailable || state.megolmSecretKnown) { if (!state.megolmBackupAvailable || state.megolmSecretKnown) {
// 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.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)
true true
} }
} else if (!state.megolmSecretKnown) { } else if (!state.megolmSecretKnown) {
// 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.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.isEnabled = true
secureBackupPreference?.onPreferenceClickListener = Preference.OnPreferenceClickListener { secureBackupPreference.onPreferenceClickListener = Preference.OnPreferenceClickListener {
(requireActivity() as? VectorBaseActivity)?.let { (requireActivity() as? VectorBaseActivity)?.let {
it.navigator.requestSelfSessionVerification(it) it.navigator.requestSelfSessionVerification(it)
} }
true true
} }
} else { } else {
secureBackupCategory?.isVisible = false secureBackupCategory.isVisible = false
} }
return return
} else { } else {
// 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.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.isEnabled = true
secureBackupPreference?.onPreferenceClickListener = Preference.OnPreferenceClickListener { secureBackupPreference.onPreferenceClickListener = Preference.OnPreferenceClickListener {
(requireActivity() as? VectorBaseActivity)?.let { (requireActivity() as? VectorBaseActivity)?.let {
it.navigator.requestSelfSessionVerification(it) it.navigator.requestSelfSessionVerification(it)
} }