From 45a1f534ba7211b31f0590511db10405e5a6740b Mon Sep 17 00:00:00 2001
From: Michael Kirk <michael.code@endoftheworl.de>
Date: Tue, 8 Aug 2017 15:03:48 -0400
Subject: [PATCH] Rename method to make way for new method.
No behavioral changes.
// FREEBIE
---
SignalServiceKit/src/Network/API/TSNetworkManager.m | 2 +-
SignalServiceKit/src/Network/OWSSignalService.h | 2 +-
SignalServiceKit/src/Network/OWSSignalService.m | 10 +++++-----
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/SignalServiceKit/src/Network/API/TSNetworkManager.m b/SignalServiceKit/src/Network/API/TSNetworkManager.m
index 3b18a7b7b..d8853ca6e 100644
--- a/SignalServiceKit/src/Network/API/TSNetworkManager.m
+++ b/SignalServiceKit/src/Network/API/TSNetworkManager.m
@@ -61,7 +61,7 @@ typedef void (^failureBlock)(NSURLSessionDataTask *task, NSError *error);
void (^failure)(NSURLSessionDataTask *task, NSError *error) =
[TSNetworkManager errorPrettifyingForFailureBlock:failureBlock];
- AFHTTPSessionManager *sessionManager = [OWSSignalService sharedInstance].HTTPSessionManager;
+ AFHTTPSessionManager *sessionManager = [OWSSignalService sharedInstance].signalServiceSessionManager;
if ([request isKindOfClass:[TSVerifyCodeRequest class]]) {
// We plant the Authorization parameter ourselves, no need to double add.
diff --git a/SignalServiceKit/src/Network/OWSSignalService.h b/SignalServiceKit/src/Network/OWSSignalService.h
index ecb570681..b85b964e4 100644
--- a/SignalServiceKit/src/Network/OWSSignalService.h
+++ b/SignalServiceKit/src/Network/OWSSignalService.h
@@ -12,7 +12,7 @@ extern NSString *const kNSNotificationName_IsCensorshipCircumventionActiveDidCha
@interface OWSSignalService : NSObject
-@property (nonatomic, readonly) AFHTTPSessionManager *HTTPSessionManager;
+@property (nonatomic, readonly) AFHTTPSessionManager *signalServiceSessionManager;
@property (atomic, readonly) BOOL isCensorshipCircumventionActive;
diff --git a/SignalServiceKit/src/Network/OWSSignalService.m b/SignalServiceKit/src/Network/OWSSignalService.m
index 1cf1bd035..3c2f56dad 100644
--- a/SignalServiceKit/src/Network/OWSSignalService.m
+++ b/SignalServiceKit/src/Network/OWSSignalService.m
@@ -154,17 +154,17 @@ NSString *const kNSNotificationName_IsCensorshipCircumventionActiveDidChange =
}
}
-- (AFHTTPSessionManager *)HTTPSessionManager
+- (AFHTTPSessionManager *)signalServiceSessionManager
{
if (self.isCensorshipCircumventionActive) {
DDLogInfo(@"%@ using reflector HTTPSessionManager", self.tag);
- return self.reflectorHTTPSessionManager;
+ return self.reflectorSignalServiceSessionManager;
} else {
- return self.defaultHTTPSessionManager;
+ return self.defaultSignalServiceSessionManager;
}
}
-- (AFHTTPSessionManager *)defaultHTTPSessionManager
+- (AFHTTPSessionManager *)defaultSignalServiceSessionManager
{
NSURL *baseURL = [[NSURL alloc] initWithString:textSecureServerURL];
NSURLSessionConfiguration *sessionConf = NSURLSessionConfiguration.ephemeralSessionConfiguration;
@@ -178,7 +178,7 @@ NSString *const kNSNotificationName_IsCensorshipCircumventionActiveDidChange =
return sessionManager;
}
-- (AFHTTPSessionManager *)reflectorHTTPSessionManager
+- (AFHTTPSessionManager *)reflectorSignalServiceSessionManager
{
NSString *localNumber = [TSAccountManager localNumber];
OWSAssert(localNumber.length > 0);