From 5886cb7406bf59b75d83faa91abc04c592d4c42e Mon Sep 17 00:00:00 2001
From: Jobobby04 <jobobby04@users.noreply.github.com>
Date: Sun, 17 May 2020 21:39:11 -0400
Subject: [PATCH] Fix all in one manga page being blank after clicking a button

---
 .../ui/manga/MangaAllInOneController.kt       |  2 +-
 .../ui/manga/MangaAllInOnePresenter.kt        | 34 +++++++++++++------
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaAllInOneController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaAllInOneController.kt
index b2ca13281..c6d35b277 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaAllInOneController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaAllInOneController.kt
@@ -467,7 +467,7 @@ class MangaAllInOneController :
         if (manga.initialized) {
             // Update view.
             setMangaInfo(manga, source, chapters)
-            if (fromSource && !presenter.hasRequested) {
+            if (fromSource && !presenter.hasRequested && chapters.isNullOrEmpty()) {
                 fetchMangaFromSource(fetchManga = false)
             }
         } else {
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaAllInOnePresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaAllInOnePresenter.kt
index e09455c19..8e08eeebd 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaAllInOnePresenter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaAllInOnePresenter.kt
@@ -134,7 +134,9 @@ class MangaAllInOnePresenter(
         scope.launch(Dispatchers.IO) {
             updateChapters()
             withContext(Dispatchers.Main) {
-                controller.onNextManga(manga, source, chapters)
+                Observable.just(manga)
+                    .observeOn(AndroidSchedulers.mainThread())
+                    .subscribeLatestCache({ view, manga -> view.onNextManga(manga, source, chapters) })
             }
         }
     }
@@ -149,23 +151,33 @@ class MangaAllInOnePresenter(
 
             withContext(Dispatchers.Main) {
                 // set chapter count
-                controller.setChapterCount(chapterCount)
+                Observable.just(chapterCount)
+                    .observeOn(AndroidSchedulers.mainThread())
+                    .subscribeLatestCache({ view, chapterCount -> view.setChapterCount(chapterCount) })
                 // update last update date
-                controller.setLastUpdateDate(lastUpdateDate)
+                Observable.just(lastUpdateDate)
+                    .observeOn(AndroidSchedulers.mainThread())
+                    .subscribeLatestCache({ view, lastUpdateDate -> view.setLastUpdateDate(lastUpdateDate) })
             }
         }
     }
 
-    private fun updateManga() {
+    private fun updateManga(updateInfo: Boolean = true) {
         scope.launch(Dispatchers.IO) {
-            val manga = db.getManga(manga.url, manga.source).executeAsBlocking()!!
-            updateChapters()
-            updateChapterInfo()
+            var manga2: Manga? = null
+            if (updateInfo) {
+                manga2 = db.getManga(manga.url, manga.source).executeAsBlocking()!!
+                updateChapters()
+                updateChapterInfo()
+            }
 
             withContext(Dispatchers.Main) {
-                controller.onNextManga(
-                    manga, source, chapters
-                )
+                if (manga2 != null) {
+                    Observable.just(manga2)
+                } else {
+                    Observable.just(manga)
+                }.observeOn(AndroidSchedulers.mainThread())
+                    .subscribeLatestCache({ view, manga -> view.onNextManga(manga, source, chapters) })
             }
         }
     }
@@ -210,7 +222,7 @@ class MangaAllInOnePresenter(
                     updateChapterInfo()
                 }
                 withContext(Dispatchers.Main) {
-                    controller.onNextManga(this@MangaAllInOnePresenter.manga, this@MangaAllInOnePresenter.source, this@MangaAllInOnePresenter.chapters)
+                    updateManga(updateInfo = false)
                     controller.onFetchMangaDone()
                 }
             } catch (e: java.lang.Exception) {