From 9d84481770467a094bfea9dbcde8a1fdc1b3b4f7 Mon Sep 17 00:00:00 2001
From: Jobobby04 <jobobby04@users.noreply.github.com>
Date: Sat, 29 Oct 2022 18:03:25 -0400
Subject: [PATCH] Cherry pick fixes

---
 .../kanade/tachiyomi/ui/browse/source/SourcesPresenter.kt   | 6 ++----
 .../java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt    | 1 -
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcesPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcesPresenter.kt
index 2d2bb60cb..cbbf9399c 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcesPresenter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcesPresenter.kt
@@ -19,10 +19,9 @@ import eu.kanade.tachiyomi.util.system.logcat
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.channels.Channel
+import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.catch
-import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.debounce
 import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.launchIn
@@ -60,7 +59,7 @@ class SourcesPresenter(
     fun onCreate() {
         // SY -->
         combine(
-            getEnabledSources.subscribe(), // Avoid crashes due to LazyColumn rendering
+            getEnabledSources.subscribe().stateIn(presenterScope, SharingStarted.Eagerly, emptyList()), // Avoid crashes due to LazyColumn rendering
             getSourceCategories.subscribe(),
             getShowLatest.subscribe(controllerMode),
             flowOf(controllerMode == SourcesController.Mode.CATALOGUE),
@@ -71,7 +70,6 @@ class SourcesPresenter(
                 _events.send(Event.FailedFetchingSources)
             }
             .flowOn(Dispatchers.IO)
-            .stateIn(presenterScope)
             .launchIn(presenterScope)
         // SY <--
     }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
index a208b08a2..c459c1879 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
@@ -57,7 +57,6 @@ import eu.kanade.tachiyomi.data.notification.Notifications
 import eu.kanade.tachiyomi.databinding.ReaderActivityBinding
 import eu.kanade.tachiyomi.source.SourceManager
 import eu.kanade.tachiyomi.source.model.Page
-import eu.kanade.tachiyomi.source.online.HttpSource
 import eu.kanade.tachiyomi.ui.base.activity.BaseRxActivity
 import eu.kanade.tachiyomi.ui.main.MainActivity
 import eu.kanade.tachiyomi.ui.manga.MangaController