diff options
author | CGantert345 <57003061+CGantert345@users.noreply.github.com> | 2021-03-25 16:49:30 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-03-25 16:49:30 +0100 |
commit | a4d6f33abac708b831a73bf175e64dd3ebeb6650 (patch) | |
tree | 3e14bb13b851d2228b765db0cb0191bb5e9e9403 /src/org/uic/barcode/ticket/api/utils/OpenAsn2ApiDecoder.java | |
parent | new release (diff) | |
parent | - bug fix for time zones (diff) | |
download | UIC-barcode-a4d6f33abac708b831a73bf175e64dd3ebeb6650.tar UIC-barcode-a4d6f33abac708b831a73bf175e64dd3ebeb6650.tar.gz UIC-barcode-a4d6f33abac708b831a73bf175e64dd3ebeb6650.tar.bz2 UIC-barcode-a4d6f33abac708b831a73bf175e64dd3ebeb6650.tar.lz UIC-barcode-a4d6f33abac708b831a73bf175e64dd3ebeb6650.tar.xz UIC-barcode-a4d6f33abac708b831a73bf175e64dd3ebeb6650.tar.zst UIC-barcode-a4d6f33abac708b831a73bf175e64dd3ebeb6650.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 | 23 |
1 files changed, 12 insertions, 11 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..d203487 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);
}
@@ -1588,9 +1593,9 @@ public class OpenAsn2ApiDecoder { document.setProductOwner(UicEncoderUtils.mapToString(asnDocument.getProductOwnerNum(),asnDocument.getProductOwnerIA5()));
document.setReference(UicEncoderUtils.mapToString(asnDocument.getReferenceNum(),asnDocument.getReferenceIA5()));
- if (asnDocument.getActivatedDay()!=null && !asnDocument.getActivatedDay().isEmpty()) {
- document.getActivatedDays().addAll(asnDocument.getActivatedDays(issuingDate));
- }
+ if (asnDocument.getActivatedDay() != null && !asnDocument.getActivatedDay().isEmpty()) {
+ document.getActivatedDays().addAll(asnDocument.getActivatedDays(issuingDate));
+ }
if(asnDocument.getIncludesSupplements()!=null) {
document.setIncludesSupplements(asnDocument.getIncludesSupplements());
@@ -1627,13 +1632,9 @@ 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));
- }
- }
+ if (asnDocument.getActivatedDay() != null && !asnDocument.getActivatedDay().isEmpty()) {
+ document.getActivatedDays().addAll(asnDocument.getActivatedDays(issuingDate));
+ }
document.setExtension(convertExtension(asnDocument.getExtension()));
document.setInfoText(asnDocument.getInfoText());
|