transaction loading progress tweaks

[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 fcaf9d5f9bc48ee3d64f616c820ee5362b27aa21..1073909dc356babd0d00625018b0681a407f5722 100644 (file)
--- a/app/src/main/java/net/ktnx/mobileledger/TransactionListActivity.java
+++ b/app/src/main/java/net/ktnx/mobileledger/TransactionListActivity.java
@@ -60,6 +60,8 @@ public class TransactionListActivity extends AppCompatActivity {
 
         setupActionBar();
 
+        MobileLedgerDatabase dbh = new MobileLedgerDatabase(this);
+
         swiper = findViewById(R.id.transaction_swipe);
         if (swiper == null) throw new RuntimeException("Can't get hold on the swipe layout");
         root = findViewById(R.id.transaction_root);
@@ -69,8 +71,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 = 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);
@@ -84,14 +86,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(dbh);
         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 +130,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 +141,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 +149,7 @@ public class TransactionListActivity extends AppCompatActivity {
                 progressBar.setProgress(progress.getProgress(), true);
             }
             else progressBar.setProgress(progress.getProgress());
+            progressBar.setIndeterminate(false);
         }
     }