Handle deleted device (#938)

Author: andrew-codechimp

custom_components/battery_notes/binary_sensor.py

@@ -77,10 +77,11 @@ def async_add_to_device(hass: HomeAssistant, entry: ConfigEntry) -> str | None:
     device_registry = dr.async_get(hass)
 
     device_id = entry.data.get(CONF_DEVICE_ID)
-    device_registry.async_update_device(device_id, add_config_entry_id=entry.entry_id)
-
-    return device_id
 
+    if device_registry.async_get(device_id):
+        device_registry.async_update_device(device_id, add_config_entry_id=entry.entry_id)
+        return device_id
+    return None
 
 async def async_setup_entry(
     hass: HomeAssistant,
@@ -131,6 +132,9 @@ async def async_registry_updated(event: Event) -> None:
 
     device_id = async_add_to_device(hass, config_entry)
 
+    if not device_id:
+        return
+
     description = BatteryNotesBinarySensorEntityDescription(
         unique_id_suffix="_battery_low",
         key="_battery_plus_low",

custom_components/battery_notes/button.py

@@ -69,10 +69,11 @@ def async_add_to_device(hass: HomeAssistant, entry: ConfigEntry) -> str | None:
     device_registry = dr.async_get(hass)
 
     device_id = entry.data.get(CONF_DEVICE_ID)
-    device_registry.async_update_device(device_id, add_config_entry_id=entry.entry_id)
-
-    return device_id
 
+    if device_registry.async_get(device_id):
+        device_registry.async_update_device(device_id, add_config_entry_id=entry.entry_id)
+        return device_id
+    return None
 
 async def async_setup_entry(
     hass: HomeAssistant,
@@ -123,6 +124,9 @@ async def async_registry_updated(event: Event) -> None:
 
     device_id = async_add_to_device(hass, config_entry)
 
+    if not device_id:
+        return
+
     enable_replaced = True
     if DOMAIN_CONFIG in hass.data[DOMAIN]:
         domain_config: dict = hass.data[DOMAIN][DOMAIN_CONFIG]

custom_components/battery_notes/sensor.py

@@ -107,10 +107,11 @@ def async_add_to_device(hass: HomeAssistant, entry: ConfigEntry) -> str | None:
     device_registry = dr.async_get(hass)
 
     device_id = entry.data.get(CONF_DEVICE_ID)
-    device_registry.async_update_device(device_id, add_config_entry_id=entry.entry_id)
-
-    return device_id
 
+    if device_registry.async_get(device_id):
+        device_registry.async_update_device(device_id, add_config_entry_id=entry.entry_id)
+        return device_id
+    return None
 
 async def async_setup_entry(
     hass: HomeAssistant,
@@ -157,6 +158,9 @@ async def async_registry_updated(event: Event) -> None:
 
     device_id = async_add_to_device(hass, config_entry)
 
+    if not device_id:
+        return
+
     device = hass.data[DOMAIN][DATA].devices[config_entry.entry_id]
 
     coordinator = device.coordinator