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=2c9724a9672a38e1f460f0f1cf74c8245a16d28d;hp=7386de0c5aca0482cd233fdaa72e0bf71a5bde2e;hb=45a7596af05e4a9469081a21c054774fcea93f8a;hpb=3b365016042215dd73cb4600840aa8199b8322b9 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..2c9724a9 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 @@ -41,6 +41,7 @@ import android.widget.ProgressBar; import android.widget.TextView; import net.ktnx.mobileledger.R; +import net.ktnx.mobileledger.async.RefreshDescriptionsTask; import net.ktnx.mobileledger.async.RetrieveTransactionsTask; import net.ktnx.mobileledger.model.Data; import net.ktnx.mobileledger.model.LedgerAccount; @@ -54,7 +55,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 +184,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 +215,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"); @@ -384,6 +384,8 @@ public class MainActivity extends AppCompatActivity { public void onRetrieveDone(boolean success) { progressLayout.setVisibility(View.GONE); updateLastUpdateTextFromDB(); + + new RefreshDescriptionsTask().execute(); } public void onRetrieveStart() { progressBar.setIndeterminate(true);