From 04cad290f7807015e7e33f5a1318f905ac42fb95 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 5 Jul 2021 19:49:48 +0100
Subject: [PATCH] Also change the emoji button subtitle

and tweak the other string more because it's not "each other" either
---
 .../choose/VerificationChooseMethodController.kt             | 5 ++++-
 vector/src/main/res/values/strings.xml                       | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

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 @@
     <string name="you">You</string>
 
     <string name="verification_scan_notice">Scan the code with the other user\'s device to securely verify each other</string>
-    <string name="verification_scan_self_notice">Scan the code with your other device to securely verify each other</string>
+    <string name="verification_scan_self_notice">Scan the code with your other device or switch and scan with this device</string>
     <string name="verification_scan_their_code">Scan their code</string>
     <string name="verification_scan_with_this_device">Scan with this device</string>
     <string name="verification_scan_emoji_title">Can\'t scan</string>
     <string name="verification_scan_emoji_subtitle">If you\'re not in person, compare emoji instead</string>
+    <string name="verification_scan_self_emoji_subtitle">Verify by comparing emoji instead</string>
 
     <string name="verification_no_scan_emoji_title">Verify by comparing emojis</string>