More thread safety fixes.

// FREEBIE

SignalServiceKit/src/Messages/Attachments/OWSAttachmentsProcessor.m

@@ -363,16 +363,20 @@ static const CGFloat kAttachmentDownloadProgressTheta = 0.001f;
             hasCheckedContentLength = YES;
         }
         success:^(NSURLSessionDataTask *_Nonnull task, id _Nullable responseObject) {
+            dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
                 if (![responseObject isKindOfClass:[NSData class]]) {
                     DDLogError(@"%@ Failed retrieval of attachment. Response had unexpected format.", self.tag);
                     NSError *error = OWSErrorMakeUnableToProcessServerResponseError();
                     return failureHandler(task, error);
                 }
                 successHandler((NSData *)responseObject);
+            });
         }
         failure:^(NSURLSessionDataTask *_Nullable task, NSError *_Nonnull error) {
+            dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
                 DDLogError(@"Failed to retrieve attachment with error: %@", error.description);
                 return failureHandler(task, error);
+            });
         }];
 }
 

SignalServiceKit/src/Messages/Interactions/TSInteraction.h

@@ -18,6 +18,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (NSString *)description;
 
+- (TSThread *)threadWithTransaction:(YapDatabaseReadWriteTransaction *)transaction;
+
 /**
  * When an interaction is updated, it often affects the UI for it's containing thread. Touching it's thread will notify
  * any observers so they can redraw any related UI.

SignalServiceKit/src/Messages/Interactions/TSInteraction.m

@@ -77,6 +77,11 @@ NS_ASSUME_NONNULL_BEGIN
     return [TSThread fetchObjectWithUniqueID:self.uniqueThreadId];
 }
 
+- (TSThread *)threadWithTransaction:(YapDatabaseReadWriteTransaction *)transaction
+{
+    return [TSThread fetchObjectWithUniqueID:self.uniqueThreadId transaction:transaction];
+}
+
 - (void)touchThreadWithTransaction:(YapDatabaseReadWriteTransaction *)transaction
 {
     TSThread *thread = [TSThread fetchObjectWithUniqueID:self.uniqueThreadId transaction:transaction];

SignalServiceKit/src/Messages/OWSDisappearingMessagesJob.m

@@ -224,14 +224,16 @@ NS_ASSUME_NONNULL_BEGIN
 + (void)becomeConsistentWithConfigurationForMessage:(TSMessage *)message
                                     contactsManager:(id<ContactsManagerProtocol>)contactsManager
 {
-    dispatch_async(self.serialQueue, ^{
         [[self sharedJob] becomeConsistentWithConfigurationForMessage:message contactsManager:contactsManager];
-    });
 }
 
 - (void)becomeConsistentWithConfigurationForMessage:(TSMessage *)message
                                     contactsManager:(id<ContactsManagerProtocol>)contactsManager
 {
+    OWSAssert(message);
+    OWSAssert(contactsManager);
+
+    dispatch_async(OWSDisappearingMessagesJob.serialQueue, ^{
         // Become eventually consistent in the case that the remote changed their settings at the same time.
         // Also in case remote doesn't support expiring messages
         OWSDisappearingMessagesConfiguration *disappearingMessagesConfiguration =
@@ -249,8 +251,8 @@ NS_ASSUME_NONNULL_BEGIN
             }
         } else if (message.expiresInSeconds != disappearingMessagesConfiguration.durationSeconds) {
             changed = YES;
-        DDLogInfo(
+            DDLogInfo(@"%@ Received remote message with different expiration set, updating our expiration to become "
-            @"%@ Received remote message with different expiration set, updating our expiration to become consistent.",
+                      @"consistent.",
                 self.tag);
             disappearingMessagesConfiguration.enabled = YES;
             disappearingMessagesConfiguration.durationSeconds = message.expiresInSeconds;
@@ -277,6 +279,7 @@ NS_ASSUME_NONNULL_BEGIN
                                                                         configuration:disappearingMessagesConfiguration]
                 save];
         }
+    });
 }
 
 - (void)startIfNecessary

SignalServiceKit/src/Messages/OWSMessageSender.m

@@ -600,9 +600,9 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException";
                success:(void (^)())successHandler
                failure:(RetryableFailureHandler)failureHandler
 {
+    dispatch_async([OWSDispatch sendingQueue], ^{
         TSThread *thread = message.thread;
 
-    dispatch_async([OWSDispatch sendingQueue], ^{
         if ([thread isKindOfClass:[TSGroupThread class]]) {
             TSGroupThread *gThread = (TSGroupThread *)thread;
 

SignalServiceKit/src/Messages/OWSReadReceiptManager.m

@@ -470,7 +470,7 @@ NSString *const OWSReadReceiptManagerAreReadReceiptsEnabled = @"areReadReceiptsE
     // Use timestampForSorting which reflects local sort order, rather than timestamp
     // which reflect sender time.
     [self markAsReadBeforeTimestamp:message.timestampForSorting
-                             thread:message.thread
+                             thread:[message threadWithTransaction:transaction]
                            wasLocal:NO
                         transaction:transaction];
 }