From 1df1144e434f96c4b148868fd184a0bdafb82830 Mon Sep 17 00:00:00 2001
From: Matthew Chen <charlesmchen@gmail.com>
Date: Thu, 28 Sep 2017 09:18:38 -0400
Subject: [PATCH] Respond to CR.

// FREEBIE
---
 Podfile.lock                                          | 2 +-
 SignalServiceKit/src/Devices/OWSRecordTranscriptJob.h | 2 --
 SignalServiceKit/src/Devices/OWSRecordTranscriptJob.m | 8 ++------
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/Podfile.lock b/Podfile.lock
index 47962746c..b5c15e928 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -130,7 +130,7 @@ EXTERNAL SOURCES:
   OpenSSL:
     :git: https://github.com/WhisperSystems/OpenSSL-Pod
   SignalServiceKit:
-    :path: "."
+    :path: .
   SocketRocket:
     :git: https://github.com/facebook/SocketRocket.git
 
diff --git a/SignalServiceKit/src/Devices/OWSRecordTranscriptJob.h b/SignalServiceKit/src/Devices/OWSRecordTranscriptJob.h
index 000e40cae..3253d17ca 100644
--- a/SignalServiceKit/src/Devices/OWSRecordTranscriptJob.h
+++ b/SignalServiceKit/src/Devices/OWSRecordTranscriptJob.h
@@ -5,7 +5,6 @@
 NS_ASSUME_NONNULL_BEGIN
 
 @class OWSIncomingSentMessageTranscript;
-@class OWSMessageSender;
 @class OWSReadReceiptManager;
 @class TSAttachmentStream;
 @class TSNetworkManager;
@@ -20,7 +19,6 @@ NS_ASSUME_NONNULL_BEGIN
 - (instancetype)init NS_UNAVAILABLE;
 - (instancetype)initWithIncomingSentMessageTranscript:(OWSIncomingSentMessageTranscript *)incomingSentMessageTranscript;
 - (instancetype)initWithIncomingSentMessageTranscript:(OWSIncomingSentMessageTranscript *)incomingSentMessageTranscript
-                                        messageSender:(OWSMessageSender *)messageSender
                                        networkManager:(TSNetworkManager *)networkManager
                                        storageManager:(TSStorageManager *)storageManager
                                    readReceiptManager:(OWSReadReceiptManager *)readReceiptManager
diff --git a/SignalServiceKit/src/Devices/OWSRecordTranscriptJob.m b/SignalServiceKit/src/Devices/OWSRecordTranscriptJob.m
index c678bedd6..bea107315 100644
--- a/SignalServiceKit/src/Devices/OWSRecordTranscriptJob.m
+++ b/SignalServiceKit/src/Devices/OWSRecordTranscriptJob.m
@@ -6,7 +6,6 @@
 #import "OWSAttachmentsProcessor.h"
 #import "OWSDisappearingMessagesJob.h"
 #import "OWSIncomingSentMessageTranscript.h"
-#import "OWSMessageSender.h"
 #import "OWSReadReceiptManager.h"
 #import "TSInfoMessage.h"
 #import "TSNetworkManager.h"
@@ -18,7 +17,6 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface OWSRecordTranscriptJob ()
 
-@property (nonatomic, readonly) OWSMessageSender *messageSender;
 @property (nonatomic, readonly) TSNetworkManager *networkManager;
 @property (nonatomic, readonly) TSStorageManager *storageManager;
 @property (nonatomic, readonly) OWSReadReceiptManager *readReceiptManager;
@@ -33,7 +31,6 @@ NS_ASSUME_NONNULL_BEGIN
 - (instancetype)initWithIncomingSentMessageTranscript:(OWSIncomingSentMessageTranscript *)incomingSentMessageTranscript
 {
     return [self initWithIncomingSentMessageTranscript:incomingSentMessageTranscript
-                                         messageSender:[TextSecureKitEnv sharedEnv].messageSender
                                         networkManager:TSNetworkManager.sharedManager
                                         storageManager:TSStorageManager.sharedManager
                                     readReceiptManager:OWSReadReceiptManager.sharedManager
@@ -41,7 +38,6 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (instancetype)initWithIncomingSentMessageTranscript:(OWSIncomingSentMessageTranscript *)incomingSentMessageTranscript
-                                        messageSender:(OWSMessageSender *)messageSender
                                        networkManager:(TSNetworkManager *)networkManager
                                        storageManager:(TSStorageManager *)storageManager
                                    readReceiptManager:(OWSReadReceiptManager *)readReceiptManager
@@ -53,7 +49,6 @@ NS_ASSUME_NONNULL_BEGIN
     }
 
     _incomingSentMessageTranscript = incomingSentMessageTranscript;
-    _messageSender = messageSender;
     _networkManager = networkManager;
     _storageManager = storageManager;
     _readReceiptManager = readReceiptManager;
@@ -103,7 +98,8 @@ NS_ASSUME_NONNULL_BEGIN
                                      expireStartedAt:transcript.expirationStartedAt];
 
     if (transcript.isExpirationTimerUpdate) {
-        [self.messageSender becomeConsistentWithDisappearingConfigurationForMessage:outgoingMessage];
+        [OWSDisappearingMessagesJob becomeConsistentWithConfigurationForMessage:outgoingMessage
+                                                                contactsManager:self.contactsManager];
         // early return to avoid saving an empty incoming message.
         return;
     }