From 26ca7242605261c3bf1c27fb427ece203504ee51 Mon Sep 17 00:00:00 2001
From: CGantert345 <57003061+CGantert345@users.noreply.github.com>
Date: Fri, 19 Mar 2021 15:51:40 +0100
Subject: time-zone-fix

---
 .../uic/barcode/ticket/api/utils/OpenAsn2ApiDecoder.java  | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'src/org/uic/barcode/ticket/api/utils/OpenAsn2ApiDecoder.java')

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());
-- 
cgit v1.2.3


From 9f75546ee8fe2ad3ab07fee7bd9503340a5174fe Mon Sep 17 00:00:00 2001
From: CGantert345 <57003061+CGantert345@users.noreply.github.com>
Date: Mon, 22 Mar 2021 11:47:46 +0100
Subject: additional tests for time zones fix for fip ticket

---
 src/org/uic/barcode/ticket/api/utils/OpenAsn2ApiDecoder.java | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'src/org/uic/barcode/ticket/api/utils/OpenAsn2ApiDecoder.java')

diff --git a/src/org/uic/barcode/ticket/api/utils/OpenAsn2ApiDecoder.java b/src/org/uic/barcode/ticket/api/utils/OpenAsn2ApiDecoder.java
index 46d2c1b..d203487 100644
--- a/src/org/uic/barcode/ticket/api/utils/OpenAsn2ApiDecoder.java
+++ b/src/org/uic/barcode/ticket/api/utils/OpenAsn2ApiDecoder.java
@@ -1593,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());
@@ -1632,7 +1632,9 @@ public class OpenAsn2ApiDecoder {
 		document.setValidUntil(asnDocument.getValidUntilDate(issuingDate));
 		document.setValidUntilUTCoffset(asnDocument.getValidUntilUTCOffset());		
 				
-		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());
-- 
cgit v1.2.3