diff --git a/changelog.d/8550.misc b/changelog.d/8550.misc new file mode 100644 index 00000000000..8fe220c7a95 --- /dev/null +++ b/changelog.d/8550.misc @@ -0,0 +1 @@ +Change outdated term Recovery Key/Passphrase to Security Key/Phrase diff --git a/library/ui-strings/src/main/res/values/strings.xml b/library/ui-strings/src/main/res/values/strings.xml index 9f842a57414..513002b1560 100644 --- a/library/ui-strings/src/main/res/values/strings.xml +++ b/library/ui-strings/src/main/res/values/strings.xml @@ -1529,8 +1529,10 @@ + + Please delete the passphrase if you want ${app_name} to generate a recovery key. - Please delete the passphrase if you want ${app_name} to generate a recovery key. + Please delete the passphrase if you want ${app_name} to generate a Security Key. Never lose encrypted messages Messages in encrypted rooms are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.\n\nSecurely back up your keys to avoid losing them. @@ -1542,18 +1544,30 @@ We’ll store an encrypted copy of your keys on your homeserver. Protect your backup with a passphrase to keep it secure.\n\nFor maximum security, this should be different from your account password. Set Passphrase Creating Backup - Or, secure your backup with a Recovery Key, saving it somewhere safe. - (Advanced) Set up with Recovery Key + + Or, secure your backup with a Recovery Key, saving it somewhere safe. + Or, secure your backup with a Security Key, saving it somewhere safe. + + (Advanced) Set up with Recovery Key + (Advanced) Set up with Security Key Success ! Your keys are being backed up. - Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your passphrase.\nKeep your recovery key somewhere very secure, like a password manager (or a safe) - Keep your recovery key somewhere very secure, like a password manager (or a safe) + + Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your passphrase.\nKeep your recovery key somewhere very secure, like a password manager (or a safe) + Your Security Key is a safety net - you can use it to restore access to your encrypted messages if you forget your passphrase.\nKeep your Security Key somewhere very secure, like a password manager (or a safe) + + Keep your recovery key somewhere very secure, like a password manager (or a safe) + Keep your Security Key somewhere very secure, like a password manager (or a safe) Done I’ve made a copy - Save Recovery Key + + Save Recovery Key + Save Security Key Share Save as File - The recovery key has been saved. + + The recovery key has been saved. + The Security Key has been saved. A backup already exist on your homeserver It looks like you already have setup key backup from another session. Do you want to replace it with the one you’re creating? @@ -1561,34 +1575,59 @@ Stop Please make a copy - Share recovery key with… - Generating Recovery Key using passphrase, this process can take several seconds. - Recovery Key + + Share recovery key with… + Share Security Key with… + + Generating Recovery Key using passphrase, this process can take several seconds. + Generating Security Key using passphrase, this process can take several seconds. + + Recovery Key + Security Key Unexpected error Are you sure? You may lose access to your messages if you log out or lose this device. Fetching backup version… - Use your recovery passphrase to unlock your encrypted messages history - use your recovery key - - Don’t know your recovery passphrase, you can %s. + + Use your recovery passphrase to unlock your encrypted messages history + Use your Security Phrase to unlock your encrypted messages history + + use your recovery key + use your Security Key + + Don’t know your recovery passphrase, you can %s. + + Don’t know your Security Phrase, you can %s. - Use your Recovery Key to unlock your encrypted messages history - Enter Recovery Key + + Use your Recovery Key to unlock your encrypted messages history + Use your Security Key to unlock your encrypted messages history + + Enter Recovery Key + Enter Security Key - - Lost your recovery key? You can set up a new one in settings. - Backup could not be decrypted with this passphrase: please verify that you entered the correct recovery passphrase. + + Lost your recovery key? You can set up a new one in settings. + Lost your Security Key? You can set up a new one in settings. + + Backup could not be decrypted with this passphrase: please verify that you entered the correct recovery passphrase. + Backup could not be decrypted with this passphrase: please verify that you entered the correct Security Phrase. Restoring backup: - Computing recovery key… + + Computing recovery key… + Computing Security Key… Downloading keys… Importing keys… Unlock History - Please enter a recovery key - Backup could not be decrypted with this recovery key: please verify that you entered the correct recovery key. + + Please enter a recovery key + Please enter a Security Key + + Backup could not be decrypted with this recovery key: please verify that you entered the correct recovery key. + Backup could not be decrypted with this Security Key: please verify that you entered the correct Security Key. Backup Restored %s ! @@ -1618,13 +1657,16 @@ Backup has a invalid signature from verified session %s Backup has a invalid signature from unverified session %s - - To use Key Backup on this session, restore with your passphrase or recovery key now. + + To use Key Backup on this session, restore with your passphrase or recovery key now. + To use Key Backup on this session, restore with your Security Phrase or Key now. Deleting backup… Checking backup state Delete Backup - Delete your backed up encryption keys from the server? You will no longer be able to use your recovery key to read encrypted message history. + + Delete your backed up encryption keys from the server? You will no longer be able to use your recovery key to read encrypted message history. + Delete your backed up encryption keys from the server? You will no longer be able to use your Security Key to read encrypted message history. Secure Backup @@ -2492,7 +2534,9 @@ Account Data Delete the account data of type %1$s?\n\nUse with caution, it may lead to unexpected behavior. - Use a Recovery Passphrase or Key + + Use a Recovery Passphrase or Key + Use a Security Phrase or Key If you can’t access an existing session Cannot find secrets in storage @@ -2557,7 +2601,9 @@ Verification Canceled - Recovery Passphrase + + Recovery Passphrase + Security Phrase Message Key @@ -2582,7 +2628,7 @@ Setting Up Key Backup - + Your %2$s & %1$s are now set.\n\nKeep them safe! You’ll need them to unlock encrypted messages and secure information if you lose all of your active sessions. @@ -2634,26 +2680,36 @@ Encryption upgrade available Verify yourself & others to keep your chats safe - + Enter your %s to continue Use File - "It's not a valid recovery key" - Please enter a recovery key + + "It's not a valid recovery key" + "It's not a valid Security Key" + + Please enter a recovery key + Please enter a Security Key Checking backup Key Checking backup Key (%s) Getting curve key Generating SSSS key from passphrase Generating SSSS key from passphrase (%s) - Generating SSSS key from recovery key + + Generating SSSS key from recovery key + Generating SSSS key from Security Key Storing keybackup secret in SSSS Enter your Key Backup Passphrase to continue. - use your Key Backup recovery key - + + use your Key Backup recovery key + use your Key Backup Security Key + Don’t know your Key Backup Passphrase, you can %s. - Key Backup recovery key + + Key Backup recovery key + Key Backup Security Key Prevent screenshots of the application Enabling this setting adds the FLAG_SECURE to all Activities. Restart the application for the change to take effect. @@ -2675,10 +2731,14 @@ Use the latest ${app_name} on your other devices: Forces the current outbound group session in an encrypted room to be discarded Only supported in encrypted rooms - + Use your %1$s or use your %2$s to continue. - Use Recovery Key - Select your Recovery Key, or input it manually by typing it or pasting from your clipboard + + Use Recovery Key + Use Security Key + + Select your Recovery Key, or input it manually by typing it or pasting from your clipboard + Select your Security Key, or input it manually by typing it or pasting from your clipboard Failed to access secure storage Forgot or lost all recovery options? Reset everything Reset everything @@ -2823,7 +2883,9 @@ LEARN MORE - Save recovery key in + + Save recovery key in + Save Security Key in Retrieving your contacts… Your contact book is empty diff --git a/vector-app/src/androidTest/java/im/vector/app/VerificationTestBase.kt b/vector-app/src/androidTest/java/im/vector/app/VerificationTestBase.kt index 48549a93dd3..52994fcf2aa 100644 --- a/vector-app/src/androidTest/java/im/vector/app/VerificationTestBase.kt +++ b/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)))) diff --git a/vector-app/src/androidTest/java/im/vector/app/VerifySessionPassphraseTest.kt b/vector-app/src/androidTest/java/im/vector/app/VerifySessionPassphraseTest.kt index f54d619772e..cdd7e9ce680 100644 --- a/vector-app/src/androidTest/java/im/vector/app/VerifySessionPassphraseTest.kt +++ b/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( - hasDescendant(withText(R.string.verification_cannot_access_other_session)), + hasDescendant(withText(R.string.verification_cannot_access_other_session_use_key)), click() ) ) diff --git a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreFromKeyFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreFromKeyFragment.kt index 9a3d37eed76..4bc9fea5c67 100644 --- a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreFromKeyFragment.kt +++ b/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) } diff --git a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreFromKeyViewModel.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreFromKeyViewModel.kt index 5fd5f8cab87..7bba7e9d59e 100644 --- a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreFromKeyViewModel.kt +++ b/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)) } } } diff --git a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseFragment.kt index cf98bc7e4d5..ff7a2078dba 100644 --- a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseFragment.kt +++ b/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) diff --git a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseViewModel.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseViewModel.kt index 81d3c64dec9..9edf33c2dc3 100644 --- a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseViewModel.kt +++ b/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)) } } } diff --git a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreSharedViewModel.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreSharedViewModel.kt index 004600edfd4..45546b44faf 100644 --- a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreSharedViewModel.kt +++ b/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 ) diff --git a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsFragment.kt index c0001501d53..8a145edcf6a 100644 --- a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsFragment.kt +++ b/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) diff --git a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsRecyclerViewController.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsRecyclerViewController.kt index b862d406c8b..0cb78c8b2aa 100644 --- a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsRecyclerViewController.kt +++ b/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 diff --git a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupSharedViewModel.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupSharedViewModel.kt index b3543bdc190..e36b5968465 100644 --- a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupSharedViewModel.kt +++ b/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 ) diff --git a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep2Fragment.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep2Fragment.kt index 3a6b11715c4..51a7fb11ab6 100644 --- a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep2Fragment.kt +++ b/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) } } } diff --git a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep3Fragment.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep3Fragment.kt index 5dcff20f0fd..dbd830c6950 100644 --- a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep3Fragment.kt +++ b/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 { diff --git a/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageViewModel.kt b/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageViewModel.kt index 4ab11a218c1..78deada40f5 100644 --- a/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageViewModel.kt +++ b/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))) }) } } diff --git a/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecuredStorageKeyFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecuredStorageKeyFragment.kt index efb24ebea7d..695401a1fd7 100644 --- a/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecuredStorageKeyFragment.kt +++ b/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) diff --git a/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecuredStoragePassphraseFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecuredStoragePassphraseFragment.kt index 877e4aa1644..3f80e5fbe4b 100644 --- a/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecuredStoragePassphraseFragment.kt +++ b/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, diff --git a/vector/src/main/java/im/vector/app/features/crypto/recover/BackupToQuadSMigrationTask.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BackupToQuadSMigrationTask.kt index 9948ea4b3ae..efc83c7d705 100644 --- a/vector/src/main/java/im/vector/app/features/crypto/recover/BackupToQuadSMigrationTask.kt +++ b/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) }, diff --git a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapConclusionFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapConclusionFragment.kt index fd1eb821dbf..61ae983c869 100644 --- a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapConclusionFragment.kt +++ b/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() } diff --git a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapMigrateBackupFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapMigrateBackupFragment.kt index 8df5ce7ad38..a5c6066714b 100644 --- a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapMigrateBackupFragment.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapMigrateBackupFragment.kt @@ -97,10 +97,10 @@ class BootstrapMigrateBackupFragment : val secret = views.bootstrapMigrateEditText.text?.toString() if (secret.isNullOrEmpty()) { - val errRes = if (isEnteringKey) R.string.recovery_key_empty_error_message else R.string.passphrase_empty_error_message + val errRes = if (isEnteringKey) R.string.security_key_empty_error_message else R.string.passphrase_empty_error_message views.bootstrapRecoveryKeyEnterTil.error = getString(errRes) } else if (isEnteringKey && !isValidRecoveryKey(secret)) { - views.bootstrapRecoveryKeyEnterTil.error = getString(R.string.bootstrap_invalid_recovery_key) + views.bootstrapRecoveryKeyEnterTil.error = getString(R.string.bootstrap_invalid_security_key) } else { view?.hideKeyboard() if (isEnteringKey) { @@ -119,7 +119,7 @@ class BootstrapMigrateBackupFragment : if (isEnteringKey) { views.bootstrapMigrateEditText.inputType = TYPE_CLASS_TEXT or TYPE_TEXT_VARIATION_VISIBLE_PASSWORD or TYPE_TEXT_FLAG_MULTI_LINE - val recKey = getString(R.string.bootstrap_migration_backup_recovery_key) + val recKey = getString(R.string.bootstrap_migration_backup_security_key) views.bootstrapDescriptionText.text = getString(R.string.enter_account_password, recKey) views.bootstrapMigrateEditText.hint = recKey @@ -134,7 +134,7 @@ class BootstrapMigrateBackupFragment : views.bootstrapMigrateForgotPassphrase.isVisible = true - val recKey = getString(R.string.bootstrap_migration_use_recovery_key) + val recKey = getString(R.string.bootstrap_migration_use_security_key) views.bootstrapMigrateForgotPassphrase.text = getString(R.string.bootstrap_migration_with_passphrase_helper_with_link, recKey) .toSpannable() .colorizeMatchingText(recKey, colorProvider.getColorFromAttribute(android.R.attr.textColorLink)) diff --git a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSaveRecoveryKeyFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSaveRecoveryKeyFragment.kt index 88db55a291b..30e5ea97e5d 100644 --- a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSaveRecoveryKeyFragment.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSaveRecoveryKeyFragment.kt @@ -105,9 +105,9 @@ class BootstrapSaveRecoveryKeyFragment : startSharePlainTextIntent( requireContext(), copyStartForActivityResult, - context?.getString(R.string.keys_backup_setup_step3_share_intent_chooser_title), + context?.getString(R.string.keys_backup_setup_step3_share_key_intent_chooser_title), recoveryKey, - context?.getString(R.string.recovery_key) + context?.getString(R.string.security_key) ) } diff --git a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSharedViewModel.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSharedViewModel.kt index b3d83b948b9..70776d62db8 100644 --- a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSharedViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSharedViewModel.kt @@ -573,7 +573,7 @@ class BootstrapSharedViewModel @AssistedInject constructor( private fun BackupToQuadSMigrationTask.Result.Failure.toHumanReadable(): String { return when (this) { - is BackupToQuadSMigrationTask.Result.InvalidRecoverySecret -> stringProvider.getString(R.string.keys_backup_passphrase_error_decrypt) + is BackupToQuadSMigrationTask.Result.InvalidRecoverySecret -> stringProvider.getString(R.string.keys_backup_security_phrase_error_decrypt) is BackupToQuadSMigrationTask.Result.ErrorFailure -> errorFormatter.toHumanReadable(throwable) // is BackupToQuadSMigrationTask.Result.NoKeyBackupVersion, // is BackupToQuadSMigrationTask.Result.IllegalParams, diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/self/SelfVerificationController.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/self/SelfVerificationController.kt index 9871d216018..4bdf03c7a80 100644 --- a/vector/src/main/java/im/vector/app/features/crypto/verification/self/SelfVerificationController.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/verification/self/SelfVerificationController.kt @@ -294,7 +294,7 @@ class SelfVerificationController @Inject constructor( if (state.quadSContainsSecrets) { bottomSheetVerificationActionItem { id("passphrase") - title(host.stringProvider.getString(R.string.verification_cannot_access_other_session)) + title(host.stringProvider.getString(R.string.verification_cannot_access_other_session_use_key)) titleColor(host.colorProvider.getColorFromAttribute(R.attr.vctr_content_primary)) subTitle(host.stringProvider.getString(R.string.verification_use_passphrase)) iconRes(R.drawable.ic_arrow_right) diff --git a/vector/src/main/res/layout/bottom_sheet_save_recovery_key.xml b/vector/src/main/res/layout/bottom_sheet_save_recovery_key.xml index 5757adea6a6..e4cbaeb6177 100644 --- a/vector/src/main/res/layout/bottom_sheet_save_recovery_key.xml +++ b/vector/src/main/res/layout/bottom_sheet_save_recovery_key.xml @@ -13,7 +13,7 @@ style="@style/Widget.Vector.TextView.HeadlineMedium" android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="@string/keys_backup_setup_step3_copy_button_title" + android:text="@string/keys_backup_setup_step3_save_key_button_title" android:textAlignment="center" android:textStyle="bold" /> diff --git a/vector/src/main/res/layout/fragment_bootstrap_migrate_backup.xml b/vector/src/main/res/layout/fragment_bootstrap_migrate_backup.xml index bec16ef0b4c..7f646f590f7 100644 --- a/vector/src/main/res/layout/fragment_bootstrap_migrate_backup.xml +++ b/vector/src/main/res/layout/fragment_bootstrap_migrate_backup.xml @@ -37,7 +37,7 @@ android:inputType="textPassword" android:maxLines="3" android:singleLine="false" - tools:hint="@string/keys_backup_restore_key_enter_hint" /> + tools:hint="@string/keys_backup_restore_security_key_enter_hint" />