From 1bc07a89b807015950a01678164502f8e1b40178 Mon Sep 17 00:00:00 2001
From: seven332 <seven332@163.com>
Date: Sat, 7 May 2016 14:09:03 +0800
Subject: [PATCH] Prepare for library upgrade

---
 app/src/main/java/com/hippo/ehviewer/ImageBitmapHelper.java | 5 +++--
 app/src/main/java/com/hippo/widget/LoadImageView.java       | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/hippo/ehviewer/ImageBitmapHelper.java b/app/src/main/java/com/hippo/ehviewer/ImageBitmapHelper.java
index 4b6d21c4f..aa8a10128 100644
--- a/app/src/main/java/com/hippo/ehviewer/ImageBitmapHelper.java
+++ b/app/src/main/java/com/hippo/ehviewer/ImageBitmapHelper.java
@@ -53,7 +53,7 @@ public class ImageBitmapHelper implements ValueHelper<ImageBitmap> {
 
     @Override
     public int sizeOf(@NonNull String key, @NonNull ImageBitmap value) {
-        return value.getWidth() * value.getHeight() * 4;
+        return value.getWidth() * value.getHeight() * 4 /* value.getByteCount() TODO Update Image */;
     }
 
     @Override
@@ -69,7 +69,8 @@ public class ImageBitmapHelper implements ValueHelper<ImageBitmap> {
     @Override
     public boolean useMemoryCache(@NonNull String key, ImageBitmap value) {
         if (value != null) {
-            return value.getWidth() * value.getHeight() <= MAX_CACHE_SIZE;
+            return value.getWidth() * value.getHeight() <= MAX_CACHE_SIZE
+                    /* value.getByteCount() <= MAX_CACHE_BYTE_COUNT TODO Update Image */;
         } else {
             return true;
         }
diff --git a/app/src/main/java/com/hippo/widget/LoadImageView.java b/app/src/main/java/com/hippo/widget/LoadImageView.java
index d5cbe26b4..d82a000b9 100644
--- a/app/src/main/java/com/hippo/widget/LoadImageView.java
+++ b/app/src/main/java/com/hippo/widget/LoadImageView.java
@@ -117,7 +117,7 @@ public class LoadImageView extends FixedAspectImageView implements Unikery<Image
 
         if (mFailed) {
             onFailure();
-        } else {
+        } else if (mTaskId == Unikery.INVALID_ID) /* if (!mConaco.isLoading(mTaskId)) TODO Update Conaco */ {
             load(mKey, mUrl, mContainer, mUseNetwork);
         }
     }