diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/choose/VerificationChooseMethodController.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/choose/VerificationChooseMethodController.kt index c3908ea90e..3b45157d9c 100644 --- a/vector/src/main/java/im/vector/app/features/crypto/verification/choose/VerificationChooseMethodController.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/verification/choose/VerificationChooseMethodController.kt @@ -47,12 +47,15 @@ class VerificationChooseMethodController @Inject constructor( if (state.otherCanScanQrCode || state.otherCanShowQrCode) { var scanCodeInstructions: String var scanOtherCodeTitle: String + var compareEmojiSubtitle: String if (state.isMe) { scanCodeInstructions = host.stringProvider.getString(R.string.verification_scan_self_notice) scanOtherCodeTitle = host.stringProvider.getString(R.string.verification_scan_with_this_device) + compareEmojiSubtitle = host.stringProvider.getString(R.string.verification_scan_self_emoji_subtitle) } else { scanCodeInstructions = host.stringProvider.getString(R.string.verification_scan_notice) scanOtherCodeTitle = host.stringProvider.getString(R.string.verification_scan_their_code) + compareEmojiSubtitle = host.stringProvider.getString(R.string.verification_scan_emoji_subtitle) } bottomSheetVerificationNoticeItem { @@ -90,7 +93,7 @@ class VerificationChooseMethodController @Inject constructor( id("openEmoji") title(host.stringProvider.getString(R.string.verification_scan_emoji_title)) titleColor(host.colorProvider.getColorFromAttribute(R.attr.vctr_content_primary)) - subTitle(host.stringProvider.getString(R.string.verification_scan_emoji_subtitle)) + subTitle(compareEmojiSubtitle) iconRes(R.drawable.ic_arrow_right) iconColor(host.colorProvider.getColorFromAttribute(R.attr.vctr_content_primary)) listener { host.listener?.doVerifyBySas() } diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml index 7f827e17bc..2708ad9fa8 100644 --- a/vector/src/main/res/values/strings.xml +++ b/vector/src/main/res/values/strings.xml @@ -2630,11 +2630,12 @@ You Scan the code with the other user\'s device to securely verify each other - Scan the code with your other device to securely verify each other + Scan the code with your other device or switch and scan with this device Scan their code Scan with this device Can\'t scan If you\'re not in person, compare emoji instead + Verify by comparing emoji instead Verify by comparing emojis