From 37dcf125e031e5b24c009bf5fe86f82537a0d5ef Mon Sep 17 00:00:00 2001
From: NekoInverter <7741672-NekoInverter@users.noreply.gitlab.com>
Date: Sat, 23 Jan 2021 13:29:48 +0800
Subject: [PATCH] Fix thumb blinking

---
 .../java/com/hippo/widget/LoadImageView.java  | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/com/hippo/widget/LoadImageView.java b/app/src/main/java/com/hippo/widget/LoadImageView.java
index cf0b2e763..ff7ec00ee 100644
--- a/app/src/main/java/com/hippo/widget/LoadImageView.java
+++ b/app/src/main/java/com/hippo/widget/LoadImageView.java
@@ -65,7 +65,7 @@ public class LoadImageView extends FixedAspectImageView implements Unikery<Image
     private int mClipHeight = Integer.MIN_VALUE;
     private int mRetryType;
     private boolean mFailed;
-    private boolean mLoadFromDrawable;
+    private boolean mLoadFromDrawable = false;
 
     public LoadImageView(Context context) {
         super(context);
@@ -109,7 +109,7 @@ public class LoadImageView extends FixedAspectImageView implements Unikery<Image
         if (!mLoadFromDrawable) {
             if (mFailed) {
                 onFailure();
-            } else if (mTaskId == Unikery.INVALID_ID) /* if (!mConaco.isLoading(mTaskId)) TODO Update Conaco */ {
+            } else if (mConaco.isLoading(this)) {
                 load(mKey, mUrl, mContainer, mUseNetwork);
             }
         }
@@ -120,14 +120,16 @@ public class LoadImageView extends FixedAspectImageView implements Unikery<Image
         super.onDetachedFromWindow();
 
         if (!mLoadFromDrawable) {
-            try {
-                // Cancel
-                mConaco.cancel(this);
-            } catch (Exception e) {
-                // Ignore
+            if (mConaco.isLoading(this)) {
+                try {
+                    // Cancel
+                    mConaco.cancel(this);
+                } catch (Exception e) {
+                    // Ignore
+                }
+                // Clear drawable
+                clearDrawable();
             }
-            // Clear drawable
-            clearDrawable();
         }
     }
 
@@ -220,7 +222,6 @@ public class LoadImageView extends FixedAspectImageView implements Unikery<Image
             return;
         }
 
-        mLoadFromDrawable = false;
         mFailed = false;
         clearRetry();
 
@@ -240,7 +241,6 @@ public class LoadImageView extends FixedAspectImageView implements Unikery<Image
 
     public void load(Drawable drawable) {
         unload();
-        mLoadFromDrawable = true;
         onPreSetImageDrawable(drawable, true);
         setImageDrawable(drawable);
     }