yusheng/QieKan-3.0
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases 2 Wiki Activity

现在超时不会触发取消任务了,onFinal会正常触发,取消任务的时候不触发onFinal,防止服务退出后仍然执行onFinal

Browse Source
This commit is contained in:
kunfei
2022-08-02 08:50:01 +08:00
parent 0325eef81d
commit 08739992e1
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/io/legado/app/help/coroutine/Coroutine.kt
+2 -4
View File
@@ -148,7 +148,7 @@ class Coroutine<T>(
success?.let { dispatchCallback(this, value, it) } success?.let { dispatchCallback(this, value, it) }
} catch (e: Throwable) { } catch (e: Throwable) {
e.printOnDebug() e.printOnDebug()
if (e is CancellationException && !isActive && e !is ActivelyCancelException) { if (e is CancellationException && e !is ActivelyCancelException && isCancelled) {
this@Coroutine.cancel() this@Coroutine.cancel()
} }
val consume: Boolean = errorReturn?.value?.let { value -> val consume: Boolean = errorReturn?.value?.let { value ->
@@ -159,9 +159,7 @@ class Coroutine<T>(
error?.let { dispatchCallback(this, e, it) } error?.let { dispatchCallback(this, e, it) }
} }
} finally { } finally {
withContext(NonCancellable) { finally?.let { dispatchVoidCallback(this, it) }
finally?.let { dispatchVoidCallback(this, it) }
}
} }
} }
} }