diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt b/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt index b5f1e3053..3d8cab975 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt @@ -469,7 +469,6 @@ class LibraryUpdateService( } // SY <-- - return runAsObservable({ // SY --> if (source is MergedSource) { diff --git a/app/src/main/java/eu/kanade/tachiyomi/extension/api/ExtensionGithubApi.kt b/app/src/main/java/eu/kanade/tachiyomi/extension/api/ExtensionGithubApi.kt index a0817df67..4bff3d5f8 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/extension/api/ExtensionGithubApi.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/extension/api/ExtensionGithubApi.kt @@ -90,7 +90,7 @@ internal class ExtensionGithubApi { val lang = element.jsonObject["lang"]!!.jsonPrimitive.content val nsfw = element.jsonObject["nsfw"]!!.jsonPrimitive.int == 1 // SY --> - val icon = "${repoUrl}/icon/${apkName.replace(".apk", ".png")}" + val icon = "$repoUrl/icon/${apkName.replace(".apk", ".png")}" // SY <-- Extension.Available(name, pkgName, versionName, versionCode, lang, nsfw, apkName, icon /* SY --> */, repoUrl /* SY <-- */) diff --git a/app/src/main/java/exh/ui/base/CoroutinePresenter.kt b/app/src/main/java/exh/ui/base/CoroutinePresenter.kt index d6cb5f026..e79cc2a0f 100644 --- a/app/src/main/java/exh/ui/base/CoroutinePresenter.kt +++ b/app/src/main/java/exh/ui/base/CoroutinePresenter.kt @@ -1,7 +1,6 @@ package exh.ui.base import androidx.annotation.CallSuper -import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Job @@ -20,9 +19,7 @@ import kotlin.coroutines.EmptyCoroutineContext @Suppress("DEPRECATION", "unused") open class CoroutinePresenter( scope: CoroutineScope = CoroutineScope(Job() + Dispatchers.Main) -) : Presenter(), - CoroutineScope by scope -{ +) : Presenter(), CoroutineScope by scope { @Suppress("DeprecatedCallableAddReplaceWith") @Deprecated("Use launchInView, Flow.inView, Flow.mapView") override fun getView(): V? { @@ -47,10 +44,10 @@ open class CoroutinePresenter( } } - fun Flow<*>.launchUnderContext(context: CoroutineContext = EmptyCoroutineContext) = - launch(this + context) { this@launchInHere.collect() } + fun Flow<*>.launchUnderContext(context: CoroutineContext = EmptyCoroutineContext) = + launch(context) { this@launchUnderContext.collect() } - fun Flow<*>.launch() = launchIn(this) + fun Flow<*>.launch() = launchIn(this@CoroutinePresenter) @CallSuper override fun destroy() { diff --git a/app/src/main/java/exh/ui/metadata/MetadataViewPresenter.kt b/app/src/main/java/exh/ui/metadata/MetadataViewPresenter.kt index 483b19612..fcedf2c61 100644 --- a/app/src/main/java/exh/ui/metadata/MetadataViewPresenter.kt +++ b/app/src/main/java/exh/ui/metadata/MetadataViewPresenter.kt @@ -15,7 +15,6 @@ import exh.ui.base.CoroutinePresenter import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.MutableStateFlow -import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.plus import uy.kohesive.injekt.Injekt