From 12d58e5aa736a0e306d292aaab8326b0db5ffb13 Mon Sep 17 00:00:00 2001
From: tom5079 <tom5079@naver.com>
Date: Sun, 4 Oct 2020 23:04:12 +0900
Subject: [PATCH] Don't cancel download onPause

---
 app/build.gradle                                            | 2 +-
 app/release/output-metadata.json                            | 2 +-
 .../java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt   | 1 +
 .../main/java/xyz/quaver/pupil/services/DownloadService.kt  | 6 +++---
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index deb80cb2..00b7ef35 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -38,7 +38,7 @@ android {
         minSdkVersion 16
         targetSdkVersion 30
         versionCode 62
-        versionName "5.1.3"
+        versionName "5.1.3-hotfix1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
index 96c10c13..d69aff38 100644
--- a/app/release/output-metadata.json
+++ b/app/release/output-metadata.json
@@ -12,7 +12,7 @@
       "filters": [],
       "properties": [],
       "versionCode": 62,
-      "versionName": "5.1.3",
+      "versionName": "5.1.3-hotfix1",
       "enabled": true,
       "outputFile": "app-release.apk"
     }
diff --git a/app/src/main/java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt b/app/src/main/java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt
index 47bbe696..50c981fe 100644
--- a/app/src/main/java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt
+++ b/app/src/main/java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt
@@ -126,6 +126,7 @@ class GalleryBlockAdapter(private val galleries: List<Int>) : RecyclerSwipeAdapt
 
         fun bind(galleryID: Int) {
             this.galleryID = galleryID
+            updateProgress(view.context)
 
             val cache = Cache.getInstance(view.context, galleryID)
 
diff --git a/app/src/main/java/xyz/quaver/pupil/services/DownloadService.kt b/app/src/main/java/xyz/quaver/pupil/services/DownloadService.kt
index 31c79ac1..c6a829c5 100644
--- a/app/src/main/java/xyz/quaver/pupil/services/DownloadService.kt
+++ b/app/src/main/java/xyz/quaver/pupil/services/DownloadService.kt
@@ -294,10 +294,10 @@ class DownloadService : Service() {
     }
 
     fun download(galleryID: Int, priority: Boolean = false, startId: Int? = null): Job = CoroutineScope(Dispatchers.IO).launch {
-        cleanCache(this@DownloadService)
+        if (DownloadManager.getInstance(this@DownloadService).isDownloading(galleryID))
+            return@launch
 
-        if (progress.containsKey(galleryID))
-            cancel(galleryID)
+        cleanCache(this@DownloadService)
 
         val cache = Cache.getInstance(this@DownloadService, galleryID)