X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Factivity%2FMainActivity.java;h=931f783582bd6b95ba1ab62965ab0640033b5dff;hp=7386de0c5aca0482cd233fdaa72e0bf71a5bde2e;hb=94aa0aa57db3dce40f31fc0321c718998d9cb48b;hpb=0700200b6627f97ac37083fc2c7131bcaa39b635 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 7386de0c..931f7835 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 @@ -54,7 +54,6 @@ import java.lang.ref.WeakReference; import java.time.ZoneId; import java.time.format.DateTimeFormatter; import java.util.Date; -import java.util.List; import java.util.Observable; import java.util.Observer; @@ -184,14 +183,14 @@ public class MainActivity extends AppCompatActivity { }); } private void setupProfile() { - List profiles = MobileLedgerProfile.loadAllFromDB(); + Data.profiles.setList(MobileLedgerProfile.loadAllFromDB()); MobileLedgerProfile profile = null; String profileUUID = MLDB.get_option_value(MLDB.OPT_PROFILE_UUID, null); if (profileUUID == null) { - if (profiles.isEmpty()) { - profiles = MobileLedgerProfile.createInitialProfileList(); - profile = profiles.get(0); + if (Data.profiles.isEmpty()) { + Data.profiles.setList(MobileLedgerProfile.createInitialProfileList()); + profile = Data.profiles.get(0); SharedPreferences backend = getSharedPreferences("backend", MODE_PRIVATE); Log.d("profiles", "Migrating from preferences to profiles"); @@ -215,7 +214,7 @@ public class MainActivity extends AppCompatActivity { profile = MobileLedgerProfile.loadUUIDFromDB(profileUUID); } - if (profile == null) profile = profiles.get(0); + if (profile == null) profile = Data.profiles.get(0); if (profile == null) throw new AssertionError("profile must have a value");