Merge pull request #66 from nativescript-community/copilot/fix-image-cache-issues

Fix cache key mismatch and add prefetch options support for Android/iOS

Author: farfromrefug

demo-snippets/vue/Pipeline.vue

@@ -55,7 +55,10 @@ export default {
         },
         async prefetchMem() {
             try {
-                await getImagePipeline().prefetchToMemoryCache(this.url);
+                await getImagePipeline().prefetchToMemoryCache(this.url, {
+                    decodeWidth: 300,
+                    decodeHeight: 300,
+                });
                 this.addLog('prefetchToMemoryCache success');
                 this.result = 'prefetchToMemoryCache success';
             } catch (err) {

demo-snippets/vue/install.ts

@@ -29,15 +29,19 @@ import CrossFadeTest from './CrossFadeTest.vue';
 export function installPlugin() {
     installMixins();
     initialize({
-        usePersistentCacheKeyStore: true
+        usePersistentCacheKeyStore: true,
+        // memoryCacheScreens: 8
     });
     Vue.use(ImageModule);
     Vue.use(ZoomImageModule);
-    getImagePipeline()
-        .isInDiskCache('https://images.pexels.com/photos/842711/pexels-photo-842711.jpeg')
-        .then((r) => {
-            console.log('installPlugin test pipeline:', r);
-        });
+    setTimeout(() => {
+        // we need to wait for the diskcache to be set
+        getImagePipeline()
+            .isInDiskCache('https://images.pexels.com/photos/842711/pexels-photo-842711.jpeg')
+            .then((r) => {
+                console.log('installPlugin test pipeline:', r);
+            });
+    }, 1000);
 }
 
 export const demos = [

gradle/wrapper/gradle-wrapper.jar

@@ -0,0 +1,7 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -23,7 +23,6 @@ public static class StoredKeys {
     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 final Key engineKey; // optional - in-memory only
 
     public StoredKeys(
         Key sourceKey,
@@ -34,8 +33,7 @@ public StoredKeys(
         byte[] transformationKeyBytes,
         Class<?> decodedResourceClass,
         Options options,
-        byte[] optionsKeyBytes,
-        Key engineKey) {
+        byte[] optionsKeyBytes) {
       this.sourceKey = sourceKey;
       this.signature = signature;
       this.width = width;
@@ -45,7 +43,6 @@ public StoredKeys(
       this.decodedResourceClass = decodedResourceClass;
       this.options = options;
       this.optionsKeyBytes = optionsKeyBytes;
-      this.engineKey = engineKey;
     }
   }
 

gradlew

@@ -33,7 +33,6 @@ com.bumptech.glide.load.engine.EngineKey buildKey(
       Class<?> resourceClass,
       Class<?> transcodeClass,
       Options options) {
-    Log.d("JS", "CapturingEngineKeyFactory buildKey " + model);
     com.bumptech.glide.load.engine.EngineKey engineKey = super.buildKey(model, signature, width, height,
         transformations, resourceClass, transcodeClass, options);
     if (listener != null) {

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

@@ -3,16 +3,24 @@
 import androidx.annotation.NonNull;
 import com.bumptech.glide.load.Key;
 import java.security.MessageDigest;
-
-/** A cache key for original source data + any requested signature. */
+import java.util.Objects;
+
+/**
+ * A cache key for original source data + any requested signature.
+ * This mimics Glide's internal DataCacheKey structure to enable proper disk cache lookups.
+ * 
+ * Based on Glide's DataCacheKey which follows this exact order:
+ * 1. sourceKey.updateDiskCacheKey(messageDigest)
+ * 2. signature.updateDiskCacheKey(messageDigest)
+ */
 final class CustomDataCacheKey implements Key {
 
   private final Key sourceKey;
   private final Key signature;
 
   CustomDataCacheKey(Key sourceKey, Key signature) {
-    this.sourceKey = sourceKey;
-    this.signature = signature;
+    this.sourceKey = Objects.requireNonNull(sourceKey, "sourceKey must not be null");
+    this.signature = Objects.requireNonNull(signature, "signature must not be null");
   }
 
   Key getSourceKey() {
@@ -42,6 +50,8 @@ public String toString() {
 
   @Override
   public void updateDiskCacheKey(@NonNull MessageDigest messageDigest) {
+    // CRITICAL: Match Glide's DataCacheKey exact order
+    // From Glide source: DataCacheKey updates sourceKey first, then signature
     sourceKey.updateDiskCacheKey(messageDigest);
     signature.updateDiskCacheKey(messageDigest);
   }