From 58e902429e8f2c9f08980756c5f9d03e9e7caccf Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Mon, 17 Jun 2019 11:52:57 +1000 Subject: [PATCH] Tweak connection settings --- SignalServiceKit/src/Loki/API/LokiAPI.swift | 4 ++-- SignalServiceKit/src/Network/OWSSignalService.m | 14 +++----------- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/SignalServiceKit/src/Loki/API/LokiAPI.swift b/SignalServiceKit/src/Loki/API/LokiAPI.swift index 54c962b83..b8779e1e5 100644 --- a/SignalServiceKit/src/Loki/API/LokiAPI.swift +++ b/SignalServiceKit/src/Loki/API/LokiAPI.swift @@ -9,10 +9,10 @@ public final class LokiAPI : NSObject { // MARK: Settings private static let version = "v1" private static let maxRetryCount: UInt = 3 - private static let defaultTimeout: TimeInterval = 20 + private static let defaultTimeout: TimeInterval = 40 private static let longPollingTimeout: TimeInterval = 40 public static let defaultMessageTTL: UInt64 = 24 * 60 * 60 * 1000 - internal static var powDifficulty: UInt = 10 + internal static var powDifficulty: UInt = 100 // MARK: Types public typealias RawResponse = Any diff --git a/SignalServiceKit/src/Network/OWSSignalService.m b/SignalServiceKit/src/Network/OWSSignalService.m index 445feef41..208c95f24 100644 --- a/SignalServiceKit/src/Network/OWSSignalService.m +++ b/SignalServiceKit/src/Network/OWSSignalService.m @@ -185,23 +185,15 @@ NSString *const kNSNotificationName_IsCensorshipCircumventionActiveDidChange = - (AFHTTPSessionManager *)defaultSignalServiceSessionManager { - NSURLSessionConfiguration *sessionConf = NSURLSessionConfiguration.ephemeralSessionConfiguration; - AFHTTPSessionManager *sessionManager = [[AFHTTPSessionManager alloc] initWithSessionConfiguration:sessionConf]; - + NSURLSessionConfiguration *configuration = NSURLSessionConfiguration.ephemeralSessionConfiguration; + AFHTTPSessionManager *sessionManager = [[AFHTTPSessionManager alloc] initWithSessionConfiguration:configuration]; AFSecurityPolicy *securityPolicy = AFSecurityPolicy.defaultPolicy; securityPolicy.allowInvalidCertificates = YES; securityPolicy.validatesDomainName = NO; sessionManager.securityPolicy = securityPolicy; - // Loki: Original code - // sessionManager.securityPolicy = [OWSHTTPSecurityPolicy sharedPolicy]; sessionManager.requestSerializer = [AFJSONRequestSerializer serializer]; - sessionManager.responseSerializer = [AFJSONResponseSerializer serializerWithReadingOptions:NSJSONReadingAllowFragments]; // LOKITODO: Disable this again? - // Disable default cookie handling for all requests. sessionManager.requestSerializer.HTTPShouldHandleCookies = NO; - - // Loki: We need to accept text/plain for now as the storage server returns this to us - sessionManager.responseSerializer.acceptableContentTypes = [sessionManager.responseSerializer.acceptableContentTypes setByAddingObject:@"text/plain"]; // LOKITODO: Remove this again? - + sessionManager.responseSerializer = [AFJSONResponseSerializer serializerWithReadingOptions:NSJSONReadingAllowFragments]; return sessionManager; }