messenger-android

commit 06e6cbd74022b39b1fcacc308307363b9e4f14c7
parent f809d06b3e72720af5d2b9973968a80d43f9b8cb
Author: t3sserakt <t3ss@posteo.de>
Date:   Wed,  8 Apr 2026 16:41:01 +0200

fixed issues on first run chat overview

Diffstat:
M
GNUnetMessenger/app/src/main/java/org/gnunet/gnunetmessenger/ui/account/AccountListFragment.kt
 | 
20
+++++++++++++-------

1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/GNUnetMessenger/app/src/main/java/org/gnunet/gnunetmessenger/ui/account/AccountListFragment.kt b/GNUnetMessenger/app/src/main/java/org/gnunet/gnunetmessenger/ui/account/AccountListFragment.kt
@@ -91,17 +91,23 @@ class AccountListFragment : Fragment() {
                     gnunetChat.connect(handle, selectedAccount)
                     selectedAccount.key = gnunetChat.getProfileKey(handle)
                     activity.setCurrentAccount(selectedAccount)
-                    activity.loadChatsAndWait()
-
-                    val action =
-                        AccountListFragmentDirections.actionAccountListFragmentToAccountOverviewFragment(
-                            account = selectedAccount
-                        )
-                    findNavController().navigate(action)
                 } catch (t: Throwable) {
                     Log.e(TAG, "Connecting account failed", t)
                     showError(getString(R.string.account_connect_failed))
+                    return@launch
+                }
+
+                try {
+                    activity.loadChatsAndWait()
+                } catch (t: Throwable) {
+                    Log.w(TAG, "Initial chat load failed, LOGIN will retry", t)
                 }
+
+                val action =
+                    AccountListFragmentDirections.actionAccountListFragmentToAccountOverviewFragment(
+                        account = selectedAccount
+                    )
+                findNavController().navigate(action)
             }
         }