X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2FTransactionListActivity.java;h=39323f7bf6b18a930660b1509404ac8fc76571a9;hp=fcaf9d5f9bc48ee3d64f616c820ee5362b27aa21;hb=1857937cbdb55199cb9391a7b42766d6dcba80c8;hpb=be608a16168cd370022a42463e51b4ce202c8a1e

diff --git a/app/src/main/java/net/ktnx/mobileledger/TransactionListActivity.java b/app/src/main/java/net/ktnx/mobileledger/TransactionListActivity.java
index fcaf9d5f..39323f7b 100644
--- a/app/src/main/java/net/ktnx/mobileledger/TransactionListActivity.java
+++ b/app/src/main/java/net/ktnx/mobileledger/TransactionListActivity.java
@@ -35,7 +35,7 @@ import android.widget.TextView;
 import net.ktnx.mobileledger.async.RetrieveTransactionsTask;
 import net.ktnx.mobileledger.model.LedgerTransaction;
 import net.ktnx.mobileledger.ui.transaction_list.TransactionListViewModel;
-import net.ktnx.mobileledger.utils.MobileLedgerDatabase;
+import net.ktnx.mobileledger.utils.MLDB;
 
 import java.lang.ref.WeakReference;
 import java.time.ZoneId;
@@ -47,7 +47,7 @@ public class TransactionListActivity extends AppCompatActivity {
     private SwipeRefreshLayout swiper;
     private RecyclerView root;
     private ProgressBar progressBar;
-    private TransactionListViewModel model;
+    public TransactionListViewModel model;
     private TextView tvLastUpdate;
     private TransactionListAdapter modelAdapter;
     @Override
@@ -69,8 +69,8 @@ public class TransactionListActivity extends AppCompatActivity {
             throw new RuntimeException("Can't get hold on the transaction list progress bar");
         tvLastUpdate = findViewById(R.id.transactions_last_update);
         {
-            long last_update = (new MobileLedgerDatabase(this))
-                    .get_option_value("transaction_list_last_update", 0);
+            long last_update = MLDB.get_option_value(this, "transaction_list_last_update", 0L);
+            Log.d("transactions", String.format("Last update = %d", last_update));
             if (last_update == 0) tvLastUpdate.setText("never");
             else {
                 Date date = new Date(last_update);
@@ -84,14 +84,14 @@ public class TransactionListActivity extends AppCompatActivity {
             }
         }
         model = ViewModelProviders.of(this).get(TransactionListViewModel.class);
-        List<LedgerTransaction> transactions =
-                model.getTransactions(new MobileLedgerDatabase(this));
+        List<LedgerTransaction> transactions = model.getTransactions(getApplicationContext());
         modelAdapter = new TransactionListAdapter(transactions);
 
         RecyclerView root = findViewById(R.id.transaction_root);
         root.setAdapter(modelAdapter);
 
         LinearLayoutManager llm = new LinearLayoutManager(this);
+
         llm.setOrientation(LinearLayoutManager.VERTICAL);
         root.setLayoutManager(llm);
 
@@ -128,6 +128,8 @@ public class TransactionListActivity extends AppCompatActivity {
 
     public void onRetrieveStart() {
         progressBar.setIndeterminate(true);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) progressBar.setProgress(0, false);
+        else progressBar.setProgress(0);
         progressBar.setVisibility(View.VISIBLE);
     }
     public void onRetrieveProgress(RetrieveTransactionsTask.Progress progress) {
@@ -137,7 +139,6 @@ public class TransactionListActivity extends AppCompatActivity {
             progressBar.setIndeterminate(true);
         }
         else {
-            progressBar.setIndeterminate(false);
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
                 progressBar.setMin(0);
             }
@@ -146,6 +147,7 @@ public class TransactionListActivity extends AppCompatActivity {
                 progressBar.setProgress(progress.getProgress(), true);
             }
             else progressBar.setProgress(progress.getProgress());
+            progressBar.setIndeterminate(false);
         }
     }
 
@@ -153,9 +155,9 @@ public class TransactionListActivity extends AppCompatActivity {
         progressBar.setVisibility(View.GONE);
         swiper.setRefreshing(false);
         if (success) {
-            MobileLedgerDatabase dbh = new MobileLedgerDatabase(this);
             Date now = new Date();
-            dbh.set_option_value("transaction_list_last_update", now.getTime());
+            MLDB.set_option_value(getApplicationContext(), "transaction_list_last_update",
+                    now.getTime());
             updateLastUpdateText(now);
             modelAdapter.notifyDataSetChanged();
         }