Refactored RCTImageDownloader to use RCTNetworking instead of a separate download system

Author: nicklockwood

Libraries/Image/RCTDownloadTaskWrapper.h

@@ -7,7 +7,6 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		03559E7F1B064DAF00730281 /* RCTDownloadTaskWrapper.m in Sources */ = {isa = PBXBuildFile; fileRef = 03559E7E1B064DAF00730281 /* RCTDownloadTaskWrapper.m */; };
 		1304D5AB1AA8C4A30002E2BE /* RCTImageView.m in Sources */ = {isa = PBXBuildFile; fileRef = 1304D5A81AA8C4A30002E2BE /* RCTImageView.m */; };
 		1304D5AC1AA8C4A30002E2BE /* RCTImageViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 1304D5AA1AA8C4A30002E2BE /* RCTImageViewManager.m */; };
 		1304D5B21AA8C50D0002E2BE /* RCTGIFImage.m in Sources */ = {isa = PBXBuildFile; fileRef = 1304D5B11AA8C50D0002E2BE /* RCTGIFImage.m */; };
@@ -33,8 +32,6 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		03559E7D1B064D3A00730281 /* RCTDownloadTaskWrapper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RCTDownloadTaskWrapper.h; sourceTree = "<group>"; };
-		03559E7E1B064DAF00730281 /* RCTDownloadTaskWrapper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTDownloadTaskWrapper.m; sourceTree = "<group>"; };
 		1304D5A71AA8C4A30002E2BE /* RCTImageView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTImageView.h; sourceTree = "<group>"; };
 		1304D5A81AA8C4A30002E2BE /* RCTImageView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTImageView.m; sourceTree = "<group>"; };
 		1304D5A91AA8C4A30002E2BE /* RCTImageViewManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTImageViewManager.h; sourceTree = "<group>"; };
@@ -74,8 +71,6 @@
 			children = (
 				143879331AAD238D00F088A5 /* RCTCameraRollManager.h */,
 				143879341AAD238D00F088A5 /* RCTCameraRollManager.m */,
-				03559E7D1B064D3A00730281 /* RCTDownloadTaskWrapper.h */,
-				03559E7E1B064DAF00730281 /* RCTDownloadTaskWrapper.m */,
 				1304D5B01AA8C50D0002E2BE /* RCTGIFImage.h */,
 				1304D5B11AA8C50D0002E2BE /* RCTGIFImage.m */,
 				58B511891A9E6BD600147676 /* RCTImageDownloader.h */,
@@ -172,7 +167,6 @@
 				1304D5B21AA8C50D0002E2BE /* RCTGIFImage.m in Sources */,
 				143879351AAD238D00F088A5 /* RCTCameraRollManager.m in Sources */,
 				143879381AAD32A300F088A5 /* RCTImageLoader.m in Sources */,
-				03559E7F1B064DAF00730281 /* RCTDownloadTaskWrapper.m in Sources */,
 				1304D5AB1AA8C4A30002E2BE /* RCTImageView.m in Sources */,
 				134B00A21B54232B00EC8DFB /* RCTImageUtils.m in Sources */,
 			);
@@ -275,6 +269,7 @@
 					"$(inherited)",
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
 					"$(SRCROOT)/../../React/**",
+					"$(SRCROOT)/../Network/**",
 				);
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
@@ -295,6 +290,7 @@
 					"$(inherited)",
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
 					"$(SRCROOT)/../../React/**",
+					"$(SRCROOT)/../Network/**",
 				);
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",

Libraries/Image/RCTDownloadTaskWrapper.m

@@ -9,38 +9,28 @@
 
 #import <UIKit/UIKit.h>
 
-#import "RCTDownloadTaskWrapper.h"
+#import "RCTBridge.h"
+#import "RCTImageLoader.h"
 
-typedef void (^RCTDataDownloadBlock)(NSData *data, NSError *error);
-typedef void (^RCTImageDownloadBlock)(UIImage *image, NSError *error);
-typedef void (^RCTImageDownloadCancellationBlock)(void);
-
-@interface RCTImageDownloader : NSObject
-
-+ (RCTImageDownloader *)sharedInstance;
-
-/**
- * Downloads a block of raw data and returns it. Note that the callback block
- * will not be executed on the same thread you called the method from, nor on
- * the main thread. Returns a token that can be used to cancel the download.
- */
-- (RCTImageDownloadCancellationBlock)downloadDataForURL:(NSURL *)url
-                                          progressBlock:(RCTDataProgressBlock)progressBlock
-                                                  block:(RCTDataDownloadBlock)block;
+@interface RCTImageDownloader : NSObject <RCTBridgeModule>
 
 /**
  * Downloads an image and decompresses it a the size specified. The compressed
  * image will be cached in memory and to disk. Note that the callback block
  * will not be executed on the same thread you called the method from, nor on
  * the main thread. Returns a token that can be used to cancel the download.
  */
-- (RCTImageDownloadCancellationBlock)downloadImageForURL:(NSURL *)url
-                                                    size:(CGSize)size
-                                                   scale:(CGFloat)scale
-                                              resizeMode:(UIViewContentMode)resizeMode
-                                               tintColor:(UIColor *)tintColor
-                                         backgroundColor:(UIColor *)backgroundColor
-                                           progressBlock:(RCTDataProgressBlock)progressBlock
-                                                   block:(RCTImageDownloadBlock)block;
+- (RCTImageLoaderCancellationBlock)downloadImageForURL:(NSURL *)url
+                                                  size:(CGSize)size
+                                                 scale:(CGFloat)scale
+                                            resizeMode:(UIViewContentMode)resizeMode
+                                         progressBlock:(RCTImageLoaderProgressBlock)progressBlock
+                                       completionBlock:(RCTImageLoaderCompletionBlock)block;
+
+@end
+
+@interface RCTBridge (RCTImageDownloader)
+
+@property (nonatomic, readonly) RCTImageDownloader *imageDownloader;
 
 @end