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 4c83154a3..31e220577 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 @@ -1,14 +1,26 @@ package io.legado.app.help.coroutine import io.legado.app.utils.printOnDebug -import kotlinx.coroutines.* - +import kotlinx.coroutines.CancellationException +import kotlinx.coroutines.CompletionHandler +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.CoroutineStart +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.DisposableHandle +import kotlinx.coroutines.Job +import kotlinx.coroutines.MainScope +import kotlinx.coroutines.ensureActive +import kotlinx.coroutines.isActive +import kotlinx.coroutines.launch +import kotlinx.coroutines.plus +import kotlinx.coroutines.withContext +import kotlinx.coroutines.withTimeout import kotlin.coroutines.CoroutineContext /** * 链式协程 */ -@Suppress("unused") +@Suppress("unused", "MemberVisibilityCanBePrivate") class Coroutine( val scope: CoroutineScope, context: CoroutineContext = Dispatchers.IO, diff --git a/app/src/main/java/io/legado/app/model/SharedJsScope.kt b/app/src/main/java/io/legado/app/model/SharedJsScope.kt index 84d183a45..6b8a925f0 100644 --- a/app/src/main/java/io/legado/app/model/SharedJsScope.kt +++ b/app/src/main/java/io/legado/app/model/SharedJsScope.kt @@ -42,11 +42,11 @@ object SharedJsScope { val js = okHttpClient.newCallStrResponse { url(value) }.body - it.evaluateString(scope, js, "jsLib", 1, null) + evaluateString(scope, js, "jsLib", 1, null) } } } else { - it.evaluateString(scope, jsLib, "jsLib", 1, null) + evaluateString(scope, jsLib, "jsLib", 1, null) } } scopeMap[key] = WeakReference(scope) diff --git a/app/src/main/java/io/legado/app/utils/Rhino.kt b/app/src/main/java/io/legado/app/utils/Rhino.kt index d0ed3a56e..b2eac4317 100644 --- a/app/src/main/java/io/legado/app/utils/Rhino.kt +++ b/app/src/main/java/io/legado/app/utils/Rhino.kt @@ -4,7 +4,7 @@ import org.mozilla.javascript.Context object Rhino { - inline fun use(block: (Context) -> R): R { + inline fun use(block: Context.() -> R): R { val context = Context.enter() return try { block.invoke(context)