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=03b9c7ac54582d501482810680b39c5f10d95c4c;hp=3e5a45fd7ff6dd939b8eade386ddc7353549be5e;hb=ea17ca9e3b03ca0090be03fdc0abbbbfd954be89;hpb=3b365016042215dd73cb4600840aa8199b8322b9

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..03b9c7ac 100644
--- a/app/src/main/java/net/ktnx/mobileledger/model/LedgerTransaction.java
+++ b/app/src/main/java/net/ktnx/mobileledger/model/LedgerTransaction.java
@@ -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<LedgerTransactionAccount> 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,11 @@ 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 ArrayList<LedgerTransactionAccount> getAccounts() {
         return accounts;
@@ -70,10 +77,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 +104,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 +140,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 " +