From a76b9af80cf8fe65d5dbb9fbb78d2026e8e2d930 Mon Sep 17 00:00:00 2001 From: Marcel Alexandru Nitan Date: Tue, 2 Apr 2024 12:13:12 +0300 Subject: [PATCH] zepos: fix timezone for sunrise/sunset time; closes #3673, closes #3400 --- .../service/devices/huami/zeppos/ZeppOsWeather.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/ZeppOsWeather.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/ZeppOsWeather.java index 46b0a6274..8456ff417 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/ZeppOsWeather.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/ZeppOsWeather.java @@ -257,7 +257,7 @@ public class ZeppOsWeather { 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")); + sunRiseSetSdf.setTimeZone(TimeZone.getDefault()); final String from = sunRiseSetSdf.format(sunRise); final String to = sunRiseSetSdf.format(sunSet); @@ -301,7 +301,7 @@ public class ZeppOsWeather { moonPhaseValue.add(String.valueOf(phase)); final SimpleDateFormat moonRiseSetSdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.ROOT); - moonRiseSetSdf.setTimeZone(TimeZone.getTimeZone("UTC")); + moonRiseSetSdf.setTimeZone(TimeZone.getDefault()); final String from = moonRiseSetSdf.format(new Date(rise * 1000L)); final String to = moonRiseSetSdf.format(new Date(set * 1000L));