X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fmodel%2FLedgerTransaction.java;h=696803670c51067b88a3f002d282db95fe19e8c0;hp=229fb9d00f827a1202981af7084b72c9382d4b34;hb=54002a662d97289a739d3cdb9888bbab58a8064f;hpb=998dd32a089d199a2569069415755eb3169b35b0 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 229fb9d0..69680367 100644 --- a/app/src/main/java/net/ktnx/mobileledger/model/LedgerTransaction.java +++ b/app/src/main/java/net/ktnx/mobileledger/model/LedgerTransaction.java @@ -19,7 +19,6 @@ package net.ktnx.mobileledger.model; import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; -import android.util.Log; import net.ktnx.mobileledger.utils.Digest; import net.ktnx.mobileledger.utils.Globals; @@ -55,8 +54,8 @@ public class LedgerTransaction { throws ParseException { this(id, Globals.parseLedgerDate(dateString), description); } - public LedgerTransaction(Integer id, Date date, String description) { - this.profile = Data.profile.get().getUuid(); + public LedgerTransaction(Integer id, Date date, String description, MobileLedgerProfile profile) { + this.profile = profile.getUuid(); this.id = id; this.date = date; this.description = description; @@ -64,12 +63,24 @@ public class LedgerTransaction { this.dataHash = null; dataLoaded = false; } + public LedgerTransaction(Integer id, Date date, String description) { + this(id, date, description, Data.profile.getValue()); + } public LedgerTransaction(Date date, String description) { this(null, date, description); } public LedgerTransaction(int id) { this(id, (Date) null, null); } + public LedgerTransaction(int id, String profileUUID) { + this.profile = profileUUID; + this.id = id; + this.date = null; + this.description = null; + this.accounts = new ArrayList<>(); + this.dataHash = null; + this.dataLoaded = false; + } public ArrayList getAccounts() { return accounts; } @@ -127,8 +138,8 @@ public class LedgerTransaction { .rawQuery("SELECT 1 from transactions where data_hash = ?", new String[]{dataHash})) { boolean result = c.moveToFirst(); - Log.d("db", String.format("Transaction %d (%s) %s", id, dataHash, - result ? "already present" : "not present")); +// debug("db", String.format("Transaction %d (%s) %s", id, dataHash, +// result ? "already present" : "not present")); return result; } } @@ -158,7 +169,7 @@ public class LedgerTransaction { new String[]{profile, String.valueOf(id)})) { while (cAcc.moveToNext()) { -// Log.d("transactions", +// debug("transactions", // String.format("Loaded %d: %s %1.2f %s", id, cAcc.getString(0), // cAcc.getFloat(1), cAcc.getString(2))); addAccount(new LedgerTransactionAccount(cAcc.getString(0), cAcc.getFloat(1),