diff options
| author | CGantert345 <57003061+CGantert345@users.noreply.github.com> | 2021-03-19 15:51:40 +0100 |
|---|---|---|
| committer | CGantert345 <57003061+CGantert345@users.noreply.github.com> | 2021-03-19 15:51:40 +0100 |
| commit | 26ca7242605261c3bf1c27fb427ece203504ee51 (patch) | |
| tree | 87ba2e32aef122c6878c0354ae6c554ca9b5816e /src/org/uic/barcode/ticket/api/utils/OpenAsn2ApiDecoder.java | |
| parent | new release (diff) | |
| download | UIC-barcode-26ca7242605261c3bf1c27fb427ece203504ee51.tar UIC-barcode-26ca7242605261c3bf1c27fb427ece203504ee51.tar.gz UIC-barcode-26ca7242605261c3bf1c27fb427ece203504ee51.tar.bz2 UIC-barcode-26ca7242605261c3bf1c27fb427ece203504ee51.tar.lz UIC-barcode-26ca7242605261c3bf1c27fb427ece203504ee51.tar.xz UIC-barcode-26ca7242605261c3bf1c27fb427ece203504ee51.tar.zst UIC-barcode-26ca7242605261c3bf1c27fb427ece203504ee51.zip | |
Diffstat (limited to 'src/org/uic/barcode/ticket/api/utils/OpenAsn2ApiDecoder.java')
| -rw-r--r-- | src/org/uic/barcode/ticket/api/utils/OpenAsn2ApiDecoder.java | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/org/uic/barcode/ticket/api/utils/OpenAsn2ApiDecoder.java b/src/org/uic/barcode/ticket/api/utils/OpenAsn2ApiDecoder.java index 46f201d..46d2c1b 100644 --- a/src/org/uic/barcode/ticket/api/utils/OpenAsn2ApiDecoder.java +++ b/src/org/uic/barcode/ticket/api/utils/OpenAsn2ApiDecoder.java @@ -189,7 +189,12 @@ public class OpenAsn2ApiDecoder { }
if (asnUicRailTicketData.getTransportDocument() != null && !asnUicRailTicketData.getTransportDocument().isEmpty()) {
- populateTravelDocuments(asnUicRailTicketData.getTransportDocument(),uicRailTicket,uicRailTicket.getIssuerDetails().getIssuingDate() );
+
+ // date is already converted to local time, use UTC for internal calculations
+ Date localIssuingDate = uicRailTicket.getIssuerDetails().getIssuingDate();
+ Date issuingDate = DateTimeUtils.dateToUTC(localIssuingDate);
+
+ populateTravelDocuments(asnUicRailTicketData.getTransportDocument(),uicRailTicket, issuingDate);
}
@@ -1627,13 +1632,7 @@ public class OpenAsn2ApiDecoder { document.setValidUntil(asnDocument.getValidUntilDate(issuingDate));
document.setValidUntilUTCoffset(asnDocument.getValidUntilUTCOffset());
- if (asnDocument.getActivatedDay()!=null && !asnDocument.getActivatedDay().isEmpty()) {
- if (document.getValidFrom() != null) {
- document.getActivatedDays().addAll(asnDocument.getActivatedDays(document.getValidFrom()));
- } else {
- document.getActivatedDays().addAll(asnDocument.getActivatedDays(issuingDate));
- }
- }
+ document.getActivatedDays().addAll(asnDocument.getActivatedDays(issuingDate));
document.setExtension(convertExtension(asnDocument.getExtension()));
document.setInfoText(asnDocument.getInfoText());
|