Merge branch 'master' into arc

jverkoey · Mar 21, 2012 · e13ec4a · e13ec4a
2 parents b387592 + 65fa7fb
commit e13ec4a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/src/core/src/NIOperations.m b/src/core/src/NIOperations.m
@@ -97,7 +97,7 @@ - (void)main {
     // responses pass.
     if ([response isKindOfClass:[NSHTTPURLResponse class]]) {
       NSHTTPURLResponse* httpResponse = (NSHTTPURLResponse *)response;
-      if (httpResponse.statusCode >= 200 && httpResponse.statusCode < 300) {
+      if (httpResponse.statusCode < 200 || httpResponse.statusCode >= 300) {
         networkError = [NSError errorWithDomain:NSURLErrorDomain
                                            code:NSURLErrorResourceUnavailable
                                        userInfo:nil];

diff --git a/src/networkimage/src/NINetworkImageView.h b/src/networkimage/src/NINetworkImageView.h
@@ -137,7 +137,7 @@ typedef enum {
 
 - (void)networkImageViewDidStartLoading;
 - (void)networkImageViewDidLoadImage:(UIImage *)image;
-- (void)networkImageViewDidFailToLoad:(NSError *)error;
+- (void)networkImageViewDidFailWithError:(NSError *)error;
 
 @end
 
@@ -163,7 +163,7 @@ typedef enum {
 /**
  * The asynchronous download failed.
  */
-- (void)networkImageViewDidFailLoad:(NINetworkImageView *)imageView;
+- (void)networkImageView:(NINetworkImageView *)imageView didFailWithError:(NSError *)error;
 
 @end
 
@@ -686,5 +686,5 @@ typedef enum {
 /**
  * A network request failed to load.
  *
- *      @fn NINetworkImageView::networkImageViewDidFailToLoad:
+ *      @fn NINetworkImageView::networkImageViewDidFailWithError:
  */
diff --git a/src/networkimage/src/NINetworkImageView.m b/src/networkimage/src/NINetworkImageView.m
@@ -204,7 +204,11 @@ - (void)_didFinishLoadingWithImage: (UIImage *)image
 - (void)_didFailToLoadWithError:(NSError *)error {
   self.operation = nil;
 
-  [self networkImageViewDidFailToLoad:error];
+  if ([self.delegate respondsToSelector:@selector(networkImageView:didFailWithError:)]) {
+    [self.delegate networkImageView:self didFailWithError:error];
+  }
+
+  [self networkImageViewDidFailWithError:error];
 }
 
 
@@ -256,7 +260,7 @@ - (void)networkImageViewDidLoadImage:(UIImage *)image {
 
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-- (void)networkImageViewDidFailToLoad:(NSError *)error {
+- (void)networkImageViewDidFailWithError:(NSError *)error {
   // No-op. Meant to be overridden.
 }