Process 'sent update' transcripts.

SignalServiceKit/src/Devices/OWSRecordTranscriptJob.h

@@ -1,5 +1,5 @@
 //
-//  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2019 Open Whisper Systems. All rights reserved.
 //
 
 NS_ASSUME_NONNULL_BEGIN
@@ -12,11 +12,11 @@ NS_ASSUME_NONNULL_BEGIN
 @interface OWSRecordTranscriptJob : NSObject
 
 - (instancetype)init NS_UNAVAILABLE;
-- (instancetype)initWithIncomingSentMessageTranscript:(OWSIncomingSentMessageTranscript *)incomingSentMessageTranscript
-    NS_DESIGNATED_INITIALIZER;
 
-- (void)runWithAttachmentHandler:(void (^)(NSArray<TSAttachmentStream *> *attachmentStreams))attachmentHandler
-                     transaction:(YapDatabaseReadWriteTransaction *)transaction;
++ (void)processIncomingSentMessageTranscript:(OWSIncomingSentMessageTranscript *)incomingSentMessageTranscript
+                           attachmentHandler:(void (^)(
+                                                 NSArray<TSAttachmentStream *> *attachmentStreams))attachmentHandler
+                                 transaction:(YapDatabaseReadWriteTransaction *)transaction;
 
 @end
 

SignalServiceKit/src/Devices/OWSRecordTranscriptJob.m

@@ -18,71 +18,53 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface OWSRecordTranscriptJob ()
-
-@property (nonatomic, readonly) OWSIncomingSentMessageTranscript *incomingSentMessageTranscript;
-
-@end
-
-#pragma mark -
-
 @implementation OWSRecordTranscriptJob
 
-- (instancetype)initWithIncomingSentMessageTranscript:(OWSIncomingSentMessageTranscript *)incomingSentMessageTranscript
-{
-    self = [super init];
-    if (!self) {
-        return self;
-    }
-
-    _incomingSentMessageTranscript = incomingSentMessageTranscript;
-
-    return self;
-}
-
 #pragma mark - Dependencies
 
-- (OWSPrimaryStorage *)primaryStorage
++ (OWSPrimaryStorage *)primaryStorage
 {
     OWSAssertDebug(SSKEnvironment.shared.primaryStorage);
 
     return SSKEnvironment.shared.primaryStorage;
 }
 
-- (TSNetworkManager *)networkManager
++ (TSNetworkManager *)networkManager
 {
     OWSAssertDebug(SSKEnvironment.shared.networkManager);
 
     return SSKEnvironment.shared.networkManager;
 }
 
-- (OWSReadReceiptManager *)readReceiptManager
++ (OWSReadReceiptManager *)readReceiptManager
 {
     OWSAssert(SSKEnvironment.shared.readReceiptManager);
 
     return SSKEnvironment.shared.readReceiptManager;
 }
 
-- (id<ContactsManagerProtocol>)contactsManager
++ (id<ContactsManagerProtocol>)contactsManager
 {
     OWSAssertDebug(SSKEnvironment.shared.contactsManager);
 
     return SSKEnvironment.shared.contactsManager;
 }
 
-- (OWSAttachmentDownloads *)attachmentDownloads
++ (OWSAttachmentDownloads *)attachmentDownloads
 {
     return SSKEnvironment.shared.attachmentDownloads;
 }
 
 #pragma mark -
 
-- (void)runWithAttachmentHandler:(void (^)(NSArray<TSAttachmentStream *> *attachmentStreams))attachmentHandler
-                     transaction:(YapDatabaseReadWriteTransaction *)transaction
++ (void)processIncomingSentMessageTranscript:(OWSIncomingSentMessageTranscript *)transcript
+                           attachmentHandler:(void (^)(
+                                                 NSArray<TSAttachmentStream *> *attachmentStreams))attachmentHandler
+                                 transaction:(YapDatabaseReadWriteTransaction *)transaction
 {
+    OWSAssertDebug(transcript);
     OWSAssertDebug(transaction);
 
-    OWSIncomingSentMessageTranscript *transcript = self.incomingSentMessageTranscript;
     OWSLogInfo(@"Recording transcript in thread: %@ timestamp: %llu", transcript.thread.uniqueId, transcript.timestamp);
 
     if (transcript.isEndSessionMessage) {

SignalServiceKit/src/Messages/OWSMessageManager.m

@@ -863,9 +863,6 @@ NS_ASSUME_NONNULL_BEGIN
             [[OWSIncomingSentMessageTranscript alloc] initWithProto:syncMessage.sent
                                                         transaction:transaction];
 
-        OWSRecordTranscriptJob *recordJob =
-            [[OWSRecordTranscriptJob alloc] initWithIncomingSentMessageTranscript:transcript];
-
         SSKProtoDataMessage *_Nullable dataMessage = syncMessage.sent.message;
         if (!dataMessage) {
             OWSFailDebug(@"Missing dataMessage.");
@@ -883,29 +880,34 @@ NS_ASSUME_NONNULL_BEGIN
         }
 
         if ([self isDataMessageGroupAvatarUpdate:syncMessage.sent.message]) {
-            [recordJob
-                runWithAttachmentHandler:^(NSArray<TSAttachmentStream *> *attachmentStreams) {
-                    OWSAssertDebug(attachmentStreams.count == 1);
-                    TSAttachmentStream *attachmentStream = attachmentStreams.firstObject;
-                    [self.dbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
-                        TSGroupThread *_Nullable groupThread =
-                            [TSGroupThread threadWithGroupId:dataMessage.group.id transaction:transaction];
-                        if (!groupThread) {
-                            OWSFailDebug(@"ignoring sync group avatar update for unknown group.");
-                            return;
-                        }
-
-                        [groupThread updateAvatarWithAttachmentStream:attachmentStream transaction:transaction];
-                    }];
-                }
-                             transaction:transaction];
+            [OWSRecordTranscriptJob
+                processIncomingSentMessageTranscript:transcript
+                                   attachmentHandler:^(NSArray<TSAttachmentStream *> *attachmentStreams) {
+                                       OWSAssertDebug(attachmentStreams.count == 1);
+                                       TSAttachmentStream *attachmentStream = attachmentStreams.firstObject;
+                                       [self.dbConnection readWriteWithBlock:^(
+                                           YapDatabaseReadWriteTransaction *transaction) {
+                                           TSGroupThread *_Nullable groupThread =
+                                               [TSGroupThread threadWithGroupId:dataMessage.group.id
+                                                                    transaction:transaction];
+                                           if (!groupThread) {
+                                               OWSFailDebug(@"ignoring sync group avatar update for unknown group.");
+                                               return;
+                                           }
+
+                                           [groupThread updateAvatarWithAttachmentStream:attachmentStream
+                                                                             transaction:transaction];
+                                       }];
+                                   }
+                                         transaction:transaction];
         } else {
-            [recordJob
-                runWithAttachmentHandler:^(NSArray<TSAttachmentStream *> *attachmentStreams) {
-                    OWSLogDebug(
-                        @"successfully fetched transcript attachments: %lu", (unsigned long)attachmentStreams.count);
-                }
-                             transaction:transaction];
+            [OWSRecordTranscriptJob
+                processIncomingSentMessageTranscript:transcript
+                                   attachmentHandler:^(NSArray<TSAttachmentStream *> *attachmentStreams) {
+                                       OWSLogDebug(@"successfully fetched transcript attachments: %lu",
+                                           (unsigned long)attachmentStreams.count);
+                                   }
+                                         transaction:transaction];
         }
     } else if (syncMessage.request) {
         if (syncMessage.request.type == SSKProtoSyncMessageRequestTypeContacts) {