|
@@ -28,8 +28,8 @@
|
|
|
|
|
|
@interface AFImageDownloaderResponseHandler : NSObject
|
|
@interface AFImageDownloaderResponseHandler : NSObject
|
|
@property (nonatomic, strong) NSUUID *uuid;
|
|
@property (nonatomic, strong) NSUUID *uuid;
|
|
-@property (nonatomic, copy) void (^successBlock)(NSURLRequest*, NSHTTPURLResponse*, UIImage*);
|
|
|
|
-@property (nonatomic, copy) void (^failureBlock)(NSURLRequest*, NSHTTPURLResponse*, NSError*);
|
|
|
|
|
|
+@property (nonatomic, copy) void (^successBlock)(NSURLRequest *, NSHTTPURLResponse *, UIImage *);
|
|
|
|
+@property (nonatomic, copy) void (^failureBlock)(NSURLRequest *, NSHTTPURLResponse *, NSError *);
|
|
@end
|
|
@end
|
|
|
|
|
|
@implementation AFImageDownloaderResponseHandler
|
|
@implementation AFImageDownloaderResponseHandler
|
|
@@ -71,11 +71,11 @@
|
|
return self;
|
|
return self;
|
|
}
|
|
}
|
|
|
|
|
|
-- (void)addResponseHandler:(AFImageDownloaderResponseHandler*)handler {
|
|
|
|
|
|
+- (void)addResponseHandler:(AFImageDownloaderResponseHandler *)handler {
|
|
[self.responseHandlers addObject:handler];
|
|
[self.responseHandlers addObject:handler];
|
|
}
|
|
}
|
|
|
|
|
|
-- (void)removeResponseHandler:(AFImageDownloaderResponseHandler*)handler {
|
|
|
|
|
|
+- (void)removeResponseHandler:(AFImageDownloaderResponseHandler *)handler {
|
|
[self.responseHandlers removeObject:handler];
|
|
[self.responseHandlers removeObject:handler];
|
|
}
|
|
}
|
|
|
|
|
|
@@ -257,7 +257,7 @@
|
|
for (AFImageDownloaderResponseHandler *handler in mergedTask.responseHandlers) {
|
|
for (AFImageDownloaderResponseHandler *handler in mergedTask.responseHandlers) {
|
|
if (handler.failureBlock) {
|
|
if (handler.failureBlock) {
|
|
dispatch_async(dispatch_get_main_queue(), ^{
|
|
dispatch_async(dispatch_get_main_queue(), ^{
|
|
- handler.failureBlock(request, (NSHTTPURLResponse*)response, error);
|
|
|
|
|
|
+ handler.failureBlock(request, (NSHTTPURLResponse *)response, error);
|
|
});
|
|
});
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -267,7 +267,7 @@
|
|
for (AFImageDownloaderResponseHandler *handler in mergedTask.responseHandlers) {
|
|
for (AFImageDownloaderResponseHandler *handler in mergedTask.responseHandlers) {
|
|
if (handler.successBlock) {
|
|
if (handler.successBlock) {
|
|
dispatch_async(dispatch_get_main_queue(), ^{
|
|
dispatch_async(dispatch_get_main_queue(), ^{
|
|
- handler.successBlock(request, (NSHTTPURLResponse*)response, responseObject);
|
|
|
|
|
|
+ handler.successBlock(request, (NSHTTPURLResponse *)response, responseObject);
|
|
});
|
|
});
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -334,7 +334,7 @@
|
|
});
|
|
});
|
|
}
|
|
}
|
|
|
|
|
|
-- (AFImageDownloaderMergedTask*)safelyRemoveMergedTaskWithURLIdentifier:(NSString *)URLIdentifier {
|
|
|
|
|
|
+- (AFImageDownloaderMergedTask *)safelyRemoveMergedTaskWithURLIdentifier:(NSString *)URLIdentifier {
|
|
__block AFImageDownloaderMergedTask *mergedTask = nil;
|
|
__block AFImageDownloaderMergedTask *mergedTask = nil;
|
|
dispatch_sync(self.synchronizationQueue, ^{
|
|
dispatch_sync(self.synchronizationQueue, ^{
|
|
mergedTask = [self removeMergedTaskWithURLIdentifier:URLIdentifier];
|
|
mergedTask = [self removeMergedTaskWithURLIdentifier:URLIdentifier];
|