X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;ds=sidebyside;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Ftransaction_list%2FTransactionListViewModel.java;h=16b9c2dc77ec6c9e48aba1793e036e27a9bf3e42;hb=0ce370cea3c5c980b6eeb14acf965188ae951f51;hp=ec339fcf499762e7847576863e84b6e83675a39c;hpb=0bbdc409d82da31324c031f36607510f17d992e6;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 ec339fcf..16b9c2dc 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
@@ -1,86 +1,54 @@
/*
- * Copyright © 2018 Damyan Ivanov.
- * This file is part of Mobile-Ledger.
- * Mobile-Ledger is free software: you can distribute it and/or modify it
+ * Copyright © 2019 Damyan Ivanov.
+ * This file is part of MoLe.
+ * MoLe is free software: you can distribute it and/or modify it
* under the term of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your opinion), any later version.
*
- * Mobile-Ledger is distributed in the hope that it will be useful,
+ * MoLe is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License terms for details.
*
* You should have received a copy of the GNU General Public License
- * along with Mobile-Ledger. If not, see .
+ * along with MoLe. If not, see .
*/
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.view.View;
-import android.widget.AutoCompleteTextView;
+import android.os.AsyncTask;
-import net.ktnx.mobileledger.R;
-import net.ktnx.mobileledger.model.LedgerTransaction;
-import net.ktnx.mobileledger.utils.MLDB;
+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.ArrayList;
+import androidx.lifecycle.ViewModel;
public class TransactionListViewModel extends ViewModel {
+ public static ObservableValue updating = new ObservableValue<>();
+ public static ObservableValue updateError = new ObservableValue<>();
- private ArrayList transactions;
-
- public void reloadTransactions(TransactionListFragment context) {
- ArrayList 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() {
+ String filter = Data.accountFilter.getValue();
+ AsyncTask task = new UTT();
+ task.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, filter);
}
- public LedgerTransaction getTransaction(int position) {
- if (position >= transactions.size()) return null;
- return transactions.get(position);
+ public static TransactionListItem getTransactionListItem(int position) {
+ if (Data.transactions == null) return null;
+ try(LockHolder lh = Data.transactions.lockForReading()) {
+ if (position >= Data.transactions.size()) return null;
+ return Data.transactions.get(position);
+ }
}
- public int getTransactionCount() {
- if (transactions == null) return 0;
- return transactions.size();
+ private static class UTT extends UpdateTransactionsTask {
+ @Override
+ protected void onPostExecute(String error) {
+ super.onPostExecute(error);
+ if (error != null) updateError.set(error);
+ }
}
}