X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fmodel%2FLedgerTransaction.java;h=fb773bf81055dcd8c26608f0764478d42cce9337;hb=9b96a8e36b9db5061ab49578cdbac1b465558dfa;hp=e566ca8f06fb8f5373ee15036f3c868f4895d086;hpb=20c03b7a5eb152d42fbbe9ecbaae27530563b398;p=mobile-ledger.git diff --git a/app/src/main/java/net/ktnx/mobileledger/model/LedgerTransaction.java b/app/src/main/java/net/ktnx/mobileledger/model/LedgerTransaction.java index e566ca8f..fb773bf8 100644 --- a/app/src/main/java/net/ktnx/mobileledger/model/LedgerTransaction.java +++ b/app/src/main/java/net/ktnx/mobileledger/model/LedgerTransaction.java @@ -1,5 +1,5 @@ /* - * Copyright © 2020 Damyan Ivanov. + * Copyright © 2021 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 @@ -52,12 +52,12 @@ public class LedgerTransaction { return res; return Float.compare(o1.getAmount(), o2.getAmount()); }; - private final String profile; + private final long profile; private final Integer id; + private final List accounts; private SimpleDate date; private String description; private String comment; - private final List accounts; private String dataHash; private boolean dataLoaded; public LedgerTransaction(Integer id, String dateString, String description) @@ -66,7 +66,7 @@ public class LedgerTransaction { } public LedgerTransaction(Integer id, SimpleDate date, String description, MobileLedgerProfile profile) { - this.profile = profile.getUuid(); + this.profile = profile.getId(); this.id = id; this.date = date; this.description = description; @@ -83,8 +83,8 @@ public class LedgerTransaction { public LedgerTransaction(int id) { this(id, (SimpleDate) null, null); } - public LedgerTransaction(int id, String profileUUID) { - this.profile = profileUUID; + public LedgerTransaction(int id, long profileId) { + this.profile = profileId; this.id = id; this.date = null; this.description = null; @@ -169,8 +169,8 @@ public class LedgerTransaction { return; try (Cursor cTr = db.rawQuery( - "SELECT year, month, day, description, comment from transactions WHERE profile=? " + - "AND id=?", new String[]{profile, String.valueOf(id)})) + "SELECT year, month, day, description, comment from transactions WHERE id=?", + new String[]{String.valueOf(id)})) { if (cTr.moveToFirst()) { date = new SimpleDate(cTr.getInt(0), cTr.getInt(1), cTr.getInt(2)); @@ -181,8 +181,8 @@ public class LedgerTransaction { try (Cursor cAcc = db.rawQuery( "SELECT account_name, amount, currency, comment FROM " + - "transaction_accounts WHERE profile=? AND transaction_id = ?", - new String[]{profile, String.valueOf(id)})) + "transaction_accounts WHERE transaction_id = ?", + new String[]{String.valueOf(id)})) { while (cAcc.moveToNext()) { // debug("transactions",