Merge branch 'mkirk/sn-copy-changes'

Signal/src/ViewControllers/FingerprintViewScanController.m

@@ -197,17 +197,17 @@ NS_ASSUME_NONNULL_BEGIN
                                                                              message:successDescription
                                                                       preferredStyle:UIAlertControllerStyleAlert];
     [alertController
-        addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"FINGERPRINT_SCAN_VERIFY_BUTTON",
+        addAction:[UIAlertAction
-                                                     @"Button that verifies user after a successful fingerprint scan.")
+                      actionWithTitle:NSLocalizedString(@"FINGERPRINT_SCAN_VERIFY_BUTTON",
-                                           style:UIAlertActionStyleDefault
+                                          @"Button that marks user as verified after a successful fingerprint scan.")
-                                         handler:^(UIAlertAction *action) {
+                                style:UIAlertActionStyleDefault
-                                             [OWSIdentityManager.sharedManager
+                              handler:^(UIAlertAction *action) {
-                                                 setVerificationState:OWSVerificationStateVerified
+                                  [OWSIdentityManager.sharedManager setVerificationState:OWSVerificationStateVerified
-                                                          identityKey:identityKey
+                                                                             identityKey:identityKey
-                                                          recipientId:recipientId
+                                                                             recipientId:recipientId
-                                                      sendSyncMessage:YES];
+                                                                         sendSyncMessage:YES];
-                                             [viewController dismissViewControllerAnimated:true completion:nil];
+                                  [viewController dismissViewControllerAnimated:true completion:nil];
-                                         }]];
+                              }]];
     UIAlertAction *dismissAction =
         [UIAlertAction actionWithTitle:dismissText
                                  style:UIAlertActionStyleDefault

Signal/translations/en.lproj/Localizable.strings

@@ -532,8 +532,8 @@
 /* alert title */
 "FAILED_VERIFICATION_TITLE" = "Failed to Verify Safety Number!";
 
-/* Button that verifies user after a successful fingerprint scan. */
+/* Button that marks user as verified after a successful fingerprint scan. */
-"FINGERPRINT_SCAN_VERIFY_BUTTON" = "Verify";
+"FINGERPRINT_SCAN_VERIFY_BUTTON" = "Mark as Verified";
 
 /* No comment provided by engineer. */
 "FINGERPRINT_SHRED_KEYMATERIAL_BUTTON" = "Reset this session.";
@@ -1328,10 +1328,10 @@
 "SMS_INVITE_BODY" = "I'm inviting you to install Signal! Here is the link:";
 
 /* Alert body after verifying privacy with {{other user's name}} */
-"SUCCESSFUL_VERIFICATION_DESCRIPTION" = "Your safety number with %@ has been verified. You can mark this contact as verified.";
+"SUCCESSFUL_VERIFICATION_DESCRIPTION" = "Your safety number with %@ matches. You can mark this contact as verified.";
 
 /* No comment provided by engineer. */
-"SUCCESSFUL_VERIFICATION_TITLE" = "Safety Number Verified!";
+"SUCCESSFUL_VERIFICATION_TITLE" = "Safety Number Matches!";
 
 /* generic cancel text */
 "TXT_CANCEL_TITLE" = "Cancel";