fix: cache improvements

Author: farfromrefug

src/image/index.android.ts

@@ -130,6 +130,11 @@ export class ImagePipeline {
         return android.net.Uri.parse(value);
     }
 
+    getCacheKey(uri: string, context) {
+        // iOS only
+        return uri;
+    }
+
     isInDiskCache(uri: string | android.net.Uri): boolean {
         return this._android.isInDiskCacheSync(this.toUri(uri));
     }

src/image/index.d.ts

@@ -357,6 +357,12 @@ export class ImagePipeline {
      */
     isInBitmapMemoryCache(uri: string): boolean;
 
+    /**
+     * Returns the actual cache key for url + context
+     * this is an iOS feature because imageView properties are used for the cache key
+     */
+    getCacheKey(uri: string, context): string;
+
     /**
      * Returns whether the image is stored in the disk cache.
      */

src/image/index.ios.ts

@@ -100,6 +100,10 @@ export class ImagePipeline {
     private mIos: SDImageCache = SDImageCache.sharedImageCache;
     constructor() {}
 
+    getCacheKey(uri: string, context) {
+        return SDWebImageManager.sharedManager.cacheKeyForURLContext(NSURL.URLWithString(uri), context);
+    }
+
     isInDiskCache(uri: string): boolean {
         return this.mIos.diskImageDataExistsWithKey(getUri(uri).absoluteString);
     }
@@ -117,7 +121,10 @@ export class ImagePipeline {
     }
 
     evictFromCache(uri: string): void {
-        this.mIos.removeImageForKeyWithCompletion(getUri(uri).absoluteString, null);
+        const key = getUri(uri).absoluteString;
+        this.mIos.removeImageFromDiskForKey(key);
+        this.mIos.removeImageFromMemoryForKey(key);
+        // this.mIos.removeImageForKeyWithCompletion(getUri(uri).absoluteString, null);
     }
 
     clearCaches() {
@@ -401,17 +408,18 @@ export class Img extends ImageBase {
                 }
 
                 const uri = getUri(src);
-                if (this.noCache) {
-                    const key = uri.absoluteString;
-                    const imagePipeLine = getImagePipeline();
-                    const isInCache = imagePipeLine.isInBitmapMemoryCache(key);
-                    if (isInCache) {
-                        imagePipeLine.evictFromCache(key);
-                    }
-                }
                 this.isLoading = true;
                 let options = SDWebImageOptions.ScaleDownLargeImages | SDWebImageOptions.AvoidAutoSetImage;
 
+                if (this.noCache) {
+                    // const key = uri.absoluteString;
+                    // const imagePipeLine = getImagePipeline();
+                    // const isInCache = imagePipeLine.isInBitmapMemoryCache(key);
+                    // if (isInCache) {
+                    //     imagePipeLine.evictFromCache(key);
+                    // }
+                    options = options | SDWebImageOptions.FromLoaderOnly;
+                }
                 if (this.alwaysFade === true) {
                     options |= SDWebImageOptions.ForceTransition;
                 }