From caa7709090d812cf67debc9ecfb6495c0e8deb2d Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Mon, 29 Jun 2020 11:39:46 +0200
Subject: [PATCH] Fix copy of cancel bootstrap

---
 .../features/crypto/recover/BootstrapBottomSheet.kt | 13 +++----------
 vector/src/main/res/values/strings.xml              |  2 +-
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapBottomSheet.kt b/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapBottomSheet.kt
index 5995879d06..f14d27b3d9 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapBottomSheet.kt
+++ b/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapBottomSheet.kt
@@ -77,24 +77,17 @@ class BootstrapBottomSheet : VectorBaseBottomSheetDialogFragment() {
                     KeepItSafeDialog().show(requireActivity())
                 }
                 is BootstrapViewEvents.SkipBootstrap -> {
-                    promptSkip(event.genKeyOption)
+                    promptSkip()
                 }
             }
         }
     }
 
-    private fun promptSkip(genKeyOption: Boolean) {
+    private fun promptSkip() {
         AlertDialog.Builder(requireContext())
                 .setTitle(R.string.are_you_sure)
-                .setMessage(if (genKeyOption) R.string.bootstrap_skip_text else R.string.bootstrap_skip_text_no_gen_key)
+                .setMessage(R.string.bootstrap_cancel_text)
                 .setPositiveButton(R.string._continue, null)
-                .apply {
-                    if (genKeyOption) {
-                        setNeutralButton(R.string.generate_message_key) { _, _ ->
-                            viewModel.handle(BootstrapActions.DoInitializeGeneratedKey)
-                        }
-                    }
-                }
                 .setNegativeButton(R.string.skip) { _, _ ->
                     dismiss()
                 }
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 0fd3ba8d51..afdde12db0 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -2341,7 +2341,7 @@ Not all features in Riot are implemented in RiotX yet. Main missing (and coming
 
     <string name="bootstrap_skip_text">Setting a Recovery Passphrase lets you secure &amp; unlock encrypted messages and trust.\n\nIf you don’t want to set a Message Password, generate a Message Key instead.</string>
     <string name="bootstrap_skip_text_no_gen_key">Setting a Recovery Passphrase lets you secure &amp; unlock encrypted messages and trust.</string>
-
+    <string name="bootstrap_cancel_text">If you cancel now, you may lose encrypted messages &amp; data if you lose access to your logins.\n\nYou can also set up Secure Backup &amp; manage your keys in Settings.</string>
 
     <string name="encryption_enabled">Encryption enabled</string>
     <string name="encryption_enabled_tile_description">Messages in this room are end-to-end encrypted. Learn more &amp; verify users in their profile.</string>