X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Factivity%2FMainActivity.java;h=927645050059c5df831d23b874abbe3221c5d4f2;hb=0e8c672647208838cb3a35bfdab22747c52a88b7;hp=7df18278515ab2d1c548cb1ee5288343d2c210f1;hpb=c8bd976d1d7f03e20db21c3056ac33c095c0057e;p=mobile-ledger.git

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 7df18278..92764505 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
@@ -53,6 +53,7 @@ import net.ktnx.mobileledger.R;
 import net.ktnx.mobileledger.async.RetrieveTransactionsTask;
 import net.ktnx.mobileledger.databinding.ActivityMainBinding;
 import net.ktnx.mobileledger.db.DB;
+import net.ktnx.mobileledger.db.Option;
 import net.ktnx.mobileledger.db.Profile;
 import net.ktnx.mobileledger.model.Data;
 import net.ktnx.mobileledger.ui.FabManager;
@@ -65,7 +66,6 @@ import net.ktnx.mobileledger.ui.templates.TemplatesActivity;
 import net.ktnx.mobileledger.ui.transaction_list.TransactionListFragment;
 import net.ktnx.mobileledger.utils.Colors;
 import net.ktnx.mobileledger.utils.Logger;
-import net.ktnx.mobileledger.utils.MLDB;
 
 import org.jetbrains.annotations.NotNull;
 
@@ -178,6 +178,7 @@ public class MainActivity extends ProfileThemedActivity implements FabManager.Fa
         markDrawerItemCurrent(R.id.nav_account_summary);
 
         b.mainPager.setAdapter(mSectionsPagerAdapter);
+        b.mainPager.setOffscreenPageLimit(1);
 
         if (pageChangeCallback == null) {
             pageChangeCallback = new ViewPager2.OnPageChangeCallback() {
@@ -543,7 +544,7 @@ public class MainActivity extends ProfileThemedActivity implements FabManager.Fa
 
         DB.get()
           .getOptionDAO()
-          .load(profile.getId(), MLDB.OPT_LAST_SCRAPE)
+          .load(profile.getId(), Option.OPT_LAST_SCRAPE)
           .observe(this, opt -> {
               long lastUpdate = 0;
               if (opt != null) {
@@ -615,14 +616,16 @@ public class MainActivity extends ProfileThemedActivity implements FabManager.Fa
             b.transactionProgressLayout.setVisibility(View.GONE);
         }
     }
-    public void onRetrieveProgress(RetrieveTransactionsTask.Progress progress) {
-        if (progress.getState() == RetrieveTransactionsTask.ProgressState.FINISHED) {
+    public void onRetrieveProgress(@Nullable RetrieveTransactionsTask.Progress progress) {
+        if (progress == null ||
+            progress.getState() == RetrieveTransactionsTask.ProgressState.FINISHED)
+        {
             Logger.debug("progress", "Done");
             b.transactionProgressLayout.setVisibility(View.GONE);
 
             mainModel.transactionRetrievalDone();
 
-            String error = progress.getError();
+            String error = (progress == null) ? null : progress.getError();
             if (error != null) {
                 if (error.equals(RetrieveTransactionsTask.Result.ERR_JSON_PARSER_ERROR))
                     error = getResources().getString(R.string.err_json_parser_error);