Add protocol context to protocol kit.

SignalServiceKit/src/Contacts/Threads/TSGroupThread.h

@@ -27,7 +27,8 @@ NS_ASSUME_NONNULL_BEGIN
 + (NSString *)threadIdFromGroupId:(NSData *)groupId;
 
 // all group threads containing recipient as a member
-+ (NSArray<TSGroupThread *> *)groupThreadsWithRecipientId:(NSString *)recipientId;
++ (NSArray<TSGroupThread *> *)groupThreadsWithRecipientId:(NSString *)recipientId
+                                              transaction:(YapDatabaseReadWriteTransaction *)transaction;
 
 - (void)updateAvatarWithAttachmentStream:(TSAttachmentStream *)attachmentStream;
 - (void)updateAvatarWithAttachmentStream:(TSAttachmentStream *)attachmentStream

SignalServiceKit/src/Contacts/Threads/TSGroupThread.m

@@ -144,28 +144,22 @@ NS_ASSUME_NONNULL_BEGIN
     return [groupMemberIds copy];
 }
 
-// Group and Contact threads share a collection, this is a convenient way to enumerate *just* the group threads
-+ (void)enumerateGroupThreadsUsingBlock:(void (^)(TSGroupThread *groupThread, BOOL *stop))block
-{
-    [self enumerateCollectionObjectsUsingBlock:^(id obj, BOOL *stop) {
-        if ([obj isKindOfClass:[TSGroupThread class]]) {
-            block((TSGroupThread *)obj, stop);
-        }
-    }];
-}
-
 // @returns all threads to which the recipient is a member.
 //
 // @note If this becomes a hotspot we can extract into a YapDB View.
 // As is, the number of groups should be small (dozens, *maybe* hundreds), and we only enumerate them upon SN changes.
 + (NSArray<TSGroupThread *> *)groupThreadsWithRecipientId:(NSString *)recipientId
-{
+                                              transaction:(YapDatabaseReadWriteTransaction *)transaction {
+
     NSMutableArray<TSGroupThread *> *groupThreads = [NSMutableArray new];
 
-    [self enumerateGroupThreadsUsingBlock:^(TSGroupThread *_Nonnull groupThread, BOOL *_Nonnull stop) {
+    [self enumerateCollectionObjectsWithTransaction:transaction usingBlock:^(id obj, BOOL *stop) {
+        if ([obj isKindOfClass:[TSGroupThread class]]) {
+            TSGroupThread *groupThread = (TSGroupThread *)obj;
             if ([groupThread.groupModel.groupMemberIds containsObject:recipientId]) {
                 [groupThreads addObject:groupThread];
             }
+        }
     }];
 
     return [groupThreads copy];

SignalServiceKit/src/Messages/OWSIdentityManager.m

@@ -471,7 +471,7 @@ NSString *const kNSNotificationName_IdentityStateDidChange = @"kNSNotificationNa
         [TSErrorMessage nonblockingIdentityChangeInThread:contactThread recipientId:recipientId];
     [messages addObject:errorMessage];
 
-    for (TSGroupThread *groupThread in [TSGroupThread groupThreadsWithRecipientId:recipientId]) {
+    for (TSGroupThread *groupThread in [TSGroupThread groupThreadsWithRecipientId:recipientId transaction:transaction]) {
         [messages addObject:[TSErrorMessage nonblockingIdentityChangeInThread:groupThread recipientId:recipientId]];
     }
 
@@ -564,7 +564,6 @@ NSString *const kNSNotificationName_IdentityStateDidChange = @"kNSNotificationNa
     });
 }
 
-// TODO: Keep converting.
 - (void)sendSyncVerificationStateMessage:(OWSVerificationStateSyncMessage *)message
 {
     OWSAssert(message);
@@ -585,7 +584,9 @@ NSString *const kNSNotificationName_IdentityStateDidChange = @"kNSNotificationNa
                     DDLogInfo(@"%@ Successfully sent verification state sync message", self.logTag);
 
                     // Record that this verification state was successfully synced.
-                    [self clearSyncMessageForRecipientId:message.verificationForRecipientId];
+                    [self.dbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction * transaction) {
+                        [self clearSyncMessageForRecipientId:message.verificationForRecipientId transaction:transaction];
+                    }];
                 }
                 failure:^(NSError *error) {
                     DDLogError(@"%@ Failed to send verification state sync message with error: %@", self.logTag, error);
@@ -598,12 +599,13 @@ NSString *const kNSNotificationName_IdentityStateDidChange = @"kNSNotificationNa
                     self.logTag,
                     message.verificationForRecipientId);
                 // Otherwise this will fail forever.
-                [self clearSyncMessageForRecipientId:message.verificationForRecipientId];
+                [self.dbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction * transaction) {
+                    [self clearSyncMessageForRecipientId:message.verificationForRecipientId transaction:transaction];
+                }];
             }
         }];
 }
 
-// TODO: Change signature of this method.
 - (void)clearSyncMessageForRecipientId:(NSString *)recipientId
                            transaction:(YapDatabaseReadWriteTransaction *)transaction
 {
@@ -630,18 +632,21 @@ NSString *const kNSNotificationName_IdentityStateDidChange = @"kNSNotificationNa
     NSData *identityKey = [rawIdentityKey removeKeyType];
 
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+        [self.dbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction * transaction) {
             switch (verified.state) {
                 case OWSSignalServiceProtosVerifiedStateDefault:
                     [self tryToApplyVerificationStateFromSyncMessage:OWSVerificationStateDefault
                                                          recipientId:recipientId
                                                          identityKey:identityKey
-                                             overwriteOnConflict:NO];
+                                                 overwriteOnConflict:NO
+                                                         transaction:transaction];
                     break;
                 case OWSSignalServiceProtosVerifiedStateVerified:
                     [self tryToApplyVerificationStateFromSyncMessage:OWSVerificationStateVerified
                                                          recipientId:recipientId
                                                          identityKey:identityKey
-                                             overwriteOnConflict:YES];
+                                                 overwriteOnConflict:YES
+                                                         transaction:transaction];
                     break;
                 case OWSSignalServiceProtosVerifiedStateUnverified:
                     OWSFail(@"Verification state sync message for recipientId: %@ has unexpected value: %@.",
@@ -649,6 +654,7 @@ NSString *const kNSNotificationName_IdentityStateDidChange = @"kNSNotificationNa
                             OWSVerificationStateToString(OWSVerificationStateNoLongerVerified));
                     return;
             }
+        }];
         [self fireIdentityStateChangeNotification];
     });
 }
@@ -657,7 +663,11 @@ NSString *const kNSNotificationName_IdentityStateDidChange = @"kNSNotificationNa
                                        recipientId:(NSString *)recipientId
                                        identityKey:(NSData *)identityKey
                                overwriteOnConflict:(BOOL)overwriteOnConflict
+                                       transaction:(YapDatabaseReadWriteTransaction *)transaction
 {
+    OWSAssert(recipientId.length > 0);
+    OWSAssert(transaction);
+
     if (recipientId.length < 1) {
         OWSFail(@"Verification state sync message missing recipientId.");
         return;
@@ -668,9 +678,8 @@ NSString *const kNSNotificationName_IdentityStateDidChange = @"kNSNotificationNa
         return;
     }
     
-    @synchronized(self)
-    {
-        OWSRecipientIdentity *_Nullable recipientIdentity = [OWSRecipientIdentity fetchObjectWithUniqueID:recipientId];
+    OWSRecipientIdentity *_Nullable recipientIdentity = [OWSRecipientIdentity fetchObjectWithUniqueID:recipientId
+                                                                                          transaction:transaction];
     if (!recipientIdentity) {
         // There's no existing recipient identity for this recipient.
         // We should probably create one.
@@ -683,9 +692,10 @@ NSString *const kNSNotificationName_IdentityStateDidChange = @"kNSNotificationNa
         
         // Ensure a remote identity exists for this key. We may be learning about
         // it for the first time.
-            [self saveRemoteIdentity:identityKey recipientId:recipientId protocolContext:protocolContext];
+        [self saveRemoteIdentity:identityKey recipientId:recipientId protocolContext:transaction];
         
-            recipientIdentity = [OWSRecipientIdentity fetchObjectWithUniqueID:recipientId];
+        recipientIdentity = [OWSRecipientIdentity fetchObjectWithUniqueID:recipientId
+                                                              transaction:transaction];
         
         if (recipientIdentity == nil) {
             OWSFail(@"Missing expected identity: %@", recipientId);
@@ -712,7 +722,8 @@ NSString *const kNSNotificationName_IdentityStateDidChange = @"kNSNotificationNa
                   OWSVerificationStateToString(recipientIdentity.verificationState),
                   OWSVerificationStateToString(verificationState));
         
-            [recipientIdentity updateWithVerificationState:verificationState];
+        [recipientIdentity updateWithVerificationState:verificationState
+         transaction:transaction];
         
         // No need to call [saveChangeMessagesForRecipientId:..] since this is
         // a new recipient.
@@ -734,9 +745,10 @@ NSString *const kNSNotificationName_IdentityStateDidChange = @"kNSNotificationNa
             }
             
             DDLogWarn(@"recipientIdentity has non-matching identityKey; overwriting: %@", recipientId);
-                [self saveRemoteIdentity:identityKey recipientId:recipientId protocolContext:protocolContext];
+            [self saveRemoteIdentity:identityKey recipientId:recipientId protocolContext:transaction];
             
-                recipientIdentity = [OWSRecipientIdentity fetchObjectWithUniqueID:recipientId];
+            recipientIdentity = [OWSRecipientIdentity fetchObjectWithUniqueID:recipientId
+                                                                  transaction:transaction];
             
             if (recipientIdentity == nil) {
                 OWSFail(@"Missing expected identity: %@", recipientId);
@@ -758,7 +770,8 @@ NSString *const kNSNotificationName_IdentityStateDidChange = @"kNSNotificationNa
             return;
         }
         
-            [recipientIdentity updateWithVerificationState:verificationState];
+        [recipientIdentity updateWithVerificationState:verificationState
+                                           transaction:transaction];
         
         [self saveChangeMessagesForRecipientId:recipientId
                              verificationState:verificationState
@@ -766,7 +779,6 @@ NSString *const kNSNotificationName_IdentityStateDidChange = @"kNSNotificationNa
                                    transaction:transaction];
     }
 }
-}
 
 // We only want to create change messages in response to user activity,
 // on any of their devices.