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

---
 .../barcode/ticket/api/utils/Api2OpenAsnEncoderV2.java   | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

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

diff --git a/src/org/uic/barcode/ticket/api/utils/Api2OpenAsnEncoderV2.java b/src/org/uic/barcode/ticket/api/utils/Api2OpenAsnEncoderV2.java
index 97abcfa..48583b9 100644
--- a/src/org/uic/barcode/ticket/api/utils/Api2OpenAsnEncoderV2.java
+++ b/src/org/uic/barcode/ticket/api/utils/Api2OpenAsnEncoderV2.java
@@ -886,7 +886,7 @@ public class Api2OpenAsnEncoderV2 {
 			
 		asnData.setTariffs(encodeTariffCollection(document.getTariffs()));
 		
-		asnData.setActivatedDays(document.getActivatedDays(),document.getValidFrom());
+		asnData.addActivatedDays(DateTimeUtils.getActivatedDays(document.getValidFrom(), document.getActivatedDays()));
 
 		if (document.getClassCode() != ITravelClassType.second && document.getClassCode() != null){
 			asnData.setClassCode(TravelClassType.valueOf(document.getClassCode().name()));
@@ -1562,14 +1562,8 @@ public class Api2OpenAsnEncoderV2 {
 			}
 		}
 
-		
-		if(document.getActivatedDays()!= null && document.getActivatedDays().size() > 0) {
-			if (document.getValidFrom() != null) {			
-				asnData.setActivatedDays(document.getActivatedDays(),document.getValidFrom());
-			} else {
-				asnData.setActivatedDays(document.getActivatedDays(),issuingDate);
-			}
-		}
+		asnData.addActivatedDays(DateTimeUtils.getActivatedDays(document.getValidFrom(), document.getActivatedDays()));
+
 		if (document.getClassCode() != null) {
 			asnData.setClassCode(TravelClassType.valueOf(document.getClassCode().name()));
 		}
@@ -1703,9 +1697,7 @@ public class Api2OpenAsnEncoderV2 {
 		
 		asnData.setValidityDates(document.getValidFrom(), document.getValidUntil(), issuingDate);
 		
-		if(document.getActivatedDays()!= null && document.getActivatedDays().size() > 0) {
-			asnData.setActivatedDays(document.getActivatedDays(), document.getValidFrom());
-		}		
+		asnData.addActivatedDays(DateTimeUtils.getActivatedDays(document.getValidFrom(), document.getActivatedDays()));
 		
 		asnData.setExtension(encodeExtension(document.getExtension()));				
 		
-- 
cgit v1.2.3