Dev

yuriy-budiyev · Mar 1, 2018 · c2f2203 · c2f2203
1 parent 2b64632
commit c2f2203
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 26 deletions.
diff --git a/src/main/java/com/budiyev/android/imageloader/BaseLoadImageAction.java b/src/main/java/com/budiyev/android/imageloader/BaseLoadImageAction.java
@@ -26,6 +26,7 @@
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Future;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 import android.graphics.Bitmap;
 import android.support.annotation.AnyThread;
@@ -44,9 +45,9 @@ abstract class BaseLoadImageAction<T> implements Callable<Void> {
     private final ExecutorService mCacheExecutor;
     private final LoadCallback mLoadCallback;
     private final ErrorCallback mErrorCallback;
+    private final AtomicBoolean mCancelled = new AtomicBoolean();
     private volatile Future<?> mLoadFuture;
     private volatile CacheImageAction mCacheAction;
-    private volatile boolean mCancelled;
 
     protected BaseLoadImageAction(@NonNull DataDescriptor<T> descriptor, @NonNull BitmapLoader<T> bitmapLoader,
             @Nullable Size requiredSize, @Nullable BitmapTransformation transformation,
@@ -76,27 +77,29 @@ protected BaseLoadImageAction(@NonNull DataDescriptor<T> descriptor, @NonNull Bi
 
     @AnyThread
     public final void submit(@NonNull ExecutorService executor) {
-        if (mCancelled) {
+        if (isCancelled()) {
             return;
         }
         mLoadFuture = executor.submit(this);
     }
 
     @AnyThread
     public final void cancel() {
-        if (mCancelled) {
-            return;
-        }
-        mCancelled = true;
-        Future<?> loadFuture = mLoadFuture;
-        if (loadFuture != null) {
-            loadFuture.cancel(false);
-        }
-        CacheImageAction cacheAction = mCacheAction;
-        if (cacheAction != null) {
-            cacheAction.cancel();
+        if (mCancelled.compareAndSet(false, true)) {
+            Future<?> loadFuture = mLoadFuture;
+            if (loadFuture != null) {
+                loadFuture.cancel(false);
+            }
+            CacheImageAction cacheAction = mCacheAction;
+            if (cacheAction != null) {
+                cacheAction.cancel();
+            }
+            onCancelled();
         }
-        onCancelled();
+    }
+
+    public final boolean isCancelled() {
+        return mCancelled.get();
     }
 
     @Override
@@ -151,20 +154,16 @@ protected final ErrorCallback getErrorCallback() {
         return mErrorCallback;
     }
 
-    protected final boolean isCancelled() {
-        return mCancelled;
-    }
-
     @WorkerThread
     protected final void loadImage() {
-        while (!mCancelled && !mPauseLock.shouldInterruptEarly() && mPauseLock.isPaused()) {
+        while (!isCancelled() && !mPauseLock.shouldInterruptEarly() && mPauseLock.isPaused()) {
             try {
                 mPauseLock.await();
             } catch (InterruptedException e) {
                 return;
             }
         }
-        if (mCancelled || mPauseLock.shouldInterruptEarly()) {
+        if (isCancelled() || mPauseLock.shouldInterruptEarly()) {
             return;
         }
         DataDescriptor<T> descriptor = mDescriptor;
@@ -180,7 +179,7 @@ protected final void loadImage() {
                 return;
             }
         }
-        if (mCancelled) {
+        if (isCancelled()) {
             return;
         }
         // Storage cache
@@ -195,7 +194,7 @@ protected final void loadImage() {
                 return;
             }
         }
-        if (mCancelled) {
+        if (isCancelled()) {
             return;
         }
         // Load new image
@@ -210,6 +209,9 @@ protected final void loadImage() {
             processError(new ImageNotLoadedException());
             return;
         }
+        if (isCancelled()) {
+            return;
+        }
         // Transform image
         BitmapTransformation transformation = mTransformation;
         if (transformation != null) {
@@ -224,10 +226,10 @@ protected final void loadImage() {
                 return;
             }
         }
-        if (mCancelled) {
+        processImage(image);
+        if (isCancelled()) {
             return;
         }
-        processImage(image);
         if (key != null) {
             if (memoryCache != null) {
                 memoryCache.put(key, image);
@@ -246,6 +248,9 @@ protected final void loadImage() {
 
     @WorkerThread
     private void processImage(@NonNull Bitmap image) {
+        if (isCancelled()) {
+            return;
+        }
         LoadCallback loadCallback = mLoadCallback;
         if (loadCallback != null) {
             loadCallback.onLoaded(image);
@@ -255,7 +260,7 @@ private void processImage(@NonNull Bitmap image) {
 
     @WorkerThread
     private void processError(@NonNull Throwable error) {
-        if (mCancelled) {
+        if (isCancelled()) {
             return;
         }
         ErrorCallback errorCallback = mErrorCallback;

diff --git a/src/main/java/com/budiyev/android/imageloader/DisplayImageAction.java b/src/main/java/com/budiyev/android/imageloader/DisplayImageAction.java
@@ -76,7 +76,7 @@ public boolean hasSameKey(@Nullable String key) {
 
     @Override
     protected void onImageLoaded(@NonNull Bitmap image) {
-        if (isCancelled() || mView.get() == null || mResources.get() == null) {
+        if (mView.get() == null || mResources.get() == null) {
             return;
         }
         mMainThreadHandler.post(new SetImageAction(image));