From dbadec2c6736e12e861e082dd92cb5a9cc18bb50 Mon Sep 17 00:00:00 2001
From: Jobobby04 <jobobby04@users.noreply.github.com>
Date: Tue, 26 Jan 2021 23:36:40 -0500
Subject: [PATCH] Revert "Fix reader bug with new suspend getFlatMetadata"

This reverts commit 96031869271b3c5ed43d3c7d227dcdcd584d9618.
---
 .../eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt  | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt
index 4925acee8..eb43ccb0c 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt
@@ -247,12 +247,15 @@ class ReaderPresenter(
             .first()
             .observeOn(AndroidSchedulers.mainThread())
             // SY -->
-            .map { manga ->
+            .flatMap { manga ->
                 val source = sourceManager.get(manga.source)?.getMainSource()
                 if (manga.initialized && source is MetadataSource<*, *>) {
-                    val flatMeta = db.getFlatMetadataForManga(mangaId).executeAsBlocking()
-                    manga to flatMeta?.raise(source.metaClass)
-                } else manga to null
+                    db.getFlatMetadataForManga(mangaId).asRxSingle().map {
+                        manga to it?.raise(source.metaClass)
+                    }.toObservable()
+                } else {
+                    Observable.just(manga to null)
+                }
             }
             .doOnNext { init(it.first, initialChapterId, it.second) }
             // SY <--