[robonect] Get Timezone from config on each request

Signed-off-by: Stefan Triller <[email protected]>
openhab · Jun 14, 2020 · 82a950f · 82a950f
1 parent beb09bf
commit 82a950f
Showing 1 changed file with 23 additions and 18 deletions.
diff --git a/...robonect/src/main/java/org/openhab/binding/robonect/internal/handler/RobonectHandler.java b/...robonect/src/main/java/org/openhab/binding/robonect/internal/handler/RobonectHandler.java
@@ -76,7 +76,7 @@ public class RobonectHandler extends BaseThingHandler {
     private HttpClient httpClient;
     private TimeZoneProvider timeZoneProvider;
 
-    private ZoneId timeZone = ZoneId.of("Europe/Berlin");
+    private RobonectConfig robonectConfig;
 
     private RobonectClient robonectClient;
 
@@ -283,13 +283,33 @@ private void updateNextTimer(MowerInfo info) {
         updateState(CHANNEL_TIMER_NEXT_TIMER, dateTime);
     }
 
+    private ZoneId getTimeZoneForThing() {
+        ZoneId timeZone = ZoneId.of("Europe/Berlin");
+
+        String timeZoneString = robonectConfig.getTimezone();
+        try {
+            if (timeZoneString != null) {
+                timeZone = ZoneId.of(timeZoneString);
+            } else {
+                logger.warn("No timezone provided, falling back to the default timezone configured in openHAB: '{}'",
+                        timeZoneProvider.getTimeZone());
+                timeZone = timeZoneProvider.getTimeZone();
+            }
+        } catch (DateTimeException e) {
+            logger.warn("Error setting timezone '{}', falling back to the default timezone configured in openHAB: '{}'",
+                    timeZoneString, timeZoneProvider.getTimeZone(), e);
+            timeZone = timeZoneProvider.getTimeZone();
+        }
+        return timeZone;
+    }
+
     private State convertUnixToDateTimeType(String unixTimeSec) {
         // the value in unixTimeSec represents the time on the robot in its configured timezone. However, it does not
         // provide which zone this is. Thus we have to add the zone information from the Thing configuration in order to
         // provide correct results.
         Instant rawInstant = Instant.ofEpochMilli(Long.valueOf(unixTimeSec) * 1000);
 
-        ZoneOffset offsetToConfiguredZone = timeZone.getRules().getOffset(rawInstant);
+        ZoneOffset offsetToConfiguredZone = getTimeZoneForThing().getRules().getOffset(rawInstant);
         long adjustedTime = rawInstant.getEpochSecond() - offsetToConfiguredZone.getTotalSeconds();
         Instant adjustedInstant = Instant.ofEpochMilli(adjustedTime * 1000);
 
@@ -342,25 +362,10 @@ private void updateLastErrorChannels(ErrorEntry error) {
 
     @Override
     public void initialize() {
-        RobonectConfig robonectConfig = getConfigAs(RobonectConfig.class);
+        robonectConfig = getConfigAs(RobonectConfig.class);
         RobonectEndpoint endpoint = new RobonectEndpoint(robonectConfig.getHost(), robonectConfig.getUser(),
                 robonectConfig.getPassword());
 
-        String timeZoneString = robonectConfig.getTimezone();
-        try {
-            if (timeZoneString != null) {
-                timeZone = ZoneId.of(timeZoneString);
-            } else {
-                logger.warn("No timezone provided, falling back to the default timezone configured in openHAB: '{}'",
-                        timeZoneProvider.getTimeZone());
-                timeZone = timeZoneProvider.getTimeZone();
-            }
-        } catch (DateTimeException e) {
-            logger.warn("Error setting timezone '{}', falling back to the default timezone configured in openHAB: '{}'",
-                    timeZoneString, timeZoneProvider.getTimeZone(), e);
-            timeZone = timeZoneProvider.getTimeZone();
-        }
-
         try {
             httpClient.start();
             robonectClient = new RobonectClient(httpClient, endpoint);