From 32a1132a55a6493941ca8441104e1b9d85688147 Mon Sep 17 00:00:00 2001
From: CGantert345 <57003061+CGantert345@users.noreply.github.com>
Date: Mon, 11 Apr 2022 10:10:04 +0200
Subject: TimeStamp using java compliant with older android version

---
 .../uic/barcode/dynamicContent/fdc1/TimeStamp.java   | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

(limited to 'src/main/java')

diff --git a/src/main/java/org/uic/barcode/dynamicContent/fdc1/TimeStamp.java b/src/main/java/org/uic/barcode/dynamicContent/fdc1/TimeStamp.java
index c2cd8fa..2f54da3 100644
--- a/src/main/java/org/uic/barcode/dynamicContent/fdc1/TimeStamp.java
+++ b/src/main/java/org/uic/barcode/dynamicContent/fdc1/TimeStamp.java
@@ -1,11 +1,11 @@
 package org.uic.barcode.dynamicContent.fdc1;
 
 import java.time.Instant;
-import java.time.ZoneId;
 import java.time.ZoneOffset;
 import java.time.ZonedDateTime;
-import java.time.temporal.ChronoField;
+import java.util.Calendar;
 import java.util.Date;
+import java.util.TimeZone;
 
 import org.uic.barcode.asn1.datatypes.FieldOrder;
 import org.uic.barcode.asn1.datatypes.IntRange;
@@ -41,18 +41,22 @@ public class TimeStamp {
 	 * Instantiates a new time stamp and sets the time-stamp to now.
 	 */
 	public TimeStamp() {
-		ZonedDateTime now = ZonedDateTime.now(ZoneId.of("UTC"));
-		day = new Long(now.get(ChronoField.DAY_OF_YEAR));
-		secondOfDay = new Long(now.get(ChronoField.SECOND_OF_DAY));
+		setNow();
 	}
 	
 	/**
 	 * Sets the the time-stamp to now.
 	 */
 	public void setNow() {
-		ZonedDateTime now = ZonedDateTime.now(ZoneId.of("UTC"));
-		day = new Long(now.get(ChronoField.DAY_OF_YEAR));
-		secondOfDay = new Long(now.get(ChronoField.SECOND_OF_DAY));		
+	    Calendar c = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
+	    day = (long) c.get(Calendar.DAY_OF_YEAR);
+	    long now = c.getTimeInMillis();
+	    c.set(Calendar.HOUR_OF_DAY, 0);
+	    c.set(Calendar.MINUTE, 0);
+	    c.set(Calendar.SECOND, 0);
+	    c.set(Calendar.MILLISECOND, 0);
+	    long passed = now - c.getTimeInMillis();
+	    secondOfDay = passed / 1000;
 	}
 	
 	/**
-- 
cgit v1.2.3