From 449944166131a007511f57a357ec36bbd4b345b6 Mon Sep 17 00:00:00 2001 From: stephane-fueled Date: Tue, 26 May 2015 17:47:02 +0100 Subject: [PATCH 1/2] feat(failedURLs): add additional error codes that shouldn't be considered as a permanent failure --- SDWebImage/SDWebImageManager.m | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/SDWebImage/SDWebImageManager.m b/SDWebImage/SDWebImageManager.m index efaf9a0..07c9dd8 100644 --- a/SDWebImage/SDWebImageManager.m +++ b/SDWebImage/SDWebImageManager.m @@ -192,7 +192,9 @@ } }); - if (error.code != NSURLErrorNotConnectedToInternet && error.code != NSURLErrorCancelled && error.code != NSURLErrorTimedOut) { + BOOL shouldBeFailedURLAlliOSVersion = (error.code != NSURLErrorNotConnectedToInternet && error.code != NSURLErrorCancelled && error.code != NSURLErrorTimedOut); + BOOL shouldBeFailedURLiOS7 = (NSFoundationVersionNumber > NSFoundationVersionNumber_iOS_6_1 && error.code != NSURLErrorInternationalRoamingOff && error.code != NSURLErrorCallIsActive && error.code != NSURLErrorDataNotAllowed); + if (shouldBeFailedURLAlliOSVersion && (NSFoundationVersionNumber <= NSFoundationVersionNumber_iOS_6_1 || shouldBeFailedURLiOS7)) { @synchronized (self.failedURLs) { [self.failedURLs addObject:url]; } From db4f3fc9b653f2c6fd79bc21acc14c620d4ea6af Mon Sep 17 00:00:00 2001 From: stephane-fueled Date: Wed, 24 Jun 2015 10:57:16 -0400 Subject: [PATCH 2/2] fix(): simplify logic for failed URLs error code on iOS6/7 --- SDWebImage/SDWebImageManager.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SDWebImage/SDWebImageManager.m b/SDWebImage/SDWebImageManager.m index 07c9dd8..fb0a2f0 100644 --- a/SDWebImage/SDWebImageManager.m +++ b/SDWebImage/SDWebImageManager.m @@ -194,7 +194,7 @@ BOOL shouldBeFailedURLAlliOSVersion = (error.code != NSURLErrorNotConnectedToInternet && error.code != NSURLErrorCancelled && error.code != NSURLErrorTimedOut); BOOL shouldBeFailedURLiOS7 = (NSFoundationVersionNumber > NSFoundationVersionNumber_iOS_6_1 && error.code != NSURLErrorInternationalRoamingOff && error.code != NSURLErrorCallIsActive && error.code != NSURLErrorDataNotAllowed); - if (shouldBeFailedURLAlliOSVersion && (NSFoundationVersionNumber <= NSFoundationVersionNumber_iOS_6_1 || shouldBeFailedURLiOS7)) { + if (shouldBeFailedURLAlliOSVersion || shouldBeFailedURLiOS7) { @synchronized (self.failedURLs) { [self.failedURLs addObject:url]; }