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) {
-            if (![responseObject isKindOfClass:[NSData class]]) {
+            dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-                DDLogError(@"%@ Failed retrieval of attachment. Response had unexpected format.", self.tag);
+                if (![responseObject isKindOfClass:[NSData class]]) {
-                NSError *error = OWSErrorMakeUnableToProcessServerResponseError();
+                    DDLogError(@"%@ Failed retrieval of attachment. Response had unexpected format.", self.tag);
-                return failureHandler(task, error);
+                    NSError *error = OWSErrorMakeUnableToProcessServerResponseError();
-            }
+                    return failureHandler(task, error);
-            successHandler((NSData *)responseObject);
+                }
+                successHandler((NSData *)responseObject);
+            });
         }
         failure:^(NSURLSessionDataTask *_Nullable task, NSError *_Nonnull error) {
-            DDLogError(@"Failed to retrieve attachment with error: %@", error.description);
+            dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-            return failureHandler(task, error);
+                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,59 +224,62 @@ 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
 {
-    // Become eventually consistent in the case that the remote changed their settings at the same time.
+    OWSAssert(message);
-    // Also in case remote doesn't support expiring messages
+    OWSAssert(contactsManager);
-    OWSDisappearingMessagesConfiguration *disappearingMessagesConfiguration =
+
-        [OWSDisappearingMessagesConfiguration fetchOrCreateDefaultWithThreadId:message.uniqueThreadId];
+    dispatch_async(OWSDisappearingMessagesJob.serialQueue, ^{
-
+        // Become eventually consistent in the case that the remote changed their settings at the same time.
-    BOOL changed = NO;
+        // Also in case remote doesn't support expiring messages
-    if (message.expiresInSeconds == 0) {
+        OWSDisappearingMessagesConfiguration *disappearingMessagesConfiguration =
-        if (disappearingMessagesConfiguration.isEnabled) {
+            [OWSDisappearingMessagesConfiguration fetchOrCreateDefaultWithThreadId:message.uniqueThreadId];
+
+        BOOL changed = NO;
+        if (message.expiresInSeconds == 0) {
+            if (disappearingMessagesConfiguration.isEnabled) {
+                changed = YES;
+                DDLogWarn(@"%@ Received remote message which had no expiration set, disabling our expiration to become "
+                          @"consistent.",
+                    self.tag);
+                disappearingMessagesConfiguration.enabled = NO;
+                [disappearingMessagesConfiguration save];
+            }
+        } else if (message.expiresInSeconds != disappearingMessagesConfiguration.durationSeconds) {
             changed = YES;
-            DDLogWarn(@"%@ Received remote message which had no expiration set, disabling our expiration to become "
+            DDLogInfo(@"%@ Received remote message with different expiration set, updating our expiration to become "
                       @"consistent.",
                 self.tag);
-            disappearingMessagesConfiguration.enabled = NO;
+            disappearingMessagesConfiguration.enabled = YES;
+            disappearingMessagesConfiguration.durationSeconds = message.expiresInSeconds;
             [disappearingMessagesConfiguration save];
         }
-    } else if (message.expiresInSeconds != disappearingMessagesConfiguration.durationSeconds) {
-        changed = YES;
-        DDLogInfo(
-            @"%@ Received remote message with different expiration set, updating our expiration to become consistent.",
-            self.tag);
-        disappearingMessagesConfiguration.enabled = YES;
-        disappearingMessagesConfiguration.durationSeconds = message.expiresInSeconds;
-        [disappearingMessagesConfiguration save];
-    }
 
-    if (!changed) {
+        if (!changed) {
-        return;
+            return;
-    }
+        }
 
-    if ([message isKindOfClass:[TSIncomingMessage class]]) {
+        if ([message isKindOfClass:[TSIncomingMessage class]]) {
-        TSIncomingMessage *incomingMessage = (TSIncomingMessage *)message;
+            TSIncomingMessage *incomingMessage = (TSIncomingMessage *)message;
-        NSString *contactName = [contactsManager displayNameForPhoneIdentifier:incomingMessage.messageAuthorId];
+            NSString *contactName = [contactsManager displayNameForPhoneIdentifier:incomingMessage.messageAuthorId];
-
+
-        // We want the info message to appear _before_ the message.
+            // We want the info message to appear _before_ the message.
-        [[[OWSDisappearingConfigurationUpdateInfoMessage alloc] initWithTimestamp:message.timestamp - 1
+            [[[OWSDisappearingConfigurationUpdateInfoMessage alloc] initWithTimestamp:message.timestamp - 1
-                                                                           thread:message.thread
+                                                                               thread:message.thread
-                                                                    configuration:disappearingMessagesConfiguration
+                                                                        configuration:disappearingMessagesConfiguration
-                                                              createdByRemoteName:contactName] save];
+                                                                  createdByRemoteName:contactName] save];
-    } else {
+        } else {
-        // We want the info message to appear _before_ the message.
+            // We want the info message to appear _before_ the message.
-        [[[OWSDisappearingConfigurationUpdateInfoMessage alloc] initWithTimestamp:message.timestamp - 1
+            [[[OWSDisappearingConfigurationUpdateInfoMessage alloc] initWithTimestamp:message.timestamp - 1
-                                                                           thread:message.thread
+                                                                               thread:message.thread
-                                                                    configuration:disappearingMessagesConfiguration]
+                                                                        configuration:disappearingMessagesConfiguration]
-            save];
+                save];
-    }
+        }
+    });
 }
 
 - (void)startIfNecessary

SignalServiceKit/src/Messages/OWSMessageSender.m

@@ -600,9 +600,9 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException";
                success:(void (^)())successHandler
                failure:(RetryableFailureHandler)failureHandler
 {
-    TSThread *thread = message.thread;
-
     dispatch_async([OWSDispatch sendingQueue], ^{
+        TSThread *thread = message.thread;
+
         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];
 }