Change "Recovery Passphrase/Key" to "Security Phrase/Key"

changelog.d/8550.misc

@@ -0,0 +1 @@
+Change outdated term Recovery Key/Passphrase to Security Key/Phrase

vector-app/src/androidTest/java/im/vector/app/VerificationTestBase.kt

@@ -189,7 +189,7 @@ abstract class VerificationTestBase {
 
         // 4S is not setup so passphrase option should be hidden
         Espresso.onView(ViewMatchers.withId(R.id.bottomSheetVerificationRecyclerView))
-                .check(ViewAssertions.matches(CoreMatchers.not(ViewMatchers.hasDescendant(ViewMatchers.withText(R.string.verification_cannot_access_other_session)))))
+                .check(ViewAssertions.matches(CoreMatchers.not(ViewMatchers.hasDescendant(ViewMatchers.withText(R.string.verification_cannot_access_other_session_use_key)))))
 
         Espresso.onView(ViewMatchers.withId(R.id.bottomSheetVerificationRecyclerView))
                 .check(ViewAssertions.matches(ViewMatchers.hasDescendant(ViewMatchers.withText(R.string.verification_verify_with_another_device))))

vector-app/src/androidTest/java/im/vector/app/VerifySessionPassphraseTest.kt

@@ -153,12 +153,12 @@ class VerifySessionPassphraseTest : VerificationTestBase() {
 
         // 4S is  setup so passphrase option should be visible
         onView(withId(R.id.bottomSheetVerificationRecyclerView))
-                .check(matches((hasDescendant(withText(R.string.verification_cannot_access_other_session)))))
+                .check(matches((hasDescendant(withText(R.string.verification_cannot_access_other_session_use_key)))))
 
         onView(withId(R.id.bottomSheetVerificationRecyclerView))
                 .perform(
                         actionOnItem<RecyclerView.ViewHolder>(
-                                hasDescendant(withText(R.string.verification_cannot_access_other_session)),
+                                hasDescendant(withText(R.string.verification_cannot_access_other_session_use_key)),
                                 click()
                         )
                 )

vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreFromKeyFragment.kt

@@ -73,7 +73,7 @@ class KeysBackupRestoreFromKeyFragment :
     private fun onRestoreFromKey() {
         val value = viewModel.recoveryCode.value
         if (value.isNullOrBlank()) {
-            viewModel.recoveryCodeErrorText.value = context?.getString(R.string.keys_backup_recovery_code_empty_error_message)
+            viewModel.recoveryCodeErrorText.value = context?.getString(R.string.keys_backup_security_key_empty_error_message)
         } else {
             viewModel.recoverKeys(sharedViewModel)
         }

vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreFromKeyViewModel.kt

@@ -47,7 +47,7 @@ class KeysBackupRestoreFromKeyViewModel @Inject constructor(
                 val recoveryKey = BackupUtils.recoveryKeyFromBase58(recoveryCode.value!!)
                 sharedViewModel.recoverUsingBackupRecoveryKey(recoveryKey!!)
             } catch (failure: Throwable) {
-                recoveryCodeErrorText.postValue(stringProvider.getString(R.string.keys_backup_recovery_code_error_decrypt))
+                recoveryCodeErrorText.postValue(stringProvider.getString(R.string.keys_backup_security_key_error_decrypt))
             }
         }
     }

vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseFragment.kt

@@ -66,8 +66,8 @@ class KeysBackupRestoreFromPassphraseFragment :
     }
 
     private fun spannableStringForHelperText(): SpannableString {
-        val clickableText = getString(R.string.keys_backup_restore_use_recovery_key)
-        val helperText = getString(R.string.keys_backup_restore_with_passphrase_helper_with_link, clickableText)
+        val clickableText = getString(R.string.keys_backup_restore_use_security_key)
+        val helperText = getString(R.string.keys_backup_restore_with_security_phrase_helper_with_link, clickableText)
 
         val spanString = SpannableString(helperText)
 

vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseViewModel.kt

@@ -44,7 +44,7 @@ class KeysBackupRestoreFromPassphraseViewModel @Inject constructor(
             try {
                 sharedViewModel.recoverUsingBackupPass(passphrase.value!!)
             } catch (failure: Throwable) {
-                passphraseErrorText.postValue(stringProvider.getString(R.string.keys_backup_passphrase_error_decrypt))
+                passphraseErrorText.postValue(stringProvider.getString(R.string.keys_backup_security_phrase_error_decrypt))
             }
         }
     }

vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreSharedViewModel.kt

@@ -96,7 +96,7 @@ class KeysBackupRestoreSharedViewModel @Inject constructor(
                     loadingEvent.postValue(
                             WaitingViewData(
                                     stringProvider.getString(R.string.keys_backup_restoring_waiting_message) +
-                                            "\n" + stringProvider.getString(R.string.keys_backup_restoring_computing_key_waiting_message),
+                                            "\n" + stringProvider.getString(R.string.keys_backup_restoring_computing_security_key_waiting_message),
                                     step.progress,
                                     step.total
                             )

vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsFragment.kt

@@ -74,7 +74,7 @@ class KeysBackupSettingsFragment :
         activity?.let {
             MaterialAlertDialogBuilder(it)
                     .setTitle(R.string.keys_backup_settings_delete_confirm_title)
-                    .setMessage(R.string.keys_backup_settings_delete_confirm_message)
+                    .setMessage(R.string.keys_backup_settings_delete_keys_confirm_message)
                     .setCancelable(false)
                     .setPositiveButton(R.string.keys_backup_settings_delete_confirm_title) { _, _ ->
                         viewModel.handle(KeyBackupSettingsAction.DeleteKeyBackup)

vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsRecyclerViewController.kt

@@ -80,7 +80,7 @@ class KeysBackupSettingsRecyclerViewController @Inject constructor(
                     style(ItemStyle.BIG_TEXT)
 
                     if (data.keysBackupVersionTrust()?.usable == false) {
-                        description(host.stringProvider.getString(R.string.keys_backup_settings_untrusted_backup).toEpoxyCharSequence())
+                        description(host.stringProvider.getString(R.string.keys_backup_settings_verify_device_now).toEpoxyCharSequence())
                     }
                 }
 
@@ -94,7 +94,7 @@ class KeysBackupSettingsRecyclerViewController @Inject constructor(
                     title(host.stringProvider.getString(R.string.keys_backup_settings_status_ko).toEpoxyCharSequence())
                     style(ItemStyle.BIG_TEXT)
                     if (data.keysBackupVersionTrust()?.usable == false) {
-                        description(host.stringProvider.getString(R.string.keys_backup_settings_untrusted_backup).toEpoxyCharSequence())
+                        description(host.stringProvider.getString(R.string.keys_backup_settings_verify_device_now).toEpoxyCharSequence())
                     } else {
                         description(keyBackupState.toString().toEpoxyCharSequence())
                     }
@@ -109,7 +109,7 @@ class KeysBackupSettingsRecyclerViewController @Inject constructor(
                     title(host.stringProvider.getString(R.string.keys_backup_settings_status_ok).toEpoxyCharSequence())
                     style(ItemStyle.BIG_TEXT)
                     if (data.keysBackupVersionTrust()?.usable == false) {
-                        description(host.stringProvider.getString(R.string.keys_backup_settings_untrusted_backup).toEpoxyCharSequence())
+                        description(host.stringProvider.getString(R.string.keys_backup_settings_verify_device_now).toEpoxyCharSequence())
                     } else {
                         description(host.stringProvider.getString(R.string.keys_backup_info_keys_all_backup_up).toEpoxyCharSequence())
                     }
@@ -129,7 +129,7 @@ class KeysBackupSettingsRecyclerViewController @Inject constructor(
                     val remainingKeysToBackup = data.remainingKeysToBackup
 
                     if (data.keysBackupVersionTrust()?.usable == false) {
-                        description(host.stringProvider.getString(R.string.keys_backup_settings_untrusted_backup).toEpoxyCharSequence())
+                        description(host.stringProvider.getString(R.string.keys_backup_settings_verify_device_now).toEpoxyCharSequence())
                     } else {
                         description(
                                 host.stringProvider

vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupSharedViewModel.kt

@@ -104,7 +104,7 @@ class KeysBackupSetupSharedViewModel @Inject constructor(
 
                 loadingStatus.postValue(
                         WaitingViewData(
-                                context.getString(R.string.keys_backup_setup_step3_generating_key_status),
+                                context.getString(R.string.keys_backup_setup_step3_generating_security_key_status),
                                 progress,
                                 total
                         )

vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep2Fragment.kt

@@ -175,7 +175,7 @@ class KeysBackupSetupStep2Fragment :
             }
             else -> {
                 // User has entered a passphrase but want to skip this step.
-                viewModel.passphraseError.value = context?.getString(R.string.keys_backup_passphrase_not_empty_error_message)
+                viewModel.passphraseError.value = context?.getString(R.string.keys_backup_security_phrase_not_empty_error_message)
             }
         }
     }

vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep3Fragment.kt

@@ -64,7 +64,7 @@ class KeysBackupSetupStep3Fragment :
         viewModel.passphrase.observe(viewLifecycleOwner) {
             if (it.isNullOrBlank()) {
                 // Recovery was generated, so show key and options to save
-                views.keysBackupSetupStep3Label2.text = getString(R.string.keys_backup_setup_step3_text_line2_no_passphrase)
+                views.keysBackupSetupStep3Label2.text = getString(R.string.keys_backup_setup_step3_key_explanation_no_passphrase)
                 views.keysBackupSetupStep3FinishButton.text = getString(R.string.keys_backup_setup_step3_button_title_no_passphrase)
 
                 views.keysBackupSetupStep3RecoveryKeyText.text = viewModel.recoveryKey.value!!.toBase58()
@@ -77,7 +77,7 @@ class KeysBackupSetupStep3Fragment :
                         }
                 views.keysBackupSetupStep3RecoveryKeyText.isVisible = true
             } else {
-                views.keysBackupSetupStep3Label2.text = getString(R.string.keys_backup_setup_step3_text_line2)
+                views.keysBackupSetupStep3Label2.text = getString(R.string.keys_backup_setup_step3_key_explanation)
                 views.keysBackupSetupStep3FinishButton.text = getString(R.string.keys_backup_setup_step3_button_title)
                 views.keysBackupSetupStep3RecoveryKeyText.isVisible = false
             }
@@ -137,7 +137,7 @@ class KeysBackupSetupStep3Fragment :
                     activity = requireActivity(),
                     activityResultLauncher = saveRecoveryActivityResultLauncher,
                     defaultFileName = "recovery-key-$userId-${timestamp}.txt",
-                    chooserHint = getString(R.string.save_recovery_key_chooser_hint)
+                    chooserHint = getString(R.string.save_security_key_chooser_hint)
             )
             dialog.dismiss()
         }
@@ -146,9 +146,9 @@ class KeysBackupSetupStep3Fragment :
             startSharePlainTextIntent(
                     context = requireContext(),
                     activityResultLauncher = null,
-                    chooserTitle = context?.getString(R.string.keys_backup_setup_step3_share_intent_chooser_title),
+                    chooserTitle = context?.getString(R.string.keys_backup_setup_step3_share_key_intent_chooser_title),
                     text = recoveryKey.toBase58(),
-                    subject = context?.getString(R.string.recovery_key)
+                    subject = context?.getString(R.string.security_key)
             )
             viewModel.copyHasBeenMade = true
             dialog.dismiss()
@@ -180,7 +180,7 @@ class KeysBackupSetupStep3Fragment :
                 activity?.let {
                     MaterialAlertDialogBuilder(it)
                             .setTitle(R.string.dialog_title_success)
-                            .setMessage(R.string.recovery_key_export_saved)
+                            .setMessage(R.string.security_key_export_saved)
                 }
             } catch (throwable: Throwable) {
                 activity?.let {

vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageViewModel.kt

@@ -243,15 +243,15 @@ class SharedSecureStorageViewModel @AssistedInject constructor(
                 _viewEvents.post(
                         SharedSecureStorageViewEvent.UpdateLoadingState(
                                 WaitingViewData(
-                                        message = stringProvider.getString(R.string.keys_backup_restoring_computing_key_waiting_message),
+                                        message = stringProvider.getString(R.string.keys_backup_restoring_computing_security_key_waiting_message),
                                         isIndeterminate = true
                                 )
                         )
                 )
                 val keySpec = RawBytesKeySpec.fromRecoveryKey(recoveryKey) ?: return@launch Unit.also {
-                    _viewEvents.post(SharedSecureStorageViewEvent.KeyInlineError(stringProvider.getString(R.string.bootstrap_invalid_recovery_key)))
+                    _viewEvents.post(SharedSecureStorageViewEvent.KeyInlineError(stringProvider.getString(R.string.bootstrap_invalid_security_key)))
                     _viewEvents.post(SharedSecureStorageViewEvent.HideModalLoading)
-                    setState { copy(checkingSSSSAction = Fail(IllegalArgumentException(stringProvider.getString(R.string.bootstrap_invalid_recovery_key)))) }
+                    setState { copy(checkingSSSSAction = Fail(IllegalArgumentException(stringProvider.getString(R.string.bootstrap_invalid_security_key)))) }
                 }
                 withContext(Dispatchers.IO) {
                     performRequest(keyInfo, keySpec, decryptedSecretMap)
@@ -268,7 +268,7 @@ class SharedSecureStorageViewModel @AssistedInject constructor(
             }, {
                 setState { copy(checkingSSSSAction = Fail(it)) }
                 _viewEvents.post(SharedSecureStorageViewEvent.HideModalLoading)
-                _viewEvents.post(SharedSecureStorageViewEvent.KeyInlineError(stringProvider.getString(R.string.keys_backup_passphrase_error_decrypt)))
+                _viewEvents.post(SharedSecureStorageViewEvent.KeyInlineError(stringProvider.getString(R.string.keys_backup_security_phrase_error_decrypt)))
             })
         }
     }
@@ -322,7 +322,7 @@ class SharedSecureStorageViewModel @AssistedInject constructor(
                 _viewEvents.post(
                         SharedSecureStorageViewEvent.UpdateLoadingState(
                                 WaitingViewData(
-                                        message = stringProvider.getString(R.string.keys_backup_restoring_computing_key_waiting_message),
+                                        message = stringProvider.getString(R.string.keys_backup_restoring_computing_security_key_waiting_message),
                                         isIndeterminate = true
                                 )
                         )
@@ -336,7 +336,7 @@ class SharedSecureStorageViewModel @AssistedInject constructor(
                                 _viewEvents.post(
                                         SharedSecureStorageViewEvent.UpdateLoadingState(
                                                 WaitingViewData(
-                                                        message = stringProvider.getString(R.string.keys_backup_restoring_computing_key_waiting_message),
+                                                        message = stringProvider.getString(R.string.keys_backup_restoring_computing_security_key_waiting_message),
                                                         isIndeterminate = false,
                                                         progress = progress,
                                                         progressTotal = total
@@ -364,7 +364,7 @@ class SharedSecureStorageViewModel @AssistedInject constructor(
             }, {
                 setState { copy(checkingSSSSAction = Fail(it)) }
                 _viewEvents.post(SharedSecureStorageViewEvent.HideModalLoading)
-                _viewEvents.post(SharedSecureStorageViewEvent.InlineError(stringProvider.getString(R.string.keys_backup_passphrase_error_decrypt)))
+                _viewEvents.post(SharedSecureStorageViewEvent.InlineError(stringProvider.getString(R.string.keys_backup_security_phrase_error_decrypt)))
             })
         }
     }

vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecuredStorageKeyFragment.kt

@@ -49,7 +49,7 @@ class SharedSecuredStorageKeyFragment :
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        views.ssssRestoreWithKeyText.text = getString(R.string.enter_secret_storage_input_key)
+        views.ssssRestoreWithKeyText.text = getString(R.string.enter_secret_storage_input_security_key)
 
         views.ssssKeyEnterEdittext.editorActionEvents()
                 .throttleFirst(300)

vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecuredStoragePassphraseFragment.kt

@@ -48,8 +48,8 @@ class SharedSecuredStoragePassphraseFragment :
         super.onViewCreated(view, savedInstanceState)
 
         // If has passphrase
-        val pass = getString(R.string.recovery_passphrase)
-        val key = getString(R.string.recovery_key)
+        val pass = getString(R.string.security_phrase)
+        val key = getString(R.string.security_key)
         views.ssssRestoreWithPassphraseWarningText.text = getString(
                 R.string.enter_secret_storage_passphrase_or_key,
                 pass,

vector/src/main/java/im/vector/app/features/crypto/recover/BackupToQuadSMigrationTask.kt

@@ -122,7 +122,7 @@ class BackupToQuadSMigrationTask @Inject constructor(
                             )
                         }
                         params.recoveryKey != null -> {
-                            reportProgress(params, R.string.bootstrap_progress_generating_ssss_recovery)
+                            reportProgress(params, R.string.bootstrap_progress_generating_ssss_from_key)
                             quadS.generateKey(
                                     UUID.randomUUID().toString(),
                                     extractCurveKeyFromRecoveryKey(params.recoveryKey)?.let { RawBytesKeySpec(it) },

vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapConclusionFragment.kt

@@ -54,11 +54,11 @@ class BootstrapConclusionFragment :
 
         views.bootstrapConclusionText.text = getString(
                 R.string.bootstrap_cross_signing_success,
-                getString(R.string.recovery_passphrase),
+                getString(R.string.security_phrase),
                 getString(R.string.message_key)
         )
                 .toSpannable()
-                .colorizeMatchingText(getString(R.string.recovery_passphrase), colorProvider.getColorFromAttribute(android.R.attr.textColorLink))
+                .colorizeMatchingText(getString(R.string.security_phrase), colorProvider.getColorFromAttribute(android.R.attr.textColorLink))
                 .colorizeMatchingText(getString(R.string.message_key), colorProvider.getColorFromAttribute(android.R.attr.textColorLink))
         views.bootstrapConclusionText.giveAccessibilityFocusOnce()
     }