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

---
 .../barcode/ticket/api/utils/OpenAsn2ApiDecoderV2.java   | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

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

diff --git a/src/org/uic/barcode/ticket/api/utils/OpenAsn2ApiDecoderV2.java b/src/org/uic/barcode/ticket/api/utils/OpenAsn2ApiDecoderV2.java
index c6eac0e..b8ee363 100644
--- a/src/org/uic/barcode/ticket/api/utils/OpenAsn2ApiDecoderV2.java
+++ b/src/org/uic/barcode/ticket/api/utils/OpenAsn2ApiDecoderV2.java
@@ -1621,9 +1621,9 @@ public class OpenAsn2ApiDecoderV2 {
 		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());
@@ -1660,13 +1660,9 @@ public class OpenAsn2ApiDecoderV2 {
 		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());
-- 
cgit v1.2.3