jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-21 04:07:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix reversed logic in zeroconf homekit pairing check (#35596)

Browse Source 
* Fix reversed logic in zeroconf homekit pairing check

* s/server_info/service_info/
This commit is contained in:
J. Nick Koston 2020-05-14 11:58:40 -05:00 committed by GitHub
parent b7ab07c987
commit a42a654590
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
homeassistant/components/zeroconf/__init__.py
View File

@ -178,6 +178,11 @@ def setup(hass, config):
return return
service_info = zeroconf.get_service_info(service_type, name) service_info = zeroconf.get_service_info(service_type, name)
if not service_info:
# Prevent the browser thread from collapsing as
# service_info can be None
return
info = info_from_service(service_info) info = info_from_service(service_info)
_LOGGER.debug("Discovered new device %s %s", name, info) _LOGGER.debug("Discovered new device %s %s", name, info)
@ -196,7 +201,8 @@ def setup(hass, config):
and HOMEKIT_PAIRED_STATUS_FLAG in info[HOMEKIT_PROPERTIES] and HOMEKIT_PAIRED_STATUS_FLAG in info[HOMEKIT_PROPERTIES]
): ):
try: try:
if not int(info[HOMEKIT_PROPERTIES][HOMEKIT_PAIRED_STATUS_FLAG]): # 0 means paired and not discoverable by iOS clients)
if int(info[HOMEKIT_PROPERTIES][HOMEKIT_PAIRED_STATUS_FLAG]):
return return
except ValueError: except ValueError:
# HomeKit pairing status unknown # HomeKit pairing status unknown

4
tests/components/zeroconf/test_init.py
View File

@ -18,8 +18,8 @@ PROPERTIES = {
NON_ASCII_KEY: None, NON_ASCII_KEY: None,
} }
HOMEKIT_STATUS_UNPAIRED = b"0" HOMEKIT_STATUS_UNPAIRED = b"1"
HOMEKIT_STATUS_PAIRED = b"1" HOMEKIT_STATUS_PAIRED = b"0"
@pytest.fixture @pytest.fixture