X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Factivity%2FMainActivity.java;h=bbc8fa79428b42c9d29d2fbe3c1255d57eacf09a;hb=2f00dcf94bcfa56717cf8422f0ceae657389ca46;hp=e7e534fedefc3c7c11d287442975440f64376339;hpb=af2045c2f1fba8c7014d3965613046cc6c54ed52;p=mobile-ledger.git

diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/activity/MainActivity.java b/app/src/main/java/net/ktnx/mobileledger/ui/activity/MainActivity.java
index e7e534fe..bbc8fa79 100644
--- a/app/src/main/java/net/ktnx/mobileledger/ui/activity/MainActivity.java
+++ b/app/src/main/java/net/ktnx/mobileledger/ui/activity/MainActivity.java
@@ -342,6 +342,14 @@ public class MainActivity extends ProfileThemedActivity {
         sm.setDynamicShortcuts(shortcuts);
     }
     private void onProfileListChanged(List<MobileLedgerProfile> newList) {
+        if (newList == null) {
+            // profiles not yet loaded from DB
+            findViewById(R.id.loading_layout).setVisibility(View.VISIBLE);
+            findViewById(R.id.no_profiles_layout).setVisibility(View.GONE);
+            findViewById(R.id.pager_layout).setVisibility(View.GONE);
+            return;
+        }
+
         if (newList.isEmpty()) {
             findViewById(R.id.no_profiles_layout).setVisibility(View.VISIBLE);
             findViewById(R.id.pager_layout).setVisibility(View.GONE);
@@ -544,7 +552,9 @@ public class MainActivity extends ProfileThemedActivity {
         }
     }
     public void updateLastUpdateTextFromDB() {
-        long last_update = (profile != null) ? profile.getLongOption(MLDB.OPT_LAST_SCRAPE, 0L) : 0;
+        if (profile == null) return;
+
+        long last_update = profile.getLongOption(MLDB.OPT_LAST_SCRAPE, 0L);
 
         debug("transactions", String.format(Locale.ENGLISH, "Last update = %d", last_update));
         if (last_update == 0) {