From 7d256bbab6aee19987c0cc9fe50af8929edd4fee Mon Sep 17 00:00:00 2001
From: Michelle Linington <michelle@signal.org>
Date: Thu, 13 Aug 2020 15:53:31 -0700
Subject: [PATCH] Some last bits of PR feedback

---
 .../Discovery/ContactDiscoveryOperation.swift  | 18 ++++--------------
 .../src/Util/NSURLSessionDataTask+OWS_HTTP.m   |  8 +++-----
 2 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/SignalServiceKit/src/Contacts/Discovery/ContactDiscoveryOperation.swift b/SignalServiceKit/src/Contacts/Discovery/ContactDiscoveryOperation.swift
index 635444a65b..5f50b149be 100644
--- a/SignalServiceKit/src/Contacts/Discovery/ContactDiscoveryOperation.swift
+++ b/SignalServiceKit/src/Contacts/Discovery/ContactDiscoveryOperation.swift
@@ -80,6 +80,10 @@ public class ContactDiscoveryError: NSError {
         ])
     }
 
+    required init?(coder: NSCoder) {
+        notImplemented()
+    }
+
     // MARK: - Variants
 
     @objc(OWSContactDiscoveryErrorCode)
@@ -105,18 +109,4 @@ public class ContactDiscoveryError: NSError {
     public override var localizedDescription: String {
         NSLocalizedString("ERROR_DESCRIPTION_SERVER_FAILURE", comment: "Generic server error")
     }
-
-    // MARK: - <NSCoding>
-
-    @objc override public func encode(with aCoder: NSCoder) {
-        super.encode(with: aCoder)
-        aCoder.encode(retrySuggested, forKey: "retrySuggested")
-        aCoder.encode((retryAfterDate as NSDate?), forKey: "retryAfterDate")
-    }
-
-    @objc required public init?(coder aDecoder: NSCoder) {
-        retrySuggested = aDecoder.decodeBool(forKey: "retrySuggested")
-        retryAfterDate = (aDecoder.decodeObject(of: NSDate.self, forKey: "retryAfterDate")) as Date?
-        super.init(coder: aDecoder)
-    }
 }
diff --git a/SignalServiceKit/src/Util/NSURLSessionDataTask+OWS_HTTP.m b/SignalServiceKit/src/Util/NSURLSessionDataTask+OWS_HTTP.m
index 06152de9bf..ed89e5c3cc 100644
--- a/SignalServiceKit/src/Util/NSURLSessionDataTask+OWS_HTTP.m
+++ b/SignalServiceKit/src/Util/NSURLSessionDataTask+OWS_HTTP.m
@@ -16,6 +16,9 @@ static NSString *const kOWSRetryAfterHeaderKey = @"Retry-After";
 - (nullable NSHTTPURLResponse *)httpResponse {
     if ([self.response isKindOfClass:[NSHTTPURLResponse class]]) {
         return (NSHTTPURLResponse *)self.response;
+    } else if (self.response) {
+        OWSFailDebug(@"Invalid response type");
+        return nil;
     } else {
         return nil;
     }
@@ -24,11 +27,6 @@ static NSString *const kOWSRetryAfterHeaderKey = @"Retry-After";
 - (NSInteger)statusCode {
     if (self.httpResponse) {
         return self.httpResponse.statusCode;
-
-    } else if (self.response) {
-        OWSFailDebug(@"Invalid response type");
-        return 0;
-
     } else {
         OWSLogInfo(@"Retrieving status code from incomplete task.");
         return 0;