From 553fcfa3b4b749fbc178ba986a63e5adc12f1316 Mon Sep 17 00:00:00 2001 From: lolodomo Date: Sun, 8 May 2022 12:08:02 +0200 Subject: [PATCH] [netatmo] Do not ignore updated events (same timestamp) (#12701) Fix #12699 Signed-off-by: Laurent Garnier --- .../handler/channelhelper/EventChannelHelper.java | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/bundles/org.openhab.binding.netatmo/src/main/java/org/openhab/binding/netatmo/internal/handler/channelhelper/EventChannelHelper.java b/bundles/org.openhab.binding.netatmo/src/main/java/org/openhab/binding/netatmo/internal/handler/channelhelper/EventChannelHelper.java index 3d880661a7..a5fe003f7e 100644 --- a/bundles/org.openhab.binding.netatmo/src/main/java/org/openhab/binding/netatmo/internal/handler/channelhelper/EventChannelHelper.java +++ b/bundles/org.openhab.binding.netatmo/src/main/java/org/openhab/binding/netatmo/internal/handler/channelhelper/EventChannelHelper.java @@ -15,8 +15,6 @@ package org.openhab.binding.netatmo.internal.handler.channelhelper; import static org.openhab.binding.netatmo.internal.NetatmoBindingConstants.*; import static org.openhab.binding.netatmo.internal.utils.ChannelTypeUtils.*; -import java.time.ZonedDateTime; - import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; import org.openhab.binding.netatmo.internal.api.data.ModuleType; @@ -37,7 +35,6 @@ import org.openhab.core.types.UnDefType; @NonNullByDefault public class EventChannelHelper extends ChannelHelper { private boolean isLocal; - private @Nullable ZonedDateTime lastEventTime; private @Nullable String vpnUrl, localUrl; private ModuleType moduleType = ModuleType.UNKNOWN; @@ -63,12 +60,9 @@ public class EventChannelHelper extends ChannelHelper { public void setNewData(@Nullable NAObject data) { if (data instanceof Event) { Event event = (Event) data; - ZonedDateTime localLast = lastEventTime; - ZonedDateTime eventTime = event.getTime(); - if ((localLast != null && !eventTime.isAfter(localLast)) || !event.getEventType().appliesOn(moduleType)) { - return; // ignore incoming events if they are deprecated + if (!event.getEventType().appliesOn(moduleType)) { + return; } - lastEventTime = eventTime; } super.setNewData(data); } -- 2.47.3