Unregister mobile_app notification services when a device is removed (#39359)

This commit is contained in:
J. Nick Koston authored and GitHub committed 2020-08-28 12:37:19 -05:00
1 parent 33a05541a4
commit 85869be2d8
3 files changed
+25 -2

No files matched your search

+14 -1
View File
@@ -60,7 +60,10 @@ NOTIFY_SERVICE_SCHEMA = vol.Schema(
@bind_hass
async def async_reload(hass, integration_name):
"""Register notify services for an integration."""
if NOTIFY_SERVICES not in hass.data:
if (
NOTIFY_SERVICES not in hass.data
or integration_name not in hass.data[NOTIFY_SERVICES]
):
return
data = hass.data[NOTIFY_SERVICES][integration_name]
@@ -74,8 +77,12 @@ async def async_reload(hass, integration_name):
if hasattr(notify_service, "targets"):
target_friendly_name = data[TARGET_FRIENDLY_NAME]
stale_targets = set(targets)
for name, target in notify_service.targets.items():
target_name = slugify(f"{target_friendly_name}_{name}")
if target_name in stale_targets:
stale_targets.remove(target_name)
if target_name in targets:
continue
targets[target_name] = target
@@ -86,6 +93,12 @@ async def async_reload(hass, integration_name):
schema=NOTIFY_SERVICE_SCHEMA,
)
for stale_target_name in stale_targets:
hass.services.async_remove(
DOMAIN,
stale_target_name,
)
friendly_name_slug = slugify(friendly_name)
if hass.services.has_service(DOMAIN, friendly_name_slug):
return