From c71eba94832d587b332e5ba8fc52bb267eb03f67 Mon Sep 17 00:00:00 2001 From: Daniele Gobbetti Date: Mon, 16 Apr 2018 18:26:23 +0200 Subject: [PATCH] Hotfix for connection issues on API < 24 Fix #1055 properly, as the previous change was not solving the issues on API < 24. This affected the connection to some devices and caused a crash on graph access. --- .../freeyourgadget/gadgetbridge/util/DateTimeUtils.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/DateTimeUtils.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/DateTimeUtils.java index 488476027..3b860edbc 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/DateTimeUtils.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/DateTimeUtils.java @@ -33,15 +33,15 @@ import nodomain.freeyourgadget.gadgetbridge.GBApplication; public class DateTimeUtils { private static SimpleDateFormat DAY_STORAGE_FORMAT = new SimpleDateFormat("yyyy-MM-dd", Locale.US); - public static SimpleDateFormat ISO_8601_FORMAT = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX", Locale.US); + public static SimpleDateFormat ISO_8601_FORMAT = new SimpleDateFormat("yyyy-MM-dd'T'hh:mm:ssZZZ", Locale.US); public static String formatDateTime(Date date) { return DateUtils.formatDateTime(GBApplication.getContext(), date.getTime(), DateUtils.FORMAT_SHOW_DATE | DateUtils.FORMAT_SHOW_TIME | DateUtils.FORMAT_NO_YEAR); } public static String formatIso8601(Date date) { - if(!GBApplication.isRunningNougatOrLater()){ - return new SimpleDateFormat("yyyy-MM-dd'T'hh:mm:ssZZZ", Locale.US).format(date); + if(GBApplication.isRunningNougatOrLater()){ + return new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX", Locale.US).format(date); } return ISO_8601_FORMAT.format(date); }