[HEOS] Update handling of groups (openhab#8348)

- remove group-mapping when marking group OFFLINE - bail out in group-handler if the pid matches but the members do not match. Signed-off-by: Martin van Wingerden <[email protected]>
andrewfg · Aug 31, 2020 · 6f8e21a · 6f8e21a
1 parent e2ae2fb
commit 6f8e21a
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/...nding.heos/src/main/java/org/openhab/binding/heos/internal/handler/HeosBridgeHandler.java b/...nding.heos/src/main/java/org/openhab/binding/heos/internal/handler/HeosBridgeHandler.java
@@ -322,16 +322,17 @@ void resetPlayerList(ChannelUID channelUID) {
      * Sets the HEOS Thing offline
      */
     @SuppressWarnings("null")
-    public void setGroupOffline(String hashValue) {
-        HeosGroupHandler groupHandler = groupHandlerMap.get(hashValue);
+    public void setGroupOffline(String groupMemberHash) {
+        HeosGroupHandler groupHandler = groupHandlerMap.get(groupMemberHash);
         if (groupHandler != null) {
             groupHandler.setStatusOffline();
         }
+        hashToGidMap.remove(groupMemberHash);
     }
 
     /**
      * Sets the HEOS Thing online. Also updates the link between
-     * the groupMemberHash value with the actual gid of this group *
+     * the groupMemberHash value with the actual gid of this group
      */
     public void setGroupOnline(String groupMemberHash, String groupId) {
         hashToGidMap.put(groupMemberHash, groupId);

diff --git a/...inding.heos/src/main/java/org/openhab/binding/heos/internal/handler/HeosGroupHandler.java b/...inding.heos/src/main/java/org/openhab/binding/heos/internal/handler/HeosGroupHandler.java
@@ -278,6 +278,8 @@ private void delayedInitialize() {
                     throw new IllegalStateException("Invalid group response received");
                 }
 
+                assertSameGroup(group);
+
                 gid = groupId;
                 updateConfiguration(groupId, group);
                 updateStatus(ThingStatus.ONLINE);
@@ -291,6 +293,20 @@ private void delayedInitialize() {
         }
     }
 
+    /**
+     * Make sure the given group is group which this handler represents
+     * 
+     * @param group retrieved from HEOS system
+     */
+    private void assertSameGroup(Group group) {
+        String storedGroupHash = HeosGroup.calculateGroupMemberHash(configuration.members);
+        String retrievedGroupHash = HeosGroup.calculateGroupMemberHash(group);
+
+        if (!retrievedGroupHash.equals(storedGroupHash)) {
+            throw new IllegalStateException("Invalid group received, members / hash do not match.");
+        }
+    }
+
     @Override
     void refreshPlayState(String id) throws IOException, ReadException {
         super.refreshPlayState(id);