From: lolodomo <lg.hc@free.fr>
Date: Sun, 14 Mar 2021 17:16:40 +0000 (+0100)
Subject: [sonos] Fix discovery of Ikea SYYMFONISK models (#10323)
X-Git-Url: https://git.basschouten.com/?a=commitdiff_plain;h=a5a7070d712e8ebe28437c7a7f96055894550261;p=openhab-addons.git

[sonos] Fix discovery of Ikea SYYMFONISK models (#10323)

Fix #10313

Signed-off-by: Laurent Garnier <lg.hc@free.fr>
---

diff --git a/bundles/org.openhab.binding.sonos/src/main/java/org/openhab/binding/sonos/internal/discovery/ZonePlayerDiscoveryParticipant.java b/bundles/org.openhab.binding.sonos/src/main/java/org/openhab/binding/sonos/internal/discovery/ZonePlayerDiscoveryParticipant.java
index d4458d430e..f9102a9e67 100644
--- a/bundles/org.openhab.binding.sonos/src/main/java/org/openhab/binding/sonos/internal/discovery/ZonePlayerDiscoveryParticipant.java
+++ b/bundles/org.openhab.binding.sonos/src/main/java/org/openhab/binding/sonos/internal/discovery/ZonePlayerDiscoveryParticipant.java
@@ -117,7 +117,10 @@ public class ZonePlayerDiscoveryParticipant implements UpnpDiscoveryParticipant
     }
 
     private String getModelName(RemoteDevice device) {
-        return SonosXMLParser.extractModelName(device.getDetails().getModelDetails().getModelName());
+        // For Ikea SYMFONISK models, the model name now starts with "SYMFONISK" with recent firmwares
+        // We can no more use extractModelName as it deletes the first word ("Sonos" for all other devices)
+        return device.getDetails().getModelDetails().getModelName().toUpperCase().contains("SYMFONISK") ? "SYMFONISK"
+                : SonosXMLParser.extractModelName(device.getDetails().getModelDetails().getModelName());
     }
 
     private @Nullable String getSonosRoomName(RemoteDevice device) {