Merge branch 'WhisperSystems-mkirk/fix-verification-crash'

src/Messages/OWSIdentityManager.m

@@ -480,7 +480,9 @@ NSString *const kNSNotificationName_IdentityStateDidChange = @"kNSNotificationNa
                                   recipientId:recipientId];
             }
             if (message.recipientIds.count > 0) {
-                [self sendSyncVerificationStateMessage:message];
+                dispatch_async(dispatch_get_main_queue(), ^{
+                    [self sendSyncVerificationStateMessage:message];
+                });
             }
         }
     });
@@ -507,7 +509,9 @@ NSString *const kNSNotificationName_IdentityStateDidChange = @"kNSNotificationNa
                                   recipientId:recipientIdentity.recipientId];
             }];
             if (message.recipientIds.count > 0) {
-                [self sendSyncVerificationStateMessage:message];
+                dispatch_async(dispatch_get_main_queue(), ^{
+                    [self sendSyncVerificationStateMessage:message];
+                });
             }
         }
     });
@@ -528,6 +532,7 @@ NSString *const kNSNotificationName_IdentityStateDidChange = @"kNSNotificationNa
 {
     OWSAssert(message);
     OWSAssert(message.recipientIds.count > 0);
+    OWSAssert([NSThread isMainThread]);
 
     if (![self isSyncEnabled]) {
         DDLogInfo(@"Skipping outgoing sync message.");

src/Messages/TSMessagesManager.m

@@ -219,6 +219,9 @@ NS_ASSUME_NONNULL_BEGIN
         [description appendString:@"Blocked"];
     } else if (syncMessage.read.count > 0) {
         [description appendString:@"ReadReceipt"];
+    } else if (syncMessage.verified.count > 0){
+        NSString *verifiedString = [NSString stringWithFormat:@"Verifications: (%lu)", (unsigned long)syncMessage.verified.count];
+        [description appendString:verifiedString];
     } else {
         // Shouldn't happen
         OWSAssert(NO);