From 7a2820ded965eccd776d005cc2ca147aa92155d2 Mon Sep 17 00:00:00 2001 From: ehendrix23 Date: Mon, 8 Jun 2020 08:55:05 -0600 Subject: [PATCH] Update aioharmony to include support for XMPP connectivity to Hub (#36485) * Update aioharmony to 0.2.3 * Update aioharmony to 0.2.4 --- homeassistant/components/harmony/manifest.json | 2 +- homeassistant/components/harmony/util.py | 7 +++---- requirements_all.txt | 2 +- requirements_test_all.txt | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/homeassistant/components/harmony/manifest.json b/homeassistant/components/harmony/manifest.json index 154fd211aa8..0c030caa04c 100644 --- a/homeassistant/components/harmony/manifest.json +++ b/homeassistant/components/harmony/manifest.json @@ -2,7 +2,7 @@ "domain": "harmony", "name": "Logitech Harmony Hub", "documentation": "https://www.home-assistant.io/integrations/harmony", - "requirements": ["aioharmony==0.1.13"], + "requirements": ["aioharmony==0.2.4"], "codeowners": ["@ehendrix23", "@bramkragten", "@bdraco"], "ssdp": [ { diff --git a/homeassistant/components/harmony/util.py b/homeassistant/components/harmony/util.py index 412aa2c6940..daee1845c2d 100644 --- a/homeassistant/components/harmony/util.py +++ b/homeassistant/components/harmony/util.py @@ -9,11 +9,10 @@ from .const import DOMAIN def find_unique_id_for_remote(harmony: HarmonyAPI): """Find the unique id for both websocket and xmpp clients.""" - websocket_unique_id = harmony.hub_config.info.get("activeRemoteId") - if websocket_unique_id is not None: - return str(websocket_unique_id) + if harmony.hub_id is not None: + return str(harmony.hub_id) - # fallback to the xmpp unique id if websocket is not available + # fallback timeStampHash if Hub ID is not available return harmony.config["global"]["timeStampHash"].split(";")[-1] diff --git a/requirements_all.txt b/requirements_all.txt index 4eac181cf27..70c244d5d40 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -178,7 +178,7 @@ aioftp==0.12.0 aioguardian==0.2.3 # homeassistant.components.harmony -aioharmony==0.1.13 +aioharmony==0.2.4 # homeassistant.components.homekit_controller aiohomekit[IP]==0.2.38 diff --git a/requirements_test_all.txt b/requirements_test_all.txt index 90cbde7ac59..82c38cedfbd 100644 --- a/requirements_test_all.txt +++ b/requirements_test_all.txt @@ -85,7 +85,7 @@ aiofreepybox==0.0.8 aioguardian==0.2.3 # homeassistant.components.harmony -aioharmony==0.1.13 +aioharmony==0.2.4 # homeassistant.components.homekit_controller aiohomekit[IP]==0.2.38