From 9c9370f72c51d7466d3b25a59264ee98f4319b3a Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Thu, 8 Nov 2018 13:37:38 +1300 Subject: Fix time formatting issues --- src/org/traccar/helper/DateUtil.java | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) (limited to 'src/org/traccar/helper/DateUtil.java') diff --git a/src/org/traccar/helper/DateUtil.java b/src/org/traccar/helper/DateUtil.java index e09ac6d0e..20a483e3c 100644 --- a/src/org/traccar/helper/DateUtil.java +++ b/src/org/traccar/helper/DateUtil.java @@ -15,9 +15,10 @@ */ package org.traccar.helper; -import org.traccar.Context; - +import java.text.SimpleDateFormat; import java.time.Instant; +import java.time.ZoneId; +import java.time.format.DateTimeFormatter; import java.util.Calendar; import java.util.Date; @@ -59,7 +60,19 @@ public final class DateUtil { } public static Date parseDate(String value) { - return Date.from(Instant.from(Context.DATE_FORMATTER.parse(value))); + return Date.from(Instant.from(DateTimeFormatter.ISO_ZONED_DATE_TIME.parse(value))); + } + + public static String formatDate(Date date) { + return formatDate(date, true); + } + + public static String formatDate(Date date, boolean zoned) { + if (zoned) { + return DateTimeFormatter.ISO_OFFSET_DATE_TIME.withZone(ZoneId.systemDefault()).format(date.toInstant()); + } else { + return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(date); + } } } -- cgit v1.2.3