Data: migrate profile to a private variable, provide methods for accessing it

[mobile-ledger.git] / app / src / main / java / net / ktnx / mobileledger / ui / activity / ProfileThemedActivity.java

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 77a9272bf9880494b52987c65db457c08bb22711..d33608a6ea63e8be6c31c861976dbc2efb3c072b 100644 (file)
--- a/app/src/main/java/net/ktnx/mobileledger/ui/activity/ProfileThemedActivity.java
+++ b/app/src/main/java/net/ktnx/mobileledger/ui/activity/ProfileThemedActivity.java
@@ -25,7 +25,6 @@ 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.MLDB;
 
 @SuppressLint("Registered")
 public class ProfileThemedActivity extends CrashReportingActivity {
@@ -40,25 +39,10 @@ public class ProfileThemedActivity extends CrashReportingActivity {
     }
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         initProfile();
-        super.onCreate(savedInstanceState);
-
         setupProfileColors();
-
-        Data.profile.observe(this, mobileLedgerProfile -> {
-            mProfile = mobileLedgerProfile;
-            setupProfileColors();
-        });
+        super.onCreate(savedInstanceState);
     }
     protected void initProfile() {
-        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;
-        }
+        mProfile = Data.initProfile();
     }
 }