From a5886cbb499320fc80c8ce4c1d285505b604e330 Mon Sep 17 00:00:00 2001 From: Andreas Shimokawa Date: Sat, 26 Aug 2017 00:23:14 +0200 Subject: [PATCH] Revert "store UTC in weather timestamp" It was already in UTC but I sucked This reverts commit b9eedce13b4cfce7c8148acf9b7834dcdc63dae7. --- .../externalevents/WeatherNotificationReceiver.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/WeatherNotificationReceiver.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/WeatherNotificationReceiver.java index 0dfd8272..809ebe0f 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/WeatherNotificationReceiver.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/WeatherNotificationReceiver.java @@ -23,8 +23,6 @@ import android.content.Intent; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.SimpleTimeZone; - import nodomain.freeyourgadget.gadgetbridge.GBApplication; import nodomain.freeyourgadget.gadgetbridge.model.Weather; import nodomain.freeyourgadget.gadgetbridge.model.WeatherSpec; @@ -53,7 +51,7 @@ public class WeatherNotificationReceiver extends BroadcastReceiver { LOG.info("weather in " + weather.location + " is " + weather.currentCondition + " (" + (weather.currentTemp - 273) + "°C)"); WeatherSpec weatherSpec = new WeatherSpec(); - weatherSpec.timestamp = (int) ((weather.queryTime - SimpleTimeZone.getDefault().getOffset(weather.queryTime)) / 1000); + weatherSpec.timestamp = (int) (weather.queryTime / 1000); weatherSpec.location = weather.location; weatherSpec.currentTemp = weather.currentTemp; weatherSpec.currentCondition = weather.currentCondition;