From 5bcb795bcac471c77f559530ada381492c4238cb Mon Sep 17 00:00:00 2001 From: "J. Nick Koston" Date: Wed, 6 Apr 2022 19:32:31 -1000 Subject: [PATCH] Move handling of non-secure login to the elkm1 library (#69483) --- homeassistant/components/elkm1/__init__.py | 10 ---------- homeassistant/components/elkm1/manifest.json | 2 +- requirements_all.txt | 2 +- requirements_test_all.txt | 2 +- 4 files changed, 3 insertions(+), 13 deletions(-) diff --git a/homeassistant/components/elkm1/__init__.py b/homeassistant/components/elkm1/__init__.py index 3fed62e961e..2536e5a8de0 100644 --- a/homeassistant/components/elkm1/__init__.py +++ b/homeassistant/components/elkm1/__init__.py @@ -351,21 +351,11 @@ async def async_wait_for_elk_to_sync( login_event.set() sync_event.set() - def first_response(*args, **kwargs): - _LOGGER.debug("ElkM1 received first response (VN)") - login_event.set() - def sync_complete(): sync_event.set() success = True elk.add_handler("login", login_status) - # VN is the first command sent for panel, when we get - # it back we now we are logged in either with or without a password - elk.add_handler("VN", first_response) - # Some panels do not respond to the vn request so we - # check for lw as well - elk.add_handler("LW", first_response) elk.add_handler("sync_complete", sync_complete) for name, event, timeout in ( ("login", login_event, login_timeout), diff --git a/homeassistant/components/elkm1/manifest.json b/homeassistant/components/elkm1/manifest.json index 695b6bcd999..ceea8e92ca5 100644 --- a/homeassistant/components/elkm1/manifest.json +++ b/homeassistant/components/elkm1/manifest.json @@ -2,7 +2,7 @@ "domain": "elkm1", "name": "Elk-M1 Control", "documentation": "https://www.home-assistant.io/integrations/elkm1", - "requirements": ["elkm1-lib==1.2.0"], + "requirements": ["elkm1-lib==1.2.2"], "dhcp": [{ "registered_devices": true }, { "macaddress": "00409D*" }], "codeowners": ["@gwww", "@bdraco"], "dependencies": ["network"], diff --git a/requirements_all.txt b/requirements_all.txt index 4d6ecb40eba..79d1b349ea8 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -578,7 +578,7 @@ elgato==3.0.0 eliqonline==1.2.2 # homeassistant.components.elkm1 -elkm1-lib==1.2.0 +elkm1-lib==1.2.2 # homeassistant.components.elmax elmax_api==0.0.2 diff --git a/requirements_test_all.txt b/requirements_test_all.txt index e71de300dfe..efafcd931ac 100644 --- a/requirements_test_all.txt +++ b/requirements_test_all.txt @@ -409,7 +409,7 @@ dynalite_devices==0.1.46 elgato==3.0.0 # homeassistant.components.elkm1 -elkm1-lib==1.2.0 +elkm1-lib==1.2.2 # homeassistant.components.elmax elmax_api==0.0.2