From 5376abcb0d6afb8e5adfc74b2fe007503c35b4df Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 8 Nov 2023 14:35:15 +0100
Subject: [PATCH 1/2] Improve dialog content when recovery key (or passphrase)
 is not correct.

---
 .../securebackup/impl/enter/SecureBackupEnterRecoveryKeyView.kt | 2 ++
 features/securebackup/impl/src/main/res/values/localazy.xml     | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/enter/SecureBackupEnterRecoveryKeyView.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/enter/SecureBackupEnterRecoveryKeyView.kt
index b5d7c9c349..a12b5907d2 100644
--- a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/enter/SecureBackupEnterRecoveryKeyView.kt
+++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/enter/SecureBackupEnterRecoveryKeyView.kt
@@ -45,6 +45,8 @@ fun SecureBackupEnterRecoveryKeyView(
         async = state.submitAction,
         onSuccess = { onDone() },
         showProgressDialog = false,
+        errorTitle = { stringResource(id = R.string.screen_recovery_key_confirm_error_title) },
+        errorMessage = { stringResource(id = R.string.screen_recovery_key_confirm_error_content) },
         onErrorDismiss = { state.eventSink(SecureBackupEnterRecoveryKeyEvents.ClearDialog) },
     )
 
diff --git a/features/securebackup/impl/src/main/res/values/localazy.xml b/features/securebackup/impl/src/main/res/values/localazy.xml
index 67dd2ec045..613ff72719 100644
--- a/features/securebackup/impl/src/main/res/values/localazy.xml
+++ b/features/securebackup/impl/src/main/res/values/localazy.xml
@@ -22,6 +22,8 @@
   <string name="screen_recovery_key_change_success">"Recovery key changed"</string>
   <string name="screen_recovery_key_change_title">"Change recovery key?"</string>
   <string name="screen_recovery_key_confirm_description">"Enter your recovery key to confirm access to your chat backup."</string>
+  <string name="screen_recovery_key_confirm_error_content">"Please try again to confirm access to your chat backup."</string>
+  <string name="screen_recovery_key_confirm_error_title">"Incorrect recovery key"</string>
   <string name="screen_recovery_key_confirm_key_description">"Enter the 48 character code."</string>
   <string name="screen_recovery_key_confirm_key_placeholder">"Enter…"</string>
   <string name="screen_recovery_key_confirm_success">"Recovery key confirmed"</string>

From 6fbe4a8f29ccbb0c3d971c8fa3d5b4b909b63b44 Mon Sep 17 00:00:00 2001
From: ElementBot <benoitm+elementbot@element.io>
Date: Wed, 8 Nov 2023 13:44:24 +0000
Subject: [PATCH 2/2] Update screenshots

---
 ...kupEnterRecoveryKeyView-Day-2_2_null_3,NEXUS_5,1.0,en].png | 4 ++--
 ...pEnterRecoveryKeyView-Night-2_3_null_3,NEXUS_5,1.0,en].png | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_null_SecureBackupEnterRecoveryKeyView-Day-2_2_null_3,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_null_SecureBackupEnterRecoveryKeyView-Day-2_2_null_3,NEXUS_5,1.0,en].png
index 310f1d6a67..06693a1a68 100644
--- a/tests/uitests/src/test/snapshots/images/ui_S_t[f.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_null_SecureBackupEnterRecoveryKeyView-Day-2_2_null_3,NEXUS_5,1.0,en].png
+++ b/tests/uitests/src/test/snapshots/images/ui_S_t[f.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_null_SecureBackupEnterRecoveryKeyView-Day-2_2_null_3,NEXUS_5,1.0,en].png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3eec71b78aa369d280904d3c0e7698c57c3d7902b6bb2d96912bae25fe691210
-size 32591
+oid sha256:2c373271f4e1e2cdfef322b67e4995632d94144a1cd4d61f9be05429f70eebfa
+size 43704
diff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_null_SecureBackupEnterRecoveryKeyView-Night-2_3_null_3,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_null_SecureBackupEnterRecoveryKeyView-Night-2_3_null_3,NEXUS_5,1.0,en].png
index cec6e33e22..7fec544d14 100644
--- a/tests/uitests/src/test/snapshots/images/ui_S_t[f.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_null_SecureBackupEnterRecoveryKeyView-Night-2_3_null_3,NEXUS_5,1.0,en].png
+++ b/tests/uitests/src/test/snapshots/images/ui_S_t[f.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_null_SecureBackupEnterRecoveryKeyView-Night-2_3_null_3,NEXUS_5,1.0,en].png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:806c8ead5894e6c0394b53cebce3f4fb53acd4dc021de2c6b7df9e5b2824e681
-size 29020
+oid sha256:16be10f3495751a5324d4c6190454a76d6534e1af8faf293ead288e331fef0ac
+size 38627