Merge pull request #4525 from vector-im/dbkr/scan_button_title

Use different title for scan button for self verification

CHANGES.rst

@@ -13,6 +13,7 @@ Changes to be released in next version
  * Fix crash on Apple Silicon Macs.
  * Media Picker: Generate video thumbnails with the correct orientation (#4515).
  * Directory List (pop-up one): Fix duplicate rooms being shown (#4537).
+ * Use different title for scan button for self verification (#4525)
 
 ⚠️ API Changes
  * 

Riot/Assets/en.lproj/Vector.strings

@@ -1387,6 +1387,7 @@ Tap the + to start adding people.";
 "key_verification_verify_qr_code_information_other_device" = "Scan the code below to verify:";
 "key_verification_verify_qr_code_emoji_information" = "Verify by comparing unique emoji.";
 "key_verification_verify_qr_code_scan_code_action" = "Scan their code";
+"key_verification_verify_qr_code_scan_code_other_device_action" = "Scan with this device";
 "key_verification_verify_qr_code_cannot_scan_action" = "Can't scan?";
 "key_verification_verify_qr_code_start_emoji_action" = "Verify by emoji";
 

Riot/Generated/Strings.swift

@@ -2014,6 +2014,10 @@ internal enum VectorL10n {
   internal static var keyVerificationVerifyQrCodeScanCodeAction: String { 
     return VectorL10n.tr("Vector", "key_verification_verify_qr_code_scan_code_action") 
   }
+  /// Scan with this device
+  internal static var keyVerificationVerifyQrCodeScanCodeOtherDeviceAction: String { 
+    return VectorL10n.tr("Vector", "key_verification_verify_qr_code_scan_code_other_device_action") 
+  }
   /// QR code has been successfully validated.
   internal static var keyVerificationVerifyQrCodeScanOtherCodeSuccessMessage: String { 
     return VectorL10n.tr("Vector", "key_verification_verify_qr_code_scan_other_code_success_message") 

Riot/Modules/KeyVerification/Common/Verify/Scanning/KeyVerificationVerifyByScanningViewController.swift

@@ -143,7 +143,9 @@ final class KeyVerificationVerifyByScanningViewController: UIViewController {
         self.titleLabel.text = VectorL10n.keyVerificationVerifyQrCodeTitle
         self.informationLabel.text = VectorL10n.keyVerificationVerifyQrCodeInformation
         
-        self.scanCodeButton.setTitle(VectorL10n.keyVerificationVerifyQrCodeScanCodeAction, for: .normal)
+        // Hide until we have the type of the verification request
+        self.scanCodeButton.isHidden = true
+
         self.cannotScanButton.setTitle(VectorL10n.keyVerificationVerifyQrCodeCannotScanAction, for: .normal)
     }
 
@@ -157,8 +159,8 @@ final class KeyVerificationVerifyByScanningViewController: UIViewController {
             self.render(error: error)
         case .scannedCodeValidated(let isValid):
             self.renderScannedCode(valid: isValid)        
-        case .cancelled(let reason):
-            self.renderCancelled(reason: reason)
+        case .cancelled(let reason, let verificationKind):
+            self.renderCancelled(reason: reason, verificationKind: verificationKind)
         case .cancelledByMe(let reason):
             self.renderCancelledByMe(reason: reason)
         }
@@ -195,10 +197,13 @@ final class KeyVerificationVerifyByScanningViewController: UIViewController {
             switch viewData.verificationKind {
             case .user:
                 informationText = VectorL10n.keyVerificationVerifyQrCodeInformation
+                self.scanCodeButton.setTitle(VectorL10n.keyVerificationVerifyQrCodeScanCodeAction, for: .normal)
             default:
                 informationText = VectorL10n.keyVerificationVerifyQrCodeInformationOtherDevice
+                self.scanCodeButton.setTitle(VectorL10n.keyVerificationVerifyQrCodeScanCodeOtherDeviceAction, for: .normal)
             }
             
+            self.scanCodeButton.isHidden = false
             self.informationLabel.text = informationText
         }
     }
@@ -231,12 +236,21 @@ final class KeyVerificationVerifyByScanningViewController: UIViewController {
         }
     }
     
-    private func renderCancelled(reason: MXTransactionCancelCode) {
+    private func renderCancelled(reason: MXTransactionCancelCode,
+                                 verificationKind: KeyVerificationKind) {
         self.activityPresenter.removeCurrentActivityIndicator(animated: true)
     
         self.stopQRCodeScanningIfPresented()
         
-        self.errorPresenter.presentError(from: self.alertPresentingViewController, title: "", message: VectorL10n.deviceVerificationCancelled, animated: true) {
+        // if we're verifying with someone else, let the user know they cancelled.
+        // if we're verifying our own device, assume the user probably knows since it was them who
+        // cancelled on their other device
+        if verificationKind == .user {
+            self.errorPresenter.presentError(from: self.alertPresentingViewController, title: "", message: VectorL10n.deviceVerificationCancelled, animated: true) {
+                self.dismissQRCodeScanningIfPresented(animated: false)
+                self.viewModel.process(viewAction: .cancel)
+            }
+        } else {
             self.dismissQRCodeScanningIfPresented(animated: false)
             self.viewModel.process(viewAction: .cancel)
         }

Riot/Modules/KeyVerification/Common/Verify/Scanning/KeyVerificationVerifyByScanningViewModel.swift

@@ -225,7 +225,7 @@ final class KeyVerificationVerifyByScanningViewModel: KeyVerificationVerifyBySca
                 return
             }
             self.unregisterTransactionDidStateChangeNotification()
-            self.update(viewState: .cancelled(reason))
+            self.update(viewState: .cancelled(cancelCode: reason, verificationKind: verificationKind))
         case MXSASTransactionStateCancelledByMe:
             guard let reason = transaction.reasonCancelCode else {
                 return
@@ -251,7 +251,7 @@ final class KeyVerificationVerifyByScanningViewModel: KeyVerificationVerifyBySca
                 return
             }
             self.unregisterTransactionDidStateChangeNotification()
-            self.update(viewState: .cancelled(reason))
+            self.update(viewState: .cancelled(cancelCode: reason, verificationKind: verificationKind))
         case .cancelledByMe:
             guard let reason = transaction.reasonCancelCode else {
                 return

Riot/Modules/KeyVerification/Common/Verify/Scanning/KeyVerificationVerifyByScanningViewState.swift

@@ -29,7 +29,7 @@ enum KeyVerificationVerifyByScanningViewState {
     case loading
     case loaded(viewData: KeyVerificationVerifyByScanningViewData)
     case scannedCodeValidated(isValid: Bool)    
-    case cancelled(MXTransactionCancelCode)
+    case cancelled(cancelCode: MXTransactionCancelCode, verificationKind: KeyVerificationKind)
     case cancelledByMe(MXTransactionCancelCode)
     case error(Error)
 }