two NPE fixed

[mobile-ledger.git] / app / src / main / java / net / ktnx / mobileledger / ui / transaction_list / TransactionListViewModel.java

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 ec339fcf499762e7847576863e84b6e83675a39c..d391b6227b5674019a853609cad9802f72330204 100644 (file)
--- 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
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2018 Damyan Ivanov.
+ * Copyright © 2019 Damyan Ivanov.
  * This file is part of Mobile-Ledger.
  * Mobile-Ledger is free software: you can distribute it and/or modify it
  * under the term of the GNU General Public License as published by
@@ -19,68 +19,46 @@ package net.ktnx.mobileledger.ui.transaction_list;
 
 import android.app.Activity;
 import android.arch.lifecycle.ViewModel;
-import android.database.Cursor;
-import android.database.sqlite.SQLiteDatabase;
-import android.util.Log;
+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.utils.MLDB;
+import net.ktnx.mobileledger.utils.ObservableValue;
 
-import java.util.ArrayList;
+import java.util.List;
 
 public class TransactionListViewModel extends ViewModel {
+    public static ObservableValue<Boolean> updating = new ObservableValue<>();
 
-    private ArrayList<LedgerTransaction> transactions;
-
-    public void reloadTransactions(TransactionListFragment context) {
-        ArrayList<LedgerTransaction> newList = new ArrayList<>();
-
-        Activity act = context.getActivity();
-
-        boolean hasFilter =
-                act.findViewById(R.id.transaction_list_account_name_filter).getVisibility() ==
-                View.VISIBLE;
-
-        String sql;
-        String[] params;
-
-        sql = "SELECT id FROM transactions  ORDER BY date desc, id desc";
-        params = null;
-
-        if (hasFilter) {
-            String filterAccName = String.valueOf(
-                    ((AutoCompleteTextView) act.findViewById(R.id.transaction_filter_account_name))
-                            .getText());
-
-            if (!filterAccName.isEmpty()) {
-                sql = "SELECT distinct tr.id from transactions tr JOIN transaction_accounts ta " +
-                      "ON ta.transaction_id=tr.id WHERE ta.account_name LIKE ?||'%' AND ta" +
-                      ".amount <> 0 ORDER BY tr.date desc, tr.id desc";
-                params = new String[]{filterAccName};
-            }
-        }
-
-        Log.d("tmp", sql);
-        try (SQLiteDatabase db = MLDB.getReadableDatabase(act)) {
-            try (Cursor cursor = db.rawQuery(sql, params)) {
-                while (cursor.moveToNext()) {
-                    newList.add(new LedgerTransaction(cursor.getInt(0)));
-                }
-                transactions = newList;
-                Log.d("transactions", "transaction list updated");
-            }
-        }
-
+    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 LedgerTransaction getTransaction(int position) {
+    public static LedgerTransaction getTransaction(int position) {
+        List<LedgerTransaction> transactions = Data.transactions.get();
         if (position >= transactions.size()) return null;
         return transactions.get(position);
     }
-    public int getTransactionCount() {
+    public static int getTransactionCount() {
+        List<LedgerTransaction> 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);
+        }
+    }
 }