X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fmodel%2FLedgerTransaction.java;h=fd2a8407dfca79910216bc3191ed692d3661f956;hb=8d69552b756ba44e254251edf08206f8866c639b;hp=3e5a45fd7ff6dd939b8eade386ddc7353549be5e;hpb=3b365016042215dd73cb4600840aa8199b8322b9;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 3e5a45fd..fd2a8407 100644
--- a/app/src/main/java/net/ktnx/mobileledger/model/LedgerTransaction.java
+++ b/app/src/main/java/net/ktnx/mobileledger/model/LedgerTransaction.java
@@ -1,18 +1,18 @@
/*
* Copyright © 2019 Damyan Ivanov.
- * This file is part of Mobile-Ledger.
- * Mobile-Ledger is free software: you can distribute it and/or modify it
+ * 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;
@@ -22,11 +22,14 @@ import android.database.sqlite.SQLiteDatabase;
import android.util.Log;
import net.ktnx.mobileledger.utils.Digest;
+import net.ktnx.mobileledger.utils.Globals;
import java.nio.charset.Charset;
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";
@@ -43,12 +46,16 @@ public class LedgerTransaction {
};
private String profile;
private Integer id;
- private String date;
+ private Date date;
private String description;
private ArrayList accounts;
private String dataHash;
private boolean dataLoaded;
- public LedgerTransaction(Integer id, String date, 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();
this.id = id;
this.date = date;
@@ -57,11 +64,20 @@ public class LedgerTransaction {
this.dataHash = null;
dataLoaded = false;
}
- public LedgerTransaction(String date, String description) {
+ public LedgerTransaction(Date date, String description) {
this(null, date, description);
}
public LedgerTransaction(int id) {
- this(id, null, null);
+ 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;
@@ -70,10 +86,10 @@ public class LedgerTransaction {
accounts.add(item);
dataHash = null;
}
- public String getDate() {
+ public Date getDate() {
return date;
}
- public void setDate(String date) {
+ public void setDate(Date date) {
this.date = date;
dataHash = null;
}
@@ -97,6 +113,8 @@ public class LedgerTransaction {
data.append('\0');
data.append(getDescription());
data.append('\0');
+ data.append(Globals.formatLedgerDate(getDate()));
+ data.append('\0');
for (LedgerTransactionAccount item : accounts) {
data.append(item.getAccountName());
data.append('\0');
@@ -131,7 +149,16 @@ public class LedgerTransaction {
new String[]{profile, String.valueOf(id)}))
{
if (cTr.moveToFirst()) {
- date = cTr.getString(0);
+ String dateString = cTr.getString(0);
+ try {
+ date = Globals.parseLedgerDate(dateString);
+ }
+ catch (ParseException e) {
+ e.printStackTrace();
+ throw new RuntimeException(
+ String.format("Error parsing date '%s' from " + "transacion %d",
+ dateString, id));
+ }
description = cTr.getString(1);
try (Cursor cAcc = db.rawQuery("SELECT account_name, amount, currency FROM " +