From 340171e0bb24de9da8037fd1331407346b7083d3 Mon Sep 17 00:00:00 2001 From: rany Date: Mon, 30 Oct 2023 13:37:56 +0200 Subject: [PATCH] Zepp OS: Fix sunrise and moon dates being off by local time + UTC offset Fixes #3400 Signed-off-by: rany --- .../gadgetbridge/service/devices/huami/Huami2021Weather.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/Huami2021Weather.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/Huami2021Weather.java index 7d8180d40..75810373b 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/Huami2021Weather.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/Huami2021Weather.java @@ -43,6 +43,7 @@ import java.util.GregorianCalendar; import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.TimeZone; import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiWeatherConditions; import nodomain.freeyourgadget.gadgetbridge.model.Weather; @@ -255,6 +256,7 @@ public class Huami2021Weather { private Range getSunriseSunset(final Date sunRise, final Date sunSet) { final SimpleDateFormat sunRiseSetSdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.ROOT); + sunRiseSetSdf.setTimeZone(TimeZone.getTimeZone("UTC")); final String from = sunRiseSetSdf.format(sunRise); final String to = sunRiseSetSdf.format(sunSet); @@ -298,6 +300,7 @@ public class Huami2021Weather { moonPhaseValue.add(String.valueOf(phase)); final SimpleDateFormat moonRiseSetSdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.ROOT); + moonRiseSetSdf.setTimeZone(TimeZone.getTimeZone("UTC")); final String from = moonRiseSetSdf.format(new Date(rise * 1000L)); final String to = moonRiseSetSdf.format(new Date(set * 1000L));