From c17a81936630c9d182d8d07793a2407e94b69b8d Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 1 Mar 2018 17:47:31 -0500 Subject: [PATCH] Elaborate request factory. --- Signal/src/Jobs/MessageFetcherJob.swift | 5 +-- Signal/src/Models/AccountManager.swift | 2 +- Signal/src/Signal-Bridging-Header.h | 3 -- .../profiles/ProfileFetcherJob.swift | 4 +- .../Attachments/OWSAttachmentsProcessor.m | 9 ++-- .../src/Network/API/OWSDevicesService.m | 3 +- .../src/Network/API/OWSUploadingService.m | 7 +-- .../API/Requests/OWSGetDevicesRequest.h | 11 ----- .../API/Requests/OWSGetDevicesRequest.m | 25 ----------- .../API/Requests/OWSGetMessagesRequest.h | 12 ----- .../API/Requests/OWSGetMessagesRequest.m | 18 -------- .../API/Requests/OWSGetProfileRequest.h | 15 ------- .../API/Requests/OWSGetProfileRequest.m | 30 ------------- .../Network/API/Requests/OWSRequestFactory.h | 12 +++++ .../Network/API/Requests/OWSRequestFactory.m | 45 +++++++++++++++++++ .../API/Requests/OWSTurnServerInfoRequest.h | 17 ------- .../API/Requests/OWSTurnServerInfoRequest.m | 26 ----------- .../API/Requests/TSAllocAttachmentRequest.h | 13 ------ .../API/Requests/TSAllocAttachmentRequest.m | 26 ----------- .../API/Requests/TSAttachmentRequest.h | 15 ------- .../API/Requests/TSAttachmentRequest.m | 28 ------------ .../src/Network/API/TSNetworkManager.h | 2 - .../src/Network/API/TSNetworkManager.m | 9 ---- 23 files changed, 72 insertions(+), 265 deletions(-) delete mode 100644 SignalServiceKit/src/Network/API/Requests/OWSGetDevicesRequest.h delete mode 100644 SignalServiceKit/src/Network/API/Requests/OWSGetDevicesRequest.m delete mode 100644 SignalServiceKit/src/Network/API/Requests/OWSGetMessagesRequest.h delete mode 100644 SignalServiceKit/src/Network/API/Requests/OWSGetMessagesRequest.m delete mode 100644 SignalServiceKit/src/Network/API/Requests/OWSGetProfileRequest.h delete mode 100644 SignalServiceKit/src/Network/API/Requests/OWSGetProfileRequest.m delete mode 100644 SignalServiceKit/src/Network/API/Requests/OWSTurnServerInfoRequest.h delete mode 100644 SignalServiceKit/src/Network/API/Requests/OWSTurnServerInfoRequest.m delete mode 100644 SignalServiceKit/src/Network/API/Requests/TSAllocAttachmentRequest.h delete mode 100644 SignalServiceKit/src/Network/API/Requests/TSAllocAttachmentRequest.m delete mode 100644 SignalServiceKit/src/Network/API/Requests/TSAttachmentRequest.h delete mode 100644 SignalServiceKit/src/Network/API/Requests/TSAttachmentRequest.m diff --git a/Signal/src/Jobs/MessageFetcherJob.swift b/Signal/src/Jobs/MessageFetcherJob.swift index b02cdb54f..a58f56a2f 100644 --- a/Signal/src/Jobs/MessageFetcherJob.swift +++ b/Signal/src/Jobs/MessageFetcherJob.swift @@ -165,10 +165,9 @@ class MessageFetcherJob: NSObject { private func fetchUndeliveredMessages() -> Promise<(envelopes: [OWSSignalServiceProtosEnvelope], more: Bool)> { return Promise { fulfill, reject in - let messagesRequest = OWSGetMessagesRequest() - + let request = OWSRequestFactory.getMessagesRequest() self.networkManager.makeRequest( - messagesRequest, + request, success: { (_: URLSessionDataTask?, responseObject: Any?) -> Void in guard let (envelopes, more) = self.parseMessagesResponse(responseObject: responseObject) else { Logger.error("\(self.logTag) response object had unexpected content") diff --git a/Signal/src/Models/AccountManager.swift b/Signal/src/Models/AccountManager.swift index c9c344621..a47c6f81c 100644 --- a/Signal/src/Models/AccountManager.swift +++ b/Signal/src/Models/AccountManager.swift @@ -116,7 +116,7 @@ class AccountManager: NSObject { func getTurnServerInfo() -> Promise { return Promise { fulfill, reject in - self.networkManager.makeRequest(TurnServerInfoRequest(), + self.networkManager.makeRequest(OWSRequestFactory.turnServerInfoRequest(), success: { (_: URLSessionDataTask, responseObject: Any?) in guard responseObject != nil else { return reject(OWSErrorMakeUnableToProcessServerResponseError()) diff --git a/Signal/src/Signal-Bridging-Header.h b/Signal/src/Signal-Bridging-Header.h index 8662cc4ab..2541750cb 100644 --- a/Signal/src/Signal-Bridging-Header.h +++ b/Signal/src/Signal-Bridging-Header.h @@ -89,8 +89,6 @@ #import #import #import -#import -#import #import #import #import @@ -101,7 +99,6 @@ #import #import #import -#import #import #import #import diff --git a/SignalMessaging/profiles/ProfileFetcherJob.swift b/SignalMessaging/profiles/ProfileFetcherJob.swift index 93c88a52a..0fa872c22 100644 --- a/SignalMessaging/profiles/ProfileFetcherJob.swift +++ b/SignalMessaging/profiles/ProfileFetcherJob.swift @@ -26,7 +26,7 @@ public class ProfileFetcherJob: NSObject { @objc public class func run(recipientId: String, networkManager: TSNetworkManager, ignoreThrottling: Bool) { - ProfileFetcherJob(networkManager: networkManager, ignoreThrottling:ignoreThrottling).run(recipientIds: [recipientId]) + ProfileFetcherJob(networkManager: networkManager, ignoreThrottling: ignoreThrottling).run(recipientIds: [recipientId]) } public init(networkManager: TSNetworkManager, ignoreThrottling: Bool = false) { @@ -95,7 +95,7 @@ public class ProfileFetcherJob: NSObject { Logger.error("\(self.TAG) getProfile: \(recipientId)") - let request = OWSGetProfileRequest(recipientId: recipientId) + let request = OWSRequestFactory.getProfileRequest(withRecipientId: recipientId) let (promise, fulfill, reject) = Promise.pending() diff --git a/SignalServiceKit/src/Messages/Attachments/OWSAttachmentsProcessor.m b/SignalServiceKit/src/Messages/Attachments/OWSAttachmentsProcessor.m index ba2ef4572..ea6138d78 100644 --- a/SignalServiceKit/src/Messages/Attachments/OWSAttachmentsProcessor.m +++ b/SignalServiceKit/src/Messages/Attachments/OWSAttachmentsProcessor.m @@ -1,5 +1,5 @@ // -// Copyright (c) 2017 Open Whisper Systems. All rights reserved. +// Copyright (c) 2018 Open Whisper Systems. All rights reserved. // #import "OWSAttachmentsProcessor.h" @@ -9,9 +9,9 @@ #import "NSNotificationCenter+OWS.h" #import "OWSBackgroundTask.h" #import "OWSError.h" +#import "OWSRequestFactory.h" #import "OWSSignalServiceProtos.pb.h" #import "TSAttachmentPointer.h" -#import "TSAttachmentRequest.h" #import "TSAttachmentStream.h" #import "TSGroupModel.h" #import "TSGroupThread.h" @@ -186,9 +186,10 @@ static const CGFloat kAttachmentDownloadProgressTheta = 0.001f; if (attachment.serverId < 100) { DDLogError(@"%@ Suspicious attachment id: %llu", self.logTag, (unsigned long long)attachment.serverId); } - TSAttachmentRequest *attachmentRequest = [[TSAttachmentRequest alloc] initWithId:attachment.serverId relay:attachment.relay]; + TSRequest *request = + [OWSRequestFactory attachmentRequestWithAttachmentId:attachment.serverId relay:attachment.relay]; - [self.networkManager makeRequest:attachmentRequest + [self.networkManager makeRequest:request success:^(NSURLSessionDataTask *task, id responseObject) { if (![responseObject isKindOfClass:[NSDictionary class]]) { DDLogError(@"%@ Failed retrieval of attachment. Response had unexpected format.", self.logTag); diff --git a/SignalServiceKit/src/Network/API/OWSDevicesService.m b/SignalServiceKit/src/Network/API/OWSDevicesService.m index c9c7a2e0c..1cb25ab59 100644 --- a/SignalServiceKit/src/Network/API/OWSDevicesService.m +++ b/SignalServiceKit/src/Network/API/OWSDevicesService.m @@ -5,7 +5,6 @@ #import "OWSDevicesService.h" #import "OWSDevice.h" #import "OWSError.h" -#import "OWSGetDevicesRequest.h" #import "OWSRequestFactory.h" #import "TSNetworkManager.h" #import @@ -17,7 +16,7 @@ NS_ASSUME_NONNULL_BEGIN - (void)getDevicesWithSuccess:(void (^)(NSArray *))successCallback failure:(void (^)(NSError *))failureCallback { - OWSGetDevicesRequest *request = [OWSGetDevicesRequest new]; + TSRequest *request = [OWSRequestFactory getDevicesRequest]; [[TSNetworkManager sharedManager] makeRequest:request success:^(NSURLSessionDataTask *task, id responseObject) { DDLogVerbose(@"Get devices request succeeded"); diff --git a/SignalServiceKit/src/Network/API/OWSUploadingService.m b/SignalServiceKit/src/Network/API/OWSUploadingService.m index 0ebc81569..8cd4336a2 100644 --- a/SignalServiceKit/src/Network/API/OWSUploadingService.m +++ b/SignalServiceKit/src/Network/API/OWSUploadingService.m @@ -1,5 +1,5 @@ // -// Copyright (c) 2017 Open Whisper Systems. All rights reserved. +// Copyright (c) 2018 Open Whisper Systems. All rights reserved. // #import "OWSUploadingService.h" @@ -8,6 +8,7 @@ #import "NSNotificationCenter+OWS.h" #import "OWSError.h" #import "OWSMessageSender.h" +#import "OWSRequestFactory.h" #import "TSAttachmentStream.h" #import "TSNetworkManager.h" #import "TSOutgoingMessage.h" @@ -67,8 +68,8 @@ static const CGFloat kAttachmentUploadProgressTheta = 0.001f; [self fireProgressNotification:kAttachmentUploadProgressTheta attachmentId:attachmentStream.uniqueId]; - TSRequest *allocateAttachment = [[TSAllocAttachmentRequest alloc] init]; - [self.networkManager makeRequest:allocateAttachment + TSRequest *request = [OWSRequestFactory allocAttachmentRequest]; + [self.networkManager makeRequest:request success:^(NSURLSessionDataTask *task, id responseObject) { dispatch_async([OWSDispatch attachmentsQueue], ^{ // TODO can we move this queue specification up a level? if (![responseObject isKindOfClass:[NSDictionary class]]) { diff --git a/SignalServiceKit/src/Network/API/Requests/OWSGetDevicesRequest.h b/SignalServiceKit/src/Network/API/Requests/OWSGetDevicesRequest.h deleted file mode 100644 index 438dd760e..000000000 --- a/SignalServiceKit/src/Network/API/Requests/OWSGetDevicesRequest.h +++ /dev/null @@ -1,11 +0,0 @@ -// Copyright © 2016 Open Whisper Systems. All rights reserved. - -#import "TSRequest.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface OWSGetDevicesRequest : TSRequest - -@end - -NS_ASSUME_NONNULL_END diff --git a/SignalServiceKit/src/Network/API/Requests/OWSGetDevicesRequest.m b/SignalServiceKit/src/Network/API/Requests/OWSGetDevicesRequest.m deleted file mode 100644 index b2018315b..000000000 --- a/SignalServiceKit/src/Network/API/Requests/OWSGetDevicesRequest.m +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright © 2016 Open Whisper Systems. All rights reserved. - -#import "OWSGetDevicesRequest.h" -#import "TSConstants.h" - -NS_ASSUME_NONNULL_BEGIN - -@implementation OWSGetDevicesRequest - -- (instancetype)init -{ - NSString *getDevicesPath = [NSString stringWithFormat:textSecureDevicesAPIFormat, @""]; - self = [super initWithURL:[NSURL URLWithString:getDevicesPath]]; - if (!self) { - return self; - } - - [self setHTTPMethod:@"GET"]; - - return self; -} - -@end - -NS_ASSUME_NONNULL_END diff --git a/SignalServiceKit/src/Network/API/Requests/OWSGetMessagesRequest.h b/SignalServiceKit/src/Network/API/Requests/OWSGetMessagesRequest.h deleted file mode 100644 index 0844878cd..000000000 --- a/SignalServiceKit/src/Network/API/Requests/OWSGetMessagesRequest.h +++ /dev/null @@ -1,12 +0,0 @@ -// Created by Michael Kirk on 12/19/16. -// Copyright © 2016 Open Whisper Systems. All rights reserved. - -#import "TSRequest.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface OWSGetMessagesRequest : TSRequest - -@end - -NS_ASSUME_NONNULL_END diff --git a/SignalServiceKit/src/Network/API/Requests/OWSGetMessagesRequest.m b/SignalServiceKit/src/Network/API/Requests/OWSGetMessagesRequest.m deleted file mode 100644 index 867cb93d6..000000000 --- a/SignalServiceKit/src/Network/API/Requests/OWSGetMessagesRequest.m +++ /dev/null @@ -1,18 +0,0 @@ -// Created by Michael Kirk on 12/19/16. -// Copyright © 2016 Open Whisper Systems. All rights reserved. - -#import "OWSGetMessagesRequest.h" - -NS_ASSUME_NONNULL_BEGIN - -@implementation OWSGetMessagesRequest - -- (instancetype)init -{ - NSURL *url = [NSURL URLWithString:@"v1/messages"]; - return [super initWithURL:url]; -} - -@end - -NS_ASSUME_NONNULL_END diff --git a/SignalServiceKit/src/Network/API/Requests/OWSGetProfileRequest.h b/SignalServiceKit/src/Network/API/Requests/OWSGetProfileRequest.h deleted file mode 100644 index d23442d3c..000000000 --- a/SignalServiceKit/src/Network/API/Requests/OWSGetProfileRequest.h +++ /dev/null @@ -1,15 +0,0 @@ -// -// Copyright (c) 2017 Open Whisper Systems. All rights reserved. -// - -#import "TSRequest.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface OWSGetProfileRequest : TSRequest - -- (instancetype)initWithRecipientId:(NSString *)recipientId; - -@end - -NS_ASSUME_NONNULL_END diff --git a/SignalServiceKit/src/Network/API/Requests/OWSGetProfileRequest.m b/SignalServiceKit/src/Network/API/Requests/OWSGetProfileRequest.m deleted file mode 100644 index 923fe4b5e..000000000 --- a/SignalServiceKit/src/Network/API/Requests/OWSGetProfileRequest.m +++ /dev/null @@ -1,30 +0,0 @@ -// -// Copyright (c) 2017 Open Whisper Systems. All rights reserved. -// - -#import "OWSGetProfileRequest.h" -#import "TSConstants.h" - -NS_ASSUME_NONNULL_BEGIN - -@implementation OWSGetProfileRequest - -- (instancetype)initWithRecipientId:(NSString *)recipientId -{ - OWSAssert(recipientId.length > 0); - - NSString *path = [NSString stringWithFormat:textSecureProfileAPIFormat, recipientId]; - self = [super initWithURL:[NSURL URLWithString:path]]; - if (!self) { - return self; - } - - self.HTTPMethod = @"GET"; - self.parameters = nil; - - return self; -} - -@end - -NS_ASSUME_NONNULL_END diff --git a/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.h b/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.h index 3be519345..3c0bb34da 100644 --- a/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.h +++ b/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.h @@ -23,6 +23,18 @@ NS_ASSUME_NONNULL_BEGIN + (TSRequest *)deviceProvisioningRequestWithMessageBody:(NSData *)messageBody ephemeralDeviceId:(NSString *)deviceId; ++ (TSRequest *)getDevicesRequest; + ++ (TSRequest *)getMessagesRequest; + ++ (TSRequest *)getProfileRequestWithRecipientId:(NSString *)recipientId; + ++ (TSRequest *)turnServerInfoRequest; + ++ (TSRequest *)allocAttachmentRequest; + ++ (TSRequest *)attachmentRequestWithAttachmentId:(UInt64)attachmentId relay:(nullable NSString *)relay; + @end NS_ASSUME_NONNULL_END diff --git a/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.m b/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.m index eeaf469d9..3f14194b3 100644 --- a/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.m +++ b/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.m @@ -67,6 +67,51 @@ NS_ASSUME_NONNULL_BEGIN }]; } ++ (TSRequest *)getDevicesRequest +{ + NSString *path = [NSString stringWithFormat:textSecureDevicesAPIFormat, @""]; + return [TSRequest requestWithUrl:[NSURL URLWithString:path] method:@"GET" parameters:@{}]; +} + ++ (TSRequest *)getMessagesRequest +{ + return [TSRequest requestWithUrl:[NSURL URLWithString:@"v1/messages"] method:@"GET" parameters:@{}]; +} + ++ (TSRequest *)getProfileRequestWithRecipientId:(NSString *)recipientId +{ + OWSAssert(recipientId.length > 0); + + NSString *path = [NSString stringWithFormat:textSecureProfileAPIFormat, recipientId]; + return [TSRequest requestWithUrl:[NSURL URLWithString:path] method:@"GET" parameters:@{}]; +} + ++ (TSRequest *)turnServerInfoRequest +{ + return [TSRequest requestWithUrl:[NSURL URLWithString:@"v1/accounts/turn"] method:@"GET" parameters:@{}]; +} + ++ (TSRequest *)allocAttachmentRequest +{ + NSString *path = [NSString stringWithFormat:@"%@", textSecureAttachmentsAPI]; + return [TSRequest requestWithUrl:[NSURL URLWithString:path] method:@"GET" parameters:@{}]; +} + ++ (TSRequest *)attachmentRequestWithAttachmentId:(UInt64)attachmentId relay:(nullable NSString *)relay +{ + OWSAssert(attachmentId > 0); + OWSAssert(relay.length > 0); + + NSString *path = [NSString stringWithFormat:@"%@/%llu", textSecureAttachmentsAPI, attachmentId]; + + // TODO: Should this be in the parameters? + if (relay.length > 0) { + path = [path stringByAppendingFormat:@"?relay=%@", relay]; + } + + return [TSRequest requestWithUrl:[NSURL URLWithString:path] method:@"GET" parameters:@{}]; +} + @end NS_ASSUME_NONNULL_END diff --git a/SignalServiceKit/src/Network/API/Requests/OWSTurnServerInfoRequest.h b/SignalServiceKit/src/Network/API/Requests/OWSTurnServerInfoRequest.h deleted file mode 100644 index 1835174f5..000000000 --- a/SignalServiceKit/src/Network/API/Requests/OWSTurnServerInfoRequest.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// Copyright (c) 2017 Open Whisper Systems. All rights reserved. -// - -#import "TSRequest.h" - -NS_ASSUME_NONNULL_BEGIN - -/** - * Fetch a list of viable ICE candidates (including TURN and STUN) used for the WebRTC call signaling process. - */ -NS_SWIFT_NAME(TurnServerInfoRequest) -@interface OWSTurnServerInfoRequest : TSRequest - -@end - -NS_ASSUME_NONNULL_END diff --git a/SignalServiceKit/src/Network/API/Requests/OWSTurnServerInfoRequest.m b/SignalServiceKit/src/Network/API/Requests/OWSTurnServerInfoRequest.m deleted file mode 100644 index 7c81e6a46..000000000 --- a/SignalServiceKit/src/Network/API/Requests/OWSTurnServerInfoRequest.m +++ /dev/null @@ -1,26 +0,0 @@ -// Created by Michael Kirk on 11/12/16. -// Copyright © 2016 Open Whisper Systems. All rights reserved. - -#import "OWSTurnServerInfoRequest.h" - -NS_ASSUME_NONNULL_BEGIN - -NSString *const OWSTurnServerInfoRequestPath = @"v1/accounts/turn"; - -@implementation OWSTurnServerInfoRequest - -- (instancetype)init -{ - self = [super initWithURL:[NSURL URLWithString:OWSTurnServerInfoRequestPath]]; - if (!self) { - return self; - } - - [self setHTTPMethod:@"GET"]; - - return self; -} - -@end - -NS_ASSUME_NONNULL_END diff --git a/SignalServiceKit/src/Network/API/Requests/TSAllocAttachmentRequest.h b/SignalServiceKit/src/Network/API/Requests/TSAllocAttachmentRequest.h deleted file mode 100644 index 3864ab2af..000000000 --- a/SignalServiceKit/src/Network/API/Requests/TSAllocAttachmentRequest.h +++ /dev/null @@ -1,13 +0,0 @@ -// -// TSAllocAttachmentRequest.h -// Signal -// -// Created by Frederic Jacobs on 21/12/14. -// Copyright (c) 2014 Open Whisper Systems. All rights reserved. -// - -#import "TSRequest.h" - -@interface TSAllocAttachmentRequest : TSRequest - -@end diff --git a/SignalServiceKit/src/Network/API/Requests/TSAllocAttachmentRequest.m b/SignalServiceKit/src/Network/API/Requests/TSAllocAttachmentRequest.m deleted file mode 100644 index 7ae72a7d2..000000000 --- a/SignalServiceKit/src/Network/API/Requests/TSAllocAttachmentRequest.m +++ /dev/null @@ -1,26 +0,0 @@ -// -// TSAllocAttachmentRequest.m -// Signal -// -// Created by Frederic Jacobs on 21/12/14. -// Copyright (c) 2014 Open Whisper Systems. All rights reserved. -// - -#import "TSAllocAttachmentRequest.h" -#import "TSConstants.h" - -@implementation TSAllocAttachmentRequest - -- (instancetype)init { - NSString *path = [NSString stringWithFormat:@"%@", textSecureAttachmentsAPI]; - - self = [super initWithURL:[NSURL URLWithString:path]]; - - if (self) { - [self setHTTPMethod:@"GET"]; - } - - return self; -} - -@end diff --git a/SignalServiceKit/src/Network/API/Requests/TSAttachmentRequest.h b/SignalServiceKit/src/Network/API/Requests/TSAttachmentRequest.h deleted file mode 100644 index 2ff72ef4a..000000000 --- a/SignalServiceKit/src/Network/API/Requests/TSAttachmentRequest.h +++ /dev/null @@ -1,15 +0,0 @@ -// -// TSRequestAttachment.h -// TextSecureiOS -// -// Created by Christine Corbett Moran on 12/1/13. -// Copyright (c) 2013 Open Whisper Systems. All rights reserved. -// - -#import "TSRequest.h" - -@interface TSAttachmentRequest : TSRequest - -- (TSRequest *)initWithId:(UInt64)attachmentId relay:(NSString *)relay; - -@end diff --git a/SignalServiceKit/src/Network/API/Requests/TSAttachmentRequest.m b/SignalServiceKit/src/Network/API/Requests/TSAttachmentRequest.m deleted file mode 100644 index 19017f5ca..000000000 --- a/SignalServiceKit/src/Network/API/Requests/TSAttachmentRequest.m +++ /dev/null @@ -1,28 +0,0 @@ -// -// TSRequestAttachment.m -// TextSecureiOS -// -// Created by Christine Corbett Moran on 12/1/13. -// Copyright (c) 2013 Open Whisper Systems. All rights reserved. -// - -#import "TSAttachmentRequest.h" -#import "TSConstants.h" - -@implementation TSAttachmentRequest - -- (TSRequest *)initWithId:(UInt64)attachmentId relay:(NSString *)relay -{ - NSString *path = [NSString stringWithFormat:@"%@/%llu", textSecureAttachmentsAPI, attachmentId]; - - if (relay && ![relay isEqualToString:@""]) { - path = [path stringByAppendingFormat:@"?relay=%@", relay]; - } - - self = [super initWithURL:[NSURL URLWithString:path]]; - - self.HTTPMethod = @"GET"; - return self; -} - -@end diff --git a/SignalServiceKit/src/Network/API/TSNetworkManager.h b/SignalServiceKit/src/Network/API/TSNetworkManager.h index 94f58d498..54329854e 100644 --- a/SignalServiceKit/src/Network/API/TSNetworkManager.h +++ b/SignalServiceKit/src/Network/API/TSNetworkManager.h @@ -6,8 +6,6 @@ * TSNetworkManager imports all TSRequests to prevent massive imports in classes that call TSNetworkManager */ -#import "TSAllocAttachmentRequest.h" -#import "TSAttachmentRequest.h" #import "TSAvailablePreKeysCountRequest.h" #import "TSContactsIntersectionRequest.h" #import "TSCurrentSignedPreKeyRequest.h" diff --git a/SignalServiceKit/src/Network/API/TSNetworkManager.m b/SignalServiceKit/src/Network/API/TSNetworkManager.m index 058385c5b..048e0797b 100644 --- a/SignalServiceKit/src/Network/API/TSNetworkManager.m +++ b/SignalServiceKit/src/Network/API/TSNetworkManager.m @@ -71,15 +71,6 @@ typedef void (^failureBlock)(NSURLSessionDataTask *task, NSError *error); OWSAssert(failureBlock); DDLogInfo(@"%@ Making request: %@", self.logTag, request); - if (!CurrentAppContext().isMainApp) { - if (![request isKindOfClass:[TSRecipientPrekeyRequest class]] - && ![request isKindOfClass:[TSSubmitMessageRequest class]] - && ![request isKindOfClass:[TSContactsIntersectionRequest class]] - && ![request isKindOfClass:[TSAllocAttachmentRequest class]]) { - // The SAE should only make requests directly related to message sending. - OWSFail(@"%@ Making unexpected request: %@", self.logTag, request); - } - } // TODO: Remove this logging when the call connection issues have been resolved. TSNetworkManagerSuccess success = ^(NSURLSessionDataTask *task, id responseObject) {