[Issue #1656] Fixing UIWebView category to use supplied success callback

brunoadacosta · Dec 3, 2013 · 8b3607c · 8b3607c
1 parent 2dcde97
commit 8b3607c
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/UIKit+AFNetworking/UIWebView+AFNetworking.m b/UIKit+AFNetworking/UIWebView+AFNetworking.m
@@ -94,10 +94,6 @@ - (void)loadRequest:(NSURLRequest *)request
             failure:(void (^)(NSError *error))failure
 {
     [self loadRequest:request MIMEType:nil textEncodingName:nil progress:progress success:^NSData *(NSHTTPURLResponse *response, NSData *data) {
-        if (!success) {
-            return data;
-        }
-
         NSStringEncoding stringEncoding = NSUTF8StringEncoding;
         if (response.textEncodingName) {
             CFStringEncoding encoding = CFStringConvertIANACharSetNameToEncoding((CFStringRef)response.textEncodingName);
@@ -106,7 +102,12 @@ - (void)loadRequest:(NSURLRequest *)request
             }
         }
 
-        return [[[NSString alloc] initWithData:data encoding:stringEncoding] dataUsingEncoding:stringEncoding];
+        NSString *string = [[NSString alloc] initWithData:data encoding:stringEncoding];
+        if (success) {
+            string = success(response, string);
+        }
+
+        return [string dataUsingEncoding:stringEncoding];
     } failure:failure];
 }