signalapp/Signal-iOS
signalapp/Signal-iOS
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 4 Wiki Activity

Some last bits of PR feedback

Browse Source
This commit is contained in:
Michelle Linington 2020-08-13 15:53:31 -07:00
parent 5da0078bbe
commit 7d256bbab6
2 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
SignalServiceKit/src/Contacts/Discovery/ContactDiscoveryOperation.swift
View File

@ -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)
}
}

8
SignalServiceKit/src/Util/NSURLSessionDataTask+OWS_HTTP.m
View File

@ -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;