Merge remote-tracking branch 'upstream/develop' into develop

appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt

@@ -277,7 +277,7 @@ class LoggedInFlowNode @AssistedInject constructor(
                     }
 
                     override fun onSetUpRecoveryClick() {
-                        backstack.push(NavTarget.SecureBackup(initialElement = SecureBackupEntryPoint.InitialTarget.SetUpRecovery))
+                        backstack.push(NavTarget.SecureBackup(initialElement = SecureBackupEntryPoint.InitialTarget.Root))
                     }
 
                     override fun onSessionConfirmRecoveryKeyClick() {

build.gradle.kts

@@ -49,7 +49,7 @@ allprojects {
         config.from(files("$rootDir/tools/detekt/detekt.yml"))
     }
     dependencies {
-        detektPlugins("io.nlopez.compose.rules:detekt:0.4.16")
+        detektPlugins("io.nlopez.compose.rules:detekt:0.4.17")
     }
 
     // KtLint

features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootView.kt

@@ -138,8 +138,8 @@ private fun ColumnScope.ManageAppSection(
     }
     if (state.showSecureBackup) {
         ListItem(
-            headlineContent = { Text(stringResource(id = CommonStrings.common_chat_backup)) },
-            leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.KeySolid())),
+            headlineContent = { Text(stringResource(id = CommonStrings.common_encryption)) },
+            leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Key())),
             trailingContent = ListItemContent.Badge.takeIf { state.showSecureBackupBadge },
             onClick = onSecureBackupClick,
         )

features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/SetUpRecoveryKeyBanner.kt

@@ -25,6 +25,7 @@ internal fun SetUpRecoveryKeyBanner(
         modifier = modifier,
         title = stringResource(R.string.banner_set_up_recovery_title),
         content = stringResource(R.string.banner_set_up_recovery_content),
+        actionText = stringResource(R.string.banner_set_up_recovery_submit),
         onSubmitClick = onContinueClick,
         onDismissClick = onDismissClick,
     )

features/roomlist/impl/src/main/res/values/localazy.xml

@@ -4,8 +4,9 @@
   <string name="banner_migrate_to_native_sliding_sync_description">"Your server now supports a new, faster protocol. Log out and log back in to upgrade now. Doing this now will help you avoid a forced logout when the old protocol is removed later."</string>
   <string name="banner_migrate_to_native_sliding_sync_force_logout_title">"Your homeserver no longer supports the old protocol. Please log out and log back in to continue using the app."</string>
   <string name="banner_migrate_to_native_sliding_sync_title">"Upgrade available"</string>
-  <string name="banner_set_up_recovery_content">"Generate a new recovery key that can be used to restore your encrypted message history in case you lose access to your devices."</string>
-  <string name="banner_set_up_recovery_title">"Set up recovery"</string>
+  <string name="banner_set_up_recovery_content">"Recover your cryptographic identity and message history with a recovery key if you have lost all your existing devices."</string>
+  <string name="banner_set_up_recovery_submit">"Set up recovery"</string>
+  <string name="banner_set_up_recovery_title">"Set up recovery to protect your account"</string>
   <string name="confirm_recovery_key_banner_message">"Your chat backup is currently out of sync. You need to enter your recovery key to maintain access to your chat backup."</string>
   <string name="confirm_recovery_key_banner_title">"Enter your recovery key"</string>
   <string name="full_screen_intent_banner_message">"To ensure you never miss an important call, please change your settings to allow full-screen notifications when your phone is locked."</string>

features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListViewTest.kt

@@ -121,12 +121,9 @@ class RoomListViewTest {
                 ),
                 onSetUpRecoveryClick = callback,
             )
-
             // Remove automatic initial events
             eventsRecorder.clear()
-
-            rule.clickOn(CommonStrings.action_continue)
-
+            rule.clickOn(R.string.banner_set_up_recovery_submit)
             eventsRecorder.assertEmpty()
         }
     }

features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/SecureBackupFlowNode.kt

@@ -22,7 +22,6 @@ import dagger.assisted.AssistedInject
 import io.element.android.anvilannotations.ContributesNode
 import io.element.android.features.securebackup.api.SecureBackupEntryPoint
 import io.element.android.features.securebackup.impl.disable.SecureBackupDisableNode
-import io.element.android.features.securebackup.impl.enable.SecureBackupEnableNode
 import io.element.android.features.securebackup.impl.enter.SecureBackupEnterRecoveryKeyNode
 import io.element.android.features.securebackup.impl.reset.ResetIdentityFlowNode
 import io.element.android.features.securebackup.impl.root.SecureBackupRootNode
@@ -63,9 +62,6 @@ class SecureBackupFlowNode @AssistedInject constructor(
         @Parcelize
         data object Disable : NavTarget
 
-        @Parcelize
-        data object Enable : NavTarget
-
         @Parcelize
         data object EnterRecoveryKey : NavTarget
 
@@ -91,10 +87,6 @@ class SecureBackupFlowNode @AssistedInject constructor(
                         backstack.push(NavTarget.Disable)
                     }
 
-                    override fun onEnableClick() {
-                        backstack.push(NavTarget.Enable)
-                    }
-
                     override fun onConfirmRecoveryKeyClick() {
                         backstack.push(NavTarget.EnterRecoveryKey)
                     }
@@ -116,9 +108,6 @@ class SecureBackupFlowNode @AssistedInject constructor(
             NavTarget.Disable -> {
                 createNode<SecureBackupDisableNode>(buildContext)
             }
-            NavTarget.Enable -> {
-                createNode<SecureBackupEnableNode>(buildContext)
-            }
             NavTarget.EnterRecoveryKey -> {
                 val callback = object : SecureBackupEnterRecoveryKeyNode.Callback {
                     override fun onEnterRecoveryKeySuccess() {

features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/disable/SecureBackupDisablePresenter.kt

@@ -37,11 +37,7 @@ class SecureBackupDisablePresenter @Inject constructor(
         val coroutineScope = rememberCoroutineScope()
         fun handleEvents(event: SecureBackupDisableEvents) {
             when (event) {
-                is SecureBackupDisableEvents.DisableBackup -> if (disableAction.value.isConfirming()) {
-                    coroutineScope.disableBackup(disableAction)
-                } else {
-                    disableAction.value = AsyncAction.ConfirmingNoParams
-                }
+                is SecureBackupDisableEvents.DisableBackup -> coroutineScope.disableBackup(disableAction)
                 SecureBackupDisableEvents.DismissDialogs -> {
                     disableAction.value = AsyncAction.Uninitialized
                 }

features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/disable/SecureBackupDisableView.kt

@@ -7,6 +7,7 @@
 
 package io.element.android.features.securebackup.impl.disable
 
+import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.ColumnScope
@@ -25,7 +26,6 @@ import io.element.android.features.securebackup.impl.R
 import io.element.android.libraries.designsystem.atomic.pages.FlowStepPage
 import io.element.android.libraries.designsystem.components.BigIcon
 import io.element.android.libraries.designsystem.components.async.AsyncActionView
-import io.element.android.libraries.designsystem.components.dialogs.ConfirmationDialog
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.theme.components.Button
@@ -44,39 +44,21 @@ fun SecureBackupDisableView(
         onBackClick = onBackClick,
         title = stringResource(id = R.string.screen_key_backup_disable_title),
         subTitle = stringResource(id = R.string.screen_key_backup_disable_description),
-        iconStyle = BigIcon.Style.Default(CompoundIcons.KeyOffSolid()),
+        iconStyle = BigIcon.Style.AlertSolid,
         buttons = { Buttons(state = state) },
     ) {
         Content(state = state)
     }
 
     AsyncActionView(
         async = state.disableAction,
-        confirmationDialog = {
-            SecureBackupDisableConfirmationDialog(
-                onConfirm = { state.eventSink.invoke(SecureBackupDisableEvents.DisableBackup) },
-                onDismiss = { state.eventSink.invoke(SecureBackupDisableEvents.DismissDialogs) },
-            )
-        },
         progressDialog = {},
         errorMessage = { it.message ?: it.toString() },
         onErrorDismiss = { state.eventSink.invoke(SecureBackupDisableEvents.DismissDialogs) },
         onSuccess = { onSuccess() },
     )
 }
 
-@Composable
-private fun SecureBackupDisableConfirmationDialog(onConfirm: () -> Unit, onDismiss: () -> Unit) {
-    ConfirmationDialog(
-        title = stringResource(id = R.string.screen_key_backup_disable_confirmation_title),
-        content = stringResource(id = R.string.screen_key_backup_disable_confirmation_description),
-        submitText = stringResource(id = R.string.screen_key_backup_disable_confirmation_action_turn_off),
-        destructiveSubmit = true,
-        onSubmitClick = onConfirm,
-        onDismiss = onDismiss,
-    )
-}
-
 @Composable
 private fun ColumnScope.Buttons(
     state: SecureBackupDisableState,
@@ -105,15 +87,20 @@ private fun Content(state: SecureBackupDisableState) {
 
 @Composable
 private fun SecureBackupDisableItem(text: String) {
-    Row(modifier = Modifier.fillMaxWidth()) {
+    Row(
+        modifier = Modifier
+            .fillMaxWidth()
+            .background(color = ElementTheme.colors.bgActionSecondaryHovered)
+            .padding(horizontal = 16.dp, vertical = 12.dp),
+        horizontalArrangement = Arrangement.spacedBy(12.dp),
+    ) {
         Icon(
             imageVector = CompoundIcons.Close(),
             contentDescription = null,
             tint = ElementTheme.colors.iconCriticalPrimary,
-            modifier = Modifier.size(20.dp)
+            modifier = Modifier.size(24.dp)
         )
         Text(
-            modifier = Modifier.padding(start = 8.dp, end = 4.dp),
             text = text,
             color = ElementTheme.colors.textSecondary,
             style = ElementTheme.typography.fontBodyMdRegular,