Skip to content
This repository was archived by the owner on Feb 5, 2025. It is now read-only.

Commit 59382bc

Browse files
sync: Handle missing error string for abnormal statuses (#1402)
1 parent 0725fcc commit 59382bc

1 file changed

Lines changed: 4 additions & 7 deletions

File tree

Source/santasyncservice/SNTSyncStage.mm

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -195,20 +195,17 @@ - (NSData *)dataFromRequest:(NSURLRequest *)request
195195

196196
// If the final attempt resulted in an error, log the error and return nil.
197197
if (response.statusCode != 200) {
198-
long code;
199-
NSString *errStr;
200-
if (response.statusCode > 0) {
201-
code = response.statusCode;
202-
errStr = [NSHTTPURLResponse localizedStringForStatusCode:response.statusCode];
203-
} else {
198+
long code = response.statusCode;
199+
NSString *errStr = [NSHTTPURLResponse localizedStringForStatusCode:response.statusCode];
200+
if (requestError.localizedDescription) {
204201
code = (long)requestError.code;
205202
errStr = requestError.localizedDescription;
206203
}
207204
LOGE(@"HTTP Response: %ld %@", code, errStr);
208205
if (error != NULL) {
209206
*error = [NSError errorWithDomain:@"com.google.santa.syncservice"
210207
code:code
211-
userInfo:@{NSLocalizedDescriptionKey : errStr}];
208+
userInfo:@{NSLocalizedDescriptionKey : errStr ?: @""}];
212209
}
213210
return nil;
214211
}

0 commit comments

Comments
 (0)