From a5f715eca1b9eb52fd977c730399845cd2fd7943 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Mon, 29 Oct 2018 12:59:16 -0400 Subject: [PATCH] Fix network manager error wrapping. --- Signal/translations/en.lproj/Localizable.strings | 3 +++ SignalServiceKit/src/Network/API/TSNetworkManager.m | 10 +++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Signal/translations/en.lproj/Localizable.strings b/Signal/translations/en.lproj/Localizable.strings index 37c681b4f..a70f744f0 100644 --- a/Signal/translations/en.lproj/Localizable.strings +++ b/Signal/translations/en.lproj/Localizable.strings @@ -1673,6 +1673,9 @@ /* No comment provided by engineer. */ "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. */ "REGISTRATION_BODY" = "Failed to re-register for push notifications."; diff --git a/SignalServiceKit/src/Network/API/TSNetworkManager.m b/SignalServiceKit/src/Network/API/TSNetworkManager.m index 324fa4f35..8cd7675ce 100644 --- a/SignalServiceKit/src/Network/API/TSNetworkManager.m +++ b/SignalServiceKit/src/Network/API/TSNetworkManager.m @@ -263,19 +263,19 @@ typedef void (^failureBlock)(NSURLSessionDataTask *task, NSError *error); recoverySuggestion:NSLocalizedString(@"MULTIDEVICE_PAIRING_MAX_RECOVERY", @"alert body: cannot link - reached max linked devices") fallbackError:networkError]; - error.isRetryable = NO; - failureBlock(task, error); + customError.isRetryable = NO; + failureBlock(task, customError); break; } case 413: { OWSLogWarn(@"Rate limit exceeded: %@", request); NSError *customError = [self errorWithHTTPCode:statusCode - description:NSLocalizedString(@"REGISTRATION_ERROR", nil) + description:NSLocalizedString(@"REGISTER_RATE_LIMITING_ERROR", nil) failureReason:networkError.localizedFailureReason recoverySuggestion:NSLocalizedString(@"REGISTER_RATE_LIMITING_BODY", nil) fallbackError:networkError]; - error.isRetryable = NO; - failureBlock(task, error); + customError.isRetryable = NO; + failureBlock(task, customError); break; } case 417: {