From 72cb58e850064af22a539f29547ae38749766e5d Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Sat, 4 Feb 2023 20:12:34 +0200
Subject: [PATCH] Fix Ruuvi Gateway data being ignored when system is not using
 UTC time (#87384)

---
 homeassistant/components/ruuvi_gateway/bluetooth.py | 11 ++++++-----
 homeassistant/components/ruuvi_gateway/const.py     |  7 -------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/homeassistant/components/ruuvi_gateway/bluetooth.py b/homeassistant/components/ruuvi_gateway/bluetooth.py
index f5748b8b4e9..4dd973155a9 100644
--- a/homeassistant/components/ruuvi_gateway/bluetooth.py
+++ b/homeassistant/components/ruuvi_gateway/bluetooth.py
@@ -2,12 +2,13 @@
 from __future__ import annotations
 
 from collections.abc import Callable
-import datetime
 import logging
+import time
 
 from home_assistant_bluetooth import BluetoothServiceInfoBleak
 
 from homeassistant.components.bluetooth import (
+    FALLBACK_MAXIMUM_STALE_ADVERTISEMENT_SECONDS,
     BaseHaRemoteScanner,
     async_get_advertisement_callback,
     async_register_scanner,
@@ -15,7 +16,6 @@ from homeassistant.components.bluetooth import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import CALLBACK_TYPE, HomeAssistant, callback
 
-from .const import OLD_ADVERTISEMENT_CUTOFF
 from .coordinator import RuuviGatewayUpdateCoordinator
 
 _LOGGER = logging.getLogger(__name__)
@@ -46,10 +46,11 @@ class RuuviGatewayScanner(BaseHaRemoteScanner):
 
     @callback
     def _async_handle_new_data(self) -> None:
-        now = datetime.datetime.now()
+        now = time.time()
         for tag_data in self.coordinator.data:
-            if now - tag_data.datetime > OLD_ADVERTISEMENT_CUTOFF:
-                # Don't process data that is older than 10 minutes
+            data_age_seconds = now - tag_data.timestamp  # Both are Unix time
+            if data_age_seconds > FALLBACK_MAXIMUM_STALE_ADVERTISEMENT_SECONDS:
+                # Don't process stale data at all
                 continue
             anno = tag_data.parse_announcement()
             self._async_on_advertisement(
diff --git a/homeassistant/components/ruuvi_gateway/const.py b/homeassistant/components/ruuvi_gateway/const.py
index 609bad9a226..80bebda105b 100644
--- a/homeassistant/components/ruuvi_gateway/const.py
+++ b/homeassistant/components/ruuvi_gateway/const.py
@@ -1,12 +1,5 @@
 """Constants for the Ruuvi Gateway integration."""
 from datetime import timedelta
 
-from homeassistant.components.bluetooth import (
-    FALLBACK_MAXIMUM_STALE_ADVERTISEMENT_SECONDS,
-)
-
 DOMAIN = "ruuvi_gateway"
 SCAN_INTERVAL = timedelta(seconds=5)
-OLD_ADVERTISEMENT_CUTOFF = timedelta(
-    seconds=FALLBACK_MAXIMUM_STALE_ADVERTISEMENT_SECONDS
-)