Merge branch 'master' of github.com:AFNetworking/AFNetworking

mattt · mattt · commit 169ef048caf1 · 2014-11-17T06:15:33.000-08:00
diff --git a/AFNetworking/AFURLResponseSerialization.m b/AFNetworking/AFURLResponseSerialization.m
@@ -113,7 +113,7 @@ - (BOOL)validateResponse:(NSHTTPURLResponse *)response
 
     if (response && [response isKindOfClass:[NSHTTPURLResponse class]]) {
         if (self.acceptableContentTypes && ![self.acceptableContentTypes containsObject:[response MIMEType]]) {
-            if ([data length] > 0) {
+            if ([data length] > 0 && [response URL]) {
                 NSMutableDictionary *mutableUserInfo = [@{
                                                           NSLocalizedDescriptionKey: [NSString stringWithFormat:NSLocalizedStringFromTable(@"Request failed: unacceptable content-type: %@", @"AFNetworking", nil), [response MIMEType]],
                                                           NSURLErrorFailingURLErrorKey:[response URL],
@@ -129,7 +129,7 @@ - (BOOL)validateResponse:(NSHTTPURLResponse *)response
             responseIsValid = NO;
         }
 
-        if (self.acceptableStatusCodes && ![self.acceptableStatusCodes containsIndex:(NSUInteger)response.statusCode]) {
+        if (self.acceptableStatusCodes && ![self.acceptableStatusCodes containsIndex:(NSUInteger)response.statusCode] && [response URL]) {
             NSMutableDictionary *mutableUserInfo = [@{
                                                NSLocalizedDescriptionKey: [NSString stringWithFormat:NSLocalizedStringFromTable(@"Request failed: %@ (%ld)", @"AFNetworking", nil), [NSHTTPURLResponse localizedStringForStatusCode:response.statusCode], (long)response.statusCode],
                                                NSURLErrorFailingURLErrorKey:[response URL],
diff --git a/UIKit+AFNetworking/UIRefreshControl+AFNetworking.m b/UIKit+AFNetworking/UIRefreshControl+AFNetworking.m
@@ -41,16 +41,14 @@ - (void)setRefreshingWithStateOfTask:(NSURLSessionTask *)task {
     [notificationCenter removeObserver:self name:AFNetworkingTaskDidCompleteNotification object:nil];
 
     if (task) {
-        if (task.state != NSURLSessionTaskStateCompleted) {
-            if (task.state == NSURLSessionTaskStateRunning) {
-                [self beginRefreshing];
-            } else {
-                [self endRefreshing];
-            }
+        if (task.state == NSURLSessionTaskStateRunning) {
+            [self beginRefreshing];
 
             [notificationCenter addObserver:self selector:@selector(af_beginRefreshing) name:AFNetworkingTaskDidResumeNotification object:task];
             [notificationCenter addObserver:self selector:@selector(af_endRefreshing) name:AFNetworkingTaskDidCompleteNotification object:task];
             [notificationCenter addObserver:self selector:@selector(af_endRefreshing) name:AFNetworkingTaskDidSuspendNotification object:task];
+        } else {
+            [self endRefreshing];
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -41,16 +41,14 @@ - (void)setRefreshingWithStateOfTask:(NSURLSessionTask *)task {`
`41`	`41`	`[notificationCenter removeObserver:self name:AFNetworkingTaskDidCompleteNotification object:nil];`
`42`	`42`
`43`	`43`	`if (task) {`
`44`		`- if (task.state != NSURLSessionTaskStateCompleted) {`
`45`		`- if (task.state == NSURLSessionTaskStateRunning) {`
`46`		`- [self beginRefreshing];`
`47`		`- } else {`
`48`		`- [self endRefreshing];`
`49`		`- }`
	`44`	`+ if (task.state == NSURLSessionTaskStateRunning) {`
	`45`	`+ [self beginRefreshing];`
`50`	`46`
`51`	`47`	`[notificationCenter addObserver:self selector:@selector(af_beginRefreshing) name:AFNetworkingTaskDidResumeNotification object:task];`
`52`	`48`	`[notificationCenter addObserver:self selector:@selector(af_endRefreshing) name:AFNetworkingTaskDidCompleteNotification object:task];`
`53`	`49`	`[notificationCenter addObserver:self selector:@selector(af_endRefreshing) name:AFNetworkingTaskDidSuspendNotification object:task];`
	`50`	`+ } else {`
	`51`	`+ [self endRefreshing];`
`54`	`52`	`}`
`55`	`53`	`}`
`56`	`54`	`}`