Showing
1 changed file
with
32 additions
and
17 deletions
... | @@ -3886,7 +3886,8 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2) | ... | @@ -3886,7 +3886,8 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2) |
3886 | NSMutableString *urlString = [NSMutableString stringWithFormat:@"%@/oauth/%@/login", _baseURL, _appUUID]; | 3886 | NSMutableString *urlString = [NSMutableString stringWithFormat:@"%@/oauth/%@/login", _baseURL, _appUUID]; |
3887 | WLLOG(@"[WARP Trace] HTTP URL: %@", urlString); | 3887 | WLLOG(@"[WARP Trace] HTTP URL: %@", urlString); |
3888 | 3888 | ||
3889 | - NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:urlString] cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:100]; | 3889 | + NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:urlString] cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:30]; |
3890 | + [request setTimeoutInterval:30]; | ||
3890 | 3891 | ||
3891 | NSDictionary *parameters; | 3892 | NSDictionary *parameters; |
3892 | 3893 | ||
... | @@ -4013,7 +4014,8 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2) | ... | @@ -4013,7 +4014,8 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2) |
4013 | NSMutableString *urlString = [NSMutableString stringWithFormat:@"%@/oauth/%@/web_authorize", _baseURL, _appUUID]; | 4014 | NSMutableString *urlString = [NSMutableString stringWithFormat:@"%@/oauth/%@/web_authorize", _baseURL, _appUUID]; |
4014 | WLLOG(@"[WARP Trace] HTTP URL: %@", urlString); | 4015 | WLLOG(@"[WARP Trace] HTTP URL: %@", urlString); |
4015 | 4016 | ||
4016 | - NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:urlString] cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:100]; | 4017 | + NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:urlString] cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:30]; |
4018 | + [request setTimeoutInterval:30]; | ||
4017 | 4019 | ||
4018 | NSDictionary *parameters; | 4020 | NSDictionary *parameters; |
4019 | 4021 | ||
... | @@ -4118,7 +4120,8 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2) | ... | @@ -4118,7 +4120,8 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2) |
4118 | NSMutableString *urlString = [NSMutableString stringWithFormat:@"%@/oauth/%@/token", _baseURL, _appUUID]; | 4120 | NSMutableString *urlString = [NSMutableString stringWithFormat:@"%@/oauth/%@/token", _baseURL, _appUUID]; |
4119 | WLLOG(@"[WARP Trace] HTTP URL: %@", urlString); | 4121 | WLLOG(@"[WARP Trace] HTTP URL: %@", urlString); |
4120 | 4122 | ||
4121 | - NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:urlString] cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:100]; | 4123 | + NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:urlString] cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:30]; |
4124 | + [request setTimeoutInterval:30]; | ||
4122 | 4125 | ||
4123 | NSDictionary *parameters; | 4126 | NSDictionary *parameters; |
4124 | 4127 | ||
... | @@ -4224,7 +4227,8 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2) | ... | @@ -4224,7 +4227,8 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2) |
4224 | NSMutableString *urlString = [NSMutableString stringWithFormat:@"%@/user/%@/register", _baseURL, _appUUID]; | 4227 | NSMutableString *urlString = [NSMutableString stringWithFormat:@"%@/user/%@/register", _baseURL, _appUUID]; |
4225 | WLLOG(@"[WARP Trace] HTTP URL: %@", urlString); | 4228 | WLLOG(@"[WARP Trace] HTTP URL: %@", urlString); |
4226 | 4229 | ||
4227 | - NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:urlString] cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:100]; | 4230 | + NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:urlString] cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:30]; |
4231 | + [request setTimeoutInterval:30]; | ||
4228 | 4232 | ||
4229 | NSDictionary *parameters; | 4233 | NSDictionary *parameters; |
4230 | 4234 | ||
... | @@ -4350,7 +4354,8 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2) | ... | @@ -4350,7 +4354,8 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2) |
4350 | NSMutableString *urlString = [NSMutableString stringWithFormat:@"%@/user/%@/change_password", _baseURL, _appUUID]; | 4354 | NSMutableString *urlString = [NSMutableString stringWithFormat:@"%@/user/%@/change_password", _baseURL, _appUUID]; |
4351 | WLLOG(@"[WARP Trace] HTTP URL: %@", urlString); | 4355 | WLLOG(@"[WARP Trace] HTTP URL: %@", urlString); |
4352 | 4356 | ||
4353 | - NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:urlString] cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:100]; | 4357 | + NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:urlString] cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:30]; |
4358 | + [request setTimeoutInterval:30]; | ||
4354 | 4359 | ||
4355 | NSDictionary *parameters; | 4360 | NSDictionary *parameters; |
4356 | 4361 | ||
... | @@ -4484,7 +4489,8 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2) | ... | @@ -4484,7 +4489,8 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2) |
4484 | NSMutableString *urlString = [NSMutableString stringWithFormat:@"%@/oauth/%@/context", _baseURL, _appUUID]; | 4489 | NSMutableString *urlString = [NSMutableString stringWithFormat:@"%@/oauth/%@/context", _baseURL, _appUUID]; |
4485 | WLLOG(@"[WARP Trace] HTTP URL: %@", urlString); | 4490 | WLLOG(@"[WARP Trace] HTTP URL: %@", urlString); |
4486 | 4491 | ||
4487 | - NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:urlString] cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:100]; | 4492 | + NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:urlString] cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:30]; |
4493 | + [request setTimeoutInterval:30]; | ||
4488 | 4494 | ||
4489 | NSDictionary *parameters; | 4495 | NSDictionary *parameters; |
4490 | 4496 | ||
... | @@ -4621,7 +4627,8 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2) | ... | @@ -4621,7 +4627,8 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2) |
4621 | NSMutableString *urlString = [NSMutableString stringWithFormat:@"%@/api/%@/handle_image", _baseURL, _appUUID]; | 4627 | NSMutableString *urlString = [NSMutableString stringWithFormat:@"%@/api/%@/handle_image", _baseURL, _appUUID]; |
4622 | WLLOG(@"[WARP Trace] HTTP URL: %@", urlString); | 4628 | WLLOG(@"[WARP Trace] HTTP URL: %@", urlString); |
4623 | 4629 | ||
4624 | - NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:urlString] cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:100]; | 4630 | + NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:urlString] cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:30]; |
4631 | + [request setTimeoutInterval:30]; | ||
4625 | 4632 | ||
4626 | NSDictionary *parameters; | 4633 | NSDictionary *parameters; |
4627 | 4634 | ||
... | @@ -4746,7 +4753,8 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2) | ... | @@ -4746,7 +4753,8 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2) |
4746 | NSMutableString *urlString = [NSMutableString stringWithFormat:@"%@/user/%@/password_reset", _baseURL, _appUUID]; | 4753 | NSMutableString *urlString = [NSMutableString stringWithFormat:@"%@/user/%@/password_reset", _baseURL, _appUUID]; |
4747 | WLLOG(@"[WARP Trace] HTTP URL: %@", urlString); | 4754 | WLLOG(@"[WARP Trace] HTTP URL: %@", urlString); |
4748 | 4755 | ||
4749 | - NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:urlString] cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:100]; | 4756 | + NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:urlString] cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:30]; |
4757 | + [request setTimeoutInterval:30]; | ||
4750 | 4758 | ||
4751 | NSDictionary *parameters; | 4759 | NSDictionary *parameters; |
4752 | 4760 | ||
... | @@ -4841,7 +4849,8 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2) | ... | @@ -4841,7 +4849,8 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2) |
4841 | NSMutableString *urlString = [NSMutableString stringWithFormat:@"%@/user/%@/otp/generate", _baseURL, _appUUID]; | 4849 | NSMutableString *urlString = [NSMutableString stringWithFormat:@"%@/user/%@/otp/generate", _baseURL, _appUUID]; |
4842 | WLLOG(@"[WARP Trace] HTTP URL: %@", urlString); | 4850 | WLLOG(@"[WARP Trace] HTTP URL: %@", urlString); |
4843 | 4851 | ||
4844 | - NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:urlString] cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:100]; | 4852 | + NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:urlString] cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:30]; |
4853 | + [request setTimeoutInterval:30]; | ||
4845 | 4854 | ||
4846 | NSDictionary *parameters; | 4855 | NSDictionary *parameters; |
4847 | 4856 | ||
... | @@ -5028,7 +5037,8 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2) | ... | @@ -5028,7 +5037,8 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2) |
5028 | NSMutableString *urlString = [NSMutableString stringWithFormat:@"%@%@", _baseURL, VERIFY_URL]; // /partners/cosmote/verify | 5037 | NSMutableString *urlString = [NSMutableString stringWithFormat:@"%@%@", _baseURL, VERIFY_URL]; // /partners/cosmote/verify |
5029 | WLLOG(@"[WARP Trace] HTTP URL: %@", urlString); | 5038 | WLLOG(@"[WARP Trace] HTTP URL: %@", urlString); |
5030 | 5039 | ||
5031 | - NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:urlString] cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:100]; | 5040 | + NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:urlString] cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:30]; |
5041 | + [request setTimeoutInterval:30]; | ||
5032 | 5042 | ||
5033 | NSDictionary *parameters; | 5043 | NSDictionary *parameters; |
5034 | 5044 | ||
... | @@ -5124,7 +5134,8 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2) | ... | @@ -5124,7 +5134,8 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2) |
5124 | NSMutableString *urlString = [NSMutableString stringWithFormat:@"%@/partners/oauth/%@/token", _baseURL, _appUUID]; // /partners/cosmote/verify | 5134 | NSMutableString *urlString = [NSMutableString stringWithFormat:@"%@/partners/oauth/%@/token", _baseURL, _appUUID]; // /partners/cosmote/verify |
5125 | WLLOG(@"[WARP Trace] HTTP URL: %@", urlString); | 5135 | WLLOG(@"[WARP Trace] HTTP URL: %@", urlString); |
5126 | 5136 | ||
5127 | - NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:urlString] cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:100]; | 5137 | + NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:urlString] cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:30]; |
5138 | + [request setTimeoutInterval:30]; | ||
5128 | 5139 | ||
5129 | NSDictionary *parameters; | 5140 | NSDictionary *parameters; |
5130 | 5141 | ||
... | @@ -5233,7 +5244,8 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2) | ... | @@ -5233,7 +5244,8 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2) |
5233 | 5244 | ||
5234 | WLLOG(@"[WARP Trace] HTTP URL: %@", urlString); | 5245 | WLLOG(@"[WARP Trace] HTTP URL: %@", urlString); |
5235 | 5246 | ||
5236 | - NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:urlString] cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:100]; | 5247 | + NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:urlString] cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:30]; |
5248 | + [request setTimeoutInterval:30]; | ||
5237 | 5249 | ||
5238 | NSDictionary *parameters; | 5250 | NSDictionary *parameters; |
5239 | 5251 | ||
... | @@ -5361,7 +5373,8 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2) | ... | @@ -5361,7 +5373,8 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2) |
5361 | 5373 | ||
5362 | WLLOG(@"[WARP Trace] HTTP URL: %@", urlString); | 5374 | WLLOG(@"[WARP Trace] HTTP URL: %@", urlString); |
5363 | 5375 | ||
5364 | - NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:urlString] cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:100]; | 5376 | + NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:urlString] cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:30]; |
5377 | + [request setTimeoutInterval:30]; | ||
5365 | 5378 | ||
5366 | NSDictionary *parameters; | 5379 | NSDictionary *parameters; |
5367 | 5380 | ||
... | @@ -5488,7 +5501,8 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2) | ... | @@ -5488,7 +5501,8 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2) |
5488 | 5501 | ||
5489 | WLLOG(@"[WARP Trace] HTTP URL: %@", urlString); | 5502 | WLLOG(@"[WARP Trace] HTTP URL: %@", urlString); |
5490 | 5503 | ||
5491 | - NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:urlString] cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:100]; | 5504 | + NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:urlString] cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:30]; |
5505 | + [request setTimeoutInterval:30]; | ||
5492 | 5506 | ||
5493 | NSDictionary *parameters; | 5507 | NSDictionary *parameters; |
5494 | 5508 | ||
... | @@ -5623,7 +5637,8 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2) | ... | @@ -5623,7 +5637,8 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2) |
5623 | 5637 | ||
5624 | WLLOG(@"[WARP Trace] HTTP URL: %@", urlString); | 5638 | WLLOG(@"[WARP Trace] HTTP URL: %@", urlString); |
5625 | 5639 | ||
5626 | - NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:urlString] cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:100]; | 5640 | + NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:urlString] cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:30]; |
5641 | + [request setTimeoutInterval:30]; | ||
5627 | 5642 | ||
5628 | NSDictionary *parameters; | 5643 | NSDictionary *parameters; |
5629 | 5644 | ||
... | @@ -5717,7 +5732,7 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2) | ... | @@ -5717,7 +5732,7 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2) |
5717 | _waitingForRegistration = YES; | 5732 | _waitingForRegistration = YES; |
5718 | 5733 | ||
5719 | NSString *urlString = [NSString stringWithFormat:@"%@/api/mobile/v2/%@/register/", _baseURL, _appUUID]; | 5734 | NSString *urlString = [NSString stringWithFormat:@"%@/api/mobile/v2/%@/register/", _baseURL, _appUUID]; |
5720 | -// NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:urlString] cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:100]; | 5735 | +// NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:urlString] cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:30]; |
5721 | // [request setAllHTTPHeaderFields:@{@"Accept-Encoding": @"gzip", | 5736 | // [request setAllHTTPHeaderFields:@{@"Accept-Encoding": @"gzip", |
5722 | // @"Accept": @"application/json", | 5737 | // @"Accept": @"application/json", |
5723 | // @"User-Agent": @"gzip", | 5738 | // @"User-Agent": @"gzip", |
... | @@ -5849,7 +5864,7 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2) | ... | @@ -5849,7 +5864,7 @@ CGFloat DistanceBetweenTwoPoints(CGPoint point1,CGPoint point2) |
5849 | _waitingForRegistration = YES; | 5864 | _waitingForRegistration = YES; |
5850 | 5865 | ||
5851 | NSString *urlString = [NSString stringWithFormat:@"%@/api/mobile/v2/%@/register/", _baseURL, _appUUID]; | 5866 | NSString *urlString = [NSString stringWithFormat:@"%@/api/mobile/v2/%@/register/", _baseURL, _appUUID]; |
5852 | -// NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:urlString] cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:100]; | 5867 | +// NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:urlString] cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:30]; |
5853 | // [request setAllHTTPHeaderFields:@{@"Accept-Encoding": @"gzip", | 5868 | // [request setAllHTTPHeaderFields:@{@"Accept-Encoding": @"gzip", |
5854 | // @"Accept": @"application/json", | 5869 | // @"Accept": @"application/json", |
5855 | // @"User-Agent": @"gzip", | 5870 | // @"User-Agent": @"gzip", | ... | ... |
-
Please register or login to post a comment