Respect the methods setting

element-hq · Feb 10, 2023 · c3a55fe · c3a55fe
1 parent 4cc2daa
commit c3a55fe
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/.../src/main/java/im/vector/app/features/crypto/recover/BootstrapSetupRecoveryKeyFragment.kt b/.../src/main/java/im/vector/app/features/crypto/recover/BootstrapSetupRecoveryKeyFragment.kt
@@ -66,7 +66,7 @@ class BootstrapSetupRecoveryKeyFragment :
             views.bootstrapSetupSecureSubmit.isVisible = false
 
             // Choose between create a passphrase or use a recovery key
-            renderBackupMethodActions(firstFormStep.methods)
+            renderBackupMethodActions(state.secureBackupMethod)
         }
     }
 

diff --git a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSharedViewModel.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSharedViewModel.kt
@@ -107,8 +107,7 @@ class BootstrapSharedViewModel @AssistedInject constructor(
                     copy(
                             step = BootstrapStep.FirstForm(
                                     keyBackUpExist = false,
-                                    reset = session.sharedSecretStorageService().isRecoverySetup(),
-                                    methods = this.secureBackupMethod
+                                    reset = session.sharedSecretStorageService().isRecoverySetup()
                             )
                     )
                 }
@@ -134,7 +133,7 @@ class BootstrapSharedViewModel @AssistedInject constructor(
                         // we just resume plain bootstrap
                         doesKeyBackupExist = false
                         setState {
-                            copy(step = BootstrapStep.FirstForm(keyBackUpExist = doesKeyBackupExist, methods = this.secureBackupMethod))
+                            copy(step = BootstrapStep.FirstForm(keyBackUpExist = doesKeyBackupExist))
                         }
                     } else {
                         // we need to get existing backup passphrase/key and convert to SSSS
@@ -148,7 +147,7 @@ class BootstrapSharedViewModel @AssistedInject constructor(
                             doesKeyBackupExist = true
                             isBackupCreatedFromPassphrase = keyVersion.getAuthDataAsMegolmBackupAuthData()?.privateKeySalt != null
                             setState {
-                                copy(step = BootstrapStep.FirstForm(keyBackUpExist = doesKeyBackupExist, methods = this.secureBackupMethod))
+                                copy(step = BootstrapStep.FirstForm(keyBackUpExist = doesKeyBackupExist))
                             }
                         }
                     }
@@ -496,7 +495,7 @@ class BootstrapSharedViewModel @AssistedInject constructor(
                 } else {
                     setState {
                         copy(
-                                step = BootstrapStep.FirstForm(keyBackUpExist = doesKeyBackupExist, methods = this.secureBackupMethod),
+                                step = BootstrapStep.FirstForm(keyBackUpExist = doesKeyBackupExist),
                                 // Also reset the passphrase
                                 passphrase = null,
                                 passphraseRepeat = null,
@@ -509,7 +508,7 @@ class BootstrapSharedViewModel @AssistedInject constructor(
             is BootstrapStep.SetupPassphrase -> {
                 setState {
                     copy(
-                            step = BootstrapStep.FirstForm(keyBackUpExist = doesKeyBackupExist, methods = this.secureBackupMethod),
+                            step = BootstrapStep.FirstForm(keyBackUpExist = doesKeyBackupExist),
                             // Also reset the passphrase
                             passphrase = null,
                             passphraseRepeat = null
@@ -530,7 +529,7 @@ class BootstrapSharedViewModel @AssistedInject constructor(
                     // Go back to the first step
                     setState {
                         copy(
-                                step = BootstrapStep.FirstForm(keyBackUpExist = doesKeyBackupExist, methods = this.secureBackupMethod),
+                                step = BootstrapStep.FirstForm(keyBackUpExist = doesKeyBackupExist),
                                 // Also reset the passphrase
                                 passphrase = null,
                                 passphraseRepeat = null
@@ -563,7 +562,7 @@ class BootstrapSharedViewModel @AssistedInject constructor(
             is BootstrapStep.GetBackupSecretForMigration -> {
                 setState {
                     copy(
-                            step = BootstrapStep.FirstForm(keyBackUpExist = doesKeyBackupExist, methods = this.secureBackupMethod),
+                            step = BootstrapStep.FirstForm(keyBackUpExist = doesKeyBackupExist),
                             // Also reset the passphrase
                             passphrase = null,
                             passphraseRepeat = null,

diff --git a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapStep.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapStep.kt
@@ -91,7 +91,7 @@ sealed class BootstrapStep {
     object CheckingMigration : BootstrapStep()
 
     // Use will be asked to choose between passphrase or recovery key, or to start process if a key backup exists
-    data class FirstForm(val keyBackUpExist: Boolean, val reset: Boolean = false, val methods: SecureBackupMethod) : BootstrapStep()
+    data class FirstForm(val keyBackUpExist: Boolean, val reset: Boolean = false) : BootstrapStep()
 
     object SetupPassphrase : BootstrapStep()
     object ConfirmPassphrase : BootstrapStep()