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=0ce37f2c0184776fc60e30ff631aad1976c495e8;hp=d0c979e6df9b06ea6325fa80c3e906f5f3a78e62;hb=6c58c1072c9af6ea0d0f52baeae7f95ba7f7ee2f;hpb=324f40ffba80292007999d9812929acc6f6a36f8

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 d0c979e6..0ce37f2c 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
@@ -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,36 +32,22 @@ 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) {
+    private void reloadTransactions(Context context) {
         transactions.clear();
-        String sql = "SELECT id, date, description FROM transactions";
-        sql += " ORDER BY date desc, id desc";
+        String sql = "SELECT id FROM transactions ORDER BY date desc, id desc";
 
-        try (SQLiteDatabase db = dbh.getReadableDatabase()) {
+        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);
+                    transactions.add(new LedgerTransaction(cursor.getInt(0)));
                 }
             }
         }