From f8f59abdf11e2d6a6aca1e1649c42675f4745866 Mon Sep 17 00:00:00 2001
From: Vitor Pamplona <vitor@vitorpamplona.com>
Date: Fri, 25 Jul 2025 14:33:14 -0400
Subject: [PATCH] Small refactoring

---
 .../amethyst/ui/screen/AccountStateViewModel.kt  | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/AccountStateViewModel.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/AccountStateViewModel.kt
index 12b91d068..d47179114 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/AccountStateViewModel.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/AccountStateViewModel.kt
@@ -94,10 +94,18 @@ class AccountStateViewModel : ViewModel() {
         }
     }
 
-    private suspend fun tryLoginExistingAccount(route: Route? = null) =
-        withContext(Dispatchers.IO) {
-            LocalPreferences.loadCurrentAccountFromEncryptedStorage()
-        }?.let { startUI(it, route) } ?: run { requestLoginUI() }
+    private suspend fun tryLoginExistingAccount(route: Route? = null) {
+        val accountSettings =
+            withContext(Dispatchers.IO) {
+                LocalPreferences.loadCurrentAccountFromEncryptedStorage()
+            }
+
+        if (accountSettings != null) {
+            startUI(accountSettings, route)
+        } else {
+            requestLoginUI()
+        }
+    }
 
     private suspend fun requestLoginUI() {
         _accountContent.update { AccountState.LoggedOff }