From 899d221b67f535b72dbbba53eb8f31b08a841955 Mon Sep 17 00:00:00 2001
From: tarsin <yuanqingxiang233@163.com>
Date: Wed, 8 Feb 2023 22:29:57 +0800
Subject: [PATCH] Fix cancellation handle

---
 .../java/com/hippo/ehviewer/spider/SpiderQueenWorker.kt  | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/hippo/ehviewer/spider/SpiderQueenWorker.kt b/app/src/main/java/com/hippo/ehviewer/spider/SpiderQueenWorker.kt
index c05d68fd7..6a98a732b 100644
--- a/app/src/main/java/com/hippo/ehviewer/spider/SpiderQueenWorker.kt
+++ b/app/src/main/java/com/hippo/ehviewer/spider/SpiderQueenWorker.kt
@@ -13,7 +13,6 @@ import com.hippo.ehviewer.spider.SpiderQueen.STATE_FAILED
 import com.hippo.ehviewer.spider.SpiderQueen.STATE_FINISHED
 import com.hippo.util.ExceptionUtils
 import com.hippo.yorozuya.StringUtils
-import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -23,6 +22,7 @@ import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.Semaphore
 import kotlinx.coroutines.sync.withLock
 import kotlinx.coroutines.sync.withPermit
+import moe.tarsin.coroutines.runCatchingCancellationTransparent
 import kotlin.coroutines.CoroutineContext
 
 class SpiderQueenWorker(private val queen: SpiderQueen) : CoroutineScope {
@@ -148,7 +148,7 @@ class SpiderQueenWorker(private val queen: SpiderQueen) : CoroutineScope {
                             "?nl=$skipHathKey"
                         }
                     }
-                    runCatching {
+                    runCatchingCancellationTransparent {
                         getGalleryPage(pageUrl, spiderInfo.gid, spiderInfo.token).also {
                             if (StringUtils.endsWith(it.imageUrl, URL_509_SUFFIX_ARRAY)) {
                                 // Get 509
@@ -193,7 +193,7 @@ class SpiderQueenWorker(private val queen: SpiderQueen) : CoroutineScope {
                     error = "ShowKey error"
                     return@repeat
                 }
-                runCatching {
+                runCatchingCancellationTransparent {
                     getGalleryPageApi(
                         spiderInfo.gid,
                         index,
@@ -239,7 +239,7 @@ class SpiderQueenWorker(private val queen: SpiderQueen) : CoroutineScope {
             }
             Log.d(DEBUG_TAG, targetImageUrl)
 
-            runCatching {
+            runCatchingCancellationTransparent {
                 Log.d(DEBUG_TAG, "Start download image $index")
                 val success: Boolean = spiderDen.makeHttpCallAndSaveImage(
                     index,
@@ -269,7 +269,6 @@ class SpiderQueenWorker(private val queen: SpiderQueen) : CoroutineScope {
                 delay(mDownloadDelay.toLong())
                 return
             }.onFailure {
-                if (it is CancellationException) throw it
                 it.printStackTrace()
                 error = NETWORK_ERROR
             }