From 83e6484156683dd9fc310721058c38bd939c37a8 Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Wed, 19 Sep 2018 16:28:03 -0400
Subject: [PATCH] Respond to CR. Rework how OWSUploadOperation's networkManager
 property.

---
 .../src/Network/API/OWSUploadOperation.m        | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/SignalServiceKit/src/Network/API/OWSUploadOperation.m b/SignalServiceKit/src/Network/API/OWSUploadOperation.m
index 025649007..bb3c90827 100644
--- a/SignalServiceKit/src/Network/API/OWSUploadOperation.m
+++ b/SignalServiceKit/src/Network/API/OWSUploadOperation.m
@@ -11,6 +11,7 @@
 #import "OWSError.h"
 #import "OWSOperation.h"
 #import "OWSRequestFactory.h"
+#import "SSKEnvironment.h"
 #import "TSAttachmentStream.h"
 #import "TSNetworkManager.h"
 #import <YapDatabase/YapDatabaseConnection.h>
@@ -27,7 +28,6 @@ static const CGFloat kAttachmentUploadProgressTheta = 0.001f;
 
 @interface OWSUploadOperation ()
 
-@property (readonly, nonatomic) TSNetworkManager *networkManager;
 @property (readonly, nonatomic) NSString *attachmentId;
 @property (readonly, nonatomic) YapDatabaseConnection *dbConnection;
 
@@ -39,15 +39,6 @@ static const CGFloat kAttachmentUploadProgressTheta = 0.001f;
 
 - (instancetype)initWithAttachmentId:(NSString *)attachmentId
                         dbConnection:(YapDatabaseConnection *)dbConnection
-{
-    return [self initWithAttachmentId:attachmentId
-                         dbConnection:dbConnection
-                       networkManager:[TSNetworkManager sharedManager]];
-}
-
-- (instancetype)initWithAttachmentId:(NSString *)attachmentId
-                        dbConnection:(YapDatabaseConnection *)dbConnection
-                      networkManager:(TSNetworkManager *)networkManager
 {
     self = [super init];
     if (!self) {
@@ -58,11 +49,15 @@ static const CGFloat kAttachmentUploadProgressTheta = 0.001f;
 
     _attachmentId = attachmentId;
     _dbConnection = dbConnection;
-    _networkManager = networkManager;
 
     return self;
 }
 
+- (TSNetworkManager *)networkManager
+{
+    return SSKEnvironment.shared.networkManager;
+}
+
 - (void)run
 {
     __block TSAttachmentStream *attachmentStream;