From 86a99da671fa7a75475d9eeddcfc6c3b2cefec6f Mon Sep 17 00:00:00 2001
From: kunfei <gekunfei@live.com>
Date: Tue, 1 Oct 2019 11:51:15 +0800
Subject: [PATCH] up

---
 app/src/main/java/io/legado/app/base/BaseViewModel.kt    | 5 +++--
 .../main/java/io/legado/app/help/coroutine/Coroutine.kt  | 9 +++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/io/legado/app/base/BaseViewModel.kt b/app/src/main/java/io/legado/app/base/BaseViewModel.kt
index 98e09354b..3610a00a5 100644
--- a/app/src/main/java/io/legado/app/base/BaseViewModel.kt
+++ b/app/src/main/java/io/legado/app/base/BaseViewModel.kt
@@ -19,7 +19,7 @@ open class BaseViewModel(application: Application) : AndroidViewModel(applicatio
 
     fun <T> execute(
         scope: CoroutineScope = this,
-        context: CoroutineContext = scope.coroutineContext.plus(Dispatchers.IO),
+        context: CoroutineContext = Dispatchers.IO,
         block: suspend CoroutineScope.() -> T
     ): Coroutine<T> {
         return Coroutine.async(scope, context) { block() }
@@ -27,9 +27,10 @@ open class BaseViewModel(application: Application) : AndroidViewModel(applicatio
 
     fun <R> submit(
         scope: CoroutineScope = this,
+        context: CoroutineContext = Dispatchers.IO,
         block: suspend CoroutineScope.() -> Deferred<R>
     ): Coroutine<R> {
-        return Coroutine.async(scope) { block().await() }
+        return Coroutine.async(scope, context) { block().await() }
     }
 
     @CallSuper
diff --git a/app/src/main/java/io/legado/app/help/coroutine/Coroutine.kt b/app/src/main/java/io/legado/app/help/coroutine/Coroutine.kt
index c61efdd23..e9fd0df86 100644
--- a/app/src/main/java/io/legado/app/help/coroutine/Coroutine.kt
+++ b/app/src/main/java/io/legado/app/help/coroutine/Coroutine.kt
@@ -7,7 +7,7 @@ import kotlin.coroutines.CoroutineContext
 
 class Coroutine<T>(
     scope: CoroutineScope,
-    context: CoroutineContext = scope.coroutineContext.plus(Dispatchers.IO),
+    context: CoroutineContext = Dispatchers.IO,
     block: suspend CoroutineScope.() -> T
 ) {
 
@@ -17,7 +17,7 @@ class Coroutine<T>(
 
         fun <T> async(
             scope: CoroutineScope = DEFAULT,
-            context: CoroutineContext = scope.coroutineContext.plus(Dispatchers.IO),
+            context: CoroutineContext = Dispatchers.IO,
             block: suspend CoroutineScope.() -> T
         ): Coroutine<T> {
             return Coroutine(scope, context, block)
@@ -117,7 +117,7 @@ class Coroutine<T>(
         return scope.plus(Dispatchers.Main).launch {
             try {
                 start?.let { dispatchVoidCallback(this, it) }
-                val value = executeBlock(context, timeMillis ?: 0L, block)
+                val value = executeBlock(scope, context, timeMillis ?: 0L, block)
                 success?.let { dispatchCallback(this, value, it) }
             } catch (e: Throwable) {
                 if (BuildConfig.DEBUG) {
@@ -162,11 +162,12 @@ class Coroutine<T>(
     }
 
     private suspend inline fun executeBlock(
+        scope: CoroutineScope,
         context: CoroutineContext,
         timeMillis: Long,
         noinline block: suspend CoroutineScope.() -> T
     ): T? {
-        return withContext(context) {
+        return withContext(scope.coroutineContext.plus(context)) {
             if (timeMillis > 0L) withTimeout(timeMillis) {
                 block()
             } else block()