more straight-forward updating of the text representing the transaction list update...

[mobile-ledger.git] / app / src / main / java / net / ktnx / mobileledger / TransactionListActivity.java

diff --git a/app/src/main/java/net/ktnx/mobileledger/TransactionListActivity.java b/app/src/main/java/net/ktnx/mobileledger/TransactionListActivity.java
index 497a1d2eba28259ad3b691588b5ac23b2f7e5203..5577d501f05b3d9da7de76ba6d40b0cc3715a16d 100644 (file)
--- 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
@@ -68,30 +68,16 @@ public class TransactionListActivity extends AppCompatActivity {
         if (progressBar == null)
             throw new RuntimeException("Can't get hold on the transaction list progress bar");
         tvLastUpdate = findViewById(R.id.transactions_last_update);
-        {
-            long last_update = dbh.get_option_value("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);
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                    tvLastUpdate.setText(date.toInstant().atZone(ZoneId.systemDefault())
-                            .format(DateTimeFormatter.ISO_LOCAL_DATE_TIME));
-                }
-                else {
-                    tvLastUpdate.setText(date.toLocaleString());
-                }
-            }
-        }
+        updateLastUpdateText();
         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 +114,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 +125,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,26 +133,33 @@ public class TransactionListActivity extends AppCompatActivity {
                 progressBar.setProgress(progress.getProgress(), true);
             }
             else progressBar.setProgress(progress.getProgress());
+            progressBar.setIndeterminate(false);
         }
     }
 
     public void onRetrieveDone(boolean success) {
         progressBar.setVisibility(View.GONE);
         swiper.setRefreshing(false);
+        updateLastUpdateText();
         if (success) {
-            MobileLedgerDatabase dbh = new MobileLedgerDatabase(this);
-            Date now = new Date();
-            dbh.set_option_value("transaction_list_last_update", now.getTime());
-            updateLastUpdateText(now);
             modelAdapter.notifyDataSetChanged();
         }
     }
-    private void updateLastUpdateText(Date now) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            tvLastUpdate.setText(now.toInstant().atZone(ZoneId.systemDefault()).toString());
-        }
-        else {
-            tvLastUpdate.setText(now.toLocaleString());
+    private void updateLastUpdateText() {
+        {
+            long last_update = MLDB.get_option_value(this, MLDB.OPT_TRANSACTION_LIST_STAMP, 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);
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                    tvLastUpdate.setText(date.toInstant().atZone(ZoneId.systemDefault())
+                            .format(DateTimeFormatter.ISO_LOCAL_DATE_TIME));
+                }
+                else {
+                    tvLastUpdate.setText(date.toLocaleString());
+                }
+            }
         }
     }
 }