From d8407e20da30d653cb39e3cd70c81554809363fd Mon Sep 17 00:00:00 2001
From: arkon <eugcheung94@gmail.com>
Date: Sat, 23 Oct 2021 17:30:56 -0400
Subject: [PATCH] Sync view state with controller on activity resume

Hopefully fixes some weird states where the bottom nav shows up when it shouldn't.

(cherry picked from commit 593091a5e304eff771604ff2a91cdc0c886c4d68)
---
 .../java/eu/kanade/tachiyomi/ui/main/MainActivity.kt     | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
index a16ba0085..7d7442f4f 100755
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
@@ -244,7 +244,7 @@ class MainActivity : BaseViewBindingActivity<MainActivityBinding>() {
             }
         )
 
-        syncActivityViewWithController(router.backstack.lastOrNull()?.controller)
+        syncActivityViewWithController()
 
         if (savedInstanceState == null) {
             // Reset Incognito Mode on relaunch
@@ -376,6 +376,7 @@ class MainActivity : BaseViewBindingActivity<MainActivityBinding>() {
 
     override fun onResume() {
         super.onResume()
+        syncActivityViewWithController()
 
         checkForUpdates()
     }
@@ -544,7 +545,11 @@ class MainActivity : BaseViewBindingActivity<MainActivityBinding>() {
         }
     }
 
-    private fun syncActivityViewWithController(to: Controller?, from: Controller? = null, isPush: Boolean = true) {
+    private fun syncActivityViewWithController(
+        to: Controller? = router.backstack.lastOrNull()?.controller,
+        from: Controller? = null,
+        isPush: Boolean = true,
+    ) {
         if (from is DialogController || to is DialogController) {
             return
         }