Deal with SY for the coroutine function changes

app/src/main/java/exh/ui/base/CoroutinePresenter.kt

@@ -1,9 +1,10 @@
 package exh.ui.base
 
 import androidx.annotation.CallSuper
+import eu.kanade.tachiyomi.util.lang.launchUI
+import eu.kanade.tachiyomi.util.lang.withUIContext
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
+import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.collect
@@ -11,14 +12,13 @@ import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.mapNotNull
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
 import nucleus.presenter.Presenter
 import kotlin.coroutines.CoroutineContext
 import kotlin.coroutines.EmptyCoroutineContext
 
 @Suppress("DEPRECATION", "unused")
 open class CoroutinePresenter<V>(
-    scope: CoroutineScope = CoroutineScope(Job() + Dispatchers.Main)
+    scope: CoroutineScope = MainScope()
 ) : Presenter<V>(), CoroutineScope by scope {
     @Suppress("DeprecatedCallableAddReplaceWith")
     @Deprecated("Use launchInView, Flow.inView, Flow.mapView")
@@ -26,19 +26,19 @@ open class CoroutinePresenter<V>(
         return super.getView()
     }
 
-    fun launchInView(block: (CoroutineScope, V) -> Unit) = launch(Dispatchers.Main) {
+    fun launchInView(block: (CoroutineScope, V) -> Unit) = launchUI {
         view?.let { block.invoke(this, it) }
     }
 
     inline fun <F> Flow<F>.inView(crossinline block: (V, F) -> Unit) = onEach {
-        withContext(Dispatchers.Main) {
+        withUIContext {
             view?.let { view -> block(view, it) }
         }
     }
 
     inline fun <F, P> Flow<F>.mapView(crossinline block: (V, F) -> P): Flow<P> {
         return mapNotNull {
-            withContext(Dispatchers.Main) {
+            withUIContext {
                 view?.let { view -> block(view, it) }
             }
         }

app/src/main/java/exh/ui/batchadd/BatchAddPresenter.kt

@@ -7,6 +7,7 @@ import com.jakewharton.rxrelay.ReplayRelay
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.ui.base.presenter.BasePresenter
+import eu.kanade.tachiyomi.util.lang.withIOContext
 import exh.GalleryAddEvent
 import exh.GalleryAdder
 import exh.util.trimOrNull
@@ -14,7 +15,6 @@ import kotlinx.coroutines.CoroutineExceptionHandler
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ensureActive
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 
@@ -65,7 +65,7 @@ class BatchAddPresenter : BasePresenter<BatchAddController>() {
 
             splitGalleries.forEachIndexed { i, s ->
                 ensureActive()
-                val result = withContext(Dispatchers.IO) { galleryAdder.addGallery(context, s, true) }
+                val result = withIOContext { galleryAdder.addGallery(context, s, true) }
                 if (result is GalleryAddEvent.Success) {
                     succeeded.add(s)
                 } else {

app/src/main/java/exh/ui/captcha/BrowserActionActivity.kt

@@ -21,12 +21,11 @@ import eu.kanade.tachiyomi.network.asObservableSuccess
 import eu.kanade.tachiyomi.source.Source
 import eu.kanade.tachiyomi.source.SourceManager
 import eu.kanade.tachiyomi.source.online.HttpSource
+import eu.kanade.tachiyomi.util.lang.withUIContext
 import eu.kanade.tachiyomi.util.system.setDefaultSettings
 import exh.source.DelegatedHttpSource
 import exh.util.melt
-import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.runBlocking
-import kotlinx.coroutines.withContext
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonObject
@@ -188,7 +187,7 @@ class BrowserActionActivity : AppCompatActivity() {
         currentLoopId = null
         validateCurrentLoopId = null
         XLog.tag("BrowserActionActivity").enableStackTrace(2).e(IllegalStateException("Captcha solve failure!"))
-        withContext(Dispatchers.Main) {
+        withUIContext {
             binding.webview.evaluateJavascript(SOLVE_UI_SCRIPT_HIDE, null)
             MaterialDialog(this@BrowserActionActivity)
                 .title(R.string.captcha_solve_failure)

app/src/main/java/exh/ui/smartsearch/SmartSearchController.kt

@@ -12,12 +12,12 @@ import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction
 import eu.kanade.tachiyomi.ui.browse.source.SourceController
 import eu.kanade.tachiyomi.ui.browse.source.browse.BrowseSourceController
 import eu.kanade.tachiyomi.ui.manga.MangaController
+import eu.kanade.tachiyomi.util.lang.withUIContext
 import eu.kanade.tachiyomi.util.system.toast
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.plus
-import kotlinx.coroutines.withContext
 import uy.kohesive.injekt.injectLazy
 
 class SmartSearchController(bundle: Bundle? = null) : NucleusController<EhSmartSearchBinding, SmartSearchPresenter>() {
@@ -52,7 +52,7 @@ class SmartSearchController(bundle: Bundle? = null) : NucleusController<EhSmartS
             .onEach { results ->
                 if (results is SmartSearchPresenter.SearchResults.Found) {
                     val transaction = MangaController(results.manga, true, smartSearchConfig).withFadeTransaction()
-                    withContext(Dispatchers.Main) {
+                    withUIContext {
                         router.replaceTopController(transaction)
                     }
                 } else {
@@ -63,7 +63,7 @@ class SmartSearchController(bundle: Bundle? = null) : NucleusController<EhSmartS
                     }
 
                     val transaction = BrowseSourceController(source, smartSearchConfig.origTitle, smartSearchConfig).withFadeTransaction()
-                    withContext(Dispatchers.Main) {
+                    withUIContext {
                         router.replaceTopController(transaction)
                     }
                 }