This commit is contained in:
kunfei
2022-07-27 20:41:04 +08:00
parent 37a057b2c6
commit 04eaa29052
2 changed files with 7 additions and 5 deletions

View File

@@ -0,0 +1,5 @@
package io.legado.app.help.coroutine
import kotlin.coroutines.cancellation.CancellationException
class ActivelyCancelException : CancellationException()

View File

@@ -40,8 +40,6 @@ class Coroutine<T>(
private var timeMillis: Long? = null
private var errorReturn: Result<T>? = null
private var isCancelCalled = false
val isCancelled: Boolean
get() = job.isCancelled
@@ -116,8 +114,7 @@ class Coroutine<T>(
}
//取消当前任务
fun cancel(cause: CancellationException? = null) {
isCancelCalled = true
fun cancel(cause: ActivelyCancelException = ActivelyCancelException()) {
job.cancel(cause)
cancel?.let {
MainScope().launch {
@@ -149,7 +146,7 @@ class Coroutine<T>(
success?.let { dispatchCallback(this, value, it) }
} catch (e: Throwable) {
e.printOnDebug()
if (e is CancellationException && !isCancelCalled) this@Coroutine.cancel()
if (e is ActivelyCancelException) this@Coroutine.cancel()
if (e is CancellationException && e !is TimeoutCancellationException) {
return@launch
}