transaction load: replace the list atomically

[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 d0c979e6df9b06ea6325fa80c3e906f5f3a78e62..f2377c958022ed653a3158330877f5f197bb7d9a 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
@@ -18,12 +18,12 @@
 package net.ktnx.mobileledger.ui.transaction_list;
 
 import android.arch.lifecycle.ViewModel;
+import android.content.Context;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 
 import net.ktnx.mobileledger.model.LedgerTransaction;
-import net.ktnx.mobileledger.model.LedgerTransactionItem;
-import net.ktnx.mobileledger.utils.MobileLedgerDatabase;
+import net.ktnx.mobileledger.utils.MLDB;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -32,37 +32,25 @@ public class TransactionListViewModel extends ViewModel {
 
     private List<LedgerTransaction> transactions;
 
-    public List<LedgerTransaction> getTransactions(MobileLedgerDatabase dbh) {
+    public List<LedgerTransaction> getTransactions(Context context) {
         if (transactions == null) {
             transactions = new ArrayList<>();
-            reloadTransactions(dbh);
+            reloadTransactions(context);
         }
 
         return transactions;
     }
-    private void reloadTransactions(MobileLedgerDatabase dbh) {
-        transactions.clear();
-        String sql = "SELECT id, date, description FROM transactions";
-        sql += " ORDER BY date desc, id desc";
+    public void reloadTransactions(Context context) {
+        ArrayList<LedgerTransaction> newList = new ArrayList<>();
 
-        try (SQLiteDatabase db = dbh.getReadableDatabase()) {
+        String sql = "SELECT id FROM transactions ORDER BY date desc, id desc";
+
+        try (SQLiteDatabase db = MLDB.getReadableDatabase(context)) {
             try (Cursor cursor = db.rawQuery(sql, null)) {
                 while (cursor.moveToNext()) {
-                    LedgerTransaction tr =
-                            new LedgerTransaction(cursor.getString(0), cursor.getString(1),
-                                    cursor.getString(2));
-                    try (Cursor cAcc = db.rawQuery("SELECT account_name, amount, currency FROM " +
-                                                   "transaction_accounts WHERE transaction_id = ?",
-                            new String[]{tr.getId()}))
-                    {
-                        while (cAcc.moveToNext()) {
-                            tr.add_item(
-                                    new LedgerTransactionItem(cAcc.getString(0), cAcc.getFloat(1),
-                                            cAcc.getString(2)));
-                        }
-                    }
-                    transactions.add(tr);
+                    newList.add(new LedgerTransaction(cursor.getInt(0)));
                 }
+                transactions = newList;
             }
         }