X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fjson%2Fv1_15%2FParsedLedgerTransaction.java;h=8b1fab78d4eea93c744bf87bf01600856d622666;hp=305a2adef949287f4283fd785edfcfaa9229148f;hb=de1680dc2e67d2f7be40466a2e51cf8641393cf1;hpb=4b22cf80c51f475d28d4779975effb9882aa3a6e diff --git a/app/src/main/java/net/ktnx/mobileledger/json/v1_15/ParsedLedgerTransaction.java b/app/src/main/java/net/ktnx/mobileledger/json/v1_15/ParsedLedgerTransaction.java index 305a2ade..8b1fab78 100644 --- a/app/src/main/java/net/ktnx/mobileledger/json/v1_15/ParsedLedgerTransaction.java +++ b/app/src/main/java/net/ktnx/mobileledger/json/v1_15/ParsedLedgerTransaction.java @@ -1,5 +1,5 @@ /* - * Copyright © 2019 Damyan Ivanov. + * 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 @@ -23,11 +23,10 @@ import net.ktnx.mobileledger.model.LedgerTransaction; import net.ktnx.mobileledger.model.LedgerTransactionAccount; import net.ktnx.mobileledger.utils.Globals; import net.ktnx.mobileledger.utils.Misc; +import net.ktnx.mobileledger.utils.SimpleDate; import java.text.ParseException; import java.util.ArrayList; -import java.util.Date; -import java.util.GregorianCalendar; import java.util.List; @JsonIgnoreProperties(ignoreUnknown = true) @@ -58,9 +57,9 @@ public class ParsedLedgerTransaction implements net.ktnx.mobileledger.json.Parse } result.setTpostings(postings); - Date transactionDate = tr.getDate(); + SimpleDate transactionDate = tr.getDateIfAny(); if (transactionDate == null) { - transactionDate = new GregorianCalendar().getTime(); + transactionDate = SimpleDate.today(); } result.setTdate(Globals.formatIsoDate(transactionDate)); result.setTdate2(null); @@ -143,7 +142,7 @@ public class ParsedLedgerTransaction implements net.ktnx.mobileledger.json.Parse tpostings.add(posting); } public LedgerTransaction asLedgerTransaction() throws ParseException { - Date date = Globals.parseIsoDate(tdate); + SimpleDate date = Globals.parseIsoDate(tdate); LedgerTransaction tr = new LedgerTransaction(tindex, date, tdescription); tr.setComment(Misc.trim(Misc.emptyIsNull(tcomment)));