From 30f21c035d28d03d4e58df8488152d357e919ca3 Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Fri, 16 Dec 2022 10:46:13 +0100
Subject: [PATCH] Fix a crash when app takes long to load

---
 .../app/fedilab/android/BaseMainActivity.java | 30 ++++++++++++-------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/app/fedilab/android/BaseMainActivity.java b/app/src/main/java/app/fedilab/android/BaseMainActivity.java
index 09fdb201b..681cf173b 100644
--- a/app/src/main/java/app/fedilab/android/BaseMainActivity.java
+++ b/app/src/main/java/app/fedilab/android/BaseMainActivity.java
@@ -322,7 +322,7 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt
         binding.compose.setOnClickListener(v -> startActivity(new Intent(this, ComposeActivity.class)));
         headerMenuOpen = false;
 
-
+        PushHelper.startStreaming(BaseMainActivity.this);
 
         // Passing each menu ID as a set of Ids because each
         // menu should be considered as top level destinations.
@@ -564,21 +564,15 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt
         //Update account details
         new Thread(() -> {
             try {
-                currentAccount = new Account(BaseMainActivity.this).getConnectedAccount();
-                //Delete cache older than 7 days
-                new StatusCache(BaseMainActivity.this).deleteForAllAccountAfter7Days();
-                MutedAccounts mutedAccounts = new MutedAccounts(BaseMainActivity.this).getMutedAccount(currentAccount);
-                if (mutedAccounts != null && mutedAccounts.accounts != null) {
-                    filteredAccounts = mutedAccounts.accounts;
+                if (currentToken == null) {
+                    currentToken = sharedpreferences.getString(Helper.PREF_USER_TOKEN, null);
                 }
+                currentAccount = new Account(BaseMainActivity.this).getConnectedAccount();
             } catch (DBException e) {
                 e.printStackTrace();
             }
             Handler mainHandler = new Handler(Looper.getMainLooper());
             Runnable myRunnable = () -> {
-                if (currentToken == null) {
-                    currentToken = sharedpreferences.getString(Helper.PREF_USER_TOKEN, null);
-                }
                 if (currentAccount == null) {
                     //It is not, the user is redirected to the login page
                     Intent myIntent = new Intent(BaseMainActivity.this, LoginActivity.class);
@@ -747,7 +741,7 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt
             return false;
         });
 
-        PushHelper.startStreaming(BaseMainActivity.this);
+
 
         binding.toolbarSearch.setOnSearchClickListener(v -> binding.tabLayout.setVisibility(View.VISIBLE));
         //For receiving  data from other activities
@@ -764,6 +758,20 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt
                 }
             }).start();
         }
+        //Fetch some db values to initialize data
+        new Thread(() -> {
+            try {
+                MutedAccounts mutedAccounts = new MutedAccounts(BaseMainActivity.this).getMutedAccount(currentAccount);
+                if (mutedAccounts != null && mutedAccounts.accounts != null) {
+                    filteredAccounts = mutedAccounts.accounts;
+                }
+                //Delete cache older than 7 days
+                new StatusCache(BaseMainActivity.this).deleteForAllAccountAfter7Days();
+            } catch (DBException e) {
+                e.printStackTrace();
+            }
+        }).start();
+
         //Fetch recent used accounts
         new Thread(() -> {
             try {