mirrors
/
SDWebImage
mirror of https://github.com/SDWebImage/SDWebImage.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2580 from zhongwuzw/fix_fail_url_block_logical 

Revert failed block processing logic
This commit is contained in:
DreamPiggy 2019-01-10 17:38:38 +08:00 committed by GitHub
parent 4a52cce18a e71e58ea6d
commit 45b4d64bda
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
SDWebImage/SDWebImageManager.m
View File

@ -374,21 +374,14 @@ static id<SDImageLoader> _defaultImageLoader;
if ([self.delegate respondsToSelector:@selector(imageManager:shouldBlockFailedURL:withError:)]) { if ([self.delegate respondsToSelector:@selector(imageManager:shouldBlockFailedURL:withError:)]) {
shouldBlockFailedURL = [self.delegate imageManager:self shouldBlockFailedURL:url withError:error]; shouldBlockFailedURL = [self.delegate imageManager:self shouldBlockFailedURL:url withError:error];
} else { } else {
NSString *domain = error.domain; shouldBlockFailedURL = ( error.code != NSURLErrorNotConnectedToInternet
NSInteger code = error.code; && error.code != NSURLErrorCancelled
if ([domain isEqualToString:NSURLErrorDomain]) { && error.code != NSURLErrorTimedOut
shouldBlockFailedURL = ( code != NSURLErrorNotConnectedToInternet && error.code != NSURLErrorInternationalRoamingOff
&& code != NSURLErrorCancelled && error.code != NSURLErrorDataNotAllowed
&& code != NSURLErrorTimedOut && error.code != NSURLErrorCannotFindHost
&& code != NSURLErrorInternationalRoamingOff && error.code != NSURLErrorCannotConnectToHost
&& code != NSURLErrorDataNotAllowed && error.code != NSURLErrorNetworkConnectionLost);
&& code != NSURLErrorCannotFindHost
&& code != NSURLErrorCannotConnectToHost
&& code != NSURLErrorNetworkConnectionLost);
} else {
// Custom loader, don't do extra error code check
shouldBlockFailedURL = NO;
}
} }
return shouldBlockFailedURL; return shouldBlockFailedURL;