X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Ftransaction_list%2FTransactionListViewModel.java;h=ef93d6436b4be23b148f82c8193810dc18c391e4;hb=b04c98250e8e2abcf1d652e2a20cff0f9b98784b;hp=7bc1a866f453d35ba5958f70ab1248af995ab607;hpb=09e26d2279484b4dfe0de218b05f075362fff4b5;p=mobile-ledger.git

diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/transaction_list/TransactionListViewModel.java b/app/src/main/java/net/ktnx/mobileledger/ui/transaction_list/TransactionListViewModel.java
index 7bc1a866..ef93d643 100644
--- a/app/src/main/java/net/ktnx/mobileledger/ui/transaction_list/TransactionListViewModel.java
+++ b/app/src/main/java/net/ktnx/mobileledger/ui/transaction_list/TransactionListViewModel.java
@@ -17,38 +17,33 @@
 
 package net.ktnx.mobileledger.ui.transaction_list;
 
-import androidx.lifecycle.ViewModel;
 import android.os.AsyncTask;
 
 import net.ktnx.mobileledger.async.UpdateTransactionsTask;
 import net.ktnx.mobileledger.model.Data;
 import net.ktnx.mobileledger.model.TransactionListItem;
+import net.ktnx.mobileledger.utils.LockHolder;
 import net.ktnx.mobileledger.utils.ObservableValue;
 
-import java.util.List;
+import androidx.lifecycle.ViewModel;
 
 public class TransactionListViewModel extends ViewModel {
     public static ObservableValue<Boolean> updating = new ObservableValue<>();
     public static ObservableValue<String> updateError = new ObservableValue<>();
 
     public static void scheduleTransactionListReload() {
-        if (Data.profile.get() == null) return;
+        if (Data.profile.getValue() == null) return;
 
-        String filter = TransactionListFragment.accountFilter.get();
+        String filter = Data.accountFilter.getValue();
         AsyncTask<String, Void, String> task = new UTT();
-        task.execute(filter);
+        task.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, filter);
     }
     public static TransactionListItem getTransactionListItem(int position) {
-        List<TransactionListItem> transactions = Data.transactions.get();
-        if (transactions == null) return null;
-        if (position >= transactions.size() + 1) return null;
-        if (position == transactions.size()) return new TransactionListItem();
-        return transactions.get(position);
-    }
-    public static int getTransactionCount() {
-        List<TransactionListItem> transactions = Data.transactions.get();
-        if (transactions == null) return 0;
-        return transactions.size();
+        if (Data.transactions == null) return null;
+        try(LockHolder lh = Data.transactions.lockForReading()) {
+            if (position >= Data.transactions.size()) return null;
+            return Data.transactions.get(position);
+        }
     }
     private static class UTT extends UpdateTransactionsTask {
         @Override