include underlying error in wrapped TSNetworkErrors

7 years ago · e22ad8ba66
parent e7170dc6e8
commit e22ad8ba66
1 changed files with 6 additions and 1 deletions
--- a/SignalServiceKit/src/Network/API/TSNetworkManager.m
+++ b/SignalServiceKit/src/Network/API/TSNetworkManager.m
@ -330,7 +330,10 @@ typedef void (^failureBlock)(NSURLSessionDataTask *task, NSError *error);
                   description:(NSString *)description
                 failureReason:(NSString *)failureReason
            recoverySuggestion:(NSString *)recoverySuggestion
-                 fallbackError:(NSError *_Nonnull)fallbackError {
+                 fallbackError:(NSError *)fallbackError
+{
+    OWSAssertDebug(fallbackError);
+
    if (!description) {
        description = fallbackError.localizedDescription;
    }
@ -359,6 +362,8 @@ typedef void (^failureBlock)(NSURLSessionDataTask *task, NSError *error);
        [dict setObject:failureData forKey:AFNetworkingOperationFailingURLResponseDataErrorKey];
    }

+    dict[NSUnderlyingErrorKey] = fallbackError;
+
    return [NSError errorWithDomain:TSNetworkManagerErrorDomain code:code userInfo:dict];
 }