Respond to CR.

SignalServiceKit/src/Messages/OWSIdentityManager.h

@@ -60,7 +60,8 @@ extern const NSUInteger kIdentityKeyLength;
 - (nullable OWSRecipientIdentity *)untrustedIdentityForSendingToRecipientId:(NSString *)recipientId;
 
 // This method can be called from any thread.
-- (void)processIncomingSyncMessage:(OWSSignalServiceProtosVerified *)verified;
+- (void)processIncomingSyncMessage:(OWSSignalServiceProtosVerified *)verified
+                       transaction:(YapDatabaseReadWriteTransaction *)transaction;
 
 - (BOOL)saveRemoteIdentity:(NSData *)identityKey recipientId:(NSString *)recipientId;
 

SignalServiceKit/src/Messages/OWSIdentityManager.m

@@ -683,7 +683,11 @@ NSString *const kNSNotificationName_IdentityStateDidChange = @"kNSNotificationNa
 }
 
 - (void)processIncomingSyncMessage:(OWSSignalServiceProtosVerified *)verified
+                       transaction:(YapDatabaseReadWriteTransaction *)transaction
 {
+    OWSAssert(verified);
+    OWSAssert(transaction);
+
     NSString *recipientId = verified.destination;
     if (recipientId.length < 1) {
         OWSFail(@"Verification state sync message missing recipientId.");
@@ -698,32 +702,29 @@ NSString *const kNSNotificationName_IdentityStateDidChange = @"kNSNotificationNa
     }
     NSData *identityKey = [rawIdentityKey removeKeyType];
 
-    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+    switch (verified.state) {
-        [self.dbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction * transaction) {
+        case OWSSignalServiceProtosVerifiedStateDefault:
-            switch (verified.state) {
+            [self tryToApplyVerificationStateFromSyncMessage:OWSVerificationStateDefault
-                case OWSSignalServiceProtosVerifiedStateDefault:
+                                                 recipientId:recipientId
-                    [self tryToApplyVerificationStateFromSyncMessage:OWSVerificationStateDefault
+                                                 identityKey:identityKey
-                                                         recipientId:recipientId
+                                         overwriteOnConflict:NO
-                                                         identityKey:identityKey
+                                                 transaction:transaction];
-                                                 overwriteOnConflict:NO
+            break;
-                                                         transaction:transaction];
+        case OWSSignalServiceProtosVerifiedStateVerified:
-                    break;
+            [self tryToApplyVerificationStateFromSyncMessage:OWSVerificationStateVerified
-                case OWSSignalServiceProtosVerifiedStateVerified:
+                                                 recipientId:recipientId
-                    [self tryToApplyVerificationStateFromSyncMessage:OWSVerificationStateVerified
+                                                 identityKey:identityKey
-                                                         recipientId:recipientId
+                                         overwriteOnConflict:YES
-                                                         identityKey:identityKey
+                                                 transaction:transaction];
-                                                 overwriteOnConflict:YES
+            break;
-                                                         transaction:transaction];
+        case OWSSignalServiceProtosVerifiedStateUnverified:
-                    break;
+            OWSFail(@"Verification state sync message for recipientId: %@ has unexpected value: %@.",
-                case OWSSignalServiceProtosVerifiedStateUnverified:
+                recipientId,
-                    OWSFail(@"Verification state sync message for recipientId: %@ has unexpected value: %@.",
+                OWSVerificationStateToString(OWSVerificationStateNoLongerVerified));
-                            recipientId,
+            return;
-                            OWSVerificationStateToString(OWSVerificationStateNoLongerVerified));
+    }
-                    return;
+
-            }
+    [self fireIdentityStateChangeNotification];
-        }];
-        [self fireIdentityStateChangeNotification];
-    });
 }
 
 - (void)tryToApplyVerificationStateFromSyncMessage:(OWSVerificationState)verificationState

SignalServiceKit/src/Messages/OWSMessageManager.m

@@ -699,7 +699,7 @@ NS_ASSUME_NONNULL_BEGIN
                                                                      transaction:transaction];
     } else if (syncMessage.hasVerified) {
         DDLogInfo(@"%@ Received verification state for %@", self.logTag, syncMessage.verified.destination);
-        [self.identityManager processIncomingSyncMessage:syncMessage.verified];
+        [self.identityManager processIncomingSyncMessage:syncMessage.verified transaction:transaction];
     } else {
         DDLogWarn(@"%@ Ignoring unsupported sync message.", self.logTag);
     }