From ab3fc7d8429537a94177cb4b2cf047069cb06404 Mon Sep 17 00:00:00 2001
From: seven332 <seven332@163.com>
Date: Sat, 14 May 2016 12:45:02 +0800
Subject: [PATCH] Avoid create dir when loading thumb in download list

---
 app/build.gradle                              |  4 ++--
 .../ehviewer/ui/scene/DownloadsScene.java     | 19 ++++++++++++++-----
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 6672d0ba2..373c061ef 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,7 @@ dependencies {
     compile 'com.github.amlcurran.showcaseview:library:5.4.3'
     compile 'com.github.seven332:animator:0.1.0'
     compile 'com.github.seven332:beerbelly:0.1.4'
-    compile 'com.github.seven332:conaco:0.1.4-eh'
+    compile 'com.github.seven332:conaco:0.1.5-eh'
     compile 'com.github.seven332:drawerlayout:0.1.0'
     compile 'com.github.seven332:easyrecyclerview:0.1.0'
     compile 'com.github.seven332:hotspot:0.1.0'
@@ -74,7 +74,7 @@ dependencies {
     compile 'com.github.seven332:unifile:0.1.3'
     compile 'com.github.seven332:yorozuya:0.1.1'
     compile 'com.github.seven332:yorozuya-thread:0.1.1'
-    compile 'com.github.seven332:yorozuya-collect:0.1.2'
+    compile 'com.github.seven332:yorozuya-collect:0.1.4'
     compile 'com.h6ah4i.android.widget.advrecyclerview:advrecyclerview:0.8.7'
     compile 'org.ccil.cowan.tagsoup:tagsoup:1.2.1'
     compile 'org.greenrobot:greendao:2.2.0'
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.java
index 7742a580a..2d7e1364c 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.java
@@ -1211,24 +1211,31 @@ public class DownloadsScene extends ToolbarScene
     private class ThumbDataContainer implements DataContainer {
 
         private final DownloadInfo mInfo;
+        @Nullable
         private UniFile mFile;
 
         public ThumbDataContainer(@NonNull DownloadInfo info) {
             mInfo = info;
         }
 
-        @Override
-        public void onUrlMoved(String requestUrl, String responseUrl) {}
-
         private void ensureFile() {
             if (mFile == null) {
                 UniFile dir = SpiderDen.getGalleryDownloadDir(mInfo);
-                if (dir != null && dir.ensureDir()) {
+                if (dir != null && dir.isDirectory()) {
                     mFile = dir.createFile(".thumb");
                 }
             }
         }
 
+        @Override
+        public boolean isEnabled() {
+            ensureFile();
+            return mFile != null;
+        }
+
+        @Override
+        public void onUrlMoved(String requestUrl, String responseUrl) {}
+
         @Override
         public boolean save(InputStream is, long length, String mediaType, ProgressNotifier notify) {
             ensureFile();
@@ -1261,7 +1268,9 @@ public class DownloadsScene extends ToolbarScene
 
         @Override
         public void remove() {
-            mFile.delete();
+            if (mFile != null) {
+                mFile.delete();
+            }
         }
     }
 }