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=1a74eaad5031da20664c7aa72fb0a7b980a44532;hb=12665a6fba07ee914b2fe7931704b904d8d2e85d;hpb=023539ae4b017c80b2b28978d701e05354d265df

diff --git a/app/src/main/java/net/ktnx/mobileledger/TransactionListActivity.java b/app/src/main/java/net/ktnx/mobileledger/TransactionListActivity.java
index 1a74eaad..6a9c24d9 100644
--- a/app/src/main/java/net/ktnx/mobileledger/TransactionListActivity.java
+++ b/app/src/main/java/net/ktnx/mobileledger/TransactionListActivity.java
@@ -29,6 +29,7 @@ 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;
 
@@ -46,8 +47,10 @@ public class TransactionListActivity extends AppCompatActivity {
     private SwipeRefreshLayout swiper;
     private RecyclerView root;
     private ProgressBar progressBar;
+    private LinearLayout progressLayout;
     private TextView tvLastUpdate;
     private TransactionListAdapter modelAdapter;
+    private RetrieveTransactionsTask retrieveTransactionsTask;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -62,9 +65,12 @@ 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);
         updateLastUpdateText();
         model = ViewModelProviders.of(this).get(TransactionListViewModel.class);
@@ -91,6 +97,9 @@ public class TransactionListActivity extends AppCompatActivity {
         if (last_update == 0) {
             update_transactions();
         }
+        else {
+            model.reloadTransactions(this);
+        }
     }
     private void setupActionBar() {
         ActionBar actionBar = getSupportActionBar();
@@ -106,19 +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);
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) progressBar.setProgress(0, false);
         else progressBar.setProgress(0);
-        progressBar.setVisibility(View.VISIBLE);
+        progressLayout.setVisibility(View.VISIBLE);
     }
     public void onRetrieveProgress(RetrieveTransactionsTask.Progress progress) {
         if ((progress.getTotal() == RetrieveTransactionsTask.Progress.INDETERMINATE) ||
@@ -140,7 +150,7 @@ public class TransactionListActivity extends AppCompatActivity {
     }
 
     public void onRetrieveDone(boolean success) {
-        progressBar.setVisibility(View.INVISIBLE);
+        progressLayout.setVisibility(View.GONE);
         swiper.setRefreshing(false);
         updateLastUpdateText();
         if (success) {
@@ -167,4 +177,9 @@ public class TransactionListActivity extends AppCompatActivity {
             }
         }
     }
+    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);
+    }
 }