From b4aa5ec593ff04c19ea67bfe329626739d68c2e1 Mon Sep 17 00:00:00 2001 From: tarsin Date: Wed, 28 Dec 2022 12:20:49 +0800 Subject: [PATCH] Revert "Get download dir in download mode only" This reverts commit 241d9daae9f4a178830bea21bfcc9377eaded792. --- app/src/main/java/com/hippo/ehviewer/spider/SpiderDen.java | 7 ++----- .../main/java/com/hippo/ehviewer/spider/SpiderQueen.java | 3 --- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/hippo/ehviewer/spider/SpiderDen.java b/app/src/main/java/com/hippo/ehviewer/spider/SpiderDen.java index 40627469e..477a31aff 100644 --- a/app/src/main/java/com/hippo/ehviewer/spider/SpiderDen.java +++ b/app/src/main/java/com/hippo/ehviewer/spider/SpiderDen.java @@ -50,12 +50,13 @@ public final class SpiderDen { @Nullable private static SimpleDiskCache sCache; @Nullable - private UniFile mDownloadDir; + private final UniFile mDownloadDir; private final long mGid; private volatile int mMode = SpiderQueen.MODE_READ; public SpiderDen(GalleryInfo galleryInfo) { mGid = galleryInfo.gid; + mDownloadDir = getGalleryDownloadDir(galleryInfo); } public static void initialize(Context context) { @@ -152,10 +153,6 @@ public final class SpiderDen { return mDownloadDir != null && mDownloadDir.isDirectory() ? mDownloadDir : null; } - public void setDownloadDir(UniFile dir) { - mDownloadDir = dir; - } - private boolean containInCache(int index) { if (sCache == null) { return false; diff --git a/app/src/main/java/com/hippo/ehviewer/spider/SpiderQueen.java b/app/src/main/java/com/hippo/ehviewer/spider/SpiderQueen.java index 98f2f0be3..3827c3e9f 100644 --- a/app/src/main/java/com/hippo/ehviewer/spider/SpiderQueen.java +++ b/app/src/main/java/com/hippo/ehviewer/spider/SpiderQueen.java @@ -317,9 +317,6 @@ public final class SpiderQueen implements Runnable { mode = MODE_READ; } - if (mode == MODE_DOWNLOAD && mSpiderDen.getDownloadDir() == null) { - mSpiderDen.setDownloadDir(SpiderDen.getGalleryDownloadDir(mGalleryInfo)); - } mSpiderDen.setMode(mode); // Update download page