From ffc7c2aa6796f14399cb9afebbc7c04f208a2308 Mon Sep 17 00:00:00 2001
From: tom5079 <tom5079@naver.com>
Date: Fri, 4 Sep 2020 11:05:29 +0900
Subject: [PATCH] Bug fix

---
 app/build.gradle                                        | 2 +-
 app/release/output-metadata.json                        | 2 +-
 app/src/main/java/xyz/quaver/pupil/ui/ReaderActivity.kt | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 698b5919..60d65bcf 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -20,7 +20,7 @@ android {
         minSdkVersion 16
         targetSdkVersion 29
         versionCode 57
-        versionName "5.0-alpha3"
+        versionName "5.0-alpha4"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
index a4d973e5..6c7db57b 100644
--- a/app/release/output-metadata.json
+++ b/app/release/output-metadata.json
@@ -12,7 +12,7 @@
       "filters": [],
       "properties": [],
       "versionCode": 57,
-      "versionName": "5.0-alpha3",
+      "versionName": "5.0-alpha4",
       "enabled": true,
       "outputFile": "app-release.apk"
     }
diff --git a/app/src/main/java/xyz/quaver/pupil/ui/ReaderActivity.kt b/app/src/main/java/xyz/quaver/pupil/ui/ReaderActivity.kt
index 7605a394..b18e7899 100644
--- a/app/src/main/java/xyz/quaver/pupil/ui/ReaderActivity.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/ReaderActivity.kt
@@ -238,10 +238,8 @@ class ReaderActivity : AppCompatActivity() {
         timer.cancel()
         (reader_recyclerview?.adapter as? ReaderAdapter)?.timer?.cancel()
 
-        if (!DownloadManager.getInstance(this).isDownloading(galleryID)) {
-            downloader?.cancel(galleryID)
-            DownloadManager.getInstance(this).deleteDownloadFolder(galleryID)
-        }
+        if (!DownloadManager.getInstance(this).isDownloading(galleryID))
+            DownloadService.cancel(this, galleryID)
 
         if (downloader != null)
             unbindService(conn)
@@ -296,6 +294,8 @@ class ReaderActivity : AppCompatActivity() {
                     .show()
             }
 
+            histories.add(galleryID)
+
             runOnUiThread {
                 reader_download_progressbar.max = reader_recyclerview.adapter?.itemCount ?: 0
                 reader_download_progressbar.progress = downloader.progress[galleryID]?.count { it.isInfinite() } ?: 0