keejef
/
session-ios
mirror of https://github.com/oxen-io/session-ios
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'charlesmchen/networkManagerErrors' into release/2.31.0

Browse Source
pull/1/head
Matthew Chen 7 years ago
parent 6e386b75c4 a5f715eca1
commit 9417bdeaa0
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File

3
Signal/translations/en.lproj/Localizable.strings
Unescape Escape View File

@ -1673,6 +1673,9 @@
/* No comment provided by engineer. */ /* No comment provided by engineer. */
"REGISTER_RATE_LIMITING_BODY" = "You have tried too often. Please wait a minute before trying again."; "REGISTER_RATE_LIMITING_BODY" = "You have tried too often. Please wait a minute before trying again.";
/* No comment provided by engineer. */
"REGISTER_RATE_LIMITING_ERROR" = "You have tried too often. Please wait a minute before trying again.";
/* Title of alert shown when push tokens sync job fails. */ /* Title of alert shown when push tokens sync job fails. */
"REGISTRATION_BODY" = "Failed to re-register for push notifications."; "REGISTRATION_BODY" = "Failed to re-register for push notifications.";

10
SignalServiceKit/src/Network/API/TSNetworkManager.m
Unescape Escape View File

@ -263,19 +263,19 @@ typedef void (^failureBlock)(NSURLSessionDataTask *task, NSError *error);
recoverySuggestion:NSLocalizedString(@"MULTIDEVICE_PAIRING_MAX_RECOVERY", recoverySuggestion:NSLocalizedString(@"MULTIDEVICE_PAIRING_MAX_RECOVERY",
@"alert body: cannot link - reached max linked devices") @"alert body: cannot link - reached max linked devices")
fallbackError:networkError]; fallbackError:networkError];
error.isRetryable = NO; customError.isRetryable = NO;
failureBlock(task, error); failureBlock(task, customError);
break; break;
} }
case 413: { case 413: {
OWSLogWarn(@"Rate limit exceeded: %@", request); OWSLogWarn(@"Rate limit exceeded: %@", request);
NSError *customError = [self errorWithHTTPCode:statusCode NSError *customError = [self errorWithHTTPCode:statusCode
description:NSLocalizedString(@"REGISTRATION_ERROR", nil) description:NSLocalizedString(@"REGISTER_RATE_LIMITING_ERROR", nil)
failureReason:networkError.localizedFailureReason failureReason:networkError.localizedFailureReason
recoverySuggestion:NSLocalizedString(@"REGISTER_RATE_LIMITING_BODY", nil) recoverySuggestion:NSLocalizedString(@"REGISTER_RATE_LIMITING_BODY", nil)
fallbackError:networkError]; fallbackError:networkError];
error.isRetryable = NO; customError.isRetryable = NO;
failureBlock(task, error); failureBlock(task, customError);
break; break;
} }
case 417: { case 417: {

Write Preview
Loading…
Cancel
Save