Fix usage of device name

Signed-off-by: Simon Spielmann <simon.spielmann@gmx.de>
openhab · Mar 30, 2023 · 4672bb0 · 4672bb0
1 parent 2bdd146
commit 4672bb0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/...icloud/src/main/java/org/openhab/binding/icloud/internal/handler/ICloudDeviceHandler.java b/...icloud/src/main/java/org/openhab/binding/icloud/internal/handler/ICloudDeviceHandler.java
@@ -188,7 +188,7 @@ private void updateLocationRelatedStates(ICloudDeviceInformation deviceInformati
             String currentId = deviceInformationRecord.getDeviceDiscoveryId();
             if (currentId == null || "".equals(currentId)) {
                 logger.debug("deviceDiscoveryId is empty, using device name for identification.");
-                currentId = deviceInformationRecord.getDeviceDisplayName();
+                currentId = deviceInformationRecord.getName();
             }
             logger.debug("Current data element: [id = {}]", currentId);
 

diff --git a/bundles/org.openhab.binding.icloud/src/test/java/org/openhab/binding/icloud/TestICloud.java b/bundles/org.openhab.binding.icloud/src/test/java/org/openhab/binding/icloud/TestICloud.java
@@ -241,7 +241,7 @@ public void testDiscovery() {
                              "scdPh": "",
                              "locationCapable": true,
                              "trackingInfo": null,
-                             "name": "Simon iPad",
+                             "name": "My iPad",
                              "isMac": false,
                              "thisDevice": false,
                              "deviceClass": "iPad",
@@ -344,7 +344,7 @@ public void testDiscovery() {
                              "scdPh": "",
                              "locationCapable": true,
                              "trackingInfo": null,
-                             "name": "Simon iPad",
+                             "name": "iPad Air without ID",
                              "isMac": false,
                              "thisDevice": false,
                              "deviceClass": "iPad",
@@ -370,7 +370,7 @@ public void testDiscovery() {
                              "locFoundEnabled": false,
                              "snd": null,
                              "lostDevice": null,
-                             "deviceDisplayName": "iPad Air without ID",
+                             "deviceDisplayName": "iPad",
                              "prsId": null,
                              "audioChannels": [