From 16e7d266fee8a4d8c9c8f1ee159d01d97a6c42d3 Mon Sep 17 00:00:00 2001
From: tarsin <yuanqingxiang233@163.com>
Date: Sun, 19 Feb 2023 09:02:16 +0800
Subject: [PATCH] Resolve #842

---
 app/src/main/AndroidManifest.xml                    |  2 +-
 .../main/java/com/hippo/ehviewer/ui/MainActivity.kt | 13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4e6173154..6c28919c4 100755
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -36,7 +36,7 @@
         <activity
             android:name=".ui.login.LoginActivity"
             android:exported="false"
-            android:theme="@style/AppTheme"
+            android:launchMode="singleTask"
             android:windowSoftInputMode="adjustResize"/>
         <activity
             android:name=".ui.MainActivity"
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.kt b/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.kt
index 0a4e5d679..f7adebe25 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.kt
@@ -233,13 +233,7 @@ class MainActivity : EhActivity() {
         val navHostFragment =
             supportFragmentManager.findFragmentById(R.id.fragment_container) as NavHostFragment
         navController = navHostFragment.navController
-        if (EhUtils.needSignedIn()) {
-            registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
-                setNavGraph()
-            }.launch(Intent(this, LoginActivity::class.java))
-        } else {
-            setNavGraph()
-        }
+        if (!EhUtils.needSignedIn()) setNavGraph()
         binding.drawView.addDrawerListener(mDrawerOnBackPressedCallback)
         binding.navView.setupWithNavController(navController)
 
@@ -371,7 +365,12 @@ class MainActivity : EhActivity() {
         }
     }
 
+    private val loginLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { setNavGraph() }
+
     override fun onResume() {
+        if (EhUtils.needSignedIn()) {
+            loginLauncher.launch(Intent(this, LoginActivity::class.java))
+        }
         super.onResume()
         lifecycleScope.launch {
             delay(100)