diff --git a/ion/src/com/koushikdutta/ion/Ion.java b/ion/src/com/koushikdutta/ion/Ion.java index e0c15fd1..f38b424c 100644 --- a/ion/src/com/koushikdutta/ion/Ion.java +++ b/ion/src/com/koushikdutta/ion/Ion.java @@ -148,6 +148,10 @@ public static Builders.IV.F> with(ImageView imageView Context context; IonImageViewRequestBuilder bitmapBuilder = new IonImageViewRequestBuilder(this); + public FileCache getStoreCache() { + return storeCache; + } + private Ion(Context context, String name) { this.context = context = context.getApplicationContext(); this.name = name; diff --git a/ion/src/com/koushikdutta/ion/IonBitmapRequestBuilder.java b/ion/src/com/koushikdutta/ion/IonBitmapRequestBuilder.java index 24565bdd..c40bd9b3 100644 --- a/ion/src/com/koushikdutta/ion/IonBitmapRequestBuilder.java +++ b/ion/src/com/koushikdutta/ion/IonBitmapRequestBuilder.java @@ -32,7 +32,7 @@ abstract class IonBitmapRequestBuilder implements BitmapFutureBuilder, Builders. }; IonRequestBuilder builder; - Ion ion; + static Ion ion; ArrayList transforms; ScaleMode scaleMode; int resizeWidth; @@ -114,7 +114,7 @@ public static String computeDecodeKey(IonRequestBuilder builder, int resizeWidth decodeKey += ":noAnimate"; if (deepZoom) decodeKey += ":deepZoom"; - return FileCache.toKeyString(decodeKey); + return ion.getCache().toKeyString(decodeKey); } public void addDefaultTransform() { @@ -141,7 +141,7 @@ public static String computeBitmapKey(String decodeKey, List transfor for (Transform transform : transforms) { bitmapKey += transform.key(); } - bitmapKey = FileCache.toKeyString(bitmapKey); + bitmapKey = ion.getCache().toKeyString(bitmapKey); } return bitmapKey; diff --git a/ion/src/com/koushikdutta/ion/IonDrawable.java b/ion/src/com/koushikdutta/ion/IonDrawable.java index 4e131f11..6dfb419e 100644 --- a/ion/src/com/koushikdutta/ion/IonDrawable.java +++ b/ion/src/com/koushikdutta/ion/IonDrawable.java @@ -675,7 +675,7 @@ private void drawDeepZoom(Canvas canvas) { // find, render/fetch // System.out.println("rendering: " + texRect + " for: " + bounds); - String tileKey = FileCache.toKeyString(info.key, ",", level, ",", x, ",", y); + String tileKey = ion.getCache().toKeyString(info.key, ",", level, ",", x, ",", y); BitmapInfo tile = ion.bitmapCache.get(tileKey); if (tile != null && tile.bitmap != null) { // render it @@ -704,7 +704,7 @@ private void drawDeepZoom(Canvas canvas) { int parentY = y >> 1; while (parentLevel >= 0) { - tileKey = FileCache.toKeyString(info.key, ",", parentLevel, ",", parentX, ",", parentY); + tileKey = ion.getCache().toKeyString(info.key, ",", parentLevel, ",", parentX, ",", parentY); tile = ion.bitmapCache.get(tileKey); if (tile != null && tile.bitmap != null) break;