Don't display security banner for unknown RecoveryState (#3579)

* Don't display security banner for unknown `RecoveryState` * Don't display 'set up recovery' if its status is unknown. Add more screenshot tests. * Update screenshots --------- Co-authored-by: ElementBot <[email protected]>
element-hq · Oct 2, 2024 · f344a12 · f344a12
1 parent 729334b
commit f344a12
Show file tree

Hide file tree

Showing 32 changed files with 76 additions and 39 deletions.
diff --git a/...mlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListPresenter.kt b/...mlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListPresenter.kt
@@ -186,9 +186,9 @@ class RoomListPresenter @Inject constructor(
                     currentSecurityBannerDismissed -> SecurityBannerState.None
                     syncState == SyncState.Running -> {
                         when (recoveryState) {
-                            RecoveryState.UNKNOWN,
                             RecoveryState.DISABLED -> SecurityBannerState.SetUpRecovery
                             RecoveryState.INCOMPLETE -> SecurityBannerState.RecoveryKeyConfirmation
+                            RecoveryState.UNKNOWN,
                             RecoveryState.WAITING_FOR_SYNC,
                             RecoveryState.ENABLED -> SecurityBannerState.None
                         }

diff --git a/...t/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListPresenterTest.kt b/...t/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListPresenterTest.kt
@@ -236,7 +236,9 @@ class RoomListPresenterTest {
 
     @Test
     fun `present - handle DismissRecoveryKeyPrompt`() = runTest {
-        val encryptionService = FakeEncryptionService()
+        val encryptionService = FakeEncryptionService().apply {
+            recoveryStateStateFlow.emit(RecoveryState.DISABLED)
+        }
         val roomListService = FakeRoomListService().apply {
             postAllRoomsLoadingState(RoomList.LoadingState.Loaded(1))
         }

diff --git a/...otlin/io/element/android/features/securebackup/impl/root/SecureBackupRootStateProvider.kt b/...otlin/io/element/android/features/securebackup/impl/root/SecureBackupRootStateProvider.kt
@@ -20,6 +20,11 @@ open class SecureBackupRootStateProvider : PreviewParameterProvider<SecureBackup
             aSecureBackupRootState(backupState = BackupState.UNKNOWN, doesBackupExistOnServer = AsyncData.Success(true)),
             aSecureBackupRootState(backupState = BackupState.UNKNOWN, doesBackupExistOnServer = AsyncData.Success(false)),
             aSecureBackupRootState(backupState = BackupState.UNKNOWN, doesBackupExistOnServer = AsyncData.Failure(Exception("An error"))),
+            aSecureBackupRootState(backupState = BackupState.WAITING_FOR_SYNC),
+            aSecureBackupRootState(backupState = BackupState.CREATING),
+            aSecureBackupRootState(backupState = BackupState.RESUMING),
+            aSecureBackupRootState(backupState = BackupState.DOWNLOADING),
+            aSecureBackupRootState(backupState = BackupState.DISABLING),
             aSecureBackupRootState(backupState = BackupState.ENABLED),
             aSecureBackupRootState(recoveryState = RecoveryState.UNKNOWN),
             aSecureBackupRootState(recoveryState = RecoveryState.ENABLED),

diff --git a/...rc/main/kotlin/io/element/android/features/securebackup/impl/root/SecureBackupRootView.kt b/...rc/main/kotlin/io/element/android/features/securebackup/impl/root/SecureBackupRootView.kt
@@ -143,8 +143,8 @@ fun SecureBackupRootView(
 
         // Setup recovery
         when (state.recoveryState) {
-            RecoveryState.WAITING_FOR_SYNC -> Unit
             RecoveryState.UNKNOWN,
+            RecoveryState.WAITING_FOR_SYNC -> Unit
             RecoveryState.DISABLED -> {
                 PreferenceText(
                     title = stringResource(id = R.string.screen_chat_backup_recovery_action_setup),

diff --git a/...pshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_0_en.png b/...pshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_0_en.png
diff --git a/...shots/images/features.securebackup.impl.root_SecureBackupRootView_Day_10_en.png b/...shots/images/features.securebackup.impl.root_SecureBackupRootView_Day_10_en.png
diff --git a/...shots/images/features.securebackup.impl.root_SecureBackupRootView_Day_11_en.png b/...shots/images/features.securebackup.impl.root_SecureBackupRootView_Day_11_en.png
diff --git a/...shots/images/features.securebackup.impl.root_SecureBackupRootView_Day_12_en.png b/...shots/images/features.securebackup.impl.root_SecureBackupRootView_Day_12_en.png
diff --git a/...shots/images/features.securebackup.impl.root_SecureBackupRootView_Day_13_en.png b/...shots/images/features.securebackup.impl.root_SecureBackupRootView_Day_13_en.png
diff --git a/...pshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_1_en.png b/...pshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_1_en.png
diff --git a/...pshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_2_en.png b/...pshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_2_en.png
diff --git a/...pshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_3_en.png b/...pshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_3_en.png
diff --git a/...pshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_4_en.png b/...pshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_4_en.png
diff --git a/...pshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_5_en.png b/...pshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_5_en.png
diff --git a/...pshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_6_en.png b/...pshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_6_en.png
diff --git a/...pshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_7_en.png b/...pshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_7_en.png
diff --git a/...pshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_8_en.png b/...pshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_8_en.png
diff --git a/...pshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_9_en.png b/...pshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_9_en.png
diff --git a/...hots/images/features.securebackup.impl.root_SecureBackupRootView_Night_0_en.png b/...hots/images/features.securebackup.impl.root_SecureBackupRootView_Night_0_en.png
diff --git a/...ots/images/features.securebackup.impl.root_SecureBackupRootView_Night_10_en.png b/...ots/images/features.securebackup.impl.root_SecureBackupRootView_Night_10_en.png
diff --git a/...ots/images/features.securebackup.impl.root_SecureBackupRootView_Night_11_en.png b/...ots/images/features.securebackup.impl.root_SecureBackupRootView_Night_11_en.png
diff --git a/...ots/images/features.securebackup.impl.root_SecureBackupRootView_Night_12_en.png b/...ots/images/features.securebackup.impl.root_SecureBackupRootView_Night_12_en.png
diff --git a/...ots/images/features.securebackup.impl.root_SecureBackupRootView_Night_13_en.png b/...ots/images/features.securebackup.impl.root_SecureBackupRootView_Night_13_en.png
diff --git a/...hots/images/features.securebackup.impl.root_SecureBackupRootView_Night_1_en.png b/...hots/images/features.securebackup.impl.root_SecureBackupRootView_Night_1_en.png
diff --git a/...hots/images/features.securebackup.impl.root_SecureBackupRootView_Night_2_en.png b/...hots/images/features.securebackup.impl.root_SecureBackupRootView_Night_2_en.png
diff --git a/...hots/images/features.securebackup.impl.root_SecureBackupRootView_Night_3_en.png b/...hots/images/features.securebackup.impl.root_SecureBackupRootView_Night_3_en.png
diff --git a/...hots/images/features.securebackup.impl.root_SecureBackupRootView_Night_4_en.png b/...hots/images/features.securebackup.impl.root_SecureBackupRootView_Night_4_en.png
diff --git a/...hots/images/features.securebackup.impl.root_SecureBackupRootView_Night_5_en.png b/...hots/images/features.securebackup.impl.root_SecureBackupRootView_Night_5_en.png
diff --git a/...hots/images/features.securebackup.impl.root_SecureBackupRootView_Night_6_en.png b/...hots/images/features.securebackup.impl.root_SecureBackupRootView_Night_6_en.png
diff --git a/...hots/images/features.securebackup.impl.root_SecureBackupRootView_Night_7_en.png b/...hots/images/features.securebackup.impl.root_SecureBackupRootView_Night_7_en.png
diff --git a/...hots/images/features.securebackup.impl.root_SecureBackupRootView_Night_8_en.png b/...hots/images/features.securebackup.impl.root_SecureBackupRootView_Night_8_en.png
diff --git a/...hots/images/features.securebackup.impl.root_SecureBackupRootView_Night_9_en.png b/...hots/images/features.securebackup.impl.root_SecureBackupRootView_Night_9_en.png