From 22242a8af340b843d66d21980ef888991914c2be Mon Sep 17 00:00:00 2001
From: mkoslacz <mateusz.koslacz@gmail.com>
Date: Mon, 16 Mar 2015 22:32:30 +0100
Subject: [PATCH] adapt to changes in AndroidAsync performed to fix issue 461

I performed changes to adapt this library to work on top of AndroidAsync modified by me in commit https://github.com/koush/AndroidAsync/commit/98a9d50ec4e466ee8d84be47e0a7bab6434e7d0f.
It's rather quick fix, using not the best patterns, to get the stuff done, but it works flawlessly. Probably you will want to adjust it to meet your standards.
I used FileCache named storeCache in Ion to resolve method calls that were static, and I changed Ion reference to static in IonBitmapRequestBuilder, assuming that Ion is anywany called in static way, to prevent changing other methods to non-static.
---
 ion/src/com/koushikdutta/ion/Ion.java                     | 4 ++++
 ion/src/com/koushikdutta/ion/IonBitmapRequestBuilder.java | 6 +++---
 ion/src/com/koushikdutta/ion/IonDrawable.java             | 4 ++--
 3 files changed, 9 insertions(+), 5 deletions(-)

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<? extends 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<Transform> 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<Transform> 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;