Home-Assistant
/
core
mirror of https://github.com/home-assistant/core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Address late review of homekit_controller (#53492) 

Co-authored-by: Martin Hjelmare <marhje52@gmail.com>
pull/53504/head
Jc2k 2021-07-26 14:32:16 +01:00 committed by GitHub
parent ad730524c8
commit af8f594939
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
homeassistant/components/homekit_controller/config_flow.py
View File

@ -279,13 +279,6 @@ class HomekitControllerFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
) )
try: try:
await pairing.list_accessories_and_characteristics() await pairing.list_accessories_and_characteristics()
_LOGGER.debug(
"%s (%s - %s) claims to be unpaired but isn't. It's implementation of HomeKit is defective or a zeroconf relay is broadcasting stale data",
name,
model,
hkid,
)
return self.async_abort(reason="already_paired")
except AuthenticationError: except AuthenticationError:
_LOGGER.debug( _LOGGER.debug(
"%s (%s - %s) is unpaired. Removing invalid pairing for this device", "%s (%s - %s) is unpaired. Removing invalid pairing for this device",
@ -294,6 +287,16 @@ class HomekitControllerFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
hkid, hkid,
) )
await self.hass.config_entries.async_remove(existing.entry_id) await self.hass.config_entries.async_remove(existing.entry_id)
else:
_LOGGER.debug(
"%s (%s - %s) claims to be unpaired but isn't. "
"It's implementation of HomeKit is defective "
"or a zeroconf relay is broadcasting stale data",
name,
model,
hkid,
)
return self.async_abort(reason="already_paired")
# Set unique-id and error out if it's already configured # Set unique-id and error out if it's already configured
self._abort_if_unique_id_configured(updates=updated_ip_port) self._abort_if_unique_id_configured(updates=updated_ip_port)