From e22ad8ba66ca77af325dd7c169ba0b08bca80ee2 Mon Sep 17 00:00:00 2001
From: Michael Kirk <michael@signal.org>
Date: Thu, 11 Oct 2018 17:11:25 -0600
Subject: [PATCH] include underlying error in wrapped TSNetworkErrors

---
 SignalServiceKit/src/Network/API/TSNetworkManager.m | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/SignalServiceKit/src/Network/API/TSNetworkManager.m b/SignalServiceKit/src/Network/API/TSNetworkManager.m
index af3bec64a..1733b244e 100644
--- 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];
 }