X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Ftransaction_list%2FTransactionListViewModel.java;h=02affd86735f85bf5710f59395e379043c0163fe;hp=d391b6227b5674019a853609cad9802f72330204;hb=ecca90e33d5334dd3a6750cb92f626bcff10a439;hpb=a6fdfa98f01366db77c1d2774575aee0b3b1b410

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 d391b622..02affd86 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,48 +17,42 @@
 
 package net.ktnx.mobileledger.ui.transaction_list;
 
-import android.app.Activity;
 import android.arch.lifecycle.ViewModel;
 import android.os.AsyncTask;
-import android.view.View;
-import android.widget.AutoCompleteTextView;
 
-import net.ktnx.mobileledger.R;
 import net.ktnx.mobileledger.async.UpdateTransactionsTask;
 import net.ktnx.mobileledger.model.Data;
-import net.ktnx.mobileledger.model.LedgerTransaction;
+import net.ktnx.mobileledger.model.TransactionListItem;
 import net.ktnx.mobileledger.utils.ObservableValue;
 
 import java.util.List;
 
 public class TransactionListViewModel extends ViewModel {
     public static ObservableValue<Boolean> updating = new ObservableValue<>();
+    public static ObservableValue<String> updateError = new ObservableValue<>();
 
-    public static void scheduleTransactionListReload(Activity act) {
-        View filter = act.findViewById(R.id.transaction_list_account_name_filter);
-        if (filter == null) return;
-        boolean hasFilter = filter.getVisibility() == View.VISIBLE;
-        String accFilter = hasFilter ? String.valueOf(
-                ((AutoCompleteTextView) act.findViewById(R.id.transaction_filter_account_name))
-                        .getText()) : null;
-        AsyncTask<String, Void, List<LedgerTransaction>> task = new UTT();
-        task.execute(accFilter);
+    public static void scheduleTransactionListReload() {
+        String filter = TransactionListFragment.accountFilter.get();
+        AsyncTask<String, Void, String> task = new UTT();
+        task.execute(filter);
     }
-    public static LedgerTransaction getTransaction(int position) {
-        List<LedgerTransaction> transactions = Data.transactions.get();
-        if (position >= transactions.size()) return null;
+    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<LedgerTransaction> transactions = Data.transactions.get();
+        List<TransactionListItem> transactions = Data.transactions.get();
         if (transactions == null) return 0;
         return transactions.size();
     }
     private static class UTT extends UpdateTransactionsTask {
         @Override
-        protected void onPostExecute(List<LedgerTransaction> list) {
-            super.onPostExecute(list);
-            if (list != null) Data.transactions.set(list);
+        protected void onPostExecute(String error) {
+            super.onPostExecute(error);
+            if (error != null) updateError.set(error);
         }
     }
 }