Fix some Ion/filecache caching size issues

Use one ion instance
Fix silly calculateSize() placement in FileCache

Clover/app/src/main/java/org/floens/chan/ChanApplication.java

@@ -26,6 +26,8 @@ import com.android.volley.RequestQueue;
 import com.android.volley.toolbox.ImageLoader;
 import com.android.volley.toolbox.Volley;
 import com.koushikdutta.ion.Ion;
+import com.koushikdutta.ion.builder.Builders;
+import com.koushikdutta.ion.builder.LoadBuilder;
 
 import org.floens.chan.core.manager.BoardManager;
 import org.floens.chan.core.manager.ReplyManager;
@@ -97,6 +99,10 @@ public class ChanApplication extends Application {
         return fileCache;
     }
 
+    public static LoadBuilder<Builders.Any.B> getIon() {
+        return Ion.getDefault(getInstance()).build(getInstance());
+    }
+
     public static SharedPreferences getPreferences() {
         return PreferenceManager.getDefaultSharedPreferences(instance);
     }
@@ -124,7 +130,8 @@ public class ChanApplication extends Application {
 
         IconCache.createIcons(this);
 
-        Ion.getDefault(this).getCache().setMaxSize(1 * 1024 * 1024);
+        Ion.getDefault(getInstance()).getCache().clear();
+        Ion.getDefault(getInstance()).getCache().setMaxSize(1 * 1024 * 1024);
 
         File cacheDir = getExternalCacheDir() != null ? getExternalCacheDir() : getCacheDir();
 

Clover/app/src/main/java/org/floens/chan/utils/FileCache.java

@@ -5,10 +5,11 @@ import android.util.Log;
 
 import com.koushikdutta.async.future.Future;
 import com.koushikdutta.async.future.FutureCallback;
-import com.koushikdutta.ion.Ion;
 import com.koushikdutta.ion.ProgressCallback;
 import com.koushikdutta.ion.Response;
 
+import org.floens.chan.ChanApplication;
+
 import java.io.File;
 import java.util.concurrent.CancellationException;
 
@@ -25,6 +26,7 @@ public class FileCache {
         this.maxSize = maxSize;
 
         makeDir();
+        calculateSize();
     }
 
     public File get(String key) {
@@ -53,7 +55,7 @@ public class FileCache {
             callback.onSuccess(file);
             return null;
         } else {
-            return Ion.with(context)
+            return ChanApplication.getIon()
                     .load(url)
                     .progress(new ProgressCallback() {
                         @Override
@@ -101,10 +103,10 @@ public class FileCache {
 
     private void makeDir() {
         if (!directory.exists()) {
-            calculateSize();
-
             if (!directory.mkdirs()) {
                 Logger.e(TAG, "Unable to create file cache dir " + directory.getAbsolutePath());
+            } else {
+                calculateSize();
             }
         }
     }