From 0014a0ca6c4e9f361964ea0dc0e13afd32fbf2af Mon Sep 17 00:00:00 2001
From: Jobobby04 <jobobby04@users.noreply.github.com>
Date: Sat, 2 May 2020 01:00:37 -0400
Subject: [PATCH] Migrate to flow

---
 .../ui/migration/manga/design/PreMigrationController.kt    | 7 +++----
 .../ui/migration/manga/process/MigrationListController.kt  | 2 +-
 .../tachiyomi/ui/setting/SettingsLibraryController.kt      | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

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 9ca83e9ff..2db9889a1 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
@@ -12,7 +12,6 @@ import com.google.android.material.bottomsheet.BottomSheetDialog
 import eu.davidea.flexibleadapter.FlexibleAdapter
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
-import eu.kanade.tachiyomi.data.preference.getOrDefault
 import eu.kanade.tachiyomi.databinding.PreMigrationControllerBinding
 import eu.kanade.tachiyomi.source.SourceManager
 import eu.kanade.tachiyomi.source.online.HttpSource
@@ -98,7 +97,7 @@ class PreMigrationController(bundle: Bundle? = null) :
         val listOfSources = adapter?.items?.filter {
             it.sourceEnabled
         }?.joinToString("/") { it.source.id.toString() }
-        prefs.migrationSources().set(listOfSources)
+        prefs.migrationSources().set(listOfSources!!)
 
         router.replaceTopController(
             MigrationListController.create(
@@ -136,7 +135,7 @@ class PreMigrationController(bundle: Bundle? = null) :
      */
     private fun getEnabledSources(): List<HttpSource> {
         val languages = prefs.enabledLanguages().get()
-        val sourcesSaved = prefs.migrationSources().getOrDefault().split("/")
+        val sourcesSaved = prefs.migrationSources().get().split("/")
         var sources = sourceManager.getVisibleCatalogueSources()
             .filterIsInstance<HttpSource>()
             .filter { it.lang in languages }
@@ -154,7 +153,7 @@ class PreMigrationController(bundle: Bundle? = null) :
     }
 
     fun isEnabled(id: String): Boolean {
-        val sourcesSaved = prefs.migrationSources().getOrDefault()
+        val sourcesSaved = prefs.migrationSources().get()
         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/migration/manga/process/MigrationListController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationListController.kt
index c3a06ed76..012c069cc 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationListController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationListController.kt
@@ -128,7 +128,7 @@ class MigrationListController(bundle: Bundle? = null) :
         val useSourceWithMost = preferences.useSourceWithMost().getOrDefault()
         val useSmartSearch = preferences.smartMigration().getOrDefault()
 
-        val sources = preferences.migrationSources().getOrDefault().split("/").mapNotNull {
+        val sources = preferences.migrationSources().get().split("/").mapNotNull {
             val value = it.toLongOrNull() ?: return
             sourceManager.get(value) as? CatalogueSource
         }
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 5eecaa14e..7dafa7d6f 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
@@ -213,7 +213,7 @@ class SettingsLibraryController : SettingsController() {
                 }
             }
             if (preferences.skipPreMigration().get() || preferences.migrationSources()
-                .getOrDefault().isNotEmpty()
+                .get().isNotEmpty()
             ) {
                 switchPreference {
                     key = Keys.skipPreMigration