From 24850450cb268ca4a3a3407a08e1e5f4b96888f6 Mon Sep 17 00:00:00 2001
From: Jobobby04 <jobobby04@users.noreply.github.com>
Date: Fri, 1 May 2020 22:16:04 -0400
Subject: [PATCH] Migrate more preferences

(cherry picked from commit 53a3be07033ae868f7d3cfe572d279b981a1fa85)
---
 .../migration/manga/design/MigrationBottomSheetDialog.kt  | 2 +-
 .../ui/migration/manga/design/PreMigrationController.kt   | 4 ++--
 .../tachiyomi/ui/setting/SettingsLibraryController.kt     | 2 +-
 app/src/main/java/exh/ui/batchadd/BatchAddController.kt   | 6 +++---
 app/src/main/java/exh/ui/lock/LockActivityDelegate.kt     | 8 ++++++--
 5 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/design/MigrationBottomSheetDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/design/MigrationBottomSheetDialog.kt
index 2b5fd0bda..39097017a 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/design/MigrationBottomSheetDialog.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/design/MigrationBottomSheetDialog.kt
@@ -94,7 +94,7 @@ class MigrationBottomSheetDialog(
         }
         sourceGroup.bindToPreference(preferences.useSourceWithMost())
 
-        skip_step.isChecked = preferences.skipPreMigration().getOrDefault()
+        skip_step.isChecked = preferences.skipPreMigration().get()
         skip_step.setOnCheckedChangeListener { _, isChecked ->
             if (isChecked)
                 (listener as? Controller)?.activity?.toast(R.string.pre_migration_skip_toast,
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/design/PreMigrationController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/design/PreMigrationController.kt
index f0da75eff..a0acdea2b 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/design/PreMigrationController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/design/PreMigrationController.kt
@@ -129,7 +129,7 @@ class PreMigrationController(bundle: Bundle? = null) : BaseController<PreMigrati
      * @return list containing enabled sources.
      */
     private fun getEnabledSources(): List<HttpSource> {
-        val languages = prefs.enabledLanguages().getOrDefault()
+        val languages = prefs.enabledLanguages().get()
         val sourcesSaved = prefs.migrationSources().getOrDefault().split("/")
         var sources = sourceManager.getVisibleCatalogueSources()
             .filterIsInstance<HttpSource>()
@@ -146,7 +146,7 @@ class PreMigrationController(bundle: Bundle? = null) : BaseController<PreMigrati
 
     fun isEnabled(id: String): Boolean {
         val sourcesSaved = prefs.migrationSources().getOrDefault()
-        val hiddenCatalogues = prefs.hiddenCatalogues().getOrDefault()
+        val hiddenCatalogues = prefs.hiddenCatalogues().get()
         return if (sourcesSaved.isEmpty()) id !in hiddenCatalogues
         else sourcesSaved.split("/").contains(id)
     }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLibraryController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLibraryController.kt
index 685f0c185..ba08bace3 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLibraryController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLibraryController.kt
@@ -210,7 +210,7 @@ class SettingsLibraryController : SettingsController() {
                     true
                 }
             }
-            if (preferences.skipPreMigration().getOrDefault() || preferences.migrationSources()
+            if (preferences.skipPreMigration().get() || preferences.migrationSources()
                     .getOrDefault().isNotEmpty()) {
                 switchPreference {
                     key = Keys.skipPreMigration
diff --git a/app/src/main/java/exh/ui/batchadd/BatchAddController.kt b/app/src/main/java/exh/ui/batchadd/BatchAddController.kt
index d2b9aeeb0..12bd832be 100755
--- a/app/src/main/java/exh/ui/batchadd/BatchAddController.kt
+++ b/app/src/main/java/exh/ui/batchadd/BatchAddController.kt
@@ -8,10 +8,10 @@ import com.afollestad.materialdialogs.MaterialDialog
 import eu.kanade.tachiyomi.databinding.EhFragmentBatchAddBinding
 import eu.kanade.tachiyomi.ui.base.controller.NucleusController
 import eu.kanade.tachiyomi.util.lang.combineLatest
-import eu.kanade.tachiyomi.util.lang.launchInUI
 import eu.kanade.tachiyomi.util.lang.plusAssign
 import kotlinx.android.synthetic.main.eh_fragment_batch_add.view.galleries_box
 import kotlinx.android.synthetic.main.eh_fragment_batch_add.view.progress_log
+import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import reactivecircus.flowbinding.android.view.clicks
 import rx.android.schedulers.AndroidSchedulers
@@ -38,13 +38,13 @@ class BatchAddController : NucleusController<EhFragmentBatchAddBinding, BatchAdd
                 .onEach {
                     addGalleries(binding.galleriesBox.text.toString())
                 }
-                .launchInUI()
+                .launchIn(scope)
 
             binding.progressDismissBtn.clicks()
                 .onEach {
                     presenter.currentlyAddingRelay.call(BatchAddPresenter.STATE_PROGRESS_TO_INPUT)
                 }
-                .launchInUI()
+                .launchIn(scope)
 
             val progressSubscriptions = CompositeSubscription()
 
diff --git a/app/src/main/java/exh/ui/lock/LockActivityDelegate.kt b/app/src/main/java/exh/ui/lock/LockActivityDelegate.kt
index 958923965..90e410c8e 100644
--- a/app/src/main/java/exh/ui/lock/LockActivityDelegate.kt
+++ b/app/src/main/java/exh/ui/lock/LockActivityDelegate.kt
@@ -6,7 +6,9 @@ import com.bluelinelabs.conductor.Router
 import com.bluelinelabs.conductor.RouterTransaction
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.data.preference.getOrDefault
-import eu.kanade.tachiyomi.util.lang.launchInUI
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import uy.kohesive.injekt.injectLazy
 
@@ -15,6 +17,8 @@ object LockActivityDelegate {
 
     var willLock: Boolean = true
 
+    private val uiScope = CoroutineScope(Dispatchers.Main)
+
     fun doLock(router: Router, animate: Boolean = false) {
         router.pushController(RouterTransaction.with(LockController())
             .popChangeHandler(LockChangeHandler(animate)))
@@ -29,7 +33,7 @@ object LockActivityDelegate {
                         activity.window.clearFlags(WindowManager.LayoutParams.FLAG_SECURE)
                     }
                 }
-            .launchInUI()
+            .launchIn(uiScope)
     }
 
     fun onResume(activity: FragmentActivity, router: Router) {