LedgerTransaction.asParsedTransaction: handle null date defaulting to today

[mobile-ledger.git] / app / src / main / java / net / ktnx / mobileledger / model / LedgerTransaction.java

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 2be23ae4961371fe050eac85440764afe508a02b..252b32f41ed7f1fe1ae8fbad7afbefde7c7127e7 100644 (file)
--- a/app/src/main/java/net/ktnx/mobileledger/model/LedgerTransaction.java
+++ b/app/src/main/java/net/ktnx/mobileledger/model/LedgerTransaction.java
@@ -31,8 +31,7 @@ import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.Date;
-
-import static net.ktnx.mobileledger.utils.Logger.debug;
+import java.util.GregorianCalendar;
 
 public class LedgerTransaction {
     private static final String DIGEST_TYPE = "SHA-256";
@@ -68,7 +67,7 @@ public class LedgerTransaction {
         dataLoaded = false;
     }
     public LedgerTransaction(Integer id, Date date, String description) {
-        this(id, date, description, Data.profile.get());
+        this(id, date, description, Data.profile.getValue());
     }
     public LedgerTransaction(Date date, String description) {
         this(null, date, description);
@@ -142,8 +141,8 @@ public class LedgerTransaction {
                 .rawQuery("SELECT 1 from transactions where data_hash = ?", new String[]{dataHash}))
         {
             boolean result = c.moveToFirst();
-            debug("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;
         }
     }
@@ -203,7 +202,11 @@ public class LedgerTransaction {
         }
 
         result.setTpostings(postings);
-        result.setTdate(Globals.formatIsoDate(date));
+        Date transactionDate = date;
+        if (transactionDate == null) {
+            transactionDate = new GregorianCalendar().getTime();
+        }
+        result.setTdate(Globals.formatIsoDate(transactionDate));
         result.setTdate2(null);
         result.setTindex(1);
         result.setTdescription(description);