X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Factivity%2FProfileThemedActivity.java;h=f4d482a5b7a93b356684115fb3f0c0c822d0c26d;hb=5e1dd65e12ff7a6c7dc3fece1238459dd0fc3efe;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..f4d482a5 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
@@ -20,11 +20,12 @@ package net.ktnx.mobileledger.ui.activity;
 import android.annotation.SuppressLint;
 import android.os.Bundle;
 
+import androidx.annotation.Nullable;
+
 import net.ktnx.mobileledger.model.Data;
 import net.ktnx.mobileledger.model.MobileLedgerProfile;
 import net.ktnx.mobileledger.utils.Colors;
-
-import androidx.annotation.Nullable;
+import net.ktnx.mobileledger.utils.MLDB;
 
 @SuppressLint("Registered")
 public class ProfileThemedActivity extends CrashReportingActivity {
@@ -39,10 +40,19 @@ public class ProfileThemedActivity extends CrashReportingActivity {
     }
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         initProfile();
-        super.onCreate(savedInstanceState);
         setupProfileColors();
+        super.onCreate(savedInstanceState);
     }
     protected void initProfile() {
-        mProfile = Data.profile.get();
+        mProfile = Data.profile.getValue();
+        if (mProfile == null) {
+            String profileUUID = MLDB.getOption(MLDB.OPT_PROFILE_UUID, null);
+            MobileLedgerProfile startupProfile;
+
+
+            startupProfile = Data.getProfile(profileUUID);
+            Data.setCurrentProfile(startupProfile);
+            mProfile = startupProfile;
+        }
     }
 }