open-source / warply_sdk_framework

Go to a project
Toggle navigation Toggle navigation pinning
Manos Chorianopoulos
c2348efd 1 parent 89d1748a

fix request timeout at 30 sec

Inline Side-by-side
Showing 4 changed files with 51 additions and 34 deletions
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
7 <key>Pods-SwiftWarplyFramework.xcscheme_^#shared#^_</key> 7 <key>Pods-SwiftWarplyFramework.xcscheme_^#shared#^_</key>
8 <dict> 8 <dict>
9 <key>orderHint</key> 9 <key>orderHint</key>
10 - <integer>0</integer> 10 + <integer>1</integer>
11 </dict> 11 </dict>
12 </dict> 12 </dict>
13 </dict> 13 </dict>
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
7 <key>SwiftWarplyFramework.xcscheme_^#shared#^_</key> 7 <key>SwiftWarplyFramework.xcscheme_^#shared#^_</key>
8 <dict> 8 <dict>
9 <key>orderHint</key> 9 <key>orderHint</key>
10 - <integer>1</integer> 10 + <integer>0</integer>
11 </dict> 11 </dict>
12 </dict> 12 </dict>
13 </dict> 13 </dict>
......
...@@ -3958,8 +3958,8 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2) ...@@ -3958,8 +3958,8 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2)
3958 NSMutableString *urlString = [NSMutableString stringWithFormat:@"%@/oauth/%@/login", _baseURL, _appUUID]; 3958 NSMutableString *urlString = [NSMutableString stringWithFormat:@"%@/oauth/%@/login", _baseURL, _appUUID];
3959 WLLOG(@"[WARP Trace] HTTP URL: %@", urlString); 3959 WLLOG(@"[WARP Trace] HTTP URL: %@", urlString);
3960 3960
3961 - NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:urlString] cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:30]; 3961 + NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:urlString] cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:30.0];
3962 - [request setTimeoutInterval:30]; 3962 + [request setTimeoutInterval:30.0];
3963 3963
3964 NSDictionary *parameters; 3964 NSDictionary *parameters;
3965 3965
...@@ -4050,6 +4050,7 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2) ...@@ -4050,6 +4050,7 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2)
4050 4050
4051 _httpClient.responseSerializer = [AFJSONResponseSerializer serializer]; 4051 _httpClient.responseSerializer = [AFJSONResponseSerializer serializer];
4052 _httpClient.requestSerializer = [AFJSONRequestSerializer serializer]; 4052 _httpClient.requestSerializer = [AFJSONRequestSerializer serializer];
4053 + [_httpClient.requestSerializer setTimeoutInterval:30];
4053 4054
4054 //Set HTTP Headers 4055 //Set HTTP Headers
4055 time_t timestamp = (time_t) [[NSDate date] timeIntervalSince1970]; 4056 time_t timestamp = (time_t) [[NSDate date] timeIntervalSince1970];
...@@ -4086,8 +4087,8 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2) ...@@ -4086,8 +4087,8 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2)
4086 NSMutableString *urlString = [NSMutableString stringWithFormat:@"%@/oauth/%@/web_authorize", _baseURL, _appUUID]; 4087 NSMutableString *urlString = [NSMutableString stringWithFormat:@"%@/oauth/%@/web_authorize", _baseURL, _appUUID];
4087 WLLOG(@"[WARP Trace] HTTP URL: %@", urlString); 4088 WLLOG(@"[WARP Trace] HTTP URL: %@", urlString);
4088 4089
4089 - NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:urlString] cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:30]; 4090 + NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:urlString] cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:30.0];
4090 - [request setTimeoutInterval:30]; 4091 + [request setTimeoutInterval:30.0];
4091 4092
4092 NSDictionary *parameters; 4093 NSDictionary *parameters;
4093 4094
...@@ -4155,6 +4156,7 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2) ...@@ -4155,6 +4156,7 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2)
4155 4156
4156 _httpClient.responseSerializer = [AFJSONResponseSerializer serializer]; 4157 _httpClient.responseSerializer = [AFJSONResponseSerializer serializer];
4157 _httpClient.requestSerializer = [AFJSONRequestSerializer serializer]; 4158 _httpClient.requestSerializer = [AFJSONRequestSerializer serializer];
4159 + [_httpClient.requestSerializer setTimeoutInterval:30];
4158 4160
4159 //Set HTTP Headers 4161 //Set HTTP Headers
4160 time_t timestamp = (time_t) [[NSDate date] timeIntervalSince1970]; 4162 time_t timestamp = (time_t) [[NSDate date] timeIntervalSince1970];
...@@ -4192,8 +4194,8 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2) ...@@ -4192,8 +4194,8 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2)
4192 NSMutableString *urlString = [NSMutableString stringWithFormat:@"%@/oauth/%@/token", _baseURL, _appUUID]; 4194 NSMutableString *urlString = [NSMutableString stringWithFormat:@"%@/oauth/%@/token", _baseURL, _appUUID];
4193 WLLOG(@"[WARP Trace] HTTP URL: %@", urlString); 4195 WLLOG(@"[WARP Trace] HTTP URL: %@", urlString);
4194 4196
4195 - NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:urlString] cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:30]; 4197 + NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:urlString] cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:30.0];
4196 - [request setTimeoutInterval:30]; 4198 + [request setTimeoutInterval:30.0];
4197 4199
4198 NSDictionary *parameters; 4200 NSDictionary *parameters;
4199 4201
...@@ -4264,6 +4266,7 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2) ...@@ -4264,6 +4266,7 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2)
4264 4266
4265 _httpClient.responseSerializer = [AFJSONResponseSerializer serializer]; 4267 _httpClient.responseSerializer = [AFJSONResponseSerializer serializer];
4266 _httpClient.requestSerializer = [AFJSONRequestSerializer serializer]; 4268 _httpClient.requestSerializer = [AFJSONRequestSerializer serializer];
4269 + [_httpClient.requestSerializer setTimeoutInterval:30];
4267 4270
4268 //Set HTTP Headers 4271 //Set HTTP Headers
4269 time_t timestamp = (time_t) [[NSDate date] timeIntervalSince1970]; 4272 time_t timestamp = (time_t) [[NSDate date] timeIntervalSince1970];
...@@ -4299,8 +4302,8 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2) ...@@ -4299,8 +4302,8 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2)
4299 NSMutableString *urlString = [NSMutableString stringWithFormat:@"%@/user/%@/register", _baseURL, _appUUID]; 4302 NSMutableString *urlString = [NSMutableString stringWithFormat:@"%@/user/%@/register", _baseURL, _appUUID];
4300 WLLOG(@"[WARP Trace] HTTP URL: %@", urlString); 4303 WLLOG(@"[WARP Trace] HTTP URL: %@", urlString);
4301 4304
4302 - NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:urlString] cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:30]; 4305 + NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:urlString] cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:30.0];
4303 - [request setTimeoutInterval:30]; 4306 + [request setTimeoutInterval:30.0];
4304 4307
4305 NSDictionary *parameters; 4308 NSDictionary *parameters;
4306 4309
...@@ -4391,6 +4394,7 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2) ...@@ -4391,6 +4394,7 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2)
4391 4394
4392 _httpClient.responseSerializer = [AFJSONResponseSerializer serializer]; 4395 _httpClient.responseSerializer = [AFJSONResponseSerializer serializer];
4393 _httpClient.requestSerializer = [AFJSONRequestSerializer serializer]; 4396 _httpClient.requestSerializer = [AFJSONRequestSerializer serializer];
4397 + [_httpClient.requestSerializer setTimeoutInterval:30];
4394 4398
4395 //Set HTTP Headers 4399 //Set HTTP Headers
4396 time_t timestamp = (time_t) [[NSDate date] timeIntervalSince1970]; 4400 time_t timestamp = (time_t) [[NSDate date] timeIntervalSince1970];
...@@ -4426,8 +4430,8 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2) ...@@ -4426,8 +4430,8 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2)
4426 NSMutableString *urlString = [NSMutableString stringWithFormat:@"%@/user/%@/change_password", _baseURL, _appUUID]; 4430 NSMutableString *urlString = [NSMutableString stringWithFormat:@"%@/user/%@/change_password", _baseURL, _appUUID];
4427 WLLOG(@"[WARP Trace] HTTP URL: %@", urlString); 4431 WLLOG(@"[WARP Trace] HTTP URL: %@", urlString);
4428 4432
4429 - NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:urlString] cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:30]; 4433 + NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:urlString] cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:30.0];
4430 - [request setTimeoutInterval:30]; 4434 + [request setTimeoutInterval:30.0];
4431 4435
4432 NSDictionary *parameters; 4436 NSDictionary *parameters;
4433 4437
...@@ -4518,6 +4522,7 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2) ...@@ -4518,6 +4522,7 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2)
4518 4522
4519 _httpClient.responseSerializer = [AFJSONResponseSerializer serializer]; 4523 _httpClient.responseSerializer = [AFJSONResponseSerializer serializer];
4520 _httpClient.requestSerializer = [AFJSONRequestSerializer serializer]; 4524 _httpClient.requestSerializer = [AFJSONRequestSerializer serializer];
4525 + [_httpClient.requestSerializer setTimeoutInterval:30];
4521 4526
4522 //Set HTTP Headers 4527 //Set HTTP Headers
4523 time_t timestamp = (time_t) [[NSDate date] timeIntervalSince1970]; 4528 time_t timestamp = (time_t) [[NSDate date] timeIntervalSince1970];
...@@ -4561,8 +4566,8 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2) ...@@ -4561,8 +4566,8 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2)
4561 NSMutableString *urlString = [NSMutableString stringWithFormat:@"%@/oauth/%@/context", _baseURL, _appUUID]; 4566 NSMutableString *urlString = [NSMutableString stringWithFormat:@"%@/oauth/%@/context", _baseURL, _appUUID];
4562 WLLOG(@"[WARP Trace] HTTP URL: %@", urlString); 4567 WLLOG(@"[WARP Trace] HTTP URL: %@", urlString);
4563 4568
4564 - NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:urlString] cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:30]; 4569 + NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:urlString] cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:30.0];
4565 - [request setTimeoutInterval:30]; 4570 + [request setTimeoutInterval:30.0];
4566 4571
4567 NSDictionary *parameters; 4572 NSDictionary *parameters;
4568 4573
...@@ -4656,6 +4661,7 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2) ...@@ -4656,6 +4661,7 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2)
4656 4661
4657 _httpClient.responseSerializer = [AFJSONResponseSerializer serializer]; 4662 _httpClient.responseSerializer = [AFJSONResponseSerializer serializer];
4658 _httpClient.requestSerializer = [AFJSONRequestSerializer serializer]; 4663 _httpClient.requestSerializer = [AFJSONRequestSerializer serializer];
4664 + [_httpClient.requestSerializer setTimeoutInterval:30];
4659 4665
4660 //Set HTTP Headers 4666 //Set HTTP Headers
4661 time_t timestamp = (time_t) [[NSDate date] timeIntervalSince1970]; 4667 time_t timestamp = (time_t) [[NSDate date] timeIntervalSince1970];
...@@ -4699,8 +4705,8 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2) ...@@ -4699,8 +4705,8 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2)
4699 NSMutableString *urlString = [NSMutableString stringWithFormat:@"%@/api/%@/handle_image", _baseURL, _appUUID]; 4705 NSMutableString *urlString = [NSMutableString stringWithFormat:@"%@/api/%@/handle_image", _baseURL, _appUUID];
4700 WLLOG(@"[WARP Trace] HTTP URL: %@", urlString); 4706 WLLOG(@"[WARP Trace] HTTP URL: %@", urlString);
4701 4707
4702 - NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:urlString] cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:30]; 4708 + NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:urlString] cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:30.0];
4703 - [request setTimeoutInterval:30]; 4709 + [request setTimeoutInterval:30.0];
4704 4710
4705 NSDictionary *parameters; 4711 NSDictionary *parameters;
4706 4712
...@@ -4790,6 +4796,7 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2) ...@@ -4790,6 +4796,7 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2)
4790 }; 4796 };
4791 _httpClient.responseSerializer = [AFJSONResponseSerializer serializer]; 4797 _httpClient.responseSerializer = [AFJSONResponseSerializer serializer];
4792 _httpClient.requestSerializer = [AFJSONRequestSerializer serializer]; 4798 _httpClient.requestSerializer = [AFJSONRequestSerializer serializer];
4799 + [_httpClient.requestSerializer setTimeoutInterval:30];
4793 4800
4794 //Set HTTP Headers 4801 //Set HTTP Headers
4795 time_t timestamp = (time_t) [[NSDate date] timeIntervalSince1970]; 4802 time_t timestamp = (time_t) [[NSDate date] timeIntervalSince1970];
...@@ -4825,8 +4832,8 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2) ...@@ -4825,8 +4832,8 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2)
4825 NSMutableString *urlString = [NSMutableString stringWithFormat:@"%@/user/%@/password_reset", _baseURL, _appUUID]; 4832 NSMutableString *urlString = [NSMutableString stringWithFormat:@"%@/user/%@/password_reset", _baseURL, _appUUID];
4826 WLLOG(@"[WARP Trace] HTTP URL: %@", urlString); 4833 WLLOG(@"[WARP Trace] HTTP URL: %@", urlString);
4827 4834
4828 - NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:urlString] cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:30]; 4835 + NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:urlString] cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:30.0];
4829 - [request setTimeoutInterval:30]; 4836 + [request setTimeoutInterval:30.0];
4830 4837
4831 NSDictionary *parameters; 4838 NSDictionary *parameters;
4832 4839
...@@ -4887,6 +4894,7 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2) ...@@ -4887,6 +4894,7 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2)
4887 }; 4894 };
4888 _httpClient.responseSerializer = [AFJSONResponseSerializer serializer]; 4895 _httpClient.responseSerializer = [AFJSONResponseSerializer serializer];
4889 _httpClient.requestSerializer = [AFJSONRequestSerializer serializer]; 4896 _httpClient.requestSerializer = [AFJSONRequestSerializer serializer];
4897 + [_httpClient.requestSerializer setTimeoutInterval:30];
4890 4898
4891 //Set HTTP Headers 4899 //Set HTTP Headers
4892 time_t timestamp = (time_t) [[NSDate date] timeIntervalSince1970]; 4900 time_t timestamp = (time_t) [[NSDate date] timeIntervalSince1970];
...@@ -4921,8 +4929,8 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2) ...@@ -4921,8 +4929,8 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2)
4921 NSMutableString *urlString = [NSMutableString stringWithFormat:@"%@/user/%@/otp/generate", _baseURL, _appUUID]; 4929 NSMutableString *urlString = [NSMutableString stringWithFormat:@"%@/user/%@/otp/generate", _baseURL, _appUUID];
4922 WLLOG(@"[WARP Trace] HTTP URL: %@", urlString); 4930 WLLOG(@"[WARP Trace] HTTP URL: %@", urlString);
4923 4931
4924 - NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:urlString] cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:30]; 4932 + NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:urlString] cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:30.0];
4925 - [request setTimeoutInterval:30]; 4933 + [request setTimeoutInterval:30.0];
4926 4934
4927 NSDictionary *parameters; 4935 NSDictionary *parameters;
4928 4936
...@@ -4983,6 +4991,7 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2) ...@@ -4983,6 +4991,7 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2)
4983 }; 4991 };
4984 _httpClient.responseSerializer = [AFJSONResponseSerializer serializer]; 4992 _httpClient.responseSerializer = [AFJSONResponseSerializer serializer];
4985 _httpClient.requestSerializer = [AFJSONRequestSerializer serializer]; 4993 _httpClient.requestSerializer = [AFJSONRequestSerializer serializer];
4994 + [_httpClient.requestSerializer setTimeoutInterval:30];
4986 4995
4987 //Set HTTP Headers 4996 //Set HTTP Headers
4988 time_t timestamp = (time_t) [[NSDate date] timeIntervalSince1970]; 4997 time_t timestamp = (time_t) [[NSDate date] timeIntervalSince1970];
...@@ -5109,8 +5118,8 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2) ...@@ -5109,8 +5118,8 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2)
5109 NSMutableString *urlString = [NSMutableString stringWithFormat:@"%@%@", _baseURL, VERIFY_URL]; // /partners/cosmote/verify 5118 NSMutableString *urlString = [NSMutableString stringWithFormat:@"%@%@", _baseURL, VERIFY_URL]; // /partners/cosmote/verify
5110 WLLOG(@"[WARP Trace] HTTP URL: %@", urlString); 5119 WLLOG(@"[WARP Trace] HTTP URL: %@", urlString);
5111 5120
5112 - NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:urlString] cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:30]; 5121 + NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:urlString] cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:30.0];
5113 - [request setTimeoutInterval:30]; 5122 + [request setTimeoutInterval:30.0];
5114 5123
5115 NSDictionary *parameters; 5124 NSDictionary *parameters;
5116 5125
...@@ -5172,6 +5181,7 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2) ...@@ -5172,6 +5181,7 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2)
5172 // } 5181 // }
5173 _httpClient.responseSerializer = [AFJSONResponseSerializer serializer]; 5182 _httpClient.responseSerializer = [AFJSONResponseSerializer serializer];
5174 _httpClient.requestSerializer = [AFJSONRequestSerializer serializer]; 5183 _httpClient.requestSerializer = [AFJSONRequestSerializer serializer];
5184 + [_httpClient.requestSerializer setTimeoutInterval:30];
5175 5185
5176 //Set HTTP Headers 5186 //Set HTTP Headers
5177 time_t timestamp = (time_t) [[NSDate date] timeIntervalSince1970]; 5187 time_t timestamp = (time_t) [[NSDate date] timeIntervalSince1970];
...@@ -5206,8 +5216,8 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2) ...@@ -5206,8 +5216,8 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2)
5206 NSMutableString *urlString = [NSMutableString stringWithFormat:@"%@/partners/oauth/%@/token", _baseURL, _appUUID]; // /partners/cosmote/verify 5216 NSMutableString *urlString = [NSMutableString stringWithFormat:@"%@/partners/oauth/%@/token", _baseURL, _appUUID]; // /partners/cosmote/verify
5207 WLLOG(@"[WARP Trace] HTTP URL: %@", urlString); 5217 WLLOG(@"[WARP Trace] HTTP URL: %@", urlString);
5208 5218
5209 - NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:urlString] cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:30]; 5219 + NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:urlString] cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:30.0];
5210 - [request setTimeoutInterval:30]; 5220 + [request setTimeoutInterval:30.0];
5211 5221
5212 NSDictionary *parameters; 5222 NSDictionary *parameters;
5213 5223
...@@ -5269,6 +5279,7 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2) ...@@ -5269,6 +5279,7 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2)
5269 // } 5279 // }
5270 _httpClient.responseSerializer = [AFJSONResponseSerializer serializer]; 5280 _httpClient.responseSerializer = [AFJSONResponseSerializer serializer];
5271 _httpClient.requestSerializer = [AFJSONRequestSerializer serializer]; 5281 _httpClient.requestSerializer = [AFJSONRequestSerializer serializer];
5282 + [_httpClient.requestSerializer setTimeoutInterval:30];
5272 5283
5273 //Set HTTP Headers 5284 //Set HTTP Headers
5274 // DEV: MWlTM0EyNjcxT2Q0a1B5QkIydEs1ZU5uRENhR0NWQjQ6MjI4MjA4ZTliMTQzNGQ2MmIxNGI3ZDAzYjM2ZjUwMzg= 5285 // DEV: MWlTM0EyNjcxT2Q0a1B5QkIydEs1ZU5uRENhR0NWQjQ6MjI4MjA4ZTliMTQzNGQ2MmIxNGI3ZDAzYjM2ZjUwMzg=
...@@ -5316,8 +5327,8 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2) ...@@ -5316,8 +5327,8 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2)
5316 5327
5317 WLLOG(@"[WARP Trace] HTTP URL: %@", urlString); 5328 WLLOG(@"[WARP Trace] HTTP URL: %@", urlString);
5318 5329
5319 - NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:urlString] cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:30]; 5330 + NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:urlString] cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:30.0];
5320 - [request setTimeoutInterval:30]; 5331 + [request setTimeoutInterval:30.0];
5321 5332
5322 NSDictionary *parameters; 5333 NSDictionary *parameters;
5323 5334
...@@ -5408,6 +5419,7 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2) ...@@ -5408,6 +5419,7 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2)
5408 5419
5409 _httpClient.responseSerializer = [AFJSONResponseSerializer serializer]; 5420 _httpClient.responseSerializer = [AFJSONResponseSerializer serializer];
5410 _httpClient.requestSerializer = [AFJSONRequestSerializer serializer]; 5421 _httpClient.requestSerializer = [AFJSONRequestSerializer serializer];
5422 + [_httpClient.requestSerializer setTimeoutInterval:30];
5411 5423
5412 //Set HTTP Headers 5424 //Set HTTP Headers
5413 time_t timestamp = (time_t) [[NSDate date] timeIntervalSince1970]; 5425 time_t timestamp = (time_t) [[NSDate date] timeIntervalSince1970];
...@@ -5445,8 +5457,8 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2) ...@@ -5445,8 +5457,8 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2)
5445 5457
5446 WLLOG(@"[WARP Trace] HTTP URL: %@", urlString); 5458 WLLOG(@"[WARP Trace] HTTP URL: %@", urlString);
5447 5459
5448 - NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:urlString] cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:30]; 5460 + NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:urlString] cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:30.0];
5449 - [request setTimeoutInterval:30]; 5461 + [request setTimeoutInterval:30.0];
5450 5462
5451 NSDictionary *parameters; 5463 NSDictionary *parameters;
5452 5464
...@@ -5537,6 +5549,7 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2) ...@@ -5537,6 +5549,7 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2)
5537 5549
5538 _httpClient.responseSerializer = [AFJSONResponseSerializer serializer]; 5550 _httpClient.responseSerializer = [AFJSONResponseSerializer serializer];
5539 _httpClient.requestSerializer = [AFJSONRequestSerializer serializer]; 5551 _httpClient.requestSerializer = [AFJSONRequestSerializer serializer];
5552 + [_httpClient.requestSerializer setTimeoutInterval:30];
5540 5553
5541 //Set HTTP Headers 5554 //Set HTTP Headers
5542 time_t timestamp = (time_t) [[NSDate date] timeIntervalSince1970]; 5555 time_t timestamp = (time_t) [[NSDate date] timeIntervalSince1970];
...@@ -5573,8 +5586,8 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2) ...@@ -5573,8 +5586,8 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2)
5573 5586
5574 WLLOG(@"[WARP Trace] HTTP URL: %@", urlString); 5587 WLLOG(@"[WARP Trace] HTTP URL: %@", urlString);
5575 5588
5576 - NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:urlString] cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:30]; 5589 + NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:urlString] cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:30.0];
5577 - [request setTimeoutInterval:30]; 5590 + [request setTimeoutInterval:30.0];
5578 5591
5579 NSDictionary *parameters; 5592 NSDictionary *parameters;
5580 5593
...@@ -5665,6 +5678,7 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2) ...@@ -5665,6 +5678,7 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2)
5665 5678
5666 _httpClient.responseSerializer = [AFJSONResponseSerializer serializer]; 5679 _httpClient.responseSerializer = [AFJSONResponseSerializer serializer];
5667 _httpClient.requestSerializer = [AFJSONRequestSerializer serializer]; 5680 _httpClient.requestSerializer = [AFJSONRequestSerializer serializer];
5681 + [_httpClient.requestSerializer setTimeoutInterval:30];
5668 5682
5669 //Set HTTP Headers 5683 //Set HTTP Headers
5670 time_t timestamp = (time_t) [[NSDate date] timeIntervalSince1970]; 5684 time_t timestamp = (time_t) [[NSDate date] timeIntervalSince1970];
...@@ -5709,8 +5723,8 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2) ...@@ -5709,8 +5723,8 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2)
5709 5723
5710 WLLOG(@"[WARP Trace] HTTP URL: %@", urlString); 5724 WLLOG(@"[WARP Trace] HTTP URL: %@", urlString);
5711 5725
5712 - NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:urlString] cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:30]; 5726 + NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:urlString] cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:30.0];
5713 - [request setTimeoutInterval:30]; 5727 + [request setTimeoutInterval:30.0];
5714 5728
5715 NSDictionary *parameters; 5729 NSDictionary *parameters;
5716 5730
...@@ -5766,6 +5780,7 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2) ...@@ -5766,6 +5780,7 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2)
5766 5780
5767 _httpClient.responseSerializer = [AFJSONResponseSerializer serializer]; 5781 _httpClient.responseSerializer = [AFJSONResponseSerializer serializer];
5768 _httpClient.requestSerializer = [AFJSONRequestSerializer serializer]; 5782 _httpClient.requestSerializer = [AFJSONRequestSerializer serializer];
5783 + [_httpClient.requestSerializer setTimeoutInterval:30];
5769 5784
5770 //Set HTTP Headers 5785 //Set HTTP Headers
5771 time_t timestamp = (time_t) [[NSDate date] timeIntervalSince1970]; 5786 time_t timestamp = (time_t) [[NSDate date] timeIntervalSince1970];
...@@ -5804,7 +5819,7 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2) ...@@ -5804,7 +5819,7 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2)
5804 _waitingForRegistration = YES; 5819 _waitingForRegistration = YES;
5805 5820
5806 NSString *urlString = [NSString stringWithFormat:@"%@/api/mobile/v2/%@/register/", _baseURL, _appUUID]; 5821 NSString *urlString = [NSString stringWithFormat:@"%@/api/mobile/v2/%@/register/", _baseURL, _appUUID];
5807 -// NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:urlString] cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:30]; 5822 +// NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:urlString] cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:30.0];
5808 // [request setAllHTTPHeaderFields:@{@"Accept-Encoding": @"gzip", 5823 // [request setAllHTTPHeaderFields:@{@"Accept-Encoding": @"gzip",
5809 // @"Accept": @"application/json", 5824 // @"Accept": @"application/json",
5810 // @"User-Agent": @"gzip", 5825 // @"User-Agent": @"gzip",
...@@ -5885,6 +5900,7 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2) ...@@ -5885,6 +5900,7 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2)
5885 5900
5886 _httpClient.responseSerializer = [AFJSONResponseSerializer serializer]; 5901 _httpClient.responseSerializer = [AFJSONResponseSerializer serializer];
5887 _httpClient.requestSerializer = [AFJSONRequestSerializer serializer]; 5902 _httpClient.requestSerializer = [AFJSONRequestSerializer serializer];
5903 + [_httpClient.requestSerializer setTimeoutInterval:30];
5888 5904
5889 5905
5890 // NSDictionary *context = [NSDictionary dictionaryWithObject:[[ASIdentifierManager sharedManager].advertisingIdentifier UUIDString] forKey:]; 5906 // NSDictionary *context = [NSDictionary dictionaryWithObject:[[ASIdentifierManager sharedManager].advertisingIdentifier UUIDString] forKey:];
...@@ -5967,7 +5983,7 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2) ...@@ -5967,7 +5983,7 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2)
5967 _waitingForRegistration = YES; 5983 _waitingForRegistration = YES;
5968 5984
5969 NSString *urlString = [NSString stringWithFormat:@"%@/api/mobile/v2/%@/register/", _baseURL, _appUUID]; 5985 NSString *urlString = [NSString stringWithFormat:@"%@/api/mobile/v2/%@/register/", _baseURL, _appUUID];
5970 -// NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:urlString] cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:30]; 5986 +// NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:urlString] cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:30.0];
5971 // [request setAllHTTPHeaderFields:@{@"Accept-Encoding": @"gzip", 5987 // [request setAllHTTPHeaderFields:@{@"Accept-Encoding": @"gzip",
5972 // @"Accept": @"application/json", 5988 // @"Accept": @"application/json",
5973 // @"User-Agent": @"gzip", 5989 // @"User-Agent": @"gzip",
...@@ -6056,6 +6072,7 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2) ...@@ -6056,6 +6072,7 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2)
6056 6072
6057 _httpClient.responseSerializer = [AFJSONResponseSerializer serializer]; 6073 _httpClient.responseSerializer = [AFJSONResponseSerializer serializer];
6058 _httpClient.requestSerializer = [AFJSONRequestSerializer serializer]; 6074 _httpClient.requestSerializer = [AFJSONRequestSerializer serializer];
6075 + [_httpClient.requestSerializer setTimeoutInterval:30];
6059 6076
6060 6077
6061 // NSDictionary *context = [NSDictionary dictionaryWithObject:[[ASIdentifierManager sharedManager].advertisingIdentifier UUIDString] forKey:]; 6078 // NSDictionary *context = [NSDictionary dictionaryWithObject:[[ASIdentifierManager sharedManager].advertisingIdentifier UUIDString] forKey:];
......