修复移除可能导致图片磁盘缓存初始化失败的问题

Author: wyouflf

library/src/com/lidroid/xutils/BitmapUtils.java

@@ -218,6 +218,11 @@ public <T extends View> void display(T container, String uri, BitmapDisplayConfi
             return;
         }
 
+        if (TextUtils.isEmpty(uri)) {
+            callBack.onLoadFailed(container, uri, displayConfig.getLoadFailedDrawable());
+            return;
+        }
+
         container.clearAnimation();
 
         if (callBack == null) {
@@ -234,11 +239,6 @@ public <T extends View> void display(T container, String uri, BitmapDisplayConfi
 
         callBack.onPreLoad(container, uri, displayConfig);
 
-        if (TextUtils.isEmpty(uri)) {
-            callBack.onLoadFailed(container, uri, displayConfig.getLoadFailedDrawable());
-            return;
-        }
-
         // find bitmap from mem cache.
         Bitmap bitmap = globalConfig.getBitmapCache().getBitmapFromMemCache(uri, displayConfig);
 

library/src/com/lidroid/xutils/bitmap/BitmapGlobalConfig.java

@@ -75,7 +75,7 @@ private BitmapGlobalConfig(Context context, String diskCachePath) {
         initBitmapCache();
     }
 
-    public static BitmapGlobalConfig getInstance(Context context, String diskCachePath) {
+    public synchronized static BitmapGlobalConfig getInstance(Context context, String diskCachePath) {
 
         if (TextUtils.isEmpty(diskCachePath)) {
             diskCachePath = OtherUtils.getDiskCacheDir(context, "xBitmapCache");

library/src/com/lidroid/xutils/bitmap/core/BitmapCache.java

@@ -40,7 +40,6 @@ public class BitmapCache {
     private LruMemoryCache<MemoryCacheKey, Bitmap> mMemoryCache;
 
     private final Object mDiskCacheLock = new Object();
-    private volatile boolean isDiskCacheReady = false;
 
     private BitmapGlobalConfig globalConfig;
 
@@ -90,7 +89,7 @@ protected int sizeOf(MemoryCacheKey key, Bitmap bitmap) {
     public void initDiskCache() {
         // Set up disk cache
         synchronized (mDiskCacheLock) {
-            if (globalConfig.isDiskCacheEnabled()) {
+            if (globalConfig.isDiskCacheEnabled() && (mDiskLruCache == null || mDiskLruCache.isClosed())) {
                 File diskCacheDir = new File(globalConfig.getDiskCachePath());
                 if (diskCacheDir.exists() || diskCacheDir.mkdirs()) {
                     long availableSpace = OtherUtils.getAvailableSpace(diskCacheDir);
@@ -99,14 +98,13 @@ public void initDiskCache() {
                     try {
                         mDiskLruCache = LruDiskCache.open(diskCacheDir, 1, 1, diskCacheSize);
                         mDiskLruCache.setFileNameGenerator(globalConfig.getFileNameGenerator());
+                        LogUtils.d("create disk cache success");
                     } catch (Throwable e) {
                         mDiskLruCache = null;
-                        LogUtils.e(e.getMessage(), e);
+                        LogUtils.e("create disk cache error", e);
                     }
                 }
             }
-            isDiskCacheReady = true;
-            mDiskCacheLock.notifyAll();
         }
     }
 
@@ -117,14 +115,18 @@ public void setMemoryCacheSize(int maxSize) {
     }
 
     public void setDiskCacheSize(int maxSize) {
-        if (mDiskLruCache != null) {
-            mDiskLruCache.setMaxSize(maxSize);
+        synchronized (mDiskCacheLock) {
+            if (mDiskLruCache != null) {
+                mDiskLruCache.setMaxSize(maxSize);
+            }
         }
     }
 
     public void setDiskCacheFileNameGenerator(FileNameGenerator fileNameGenerator) {
-        if (mDiskLruCache != null && fileNameGenerator != null) {
-            mDiskLruCache.setFileNameGenerator(fileNameGenerator);
+        synchronized (mDiskCacheLock) {
+            if (mDiskLruCache != null && fileNameGenerator != null) {
+                mDiskLruCache.setFileNameGenerator(fileNameGenerator);
+            }
         }
     }
 
@@ -137,17 +139,11 @@ public Bitmap downloadBitmap(String uri, BitmapDisplayConfig config, final Bitma
 
         try {
             Bitmap bitmap = null;
+
             // try download to disk
             if (globalConfig.isDiskCacheEnabled()) {
-                synchronized (mDiskCacheLock) {
-                    // Wait for disk cache to initialize
-                    while (!isDiskCacheReady) {
-                        try {
-                            mDiskCacheLock.wait();
-                        } catch (Throwable e) {
-                            break;
-                        }
-                    }
+                if (mDiskLruCache == null) {
+                    initDiskCache();
                 }
 
                 if (mDiskLruCache != null) {
@@ -245,10 +241,13 @@ public Bitmap getBitmapFromMemCache(String uri, BitmapDisplayConfig config) {
      * @return The file if found in cache.
      */
     public File getBitmapFileFromDiskCache(String uri) {
-        if (mDiskLruCache != null) {
-            return mDiskLruCache.getCacheFile(uri, DISK_CACHE_INDEX);
+        synchronized (mDiskCacheLock) {
+            if (mDiskLruCache != null) {
+                return mDiskLruCache.getCacheFile(uri, DISK_CACHE_INDEX);
+            } else {
+                return null;
+            }
         }
-        return null;
     }
 
     /**
@@ -260,14 +259,8 @@ public File getBitmapFileFromDiskCache(String uri) {
      */
     public Bitmap getBitmapFromDiskCache(String uri, BitmapDisplayConfig config) {
         if (uri == null || !globalConfig.isDiskCacheEnabled()) return null;
-        synchronized (mDiskCacheLock) {
-            while (!isDiskCacheReady) {
-                try {
-                    mDiskCacheLock.wait();
-                } catch (Throwable e) {
-                    break;
-                }
-            }
+        if (mDiskLruCache == null) {
+            initDiskCache();
         }
         if (mDiskLruCache != null) {
             LruDiskCache.Snapshot snapshot = null;
@@ -315,10 +308,10 @@ public void clearMemoryCache() {
 
     public void clearDiskCache() {
         synchronized (mDiskCacheLock) {
-            isDiskCacheReady = false;
             if (mDiskLruCache != null && !mDiskLruCache.isClosed()) {
                 try {
                     mDiskLruCache.delete();
+                    mDiskLruCache.close();
                 } catch (Throwable e) {
                     LogUtils.e(e.getMessage(), e);
                 }
@@ -377,16 +370,15 @@ public void flush() {
      */
     public void close() {
         synchronized (mDiskCacheLock) {
-            isDiskCacheReady = false;
             if (mDiskLruCache != null) {
                 try {
                     if (!mDiskLruCache.isClosed()) {
                         mDiskLruCache.close();
-                        mDiskLruCache = null;
                     }
                 } catch (Throwable e) {
                     LogUtils.e(e.getMessage(), e);
                 }
+                mDiskLruCache = null;
             }
         }
     }