diff --git a/Podfile b/Podfile index aca1cb6..3fafd7f 100644 --- a/Podfile +++ b/Podfile @@ -16,4 +16,5 @@ target "Push" do pod 'DateTools', :path => '~/Repositories/DateTools' pod 'YAML-Framework' pod 'HTMLKit', '~> 0.9' + pod 'NewNode' end \ No newline at end of file diff --git a/Push/NotificationManager.m b/Push/NotificationManager.m index 977831c..5e23b35 100644 --- a/Push/NotificationManager.m +++ b/Push/NotificationManager.m @@ -6,6 +6,8 @@ // Copyright © 2016 OCCRP. All rights reserved. // +@import NewNode; + #import "NotificationManager.h" #import "SettingsManager.h" #import "LanguageManager.h" @@ -111,8 +113,10 @@ - (void)registerWithPushServer:(NSData*)devToken andLanguage:(NSString*)language @"sandbox": SANDBOX}; NSMutableURLRequest * request = [[AFHTTPRequestSerializer serializer] requestWithMethod:@"POST" URLString:urlString parameters:parameters error:nil]; - - AFURLSessionManager *manager = [[AFURLSessionManager alloc] initWithSessionConfiguration:[NSURLSessionConfiguration defaultSessionConfiguration]]; + + NSURLSessionConfiguration *config = NSURLSessionConfiguration.defaultSessionConfiguration; + config.connectionProxyDictionary = NewNode.connectionProxyDictionary; + AFURLSessionManager *manager = [[AFURLSessionManager alloc] initWithSessionConfiguration:config]; manager.responseSerializer = [AFHTTPResponseSerializer serializer]; @@ -141,8 +145,10 @@ - (void)unRegisterWithPushServerWithLanguage:(NSString*)languageShortCode NSMutableURLRequest * request = [[AFHTTPRequestSerializer serializer] requestWithMethod:@"POST" URLString:urlString parameters:parameters error:nil]; - AFURLSessionManager *manager = [[AFURLSessionManager alloc] initWithSessionConfiguration:[NSURLSessionConfiguration defaultSessionConfiguration]]; - + NSURLSessionConfiguration *config = NSURLSessionConfiguration.defaultSessionConfiguration; + config.connectionProxyDictionary = NewNode.connectionProxyDictionary; + AFURLSessionManager *manager = [[AFURLSessionManager alloc] initWithSessionConfiguration:config]; + manager.responseSerializer = [AFHTTPResponseSerializer serializer]; NSURLSessionDataTask *dataTask = [manager dataTaskWithRequest:request completionHandler:^(NSURLResponse *response, id responseObject, NSError *error) { diff --git a/Push/PushSyncManager.m b/Push/PushSyncManager.m index c9d5346..29cc3b5 100644 --- a/Push/PushSyncManager.m +++ b/Push/PushSyncManager.m @@ -6,6 +6,8 @@ // Copyright © 2015 OCCRP. All rights reserved. // +@import NewNode; + #import "PushSyncManager.h" #import "SettingsManager.h" #import "LanguageManager.h" @@ -37,7 +39,10 @@ + (PushSyncManager *)sharedManager { - (instancetype)init { - return [super initWithBaseURL:[NSURL URLWithString:[SettingsManager sharedManager].pushUrl]]; + NSURLSessionConfiguration *config = NSURLSessionConfiguration.defaultSessionConfiguration; + config.connectionProxyDictionary = NewNode.connectionProxyDictionary; + return [super initWithBaseURL:[NSURL URLWithString:[SettingsManager sharedManager].pushUrl] + sessionConfiguration:config]; } // Returns the current cached array, and then does another call.