From 7cf26363c8eff83517ec97c5027d464fb36ffdb4 Mon Sep 17 00:00:00 2001
From: arkon <eugcheung94@gmail.com>
Date: Sun, 24 May 2020 18:10:57 -0400
Subject: [PATCH] Convert last used source preference to flow

---
 .../data/preference/PreferencesHelper.kt      |  2 +-
 .../ui/browse/source/SourcePresenter.kt       | 35 +++++++++++++------
 2 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
index de566015a2..ab304c8be2 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
@@ -137,7 +137,7 @@ class PreferencesHelper(val context: Context) {
 
     fun autoUpdateTrack() = prefs.getBoolean(Keys.autoUpdateTrack, true)
 
-    fun lastUsedCatalogueSource() = rxPrefs.getLong(Keys.lastUsedCatalogueSource, -1)
+    fun lastUsedCatalogueSource() = flowPrefs.getLong(Keys.lastUsedCatalogueSource, -1)
 
     fun lastUsedCategory() = flowPrefs.getInt(Keys.lastUsedCategory, 0)
 
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcePresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcePresenter.kt
index 1b342d4f9a..acad3dbe34 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcePresenter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcePresenter.kt
@@ -7,10 +7,18 @@ import eu.kanade.tachiyomi.source.LocalSource
 import eu.kanade.tachiyomi.source.SourceManager
 import eu.kanade.tachiyomi.ui.base.presenter.BasePresenter
 import java.util.TreeMap
-import java.util.concurrent.TimeUnit
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.drop
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.flow.onStart
 import rx.Observable
 import rx.Subscription
-import rx.android.schedulers.AndroidSchedulers
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 
@@ -26,6 +34,8 @@ class SourcePresenter(
     private val preferences: PreferencesHelper = Injekt.get()
 ) : BasePresenter<SourceController>() {
 
+    private val scope = CoroutineScope(Job() + Dispatchers.Main)
+
     var sources = getEnabledSources()
 
     /**
@@ -79,16 +89,21 @@ class SourcePresenter(
     }
 
     private fun loadLastUsedSource() {
-        val sharedObs = preferences.lastUsedCatalogueSource().asObservable().share()
+        // Immediate initial load
+        preferences.lastUsedCatalogueSource().get().let { updateLastUsedSource(it) }
 
-        // Emit the first item immediately but delay subsequent emissions by 500ms.
-        Observable.merge(
-            sharedObs.take(1),
-            sharedObs.skip(1).delay(500, TimeUnit.MILLISECONDS, AndroidSchedulers.mainThread())
-        )
+        // Subsequent updates
+        preferences.lastUsedCatalogueSource().asFlow()
+            .drop(1)
+            .onStart { delay(500) }
             .distinctUntilChanged()
-            .map { item -> (sourceManager.get(item) as? CatalogueSource)?.let { SourceItem(it) } }
-            .subscribeLatestCache(SourceController::setLastUsedSource)
+            .onEach { updateLastUsedSource(it) }
+            .launchIn(scope)
+    }
+
+    private fun updateLastUsedSource(sourceId: Long) {
+        val source = (sourceManager.get(sourceId) as? CatalogueSource)?.let { SourceItem(it) }
+        source?.let { view?.setLastUsedSource(it) }
     }
 
     fun updateSources() {