From 0f0937adf572cf24c186a348857bbdd9ce93f076 Mon Sep 17 00:00:00 2001
From: Aran Leite <hyoretsu@gmail.com>
Date: Sat, 4 Sep 2021 23:43:56 -0300
Subject: [PATCH] Skip bookmark check when cancelling downloads (#5853)

* Skip bookmark check when cancelling downloads

* DownloadManager: simplified filteredChapters declaration

* Completed documentation of DownloadManager's deleteChapters()

(cherry picked from commit 02b430a5bf3bdf7db6c9e04fd3f954cce4558d12)
---
 .../tachiyomi/data/download/DownloadManager.kt     | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadManager.kt b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadManager.kt
index 658f2652d..de310627d 100755
--- a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadManager.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadManager.kt
@@ -218,7 +218,7 @@ class DownloadManager(private val context: Context) {
      * @param download the download to cancel.
      */
     fun deletePendingDownload(download: Download) {
-        deleteChapters(listOf(download.chapter), download.manga, download.source)
+        deleteChapters(listOf(download.chapter), download.manga, download.source, true)
     }
 
     fun deletePendingDownloads(vararg downloads: Download) {
@@ -226,7 +226,7 @@ class DownloadManager(private val context: Context) {
         downloadsByManga.map { entry ->
             val manga = entry.value.first().manga
             val source = entry.value.first().source
-            deleteChapters(entry.value.map { it.chapter }, manga, source)
+            deleteChapters(entry.value.map { it.chapter }, manga, source, true)
         }
     }
 
@@ -236,9 +236,15 @@ class DownloadManager(private val context: Context) {
      * @param chapters the list of chapters to delete.
      * @param manga the manga of the chapters.
      * @param source the source of the chapters.
+     * @param isCancelling true if it's simply cancelling a download
      */
-    fun deleteChapters(chapters: List<Chapter>, manga: Manga, source: Source): List<Chapter> {
-        val filteredChapters = getChaptersToDelete(chapters)
+    fun deleteChapters(chapters: List<Chapter>, manga: Manga, source: Source, isCancelling: Boolean = false): List<Chapter> {
+        val filteredChapters = if (isCancelling) {
+            chapters
+        } else {
+            getChaptersToDelete(chapters)
+        }
+
         launchIO {
             removeFromDownloadQueue(filteredChapters)