The `storeImage:` methods from `SDImageCache` were async already, but declared a…

…s sync. Properly marked them as async + added completion. Got rid of the recalculate param. If the `NSData` is provided, use it. Otherwise, recalculate from the `UIImage`

@@ -93,35 +93,48 @@ typedef void(^SDWebImageCalculateSizeBlock)(NSUInteger fileCount, NSUInteger tot
  */
  */
 - (void)addReadOnlyCachePath:(nonnull NSString *)path;
 - (void)addReadOnlyCachePath:(nonnull NSString *)path;
 
 
+#pragma mark - Store Ops
+
 /**
 /**
- * Store an image into memory and disk cache at the given key.
+ * Asynchronously store an image into memory and disk cache at the given key.
  *
  *
- * @param image The image to store
- * @param key   The unique image cache key, usually it's image absolute URL
+ * @param image      The image to store
+ * @param key        The unique image cache key, usually it's image absolute URL
+ * @param completion A block executed after the operation is finished
  */
  */
-- (void)storeImage:(nullable UIImage *)image forKey:(nullable NSString *)key;
+- (void)storeImage:(nullable UIImage *)image
+            forKey:(nullable NSString *)key
+        completion:(nullable SDWebImageNoParamsBlock)completionBlock;
 
 
 /**
 /**
- * Store an image into memory and optionally disk cache at the given key.
+ * Asynchronously store an image into memory and disk cache at the given key.
  *
  *
- * @param image  The image to store
- * @param key    The unique image cache key, usually it's image absolute URL
- * @param toDisk Store the image to disk cache if YES
+ * @param image      The image to store
+ * @param key        The unique image cache key, usually it's image absolute URL
+ * @param toDisk     Store the image to disk cache if YES
+ * @param completion A block executed after the operation is finished
  */
  */
-- (void)storeImage:(nullable UIImage *)image forKey:(nullable NSString *)key toDisk:(BOOL)toDisk;
+- (void)storeImage:(nullable UIImage *)image
+            forKey:(nullable NSString *)key
+            toDisk:(BOOL)toDisk
+        completion:(nullable SDWebImageNoParamsBlock)completionBlock;
 
 
 /**
 /**
- * Store an image into memory and optionally disk cache at the given key.
+ * Asynchronously store an image into memory and disk cache at the given key.
  *
  *
- * @param image       The image to store
- * @param recalculate BOOL indicates if imageData can be used or a new data should be constructed from the UIImage
- * @param imageData   The image data as returned by the server, this representation will be used for disk storage
- *                    instead of converting the given image object into a storable/compressed image format in order
- *                    to save quality and CPU
- * @param key         The unique image cache key, usually it's image absolute URL
- * @param toDisk      Store the image to disk cache if YES
+ * @param image      The image to store
+ * @param imageData  The image data as returned by the server, this representation will be used for disk storage
+ *                   instead of converting the given image object into a storable/compressed image format in order
+ *                   to save quality and CPU
+ * @param key        The unique image cache key, usually it's image absolute URL
+ * @param toDisk     Store the image to disk cache if YES
+ * @param completion A block executed after the operation is finished
  */
  */
-- (void)storeImage:(nullable UIImage *)image recalculateFromImage:(BOOL)recalculate imageData:(nullable NSData *)imageData forKey:(nullable NSString *)key toDisk:(BOOL)toDisk;
+- (void)storeImage:(nullable UIImage *)image
+         imageData:(nullable NSData *)imageData
+            forKey:(nullable NSString *)key
+            toDisk:(BOOL)toDisk
+        completion:(nullable SDWebImageNoParamsBlock)completionBlock;
 
 
 /**
 /**
  * Synchronously store image NSData into disk cache at the given key.
  * Synchronously store image NSData into disk cache at the given key.

@@ -176,8 +176,30 @@ FOUNDATION_STATIC_INLINE NSUInteger SDCacheCostForImage(UIImage *image) {
     return [paths[0] stringByAppendingPathComponent:fullNamespace];
     return [paths[0] stringByAppendingPathComponent:fullNamespace];
 }
 }
 
 
-- (void)storeImage:(nullable UIImage *)image recalculateFromImage:(BOOL)recalculate imageData:(nullable NSData *)imageData forKey:(nullable  NSString *)key toDisk:(BOOL)toDisk {
+#pragma mark - Store Ops
+
+- (void)storeImage:(nullable UIImage *)image
+            forKey:(nullable NSString *)key
+        completion:(nullable SDWebImageNoParamsBlock)completionBlock {
+    [self storeImage:image imageData:nil forKey:key toDisk:YES completion:completionBlock];
+}
+
+- (void)storeImage:(nullable UIImage *)image
+            forKey:(nullable NSString *)key
+            toDisk:(BOOL)toDisk
+        completion:(nullable SDWebImageNoParamsBlock)completionBlock {
+    [self storeImage:image imageData:nil forKey:key toDisk:toDisk completion:completionBlock];
+}
+
+- (void)storeImage:(nullable UIImage *)image
+         imageData:(nullable NSData *)imageData
+            forKey:(nullable NSString *)key
+            toDisk:(BOOL)toDisk
+        completion:(nullable SDWebImageNoParamsBlock)completionBlock {
     if (!image || !key) {
     if (!image || !key) {
+        if (completionBlock) {
+            completionBlock();
+        }
         return;
         return;
     }
     }
     // if memory cache is enabled
     // if memory cache is enabled
@@ -185,7 +207,7 @@ FOUNDATION_STATIC_INLINE NSUInteger SDCacheCostForImage(UIImage *image) {
         NSUInteger cost = SDCacheCostForImage(image);
         NSUInteger cost = SDCacheCostForImage(image);
         [self.memCache setObject:image forKey:key cost:cost];
         [self.memCache setObject:image forKey:key cost:cost];
     }
     }
-
+    
     if (toDisk) {
     if (toDisk) {
         dispatch_async(self.ioQueue, ^{
         dispatch_async(self.ioQueue, ^{
             NSData *data = imageData;
             NSData *data = imageData;
@@ -194,20 +216,21 @@ FOUNDATION_STATIC_INLINE NSUInteger SDCacheCostForImage(UIImage *image) {
                 SDImageFormat imageFormatFromData = [NSData sd_imageFormatForImageData:data];
                 SDImageFormat imageFormatFromData = [NSData sd_imageFormatForImageData:data];
                 data = [image sd_imageDataAsFormat:imageFormatFromData];
                 data = [image sd_imageDataAsFormat:imageFormatFromData];
             }
             }
-
+            
             [self storeImageDataToDisk:data forKey:key];
             [self storeImageDataToDisk:data forKey:key];
+            if (completionBlock) {
+                dispatch_async(dispatch_get_main_queue(), ^{
+                    completionBlock();
+                });
+            }
         });
         });
+    } else {
+        if (completionBlock) {
+            completionBlock();
+        }
     }
     }
 }
 }
 
 
-- (void)storeImage:(nullable UIImage *)image forKey:(nullable NSString *)key {
-    [self storeImage:image recalculateFromImage:YES imageData:nil forKey:key toDisk:YES];
-}
-
-- (void)storeImage:(nullable UIImage *)image forKey:(nullable NSString *)key toDisk:(BOOL)toDisk {
-    [self storeImage:image recalculateFromImage:YES imageData:nil forKey:key toDisk:toDisk];
-}
-
 - (void)storeImageDataToDisk:(nullable NSData *)imageData forKey:(nullable NSString *)key {
 - (void)storeImageDataToDisk:(nullable NSData *)imageData forKey:(nullable NSString *)key {
     if (!imageData || !key) {
     if (!imageData || !key) {
         return;
         return;

@@ -218,7 +218,8 @@
 
 
                             if (transformedImage && finished) {
                             if (transformedImage && finished) {
                                 BOOL imageWasTransformed = ![transformedImage isEqual:downloadedImage];
                                 BOOL imageWasTransformed = ![transformedImage isEqual:downloadedImage];
-                                [self.imageCache storeImage:transformedImage recalculateFromImage:imageWasTransformed imageData:(imageWasTransformed ? nil : downloadedData) forKey:key toDisk:cacheOnDisk];
+                                // pass nil if the image was transformed, so we can recalculate the data from the image
+                                [self.imageCache storeImage:transformedImage imageData:(imageWasTransformed ? nil : downloadedData) forKey:key toDisk:cacheOnDisk completion:nil];
                             }
                             }
 
 
                             dispatch_main_sync_safe(^{
                             dispatch_main_sync_safe(^{
@@ -229,7 +230,7 @@
                         });
                         });
                     } else {
                     } else {
                         if (downloadedImage && finished) {
                         if (downloadedImage && finished) {
-                            [self.imageCache storeImage:downloadedImage recalculateFromImage:NO imageData:downloadedData forKey:key toDisk:cacheOnDisk];
+                            [self.imageCache storeImage:downloadedImage imageData:downloadedData forKey:key toDisk:cacheOnDisk completion:nil];
                         }
                         }
 
 
                         dispatch_main_sync_safe(^{
                         dispatch_main_sync_safe(^{
@@ -288,7 +289,7 @@
 - (void)saveImageToCache:(nullable UIImage *)image forURL:(nullable NSURL *)url {
 - (void)saveImageToCache:(nullable UIImage *)image forURL:(nullable NSURL *)url {
     if (image && url) {
     if (image && url) {
         NSString *key = [self cacheKeyForURL:url];
         NSString *key = [self cacheKeyForURL:url];
-        [self.imageCache storeImage:image forKey:key toDisk:YES];
+        [self.imageCache storeImage:image forKey:key toDisk:YES completion:nil];
     }
     }
 }
 }