Merge branch 'charlesmchen/fingerprints6'

Signal/Images.xcassets/table_ic_not_verified.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "table_ic_not_verified@1x.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "table_ic_not_verified@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "table_ic_not_verified@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Signal/src/ViewControllers/OWSConversationSettingsTableViewController.m

@@ -240,12 +240,16 @@ NS_ASSUME_NONNULL_BEGIN
     firstSection.customHeaderHeight = @(100.f);
 
     if (!self.isGroupThread && self.thread.hasSafetyNumbers) {
+        NSString *recipientId = self.thread.contactIdentifier;
+        BOOL isVerified = [[OWSIdentityManager sharedManager] verificationStateForRecipientId:recipientId]
+            == OWSVerificationStateVerified;
+
         [firstSection addItem:[OWSTableItem itemWithCustomCellBlock:^{
             return [weakSelf
                 disclosureCellWithName:
                     NSLocalizedString(@"VERIFY_PRIVACY",
                         @"Label for button or row which allows users to verify the safety number of another user.")
-                              iconName:@"table_ic_verify"];
+                              iconName:(isVerified ? @"table_ic_verify" : @"table_ic_not_verified")];
         }
                                   actionBlock:^{
                                       [weakSelf showVerificationView];

Signal/src/views/OWSSystemMessageCell.m

@@ -141,6 +141,15 @@ NS_ASSUME_NONNULL_BEGIN
                 break;
             case TSInfoMessageVerificationStateChange:
                 result = [UIImage imageNamed:@"system_message_verified"];
+
+                OWSAssert([interaction isKindOfClass:[OWSVerificationStateChangeMessage class]]);
+                if ([interaction isKindOfClass:[OWSVerificationStateChangeMessage class]]) {
+                    OWSVerificationStateChangeMessage *message = (OWSVerificationStateChangeMessage *)interaction;
+                    BOOL isVerified = message.verificationState == OWSVerificationStateVerified;
+                    if (!isVerified) {
+                        result = [UIImage imageNamed:@"system_message_info"];
+                    }
+                }
                 break;
         }
     } else if ([interaction isKindOfClass:[TSCall class]]) {

Signal/translations/en.lproj/Localizable.strings

@@ -1430,16 +1430,16 @@
 "VERIFICATION_PHONE_NUMBER_FORMAT" = "Enter the verification code we sent to %@.";
 
 /* Format for info message indicating that the verification state was unverified on this device. Embeds {{user's name or phone number}}. */
-"VERIFICATION_STATE_CHANGE_FORMAT_NOT_VERIFIED_LOCAL" = "You unverified %@.";
+"VERIFICATION_STATE_CHANGE_FORMAT_NOT_VERIFIED_LOCAL" = "You marked %@ as not verified.";
 
 /* Format for info message indicating that the verification state was unverified on another device. Embeds {{user's name or phone number}}. */
-"VERIFICATION_STATE_CHANGE_FORMAT_NOT_VERIFIED_OTHER_DEVICE" = "You unverified %@ on another device.";
+"VERIFICATION_STATE_CHANGE_FORMAT_NOT_VERIFIED_OTHER_DEVICE" = "You marked %@ as not verified on another device.";
 
 /* Format for info message indicating that the verification state was verified on this device. Embeds {{user's name or phone number}}. */
-"VERIFICATION_STATE_CHANGE_FORMAT_VERIFIED_LOCAL" = "You verified %@.";
+"VERIFICATION_STATE_CHANGE_FORMAT_VERIFIED_LOCAL" = "You marked %@ as verified.";
 
 /* Format for info message indicating that the verification state was verified on another device. Embeds {{user's name or phone number}}. */
-"VERIFICATION_STATE_CHANGE_FORMAT_VERIFIED_OTHER_DEVICE" = "You verified %@ on another device.";
+"VERIFICATION_STATE_CHANGE_FORMAT_VERIFIED_OTHER_DEVICE" = "You marked %@ as verified on another device.";
 
 /* Generic message indicating that verification state changed for a given user. */
 "VERIFICATION_STATE_CHANGE_GENERIC" = "Verification state changed.";