@nativescript-community/ui-image 5.0.12 → 5.0.13

package/platforms/android/java/com/nativescript/image/SaveKeysRequestListener.java

@@ -1,145 +1,89 @@
 package com.nativescript.image;
 
-import android.graphics.drawable.Drawable;
-import android.util.Log;
-
-import androidx.annotation.Nullable;
-
 import com.bumptech.glide.load.Key;
 import com.bumptech.glide.load.Options;
 import com.bumptech.glide.load.Transformation;
+import com.bumptech.glide.load.model.GlideUrl;
 import com.bumptech.glide.request.RequestListener;
-import com.bumptech.glide.request.RequestOptions;
 import com.bumptech.glide.request.target.Target;
-import com.bumptech.glide.load.engine.GlideException;
-
-/**
- * RequestListener that records the disk & transformation key bytes used for a
- * request
- * and persists them via EvictionManager so later evictions / presence checks
- * can recreate
- * the exact disk keys without needing to recreate Transformation objects.
- *
- * Usage:
- * - Preferred: pass a RequestOptions instance; this listener will extract the
- * internal Options
- * via ExtractRequestOptions (cached reflection) so your existing RequestOptions
- * usage continues to work.
- * - Alternative: pass an Options instance directly if you already have it.
- *
- * The listener returns false from callbacks so it does not short-circuit other
- * listeners or Glide's handling.
- */
-public final class SaveKeysRequestListener implements RequestListener<Drawable> {
-  private static final String TAG = "SaveKeysRequestListener";
-
-  private final String id; // canonical id you use to later evict (typically the URL string or normalized
-                           // model id)
-  private final Object model; // the same model object you pass to Glide.load(...)
-  private final Key sourceKey;
-  private final Key signature;
-  private final int width;
-  private final int height;
-  @Nullable
-  private final Transformation<?> transformation;
-  private final Options options;
-  private final Class<?> decodedResourceClass;
+import android.util.Log;
 
-  /**
-   * Construct directly with an Options instance.
-   */
-  public SaveKeysRequestListener(
-      String id,
-      Object model,
-      Key sourceKey,
-      Key signature,
-      int width,
-      int height,
-      @Nullable Transformation<?> transformation,
-      RequestOptions options,
-      Class<?> decodedResourceClass) {
-    this.id = id;
-    this.model = model;
-    this.sourceKey = sourceKey;
-    this.signature = signature;
-    this.width = width;
-    this.height = height;
-    this.transformation = transformation;
-    this.options = (options == null) ? new Options() : ExtractRequestOptions.getFrom(options);
-    this.decodedResourceClass = (decodedResourceClass == null) ? Drawable.class : decodedResourceClass;
-  }
+public class SaveKeysRequestListener implements RequestListener<Object> {
+    private static final String TAG = "SaveKeysRequestListener";
+    
+    private final String id;
+    private final Object model;
+    private final Key fallbackSourceKey;
+    private final Key signature;
+    /**
+     * Construct directly with an Options instance.
+     */
+    public SaveKeysRequestListener(
+            String id,
+            Object model,
+            Key fallbackSourceKey,
+            Key signature) {
+        this.id = id;
+        this.model = model;
+        this.fallbackSourceKey = fallbackSourceKey;
+        this.signature = signature;
+    }
 
-  @Override
-  public boolean onLoadFailed(GlideException e, Object model, Target<Drawable> target, boolean isFirstResource) {
-    // We don't persist anything on failure (could be added). Do not consume the
-    // event.
-    return false;
-  }
+    private static String normalizeIdFromModel(Object model, String fallback) {
+        if (model == null) {
+            return fallback;
+        }
+        if (model instanceof GlideUrl) {
+            try {
+                return ((GlideUrl) model).toStringUrl();
+            } catch (Throwable t) {
+                return String.valueOf(model);
+            }
+        }
+        return String.valueOf(model);
+    }
 
-  @Override
-  public boolean onResourceReady(Drawable resource, Object model, Target<Drawable> target,
-      com.bumptech.glide.load.DataSource dataSource, boolean isFirstResource) {
-    try {
-      byte[] transformationBytes = null;
-      byte[] optionsBytes = null;
+    private static Key sourceKeyFromModel(Object model, Key fallback) {
+        // GlideUrl (including CustomGlideUrl) implements Key
+        if (model instanceof Key) {
+            return (Key) model;
+        }
+        // For string models, fallback to ObjectKey
+        return fallback;
+    }
 
-      // Record transformation key bytes if we have a transformation instance
-      if (transformation != null) {
+    @Override
+    public boolean onResourceReady(Object resource, Object model, Target<Object> target, 
+                                   com.bumptech.glide.load.DataSource dataSource, 
+                                   boolean isFirst) {
         try {
-          RecordingDigest rd = new RecordingDigest();
-          transformation.updateDiskCacheKey(rd);
-          transformationBytes = rd.digest();
-        } catch (Throwable t) {
-          Log.w(TAG, "Failed to record transformation key bytes for id=" + id, t);
-        }
-      }
+            // CRITICAL: Use the actual model passed to onResourceReady, not constructor model
+            // This ensures we capture the exact key Glide used
+            final String normalizedId = normalizeIdFromModel(model, this.id);
+            final Key actualSourceKey = sourceKeyFromModel(model, this.fallbackSourceKey);
 
-      // Record options key bytes (Options.updateDiskCacheKey)
-      try {
-        RecordingDigest rd2 = new RecordingDigest();
-        options.updateDiskCacheKey(rd2);
-        optionsBytes = rd2.digest();
-      } catch (Throwable t) {
-        Log.w(TAG, "Failed to record options key bytes for id=" + id, t);
-      }
+            // Log.i(TAG, "onResourceReady: id=" + normalizedId + 
+            //           " sourceKey=" + actualSourceKey +
+            //           " model=" + model);
 
-      // Attempt to preserve existing engineKey if present
-      com.bumptech.glide.load.Key engineKeyToKeep = null;
 
-      try {
-        CacheKeyStore.StoredKeys existing = null;
-        if (EvictionManager.get() != null) {
-          // use the public API to fetch current stored keys for this id (may be
-          // persistent or in-memory)
-          existing = EvictionManager.get().getKeyStore().get(id);
-        }
-        if (existing != null && existing.engineKey != null) {
-          engineKeyToKeep = existing.engineKey;
+            CacheKeyStore.StoredKeys s = new CacheKeyStore.StoredKeys(
+                actualSourceKey,
+                this.signature
+            );
+
+            EvictionManager.get().saveKeys(normalizedId, s);
+            // Log.i(TAG, "Keys saved for: " + normalizedId + " s=" +s);
+        } catch (Throwable t) {
+            Log.e(TAG, "Failed to save keys", t);
         }
-      } catch (Throwable t) {
-        Log.w(TAG, "Failed to read existing stored keys to preserve engineKey for id=" + id, t);
-      }
 
-      // Build StoredKeys and persist via EvictionManager
-      CacheKeyStore.StoredKeys stored = new CacheKeyStore.StoredKeys(
-          sourceKey,
-          signature,
-          width,
-          height,
-          transformation, // may be null; kept for in-process fallback
-          transformationBytes, // recorded transformation bytes (preferred)
-          decodedResourceClass,
-          options,
-          optionsBytes,
-          engineKeyToKeep // preserve any engineKey we found
-      );
+        return false; // Don't consume the event
+    }
 
-      EvictionManager.get().saveKeys(id, stored);
-    } catch (Throwable t) {
-      Log.w(TAG, "Unexpected error in SaveKeysRequestListener.onResourceReady for id=" + id, t);
+    @Override
+    public boolean onLoadFailed(com.bumptech.glide.load.engine.GlideException e, 
+                               Object model, Target<Object> target, boolean isFirstResource) {
+        return false; // Don't consume
     }
-    // Do not consume the event; allow other listeners and Glide to continue normal
-    // handling.
-    return false;
-  }
 }

package/platforms/android/java/com/nativescript/image/SharedPrefCacheKeyStore.java

@@ -5,27 +5,23 @@ import android.content.SharedPreferences;
 import android.util.Base64;
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.json.JSONArray;
 import com.bumptech.glide.load.Key;
+import com.bumptech.glide.load.model.GlideUrl;
+import com.bumptech.glide.load.model.LazyHeaders;
 import com.bumptech.glide.signature.ObjectKey;
 import com.bumptech.glide.load.Options;
-import com.bumptech.glide.load.Transformation;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Iterator;
+import android.util.Log;
 
 /**
- * SharedPreferences-backed minimal persistent store.
- * Stores:
- * - source (string)
- * - signature (string)
- * - width, height
- * - decodedResourceClass (string)
- * - transformationKeyBytes (base64)
- * - optionsKeyBytes (base64)
- *
- * For transformations: we store recorded bytes (from RecordingDigest) rather
- * than trying to
- * re-create the Transformation object.
+ * SharedPreferences-backed persistent store.
  */
-public class SharedPrefCacheKeyStore {
-  private static final String PREFS = "glide_cache_keys_v2";
+public class SharedPrefCacheKeyStore extends CacheKeyStore {
+  private static final String TAG = "SharedPrefCacheKeyStore";
+  private static final String PREFS = "glide_cache_keys_v3"; // bump version
   private final SharedPreferences prefs;
 
   public SharedPrefCacheKeyStore(Context context) {
@@ -35,19 +31,26 @@ public class SharedPrefCacheKeyStore {
   public void put(String id, CacheKeyStore.StoredKeys keys) {
     try {
       JSONObject j = new JSONObject();
-      j.put("source", keys.sourceKey == null ? JSONObject.NULL : keys.sourceKey.toString());
-      j.put("signature", keys.signature == null ? JSONObject.NULL : keys.signature.toString());
-      j.put("width", keys.width);
-      j.put("height", keys.height);
-      j.put("decodedResourceClass",
-          keys.decodedResourceClass == null ? JSONObject.NULL : keys.decodedResourceClass.getName());
-      j.put("transformationBytes", keys.transformationKeyBytes == null ? JSONObject.NULL
-          : Base64.encodeToString(keys.transformationKeyBytes, Base64.NO_WRAP));
-      j.put("optionsBytes",
-          keys.optionsKeyBytes == null ? JSONObject.NULL : Base64.encodeToString(keys.optionsKeyBytes, Base64.NO_WRAP));
+        // Log.d(TAG, "SharedPrefCacheKeyStore.put id=" + id + " sourceKey=" + keys.sourceKey);
+
+      if (keys.sourceKey instanceof GlideUrl) {
+        GlideUrl glideUrl = (GlideUrl) keys.sourceKey;
+        j.put("sourceType", "GlideUrl");
+        j.put("sourceUrl", glideUrl.toStringUrl());
+        
+      } else if (keys.sourceKey != null) {
+        j.put("sourceType", "ObjectKey");
+        j.put("source", keys.sourceKey.toString());
+      } else {
+        j.put("sourceType", "null");
+      }
+      
+      if ( keys.signature != null) {
+        j.put("signature", keys.signature.toString());
+      }
       prefs.edit().putString(id, j.toString()).apply();
     } catch (JSONException e) {
-      // log if you want
+      Log.e(TAG, "Failed to serialize keys for " + id, e);
     }
   }
 
@@ -57,31 +60,50 @@ public class SharedPrefCacheKeyStore {
       return null;
     try {
       JSONObject j = new JSONObject(s);
-      String source = j.optString("source", null);
-      String signature = j.optString("signature", null);
-      int width = j.optInt("width", com.bumptech.glide.request.target.Target.SIZE_ORIGINAL);
-      int height = j.optInt("height", com.bumptech.glide.request.target.Target.SIZE_ORIGINAL);
-      String decodedName = j.optString("decodedResourceClass", android.graphics.Bitmap.class.getName());
-      String transformationBase64 = j.optString("transformationBytes", null);
-      String optionsBase64 = j.optString("optionsBytes", null);
-
-      Key sourceKey = source != null && !"null".equals(source) ? new ObjectKey(source) : new ObjectKey(id);
-      Key signatureKey = signature != null && !"null".equals(signature) ? new ObjectKey(signature)
-          : new ObjectKey("signature-none");
-      Class<?> decodedClass = Class.forName(decodedName);
-      byte[] transformationBytes = (transformationBase64 == null || "null".equals(transformationBase64)) ? null
-          : Base64.decode(transformationBase64, Base64.NO_WRAP);
-      byte[] optionsBytes = (optionsBase64 == null || "null".equals(optionsBase64)) ? null
-          : Base64.decode(optionsBase64, Base64.NO_WRAP);
 
-      // We cannot re-create a reliable Options instance from optionsBytes. We store
-      // optionsBytes and will replay them
-      // into the ResourceCacheKey digest when deleting. For in-memory Options pass an
-      // empty instance or the caller's instance.
-      Options options = new Options();
-      return new CacheKeyStore.StoredKeys(sourceKey, signatureKey, width, height, /* transformation */ null,
-          transformationBytes, decodedClass, options, optionsBytes, /* engineKey */ null);
+      Key sourceKey;
+      String sourceType = j.optString("sourceType", "ObjectKey");
+      
+      if ("GlideUrl".equals(sourceType)) {
+        String url = j.optString("sourceUrl", null);
+        
+        if (url != null) {
+          sourceKey = new CustomGlideUrl(url, null, null, null);
+        } else {
+          sourceKey = new ObjectKey(id);
+        }
+      } else{
+        String source = j.optString("source", null);
+        if (source != null && !"null".equals(source)) {
+          // Extract inner value from "ObjectKey{object=value}" format
+          String innerValue = source;
+          if (innerValue.startsWith("ObjectKey{object=") && innerValue.endsWith("}")) {
+            innerValue = innerValue.substring(17, innerValue.length() - 1);
+          }
+          sourceKey = new ObjectKey(innerValue);
+        } else {
+          sourceKey = new ObjectKey(id);
+        }
+        // Log.d(TAG, "SharedPrefCacheKeyStore.get id=" + id + " source=" + source + " sourceKey=" + sourceKey);
+      }
+      
+      String signatureStr = j.optString("signature", null);
+     
+      Key signatureKey;
+      if (signatureStr != null && !"null".equals(signatureStr)) {
+        // Extract inner value from "ObjectKey{object=value}" format
+        String innerValue = signatureStr;
+        if (signatureStr.startsWith("ObjectKey{object=") && signatureStr.endsWith("}")) {
+          innerValue = signatureStr.substring(17, signatureStr.length() - 1);
+        }
+        signatureKey = new ObjectKey(innerValue);
+      } else {
+        signatureKey = new ObjectKey("signature-none");
+      }
+      
+      return new CacheKeyStore.StoredKeys(sourceKey, signatureKey);
     } catch (Exception e) {
+      Log.e(TAG, "Failed to deserialize keys for " + id, e);
       return null;
     }
   }
@@ -89,4 +111,8 @@ public class SharedPrefCacheKeyStore {
   public void remove(String id) {
     prefs.edit().remove(id).apply();
   }
+  
+  public void clearAll() {
+    prefs.edit().clear().apply();
+  }
 }

package/typings/ui_image.android.d.ts

@@ -126,6 +126,7 @@ declare namespace com {
 			export class EvictionManager {
 				public static class: java.lang.Class<com.nativescript.image.EvictionManager>;
 				public clearAll(): void;
+				public setGlideInstance(glideInstance: com.bumptech.glide.Glide);
 				public static get(): com.nativescript.image.EvictionManager;
 				public clearMemory(callback: com.nativescript.image.EvictionManager.EvictionCallback): void;
 				public clearAll(callback: com.nativescript.image.EvictionManager.EvictionCallback): void;
@@ -136,7 +137,6 @@ declare namespace com {
 				public setDiskCache(diskCache: com.bumptech.glide.load.engine.cache.DiskCache): void;
 				public isInMemoryCache(this_: string): boolean;
 				public evictAllForId(id: string): void;
-				public evictSourceForId(id: string, callback: com.nativescript.image.EvictionManager.EvictionCallback): void;
 				public evictDiskForId(this_: string, id: com.nativescript.image.EvictionManager.EvictionCallback): void;
 				public isInDiskCacheBlocking(resourceKey: string): androidNative.Array<boolean>;
 				public clearDiskCache(): void;
@@ -173,6 +173,14 @@ declare namespace com {
 					public constructor();
 					public onComplete(param0: boolean, param1: java.lang.Exception): void;
 				}
+
+                export function setGlideInstance(glideInstance: bumptech.glide.Glide) {
+                    throw new Error('Function not implemented.');
+                }
+
+                export function setGlideInstance(glideInstance: bumptech.glide.Glide) {
+                    throw new Error('Function not implemented.');
+                }
 			}
 			export class ExtractRequestOptions {
 				public static class: java.lang.Class<com.nativescript.image.ExtractRequestOptions>;
@@ -488,24 +496,9 @@ declare namespace com {
 				public source(): okio.BufferedSource;
 				public contentType(): okhttp3.MediaType;
 			}
-			export class RecordingDigest {
-				public static class: java.lang.Class<com.nativescript.image.RecordingDigest>;
-				public engineUpdate(input: number): void;
-				public engineUpdate(input: androidNative.Array<number>, offset: number, len: number): void;
-				public engineDigest(): androidNative.Array<number>;
-				public engineReset(): void;
-				public constructor();
-			}
-			export class RecreatedResourceKey {
-				public static class: java.lang.Class<com.nativescript.image.RecreatedResourceKey>;
-				public hashCode(): number;
-				public constructor(sourceKey: com.bumptech.glide.load.Key, signature: com.bumptech.glide.load.Key, width: number, height: number, transformationKeyBytes: androidNative.Array<number>, decodedResourceClass: java.lang.Class<any>, optionsKeyBytes: androidNative.Array<number>);
-				public equals(o: any): boolean;
-				public updateDiskCacheKey(messageDigest: java.security.MessageDigest): void;
-			}
 			export class SaveKeysRequestListener extends com.bumptech.glide.request.RequestListener<globalAndroid.graphics.drawable.Drawable> {
 				public static class: java.lang.Class<com.nativescript.image.SaveKeysRequestListener>;
-				public constructor(id: string, model: any, sourceKey: com.bumptech.glide.load.Key, signature: com.bumptech.glide.load.Key, width: number, height: number, transformation: com.bumptech.glide.load.Transformation<any>, options: com.bumptech.glide.request.RequestOptions, decodedResourceClass: java.lang.Class<any>);
+				public constructor(id: string, model: any, sourceKey: com.bumptech.glide.load.Key, signature: com.bumptech.glide.load.Key);
 				public onLoadFailed(e: com.bumptech.glide.load.engine.GlideException, model: any, target: com.bumptech.glide.request.target.Target<globalAndroid.graphics.drawable.Drawable>, isFirstResource: boolean): boolean;
 				public onResourceReady(t: globalAndroid.graphics.drawable.Drawable, rd2: any, t_1: com.bumptech.glide.request.target.Target<globalAndroid.graphics.drawable.Drawable>, existing: com.bumptech.glide.load.DataSource, t_2: boolean): boolean;
 			}

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

@@ -1,43 +0,0 @@
-package com.bumptech.glide.load.engine;
-
-import com.bumptech.glide.load.Key;
-import com.bumptech.glide.load.Options;
-import com.bumptech.glide.load.Transformation;
-import java.util.Map;
-import android.util.Log;
-
-/**
- * Public subclass of package-private EngineKeyFactory that notifies a listener
- * when an
- * EngineKey is created.
- */
-public class CapturingEngineKeyFactory extends EngineKeyFactory {
-  public interface Listener {
-    void onEngineKeyCreated(Key engineKey, Object model);
-  }
-
-  private final Listener listener;
-
-  public CapturingEngineKeyFactory(Listener listener) {
-    this.listener = listener;
-  }
-
-  @SuppressWarnings({ "rawtypes", "unchecked" })
-  @Override
-  com.bumptech.glide.load.engine.EngineKey buildKey(
-      Object model,
-      Key signature,
-      int width,
-      int height,
-      Map<Class<?>, Transformation<?>> transformations,
-      Class<?> resourceClass,
-      Class<?> transcodeClass,
-      Options options) {
-    com.bumptech.glide.load.engine.EngineKey engineKey = super.buildKey(model, signature, width, height,
-        transformations, resourceClass, transcodeClass, options);
-    if (listener != null) {
-      listener.onEngineKeyCreated(engineKey, model);
-    }
-    return engineKey;
-  }
-}

package/platforms/android/java/com/nativescript/image/RecordingDigest.java

@@ -1,48 +0,0 @@
-package com.nativescript.image;
-
-import java.io.ByteArrayOutputStream;
-import java.security.MessageDigest;
-
-/**
- * Small MessageDigest that records raw bytes passed to update(...).
- * We don't compute a digest here: we simply capture the bytes that callers
- * write by calling
- * update(byte[]) so we can later replay them into another MessageDigest.
- *
- * Usage:
- * RecordingDigest r = new RecordingDigest();
- * transformation.updateDiskCacheKey(r);
- * byte[] bytes = r.digest(); // returns the concatenated bytes that
- * transformation wrote
- */
-public final class RecordingDigest extends MessageDigest {
-  private final ByteArrayOutputStream out = new ByteArrayOutputStream();
-
-  public RecordingDigest() {
-    // algorithm name is arbitrary here; we do not rely on MessageDigest's actual
-    // hashing.
-    super("NONE");
-  }
-
-  @Override
-  protected void engineUpdate(byte input) {
-    out.write(input);
-  }
-
-  @Override
-  protected void engineUpdate(byte[] input, int offset, int len) {
-    out.write(input, offset, len);
-  }
-
-  @Override
-  protected byte[] engineDigest() {
-    byte[] result = out.toByteArray();
-    out.reset();
-    return result;
-  }
-
-  @Override
-  protected void engineReset() {
-    out.reset();
-  }
-}

package/platforms/android/java/com/nativescript/image/RecreatedResourceKey.java

@@ -1,95 +0,0 @@
-package com.nativescript.image;
-
-import androidx.annotation.NonNull;
-import com.bumptech.glide.load.Key;
-import java.nio.ByteBuffer;
-import java.security.MessageDigest;
-import java.util.Objects;
-
-/**
- * Recreates ResourceCacheKey updateDiskCacheKey ordering but accepts
- * precomputed transformation
- * and options key bytes. This avoids the need to reconstruct
- * Transformation/Options objects.
- *
- * Ordering mirrors Glide's ResourceCacheKey:
- * signature.updateDiskCacheKey(md)
- * sourceKey.updateDiskCacheKey(md)
- * md.update(dimensions)
- * md.update(transformationKeyBytes) -- if present
- * md.update(optionsKeyBytes) -- if present
- * md.update(decodedResourceClass.getName().getBytes(...))
- */
-public final class RecreatedResourceKey implements Key {
-  private final Key sourceKey;
-  private final Key signature;
-  private final int width;
-  private final int height;
-  private final byte[] transformationKeyBytes; // may be null
-  private final Class<?> decodedResourceClass;
-  private final byte[] optionsKeyBytes; // may be null
-
-  public RecreatedResourceKey(
-      Key sourceKey,
-      Key signature,
-      int width,
-      int height,
-      byte[] transformationKeyBytes,
-      Class<?> decodedResourceClass,
-      byte[] optionsKeyBytes) {
-    this.sourceKey = Objects.requireNonNull(sourceKey);
-    this.signature = Objects.requireNonNull(signature);
-    this.width = width;
-    this.height = height;
-    this.transformationKeyBytes = transformationKeyBytes;
-    this.decodedResourceClass = Objects.requireNonNull(decodedResourceClass);
-    this.optionsKeyBytes = optionsKeyBytes;
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o)
-      return true;
-    if (!(o instanceof RecreatedResourceKey))
-      return false;
-    RecreatedResourceKey that = (RecreatedResourceKey) o;
-    return width == that.width
-        && height == that.height
-        && sourceKey.equals(that.sourceKey)
-        && signature.equals(that.signature)
-        && java.util.Arrays.equals(transformationKeyBytes, that.transformationKeyBytes)
-        && decodedResourceClass.equals(that.decodedResourceClass)
-        && java.util.Arrays.equals(optionsKeyBytes, that.optionsKeyBytes);
-  }
-
-  @Override
-  public int hashCode() {
-    int result = sourceKey.hashCode();
-    result = 31 * result + signature.hashCode();
-    result = 31 * result + width;
-    result = 31 * result + height;
-    result = 31 * result + java.util.Arrays.hashCode(transformationKeyBytes);
-    result = 31 * result + decodedResourceClass.hashCode();
-    result = 31 * result + java.util.Arrays.hashCode(optionsKeyBytes);
-    return result;
-  }
-
-  @Override
-  public void updateDiskCacheKey(@NonNull MessageDigest messageDigest) {
-    byte[] dimensions = ByteBuffer.allocate(8).putInt(width).putInt(height).array();
-
-    signature.updateDiskCacheKey(messageDigest);
-    sourceKey.updateDiskCacheKey(messageDigest);
-    messageDigest.update(dimensions);
-
-    if (transformationKeyBytes != null) {
-      messageDigest.update(transformationKeyBytes);
-    }
-
-    if (optionsKeyBytes != null) {
-      messageDigest.update(optionsKeyBytes);
-    }
-
-    messageDigest.update(decodedResourceClass.getName().getBytes(CHARSET));
-  }
-}