X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fmodel%2FLedgerTransaction.java;h=9b73d2ce9d1c9d477c77fe70f83bcdb0ee126aeb;hb=217da55a224e2ae899d0b50604e2e54f882ec04f;hp=7b63a59a3ef6c8839df40b8ff5abfe5a8051cae7;hpb=6ea8c7c196778dda4496d23541b059ec78cba76d;p=mobile-ledger-staging.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 7b63a59a..9b73d2ce 100644
--- a/app/src/main/java/net/ktnx/mobileledger/model/LedgerTransaction.java
+++ b/app/src/main/java/net/ktnx/mobileledger/model/LedgerTransaction.java
@@ -1,34 +1,34 @@
/*
- * Copyright © 2019 Damyan Ivanov.
- * This file is part of Mobile-Ledger.
- * Mobile-Ledger is free software: you can distribute it and/or modify it
+ * Copyright © 2020 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
* the Free Software Foundation, either version 3 of the License, or
* (at your opinion), any later version.
*
- * Mobile-Ledger is distributed in the hope that it will be useful,
+ * MoLe is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License terms for details.
*
* You should have received a copy of the GNU General Public License
- * along with Mobile-Ledger. If not, see .
+ * along with MoLe. If not, see .
*/
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;
+import net.ktnx.mobileledger.utils.SimpleDate;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
import java.security.NoSuchAlgorithmException;
+import java.text.ParseException;
import java.util.ArrayList;
import java.util.Comparator;
-import java.util.Date;
public class LedgerTransaction {
private static final String DIGEST_TYPE = "SHA-256";
@@ -36,25 +36,36 @@ public class LedgerTransaction {
new Comparator() {
@Override
public int compare(LedgerTransactionAccount o1, LedgerTransactionAccount o2) {
- int res = o1.getAccountName().compareTo(o2.getAccountName());
- if (res != 0) return res;
- res = o1.getCurrency().compareTo(o2.getCurrency());
- if (res != 0) return res;
+ int res = o1.getAccountName()
+ .compareTo(o2.getAccountName());
+ if (res != 0)
+ return res;
+ res = o1.getCurrency()
+ .compareTo(o2.getCurrency());
+ if (res != 0)
+ return res;
+ res = o1.getComment()
+ .compareTo(o2.getComment());
+ if (res != 0)
+ return res;
return Float.compare(o1.getAmount(), o2.getAmount());
}
};
private String profile;
private Integer id;
- private Date date;
+ private SimpleDate date;
private String description;
+ private String comment;
private ArrayList accounts;
private String dataHash;
private boolean dataLoaded;
- public LedgerTransaction(Integer id, String dateString, String description) {
+ public LedgerTransaction(Integer id, String dateString, String description)
+ 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, SimpleDate date, String description,
+ MobileLedgerProfile profile) {
+ this.profile = profile.getUuid();
this.id = id;
this.date = date;
this.description = description;
@@ -62,11 +73,23 @@ public class LedgerTransaction {
this.dataHash = null;
dataLoaded = false;
}
- public LedgerTransaction(Date date, String description) {
+ public LedgerTransaction(Integer id, SimpleDate date, String description) {
+ this(id, date, description, Data.profile.getValue());
+ }
+ public LedgerTransaction(SimpleDate date, String description) {
this(null, date, description);
}
public LedgerTransaction(int id) {
- this(id, (Date) null, null);
+ this(id, (SimpleDate) 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;
@@ -75,10 +98,10 @@ public class LedgerTransaction {
accounts.add(item);
dataHash = null;
}
- public Date getDate() {
+ public SimpleDate getDate() {
return date;
}
- public void setDate(Date date) {
+ public void setDate(SimpleDate date) {
this.date = date;
dataHash = null;
}
@@ -89,19 +112,29 @@ public class LedgerTransaction {
this.description = description;
dataHash = null;
}
+ public String getComment() {
+ return comment;
+ }
+ public void setComment(String comment) {
+ this.comment = comment;
+ }
public int getId() {
return id;
}
protected void fillDataHash() {
- if (dataHash != null) return;
+ if (dataHash != null)
+ return;
try {
Digest sha = new Digest(DIGEST_TYPE);
StringBuilder data = new StringBuilder();
+ data.append("ver1");
data.append(profile);
data.append(getId());
data.append('\0');
data.append(getDescription());
data.append('\0');
+ data.append(getComment());
+ data.append('\0');
data.append(Globals.formatLedgerDate(getDate()));
data.append('\0');
for (LedgerTransactionAccount item : accounts) {
@@ -110,8 +143,11 @@ public class LedgerTransaction {
data.append(item.getCurrency());
data.append('\0');
data.append(item.getAmount());
+ data.append('\0');
+ data.append(item.getComment());
}
- sha.update(data.toString().getBytes(Charset.forName("UTF-8")));
+ sha.update(data.toString()
+ .getBytes(StandardCharsets.UTF_8));
dataHash = sha.digestToHexString();
}
catch (NoSuchAlgorithmException e) {
@@ -121,38 +157,41 @@ public class LedgerTransaction {
}
public boolean existsInDb(SQLiteDatabase db) {
fillDataHash();
- try (Cursor c = db
- .rawQuery("SELECT 1 from transactions where data_hash = ?", new String[]{dataHash}))
+ try (Cursor c = db.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;
}
}
public void loadData(SQLiteDatabase db) {
- if (dataLoaded) return;
+ if (dataLoaded)
+ return;
- try (Cursor cTr = db
- .rawQuery("SELECT date, description from transactions WHERE profile=? AND id=?",
- new String[]{profile, String.valueOf(id)}))
+ try (Cursor cTr = db.rawQuery(
+ "SELECT year, month, day, description, comment from transactions WHERE profile=? " +
+ "AND id=?", new String[]{profile, String.valueOf(id)}))
{
if (cTr.moveToFirst()) {
- String dateString = cTr.getString(0);
- date = Globals.parseLedgerDate(dateString);
- description = cTr.getString(1);
+ date = new SimpleDate(cTr.getInt(0), cTr.getInt(1), cTr.getInt(2));
+ description = cTr.getString(3);
+ comment = cTr.getString(4);
+
+ accounts.clear();
- try (Cursor cAcc = db.rawQuery("SELECT account_name, amount, currency FROM " +
- "transaction_accounts WHERE " +
- "profile=? AND transaction_id = ?",
+ 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)}))
{
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),
- cAcc.getString(2)));
+ cAcc.getString(2), cAcc.getString(3)));
}
finishLoading();
@@ -162,6 +201,7 @@ public class LedgerTransaction {
}
public String getDataHash() {
+ fillDataHash();
return dataHash;
}
public void finishLoading() {