From 9211248f965d981afb988aec19e09d8fb071d2f6 Mon Sep 17 00:00:00 2001 From: J-N-K Date: Sat, 28 Nov 2020 13:10:19 +0100 Subject: [PATCH] fix announcement (#9155) Signed-off-by: Jan N. Klug --- bundles/org.openhab.binding.amazonechocontrol/README.md | 2 +- .../openhab/binding/amazonechocontrol/internal/Connection.java | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/bundles/org.openhab.binding.amazonechocontrol/README.md b/bundles/org.openhab.binding.amazonechocontrol/README.md index 393d7c2ea..ccaa0988f 100644 --- a/bundles/org.openhab.binding.amazonechocontrol/README.md +++ b/bundles/org.openhab.binding.amazonechocontrol/README.md @@ -584,7 +584,7 @@ Expert: You can use a json formatted string to control title, sound and volume: ```php -{ "sound": true, "speak":"" "title": "", "body": "<Body Text>", "volume": 20} +{ "sound": true, "speak":"<Speak>", "title": "<Title>", "body": "<Body Text>", "volume": 20} ``` The combination of `sound=true` and `speak` in SSML syntax is not allowed. diff --git a/bundles/org.openhab.binding.amazonechocontrol/src/main/java/org/openhab/binding/amazonechocontrol/internal/Connection.java b/bundles/org.openhab.binding.amazonechocontrol/src/main/java/org/openhab/binding/amazonechocontrol/internal/Connection.java index 48bc57b91..14f8607ee 100644 --- a/bundles/org.openhab.binding.amazonechocontrol/src/main/java/org/openhab/binding/amazonechocontrol/internal/Connection.java +++ b/bundles/org.openhab.binding.amazonechocontrol/src/main/java/org/openhab/binding/amazonechocontrol/internal/Connection.java @@ -1355,8 +1355,7 @@ public class Connection { JsonAnnouncementContent[] contentArray = new JsonAnnouncementContent[1]; JsonAnnouncementContent content = new JsonAnnouncementContent(); content.display.title = title == null || title.isEmpty() ? "openHAB" : title; - content.display.body = bodyText; - content.display.body = speak.replaceAll("<.+?>", " ").replaceAll("\\s+", " ").trim(); + content.display.body = bodyText.replaceAll("<.+?>", " ").replaceAll("\\s+", " ").trim(); if (speak.startsWith("<speak>") && speak.endsWith("</speak>")) { content.speak.type = "ssml"; }