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=6a9c24d9a5dbbc78bc0be5f153922514026c7da1;hp=fcaf9d5f9bc48ee3d64f616c820ee5362b27aa21;hb=12665a6fba07ee914b2fe7931704b904d8d2e85d;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..6a9c24d9 100644
--- a/app/src/main/java/net/ktnx/mobileledger/TransactionListActivity.java
+++ b/app/src/main/java/net/ktnx/mobileledger/TransactionListActivity.java
@@ -29,27 +29,28 @@ import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.Toolbar;
 import android.util.Log;
 import android.view.View;
+import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 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;
 import java.time.format.DateTimeFormatter;
 import java.util.Date;
-import java.util.List;
 
 public class TransactionListActivity extends AppCompatActivity {
+    public TransactionListViewModel model;
     private SwipeRefreshLayout swiper;
     private RecyclerView root;
     private ProgressBar progressBar;
-    private TransactionListViewModel model;
+    private LinearLayout progressLayout;
     private TextView tvLastUpdate;
     private TransactionListAdapter modelAdapter;
+    private RetrieveTransactionsTask retrieveTransactionsTask;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -64,34 +65,22 @@ public class TransactionListActivity extends AppCompatActivity {
         if (swiper == null) throw new RuntimeException("Can't get hold on the swipe layout");
         root = findViewById(R.id.transaction_root);
         if (root == null) throw new RuntimeException("Can't get hold on the transaction list view");
-        progressBar = findViewById(R.id.transaction_progress_bar);
+        progressBar = findViewById(R.id.transaction_list_progress_bar);
         if (progressBar == null)
             throw new RuntimeException("Can't get hold on the transaction list progress bar");
+        progressLayout = findViewById(R.id.transaction_progress_layout);
+        if (progressLayout == null) throw new RuntimeException(
+                "Can't get hold on the transaction list progress bar layout");
         tvLastUpdate = findViewById(R.id.transactions_last_update);
-        {
-            long last_update = (new MobileLedgerDatabase(this))
-                    .get_option_value("transaction_list_last_update", 0);
-            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));
-        modelAdapter = new TransactionListAdapter(transactions);
+        modelAdapter = new TransactionListAdapter(model);
 
         RecyclerView root = findViewById(R.id.transaction_root);
         root.setAdapter(modelAdapter);
 
         LinearLayoutManager llm = new LinearLayoutManager(this);
+
         llm.setOrientation(LinearLayoutManager.VERTICAL);
         root.setLayoutManager(llm);
 
@@ -102,7 +91,15 @@ public class TransactionListActivity extends AppCompatActivity {
 
         swiper.setColorSchemeResources(R.color.colorPrimary, R.color.colorAccent);
 
-//        update_transactions();
+        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) {
+            update_transactions();
+        }
+        else {
+            model.reloadTransactions(this);
+        }
     }
     private void setupActionBar() {
         ActionBar actionBar = getSupportActionBar();
@@ -118,17 +115,20 @@ public class TransactionListActivity extends AppCompatActivity {
         overridePendingTransition(R.anim.dummy, R.anim.slide_out_right);
     }
     private void update_transactions() {
-        RetrieveTransactionsTask task = new RetrieveTransactionsTask(new WeakReference<>(this));
+        retrieveTransactionsTask = new RetrieveTransactionsTask(new WeakReference<>(this));
 
         RetrieveTransactionsTask.Params params = new RetrieveTransactionsTask.Params(
                 PreferenceManager.getDefaultSharedPreferences(this));
 
-        task.execute(params);
+        retrieveTransactionsTask.execute(params);
+        findViewById(R.id.transaction_list_cancel_download).setEnabled(true);
     }
 
     public void onRetrieveStart() {
         progressBar.setIndeterminate(true);
-        progressBar.setVisibility(View.VISIBLE);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) progressBar.setProgress(0, false);
+        else progressBar.setProgress(0);
+        progressLayout.setVisibility(View.VISIBLE);
     }
     public void onRetrieveProgress(RetrieveTransactionsTask.Progress progress) {
         if ((progress.getTotal() == RetrieveTransactionsTask.Progress.INDETERMINATE) ||
@@ -137,7 +137,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 +145,41 @@ 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);
+        progressLayout.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);
+            Log.d("transactions", "calling notifyDataSetChanged()");
             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(getString(R.string.transaction_last_update_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());
+                }
+            }
         }
     }
+    public void onStopTransactionRefreshClick(View view) {
+        Log.d("interactive", "Cancelling transactions refresh");
+        if (retrieveTransactionsTask != null) retrieveTransactionsTask.cancel(false);
+        findViewById(R.id.transaction_list_cancel_download).setEnabled(false);
+    }
 }