From 2fc379915371af82941e3b348dadd46757591e80 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Wed, 24 Feb 2021 09:49:02 +0100
Subject: [PATCH] use DateTime instead of Calendar

---
 app/build.gradle                                     |  1 +
 .../info/nightscout/androidaps/utils/DateUtil.java   | 12 ++++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 1a63ad3b3a..f881b3f080 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -100,6 +100,7 @@ def allCommitted = { ->
 
 tasks.matching { it instanceof Test }.all {
     testLogging.events = ["failed", "skipped", "started"]
+    // testLogging.events = ["failed", "skipped", "started", "standard_out"] use to display stdout in travis
     testLogging.exceptionFormat = "full"
 }
 
diff --git a/core/src/main/java/info/nightscout/androidaps/utils/DateUtil.java b/core/src/main/java/info/nightscout/androidaps/utils/DateUtil.java
index 256b5215de..ed2974424b 100644
--- a/core/src/main/java/info/nightscout/androidaps/utils/DateUtil.java
+++ b/core/src/main/java/info/nightscout/androidaps/utils/DateUtil.java
@@ -139,12 +139,12 @@ public class DateUtil {
                 hours -= 12;
             if ((m.group(3).equals(" p.m.") || m.group(3).equals(" PM") || m.group(3).equals("PM")) && !(m.group(1).equals("12")))
                 hours += 12;
-            Calendar c = Calendar.getInstance();
-            c.set(Calendar.HOUR_OF_DAY, hours);
-            c.set(Calendar.MINUTE, minutes);
-            c.set(Calendar.SECOND, 0);
-            c.set(Calendar.MILLISECOND, 0);
-            retval = c.getTimeInMillis();
+            DateTime t = new DateTime()
+                    .withHourOfDay(hours)
+                    .withMinuteOfHour(minutes)
+                    .withSecondOfMinute(0)
+                    .withMillisOfSecond(0);
+            retval = t.getMillis();
         }
         return retval;
     }