[library] Clean up CacheableBitmapDrawable.checkState()

chrisbanes · Mar 11, 2013 · c7c29d6 · c7c29d6
1 parent 4af5620
commit c7c29d6
Showing 1 changed file with 25 additions and 37 deletions.
diff --git a/library/src/uk/co/senab/bitmapcache/CacheableBitmapDrawable.java b/library/src/uk/co/senab/bitmapcache/CacheableBitmapDrawable.java
@@ -152,9 +152,9 @@ private void checkState() {
      * happens now, or is delayed depends on whether the Drawable has been displayed or not. <ul>
      * <li>If it has been displayed, it is recycled straight away.</li> <li>If it has not been
      * displayed, and <code>ignoreBeenDisplayed</code> is <code>false</code>, a call to
-     * <code>checkState(true)</code> is queued to be called after a delay.</li> <li>If it has not been
+     * <code>checkState(true)</code> is queued to be called after a delay.</li> <li>If it has not
-     * displayed, and <code>ignoreBeenDisplayed</code> is <code>true</code>, it is recycled straight
+     * been displayed, and <code>ignoreBeenDisplayed</code> is <code>true</code>, it is recycled
-     * away.</li> </ul>
+     * straight away.</li> </ul>
      *
      * @param ignoreBeenDisplayed - Whether to ignore the 'has been displayed' flag when deciding
      *                            whether to recycle() now.
@@ -172,43 +172,31 @@ private synchronized void checkState(final boolean ignoreBeenDisplayed) {
             return;
         }
 
-        if (mCacheCount <= 0 && mDisplayingCount <= 0) {
+        // Cancel the callback, if one is queued.
-            // We're not being referenced or used anywhere
+        cancelCheckStateCallback();
-
+
-            // Cancel the callback, if one is queued.
+        // We're not being referenced or used anywhere
-            cancelCheckStateCallback();
+        if (mCacheCount <= 0 && mDisplayingCount <= 0 && hasValidBitmap()) {
-
-            if (hasValidBitmap()) {
-                /**
-                 * If we have been displayed or we don't care whether we have
-                 * been or not, then recycle() now. Otherwise, we retry in 1
-                 * second.
-                 */
-                if (mHasBeenDisplayed || ignoreBeenDisplayed) {
-                    if (Constants.DEBUG) {
-                        Log.d(LOG_TAG, "Recycling bitmap with url: " + mUrl);
-                    }
-                    getBitmap().recycle();
-                } else {
-                    if (Constants.DEBUG) {
-                        Log.d(LOG_TAG,
-                                "Unused Bitmap which hasn't been displayed, delaying recycle(): "
-                                        + mUrl);
-                    }
-                    mCheckStateRunnable = new CheckStateRunnable(this);
-                    sHandler.postDelayed(mCheckStateRunnable,
-                            Constants.UNUSED_DRAWABLE_RECYCLE_DELAY_MS);
-                }
-            }
-        } else {
-            // We're being referenced (by either a cache or used somewhere)
 
             /**
-             * If mCheckStateRunnable isn't null, then a checkState() call has
+             * If we have been displayed or we don't care whether we have
-             * been queued previously. As we're being used now, cancel the
+             * been or not, then recycle() now. Otherwise, we retry after a delay.
-             * callback.
              */
-            cancelCheckStateCallback();
+            if (mHasBeenDisplayed || ignoreBeenDisplayed) {
+                if (Constants.DEBUG) {
+                    Log.d(LOG_TAG, "Recycling bitmap with url: " + mUrl);
+                }
+                getBitmap().recycle();
+            } else {
+                if (Constants.DEBUG) {
+                    Log.d(LOG_TAG,
+                            "Unused Bitmap which hasn't been displayed, delaying recycle(): "
+                                    + mUrl);
+                }
+                mCheckStateRunnable = new CheckStateRunnable(this);
+                sHandler.postDelayed(mCheckStateRunnable,
+                        Constants.UNUSED_DRAWABLE_RECYCLE_DELAY_MS);
+            }
         }
     }