Merge pull request #68 from nativescript-community/copilot/fix-custom-glide-url-issue

Fix file:// URL handling, cache eviction, cache detection, and force reload with efficient disk cache tracking in Android image loader

Author: farfromrefug

demo-snippets/vue/Pipeline.vue

@@ -4,8 +4,9 @@
         <StackLayout padding="12">
             <Label text="ImagePipeline API" class="h2" />
             <TextField v-model="url" hint="Image URL" keyboardType="url" />
-            <NSImg ref="opacityImg" height="100" width="100%" :src="url" @finalImageSet="onFinalImageSet" @failure="onFailure" />
+            <NSImg ref="opacityImg" :decodeWidth="decodeWidth" height="100" width="100%" :src="url" @finalImageSet="onFinalImageSet" @failure="onFailure" />
             <WrapLayout marginTop="8">
+                <Button text="switchDecodeWidth" @tap="switchDecodeWidth" />
                 <Button text="prefetchToMemory" @tap="prefetchMem" />
                 <Button text="prefetchToDisk" @tap="prefetchDisk" />
                 <Button text="evictFromCache" @tap="evictFromCache" />
@@ -32,12 +33,16 @@ import { getImagePipeline } from '@nativescript-community/ui-image';
 export default {
     data() {
         return {
-            url: 'https://images.pexels.com/photos/842711/pexels-photo-842711.jpeg',
+            decodeWidth: 100,
+            url: '~/assets/images/dessert.jpg',
             logs: [] as string[],
             result: ''
         };
     },
     methods: {
+        switchDecodeWidth() {
+            this.decodeWidth = this.decodeWidth === 10 ? 100 : 10;
+        },
         onFinalImageSet(e: any) {
             const info = e.imageInfo;
             this.addLog('loaded: ' + (info ? `${info.getWidth()}x${info.getHeight()}` : 'unknown') + ' from: ' + e.source);
@@ -57,7 +62,7 @@ export default {
             try {
                 await getImagePipeline().prefetchToMemoryCache(this.url, {
                     decodeWidth: 300,
-                    decodeHeight: 300,
+                    decodeHeight: 300
                 });
                 this.addLog('prefetchToMemoryCache success');
                 this.result = 'prefetchToMemoryCache success';

packages/image/platforms/android/java/com/nativescript/image/CacheKeyStore.java

@@ -16,33 +16,20 @@ public class CacheKeyStore {
   public static class StoredKeys {
     public final Key sourceKey;
     public final Key signature;
-    public final int width;
-    public final int height;
-    public final Transformation<?> transformation; // optional in-memory only
-    public final byte[] transformationKeyBytes; // raw bytes written by transformation.updateDiskCacheKey
-    public final Class<?> decodedResourceClass;
-    public final Options options; // may be null or placeholder for in-memory
-    public final byte[] optionsKeyBytes; // raw bytes from options.updateDiskCacheKey
-
     public StoredKeys(
         Key sourceKey,
-        Key signature,
-        int width,
-        int height,
-        Transformation<?> transformation,
-        byte[] transformationKeyBytes,
-        Class<?> decodedResourceClass,
-        Options options,
-        byte[] optionsKeyBytes) {
+        Key signature) {
       this.sourceKey = sourceKey;
       this.signature = signature;
-      this.width = width;
-      this.height = height;
-      this.transformation = transformation;
-      this.transformationKeyBytes = transformationKeyBytes;
-      this.decodedResourceClass = decodedResourceClass;
-      this.options = options;
-      this.optionsKeyBytes = optionsKeyBytes;
+    }
+
+    public String toString() {
+      return "CacheKeyStore.StoredKeys {"
+          + "sourceKey="
+          + sourceKey
+          + ", signature="
+          + signature
+          + '}';
     }
   }
 
@@ -62,4 +49,5 @@ public void remove(String id) {
   public void clearAll() {
     map.clear();
   }
+
 }

packages/image/platforms/android/java/com/nativescript/image/CapturingEngineKeyFactory.java

@@ -13,7 +13,7 @@
 import com.bumptech.glide.load.engine.cache.DiskCache;
 import com.bumptech.glide.load.engine.cache.DiskLruCacheWrapper;
 import com.bumptech.glide.load.engine.cache.MemoryCache;
-import com.bumptech.glide.load.engine.CapturingEngineKeyFactory;
+import com.bumptech.glide.load.engine.cache.ModelSignatureDiskLruCacheWrapper;
 import com.bumptech.glide.load.model.GlideUrl;
 import com.bumptech.glide.module.AppGlideModule;
 import com.bumptech.glide.RequestBuilder;
@@ -91,7 +91,7 @@ public void applyOptions(@NonNull Context context, @NonNull GlideBuilder builder
     builder.setDiskCache(new DiskCache.Factory() {
       @Override
       public DiskCache build() {
-        DiskCache dc = DiskLruCacheWrapper.create(getCacheDirectory(context, config.getDiskCacheName()), config.getDiskCacheSize());
+        ModelSignatureDiskLruCacheWrapper dc = ModelSignatureDiskLruCacheWrapper.create(getCacheDirectory(context, config.getDiskCacheName()), config.getDiskCacheSize());
         EvictionManager.get().setDiskCache(dc);
         return dc;
       }