X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Factivity%2FProfileThemedActivity.java;h=821d186d88a2382f405dd6209bf2f61ee8e3be19;hb=aab4c009a95d371354f14685152b275812d60a15;hp=fb6db900d7031f0fefe82c40b4997d44ed533dbb;hpb=99c3bfb3451ebb1fc55d728d8d1741849cf789db;p=mobile-ledger-staging.git

diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/activity/ProfileThemedActivity.java b/app/src/main/java/net/ktnx/mobileledger/ui/activity/ProfileThemedActivity.java
index fb6db900..821d186d 100644
--- a/app/src/main/java/net/ktnx/mobileledger/ui/activity/ProfileThemedActivity.java
+++ b/app/src/main/java/net/ktnx/mobileledger/ui/activity/ProfileThemedActivity.java
@@ -23,11 +23,14 @@ import android.os.Bundle;
 import net.ktnx.mobileledger.model.Data;
 import net.ktnx.mobileledger.model.MobileLedgerProfile;
 import net.ktnx.mobileledger.utils.Colors;
+import net.ktnx.mobileledger.utils.GetOptCallback;
+import net.ktnx.mobileledger.utils.MLDB;
 
 import androidx.annotation.Nullable;
 
 @SuppressLint("Registered")
 public class ProfileThemedActivity extends CrashReportingActivity {
+    static final int waitSlice = 200;
     protected MobileLedgerProfile mProfile;
     protected void setupProfileColors() {
         Colors.setupTheme(this, mProfile);
@@ -40,9 +43,24 @@ public class ProfileThemedActivity extends CrashReportingActivity {
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         initProfile();
         super.onCreate(savedInstanceState);
-        setupProfileColors();
+        Data.profile.observe(this, mobileLedgerProfile -> {
+            mProfile = mobileLedgerProfile;
+            setupProfileColors();
+        });
     }
     protected void initProfile() {
-        mProfile = Data.profile.get();
+        mProfile = Data.profile.getValue();
+        if (mProfile == null) {
+            MLDB.getOption(MLDB.OPT_PROFILE_UUID, null, new GetOptCallback() {
+                @Override
+                protected void onResult(String profileUUID) {
+                    MobileLedgerProfile startupProfile;
+
+
+                    startupProfile = Data.getProfile(profileUUID);
+                    Data.setCurrentProfile(startupProfile);
+                }
+            });
+        }
     }
 }