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=1482c1d59d991b7f3bc2c459db9d72d7da315038;hp=d0c979e6df9b06ea6325fa80c3e906f5f3a78e62;hb=0250439d60e198f47f86ab4091027ec0d772d4c9;hpb=02c8136aabdf10f40b96cefd5bd69104a3e8c8f7 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..1482c1d5 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 @@ -22,7 +22,6 @@ 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 java.util.ArrayList; @@ -42,26 +41,12 @@ public class TransactionListViewModel extends ViewModel { } private void reloadTransactions(MobileLedgerDatabase dbh) { 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 (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))); } } }