filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename param

This commit is contained in:
Benoit Marty 2020-07-11 13:13:44 +02:00
parent 1afabb69c1
commit 352662d19a
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -128,18 +128,18 @@ class VectorSettingsSecurityPrivacyFragment @Inject constructor(
disposables.clear() disposables.clear()
} }
private fun refresh4SSection(state: SecretsSynchronisationInfo) { private fun refresh4SSection(info: 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 (!info.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 (!info.isBackupSetup) {
if (state.isCrossSigningEnabled && state.allPrivateKeysKnown) { if (info.isCrossSigningEnabled && info.allPrivateKeysKnown) {
// You can setup recovery! // You can setup recovery!
secureBackupCategory.isVisible = true secureBackupCategory.isVisible = true
secureBackupPreference.isVisible = true secureBackupPreference.isVisible = true
@ -158,10 +158,10 @@ class VectorSettingsSecurityPrivacyFragment @Inject constructor(
} }
// so here we know that 4S is setup // so here we know that 4S is setup
if (state.isCrossSigningTrusted && state.allPrivateKeysKnown) { if (info.isCrossSigningTrusted && info.allPrivateKeysKnown) {
// Looks like we have all cross signing secrets and session is trusted // Looks like we have all cross signing secrets and session is trusted
// Let's see if there is a megolm backup // Let's see if there is a megolm backup
if (!state.megolmBackupAvailable || state.megolmSecretKnown) { if (!info.megolmBackupAvailable || info.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
@ -171,7 +171,7 @@ class VectorSettingsSecurityPrivacyFragment @Inject constructor(
BootstrapBottomSheet.show(parentFragmentManager, initCrossSigningOnly = false, forceReset4S = true) BootstrapBottomSheet.show(parentFragmentManager, initCrossSigningOnly = false, forceReset4S = true)
true true
} }
} else if (!state.megolmSecretKnown) { } else if (!info.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