1
0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2024-12-01 06:22:55 +01:00

zepos: fix timezone for sunrise/sunset time; closes #3673, closes #3400

This commit is contained in:
Marcel Alexandru Nitan 2024-04-02 12:13:12 +03:00 committed by José Rebelo
parent f9268d981e
commit a76b9af80c

View File

@ -257,7 +257,7 @@ public class ZeppOsWeather {
private Range getSunriseSunset(final Date sunRise, final Date sunSet) { private Range getSunriseSunset(final Date sunRise, final Date sunSet) {
final SimpleDateFormat sunRiseSetSdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.ROOT); 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 from = sunRiseSetSdf.format(sunRise);
final String to = sunRiseSetSdf.format(sunSet); final String to = sunRiseSetSdf.format(sunSet);
@ -301,7 +301,7 @@ public class ZeppOsWeather {
moonPhaseValue.add(String.valueOf(phase)); moonPhaseValue.add(String.valueOf(phase));
final SimpleDateFormat moonRiseSetSdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.ROOT); 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 from = moonRiseSetSdf.format(new Date(rise * 1000L));
final String to = moonRiseSetSdf.format(new Date(set * 1000L)); final String to = moonRiseSetSdf.format(new Date(set * 1000L));