X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Factivity%2FProfileThemedActivity.java;h=745e888a03f40b3fa5bdd319c1c160ed313793c0;hb=c392329991fffc8aee0a7e888f68784976e473de;hp=821d186d88a2382f405dd6209bf2f61ee8e3be19;hpb=aab4c009a95d371354f14685152b275812d60a15;p=mobile-ledger.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 821d186d..745e888a 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
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2019 Damyan Ivanov.
+ * Copyright © 2020 Damyan Ivanov.
  * This file is part of MoLe.
  * MoLe is free software: you can distribute it and/or modify it
  * under the term of the GNU General Public License as published by
@@ -20,20 +20,18 @@ 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 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);
+        final int themeHue = (mProfile == null) ? -1 : mProfile.getThemeHue();
+        Colors.setupTheme(this, themeHue);
     }
     @Override
     protected void onStart() {
@@ -42,25 +40,15 @@ public class ProfileThemedActivity extends CrashReportingActivity {
     }
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         initProfile();
-        super.onCreate(savedInstanceState);
-        Data.profile.observe(this, mobileLedgerProfile -> {
-            mProfile = mobileLedgerProfile;
+        setupProfileColors();
+        Data.observeProfile(this, profile -> {
+            mProfile = profile;
             setupProfileColors();
         });
+
+        super.onCreate(savedInstanceState);
     }
     protected void initProfile() {
-        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);
-                }
-            });
-        }
+        mProfile = Data.initProfile();
     }
 }