From c63deb05e4cef7d7c13e886a91b00f5a3217a54a Mon Sep 17 00:00:00 2001 From: Kevin Siml Date: Sat, 11 Mar 2023 15:20:14 +0100 Subject: [PATCH 01/51] Update README.md --- bundles/org.openhab.binding.pushsafer/README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bundles/org.openhab.binding.pushsafer/README.md b/bundles/org.openhab.binding.pushsafer/README.md index 727cd9e6c336c..a51a93102f70f 100644 --- a/bundles/org.openhab.binding.pushsafer/README.md +++ b/bundles/org.openhab.binding.pushsafer/README.md @@ -29,8 +29,10 @@ You are able to create multiple instances of this Thing to broadcast to differen | `confirm` | integer | Integer 10-10800 (10s steps) Time in seconds after which a message should be sent again before it is confirmed. (default: `0`). **advanced** | | `time2live` | integer | Time in minutes, after a message automatically gets purged (default: `0`). **advanced** | | `answer` | integer | 1 = enables reply to push notifications (default: `0`). **advanced** | +| `answeroptions` | text | specify predefined answer options divided by a pipe character, e.g. Yes|No|Maybe **advanced** | +| `answerforce` | integer | 1 = force an answer. The user will be prompted to answer, the message will be open directly. (default: `0`). **advanced** | -The `retry` and `expire` parameters are only used for emergency-priority notifications. +The `retry`, `expire` and `confirm` parameters are only used for emergency-priority notifications. ## Channels From b67552ce90a62a4e08a95c7419077e67ae474bbc Mon Sep 17 00:00:00 2001 From: Kevin Siml Date: Sat, 11 Mar 2023 15:21:30 +0100 Subject: [PATCH 02/51] Update README.md --- bundles/org.openhab.binding.pushsafer/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundles/org.openhab.binding.pushsafer/README.md b/bundles/org.openhab.binding.pushsafer/README.md index a51a93102f70f..276deaeab81bd 100644 --- a/bundles/org.openhab.binding.pushsafer/README.md +++ b/bundles/org.openhab.binding.pushsafer/README.md @@ -29,7 +29,7 @@ You are able to create multiple instances of this Thing to broadcast to differen | `confirm` | integer | Integer 10-10800 (10s steps) Time in seconds after which a message should be sent again before it is confirmed. (default: `0`). **advanced** | | `time2live` | integer | Time in minutes, after a message automatically gets purged (default: `0`). **advanced** | | `answer` | integer | 1 = enables reply to push notifications (default: `0`). **advanced** | -| `answeroptions` | text | specify predefined answer options divided by a pipe character, e.g. Yes|No|Maybe **advanced** | +| `answeroptions` | text | specify predefined answer options divided by a pipe character, e.g. Yes|No|Maybe **advanced** | | `answerforce` | integer | 1 = force an answer. The user will be prompted to answer, the message will be open directly. (default: `0`). **advanced** | The `retry`, `expire` and `confirm` parameters are only used for emergency-priority notifications. From 6ec76ada9f21dda6a0fecbbb88fe6a7d676f4d8a Mon Sep 17 00:00:00 2001 From: Kevin Siml Date: Sat, 11 Mar 2023 15:24:34 +0100 Subject: [PATCH 03/51] Update PushsaferAccountConfiguration.java --- .../internal/config/PushsaferAccountConfiguration.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bundles/org.openhab.binding.pushsafer/src/main/java/org/openhab/binding/pushsafer/internal/config/PushsaferAccountConfiguration.java b/bundles/org.openhab.binding.pushsafer/src/main/java/org/openhab/binding/pushsafer/internal/config/PushsaferAccountConfiguration.java index c6c65f1259e9d..2deb456511487 100644 --- a/bundles/org.openhab.binding.pushsafer/src/main/java/org/openhab/binding/pushsafer/internal/config/PushsaferAccountConfiguration.java +++ b/bundles/org.openhab.binding.pushsafer/src/main/java/org/openhab/binding/pushsafer/internal/config/PushsaferAccountConfiguration.java @@ -35,6 +35,8 @@ public class PushsaferAccountConfiguration { public String url = DEFAULT_URL; public String urlTitle = DEFAULT_URLTITLE; public boolean answer = DEFAULT_ANSWER; + public String answeroptions = DEFAULT_ANSWEROPTIONS; + public boolean answerforce = DEFAULT_ANSWERFORCE; public int confirm = DEFAULT_CONFIRM; public int time2live = DEFAULT_TIME2LIVE; public String vibration = DEFAULT_VIBRATION; From 8feeb8a7caa394c489c5dd2c0fc18a1820dffaf6 Mon Sep 17 00:00:00 2001 From: Kevin Siml Date: Sat, 11 Mar 2023 15:31:11 +0100 Subject: [PATCH 04/51] Update PushsaferMessageBuilder.java --- .../connection/PushsaferMessageBuilder.java | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/bundles/org.openhab.binding.pushsafer/src/main/java/org/openhab/binding/pushsafer/internal/connection/PushsaferMessageBuilder.java b/bundles/org.openhab.binding.pushsafer/src/main/java/org/openhab/binding/pushsafer/internal/connection/PushsaferMessageBuilder.java index b9d2c3c786ab3..76d49b529dd45 100644 --- a/bundles/org.openhab.binding.pushsafer/src/main/java/org/openhab/binding/pushsafer/internal/connection/PushsaferMessageBuilder.java +++ b/bundles/org.openhab.binding.pushsafer/src/main/java/org/openhab/binding/pushsafer/internal/connection/PushsaferMessageBuilder.java @@ -57,6 +57,8 @@ public class PushsaferMessageBuilder { private static final String MESSAGE_KEY_SOUND = "s"; private static final String MESSAGE_KEY_TIME2LIVE = "l"; private static final String MESSAGE_KEY_ANSWER = "a"; + private static final String MESSAGE_KEY_ANSWEROPTIONS = "ao"; + private static final String MESSAGE_KEY_ANSWERFORCE = "af"; private static final String MESSAGE_KEY_CONFIRM = "cr"; private static final String MESSAGE_KEY_ATTACHMENT = "p"; public static final String MESSAGE_KEY_HTML = "html"; @@ -90,6 +92,8 @@ public class PushsaferMessageBuilder { private int confirm; private int time2live; private boolean answer; + private @Nullable String answeroptions; + private boolean answerforce; private @Nullable String color; private @Nullable String vibration; private @Nullable String attachment; @@ -180,6 +184,21 @@ public PushsaferMessageBuilder withAnswer(boolean answer) { this.answer = answer; return this; } + + public PushsaferMessageBuilder withAnswerForce(boolean answerforce) { + this.answerforce = answerforce; + return this; + } + + public PushsaferMessageBuilder withAnswerOptions(String answeroptions) { + this.answeroptions = answeroptions; + return this; + } + + public PushsaferMessageBuilder withAnswer(boolean answer) { + this.answer = answer; + return this; + } public PushsaferMessageBuilder withTime2live(int time2live) { this.time2live = time2live; @@ -306,6 +325,10 @@ public ContentProvider build() throws PushsaferCommunicationException { body.addFieldPart(MESSAGE_KEY_CONFIRM, new StringContentProvider(String.valueOf(confirm)), null); body.addFieldPart(MESSAGE_KEY_ANSWER, new StringContentProvider(String.valueOf(answer)), null); + + body.addFieldPart(MESSAGE_KEY_ANSWEROPTIONS, new StringContentProvider(String.valueOf(answeroptions)), null); + + body.addFieldPart(MESSAGE_KEY_ANSWERFORCE, new StringContentProvider(String.valueOf(answerforce)), null); body.addFieldPart(MESSAGE_KEY_TIME2LIVE, new StringContentProvider(String.valueOf(time2live)), null); From 12b8767578ccb2932a4ab8a72905f1af0e392f60 Mon Sep 17 00:00:00 2001 From: Kevin Siml Date: Sat, 11 Mar 2023 15:33:28 +0100 Subject: [PATCH 05/51] Update PushsaferAccountHandler.java --- .../internal/handler/PushsaferAccountHandler.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/bundles/org.openhab.binding.pushsafer/src/main/java/org/openhab/binding/pushsafer/internal/handler/PushsaferAccountHandler.java b/bundles/org.openhab.binding.pushsafer/src/main/java/org/openhab/binding/pushsafer/internal/handler/PushsaferAccountHandler.java index 04ff15cbec1da..11b3ea0e72382 100644 --- a/bundles/org.openhab.binding.pushsafer/src/main/java/org/openhab/binding/pushsafer/internal/handler/PushsaferAccountHandler.java +++ b/bundles/org.openhab.binding.pushsafer/src/main/java/org/openhab/binding/pushsafer/internal/handler/PushsaferAccountHandler.java @@ -182,6 +182,14 @@ public PushsaferMessageBuilder getDefaultPushsaferMessageBuilder(String message) if (DEFAULT_ANSWER != config.answer) { builder.withAnswer(config.answer); } + // add answeroptions if defined + if (DEFAULT_ANSWEROPTIONS != config.answeroptions) { + builder.withAnswerOptions(config.answeroptions); + } + // add answerforce if defined + if (DEFAULT_ANSWERFORCE != config.answerforce) { + builder.withAnswerForce(config.answerforce); + } // add time2live if defined if (DEFAULT_TIME2LIVE != config.time2live) { builder.withTime2live(config.time2live); From cba35dd7d94b7f4fcd594abd1d1f97c2fc3cadce Mon Sep 17 00:00:00 2001 From: Kevin Siml Date: Sat, 11 Mar 2023 15:37:28 +0100 Subject: [PATCH 06/51] Update PushsaferBindingConstants.java --- .../binding/pushsafer/internal/PushsaferBindingConstants.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bundles/org.openhab.binding.pushsafer/src/main/java/org/openhab/binding/pushsafer/internal/PushsaferBindingConstants.java b/bundles/org.openhab.binding.pushsafer/src/main/java/org/openhab/binding/pushsafer/internal/PushsaferBindingConstants.java index f8e723ac76761..09661d34013c8 100644 --- a/bundles/org.openhab.binding.pushsafer/src/main/java/org/openhab/binding/pushsafer/internal/PushsaferBindingConstants.java +++ b/bundles/org.openhab.binding.pushsafer/src/main/java/org/openhab/binding/pushsafer/internal/PushsaferBindingConstants.java @@ -39,6 +39,8 @@ public class PushsaferBindingConstants { public static final String DEFAULT_VIBRATION = "1"; public static final int DEFAULT_CONFIRM = 0; public static final boolean DEFAULT_ANSWER = false; + public static final String DEFAULT_ANSWEROPTIONS = ""; + public static final boolean DEFAULT_ANSWERFORCE = false; public static final int DEFAULT_TIME2LIVE = 0; public static final String DEFAULT_TITLE = "openHAB"; } From 808aa91158ae6aaeda547908e38b539debe7396d Mon Sep 17 00:00:00 2001 From: Kevin Siml Date: Sat, 11 Mar 2023 15:39:27 +0100 Subject: [PATCH 07/51] Update addon.xml --- .../src/main/resources/OH-INF/addon/addon.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/addon/addon.xml index 745f5bb0b1a05..72293eddaf35e 100644 --- a/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/addon/addon.xml +++ b/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/addon/addon.xml @@ -6,7 +6,7 @@ binding Pushsafer Binding With Pushsafer you can send & receive push notifications in real time, easily and securely on your - iPhone, iPad, Android, Windows mobile or Windows desktop device as well as on your browser (Chrome, Firefox, Opera + iPhone, iPad, Android, Windows mobile or Windows desktop device, Telegram as well as on your browser (Chrome, Firefox, Opera & Yandex)! From 857b2ca9d2e7758894d8121bf6d497ebe0c6bd8c Mon Sep 17 00:00:00 2001 From: Kevin Siml Date: Sat, 11 Mar 2023 15:41:19 +0100 Subject: [PATCH 08/51] Update config.xml --- .../src/main/resources/OH-INF/config/config.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/config/config.xml b/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/config/config.xml index 6f362b8b3c587..374fbbe7f8667 100644 --- a/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/config/config.xml +++ b/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/config/config.xml @@ -94,6 +94,17 @@ true = Enable reply to push notifications, false otherwise. false + + true + + specify predefined answer options divided by a pipe character, e.g. Yes|No|Maybe + + + true + + true = force an answer. The user will be prompted to answer, the message will be open directly. + false + From 400f1c4308a212c895409e01955e520de43b6597 Mon Sep 17 00:00:00 2001 From: Kevin Siml Date: Sat, 11 Mar 2023 15:43:20 +0100 Subject: [PATCH 09/51] Update pushsafer.properties --- .../src/main/resources/OH-INF/i18n/pushsafer.properties | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/i18n/pushsafer.properties b/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/i18n/pushsafer.properties index b3c88546ee64a..a3388a322753f 100644 --- a/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/i18n/pushsafer.properties +++ b/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/i18n/pushsafer.properties @@ -12,6 +12,10 @@ thing-type.pushsafer.pushsafer-account.description = Provides access to the Push thing-type.config.pushsafer.pushsafer-account.answer.label = Answer thing-type.config.pushsafer.pushsafer-account.answer.description = true = Enable reply to push notifications, false otherwise. +thing-type.config.pushsafer.pushsafer-account.answeroptions.label = Answer Options +thing-type.config.pushsafer.pushsafer-account.answeroptions.description = specify predefined answer options divided by a pipe character, e.g. Yes|No|Maybe. +thing-type.config.pushsafer.pushsafer-account.answerforce.label = Answer Force +thing-type.config.pushsafer.pushsafer-account.answerforce.description = true = force an answer. The user will be prompted to answer, the message will be open directly. thing-type.config.pushsafer.pushsafer-account.apikey.label = Private or Alias Key thing-type.config.pushsafer.pushsafer-account.apikey.description = Your Private or Alias to access the Pushsafer Message API. thing-type.config.pushsafer.pushsafer-account.color.label = Icon Color From 3477b7d775eadfa769a206c97875f9a893fad645 Mon Sep 17 00:00:00 2001 From: Kevin Siml Date: Sat, 11 Mar 2023 15:45:44 +0100 Subject: [PATCH 10/51] Update pushsafer_de.properties --- .../src/main/resources/OH-INF/i18n/pushsafer_de.properties | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/i18n/pushsafer_de.properties b/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/i18n/pushsafer_de.properties index 4aa0a86f46e7d..dbf72a4a77eb0 100644 --- a/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/i18n/pushsafer_de.properties +++ b/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/i18n/pushsafer_de.properties @@ -12,6 +12,10 @@ thing-type.pushsafer.pushsafer-account.description = Ermöglicht den Zugriff auf thing-type.config.pushsafer.pushsafer-account.answer.label = Antwort thing-type.config.pushsafer.pushsafer-account.answer.description = true \= Aktiviere Antworten auf Push-Benachrichtigungen, sonst false. +thing-type.config.pushsafer.pushsafer-account.answeroptions.label = Antwort Optionen +thing-type.config.pushsafer.pushsafer-account.answeroptions.description = vordefinierte Antwortmöglichkeiten getrennt mit einem Pipe-Zeichen z.B. Ja|Nein|Vielleicht. +thing-type.config.pushsafer.pushsafer-account.answerforce.label = Antwort erzwingen +thing-type.config.pushsafer.pushsafer-account.answerforce.description = true \= erzwingt eine Antwort, der Nutzer wird aufgefordert zu antworten, die Nachricht wird direkt geöffnet, sonst false. thing-type.config.pushsafer.pushsafer-account.apikey.label = Privater Schlüssel thing-type.config.pushsafer.pushsafer-account.apikey.description = Ihr privater Schlüssel für den Zugriff auf die Pushsafer Nachrichten-API. thing-type.config.pushsafer.pushsafer-account.color.label = Icon-Farbe From 47709bb3ac34119a811517268ba80940a4d2cf22 Mon Sep 17 00:00:00 2001 From: Kevin Siml Date: Sat, 11 Mar 2023 15:48:26 +0100 Subject: [PATCH 11/51] Update PushsaferMessageBuilder.java --- .../internal/connection/PushsaferMessageBuilder.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/bundles/org.openhab.binding.pushsafer/src/main/java/org/openhab/binding/pushsafer/internal/connection/PushsaferMessageBuilder.java b/bundles/org.openhab.binding.pushsafer/src/main/java/org/openhab/binding/pushsafer/internal/connection/PushsaferMessageBuilder.java index 76d49b529dd45..b3eea8e212511 100644 --- a/bundles/org.openhab.binding.pushsafer/src/main/java/org/openhab/binding/pushsafer/internal/connection/PushsaferMessageBuilder.java +++ b/bundles/org.openhab.binding.pushsafer/src/main/java/org/openhab/binding/pushsafer/internal/connection/PushsaferMessageBuilder.java @@ -185,20 +185,15 @@ public PushsaferMessageBuilder withAnswer(boolean answer) { return this; } - public PushsaferMessageBuilder withAnswerForce(boolean answerforce) { + public PushsaferMessageBuilder withAnswerForce(boolean answerforce) { this.answerforce = answerforce; return this; } - public PushsaferMessageBuilder withAnswerOptions(String answeroptions) { + public PushsaferMessageBuilder withAnswerOptions(String answeroptions) { this.answeroptions = answeroptions; return this; } - - public PushsaferMessageBuilder withAnswer(boolean answer) { - this.answer = answer; - return this; - } public PushsaferMessageBuilder withTime2live(int time2live) { this.time2live = time2live; From 9c68e4fb9aa13c4fa3f29d0ba9fd4d5983cf2a2d Mon Sep 17 00:00:00 2001 From: Kevin Siml Date: Sat, 11 Mar 2023 15:56:11 +0100 Subject: [PATCH 12/51] Update README.md --- bundles/org.openhab.binding.pushsafer/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundles/org.openhab.binding.pushsafer/README.md b/bundles/org.openhab.binding.pushsafer/README.md index 276deaeab81bd..c91c6f71ca4c0 100644 --- a/bundles/org.openhab.binding.pushsafer/README.md +++ b/bundles/org.openhab.binding.pushsafer/README.md @@ -32,7 +32,7 @@ You are able to create multiple instances of this Thing to broadcast to differen | `answeroptions` | text | specify predefined answer options divided by a pipe character, e.g. Yes|No|Maybe **advanced** | | `answerforce` | integer | 1 = force an answer. The user will be prompted to answer, the message will be open directly. (default: `0`). **advanced** | -The `retry`, `expire` and `confirm` parameters are only used for emergency-priority notifications. +The `retry` and `expire` parameters are only used for emergency-priority notifications. ## Channels From cb985a8ccea098dc5e622f44a473c49d2e18a380 Mon Sep 17 00:00:00 2001 From: Kevin Siml Date: Sat, 11 Mar 2023 16:40:59 +0100 Subject: [PATCH 13/51] Update README.md [Pushsafer] add latest parameter answeroptions and answerforce Signed-off-by: Pushsafer.com Kevin Siml From 55991863deae99ea75db85be5877818780d99038 Mon Sep 17 00:00:00 2001 From: Kevin Siml Date: Sat, 11 Mar 2023 16:41:25 +0100 Subject: [PATCH 14/51] Update PushsaferBindingConstants.java [Pushsafer] add latest parameter answeroptions and answerforce Signed-off-by: Pushsafer.com Kevin Siml From 5e90764d68a9db0a10c58891c18e1e227136791f Mon Sep 17 00:00:00 2001 From: Kevin Siml Date: Sat, 11 Mar 2023 16:41:38 +0100 Subject: [PATCH 15/51] Update PushsaferAccountConfiguration.java [Pushsafer] add latest parameter answeroptions and answerforce Signed-off-by: Pushsafer.com Kevin Siml From b715a3595072eaddf01a7540703146b83d10f6f9 Mon Sep 17 00:00:00 2001 From: Kevin Siml Date: Sat, 11 Mar 2023 16:41:52 +0100 Subject: [PATCH 16/51] Update PushsaferMessageBuilder.java [Pushsafer] add latest parameter answeroptions and answerforce Signed-off-by: Pushsafer.com Kevin Siml From 7bfc16b0db49a4e13bef88f46397dfddd2e7e4b0 Mon Sep 17 00:00:00 2001 From: Kevin Siml Date: Sat, 11 Mar 2023 16:42:06 +0100 Subject: [PATCH 17/51] Update PushsaferAccountHandler.java [Pushsafer] add latest parameter answeroptions and answerforce Signed-off-by: Pushsafer.com Kevin Siml From 5d8ff143d646ad7db735608bd63bce3c8e5d5e43 Mon Sep 17 00:00:00 2001 From: Kevin Siml Date: Sat, 11 Mar 2023 16:42:18 +0100 Subject: [PATCH 18/51] Update addon.xml [Pushsafer] add latest parameter answeroptions and answerforce Signed-off-by: Pushsafer.com Kevin Siml From b5d08e5bd74a68f892b5ecbe3d759a2071f1f99f Mon Sep 17 00:00:00 2001 From: Kevin Siml Date: Sat, 11 Mar 2023 16:42:44 +0100 Subject: [PATCH 19/51] Update config.xml [Pushsafer] add latest parameter answeroptions and answerforce Signed-off-by: Pushsafer.com Kevin Siml From a3c3b35f23dd4d11edd14da440fea0cc070b601d Mon Sep 17 00:00:00 2001 From: Kevin Siml Date: Sat, 11 Mar 2023 16:42:56 +0100 Subject: [PATCH 20/51] Update pushsafer.properties [Pushsafer] add latest parameter answeroptions and answerforce Signed-off-by: Pushsafer.com Kevin Siml From 94b0640cfa214577d49618e72684e5fe2aa52d61 Mon Sep 17 00:00:00 2001 From: Kevin Siml Date: Sat, 11 Mar 2023 16:43:08 +0100 Subject: [PATCH 21/51] Update pushsafer_de.properties [Pushsafer] add latest parameter answeroptions and answerforce Signed-off-by: Pushsafer.com Kevin Siml From 862116af5d3abcd221b850d44887fe579283e37e Mon Sep 17 00:00:00 2001 From: Kevin Siml Date: Sat, 11 Mar 2023 22:31:03 +0100 Subject: [PATCH 22/51] Update README.md --- bundles/org.openhab.binding.pushsafer/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bundles/org.openhab.binding.pushsafer/README.md b/bundles/org.openhab.binding.pushsafer/README.md index c91c6f71ca4c0..3ef0753913ae5 100644 --- a/bundles/org.openhab.binding.pushsafer/README.md +++ b/bundles/org.openhab.binding.pushsafer/README.md @@ -29,8 +29,8 @@ You are able to create multiple instances of this Thing to broadcast to differen | `confirm` | integer | Integer 10-10800 (10s steps) Time in seconds after which a message should be sent again before it is confirmed. (default: `0`). **advanced** | | `time2live` | integer | Time in minutes, after a message automatically gets purged (default: `0`). **advanced** | | `answer` | integer | 1 = enables reply to push notifications (default: `0`). **advanced** | -| `answeroptions` | text | specify predefined answer options divided by a pipe character, e.g. Yes|No|Maybe **advanced** | -| `answerforce` | integer | 1 = force an answer. The user will be prompted to answer, the message will be open directly. (default: `0`). **advanced** | +| `answeroptions` | text | specify predefined answer options divided by a pipe character, e.g. Yes\|No\|Maybe **advanced** | +| `answerforce` | integer | 1 = force an answer. The user will be prompted to answer, the message will be open directly. (default: `0`). **advanced** | The `retry` and `expire` parameters are only used for emergency-priority notifications. From 5b213555727257a79bf4bdd7dd9c02886b548b88 Mon Sep 17 00:00:00 2001 From: Kevin Siml Date: Sat, 11 Mar 2023 22:33:40 +0100 Subject: [PATCH 23/51] Update PushsaferMessageBuilder.java --- .../internal/connection/PushsaferMessageBuilder.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/bundles/org.openhab.binding.pushsafer/src/main/java/org/openhab/binding/pushsafer/internal/connection/PushsaferMessageBuilder.java b/bundles/org.openhab.binding.pushsafer/src/main/java/org/openhab/binding/pushsafer/internal/connection/PushsaferMessageBuilder.java index b3eea8e212511..f9e31c72a4591 100644 --- a/bundles/org.openhab.binding.pushsafer/src/main/java/org/openhab/binding/pushsafer/internal/connection/PushsaferMessageBuilder.java +++ b/bundles/org.openhab.binding.pushsafer/src/main/java/org/openhab/binding/pushsafer/internal/connection/PushsaferMessageBuilder.java @@ -184,12 +184,12 @@ public PushsaferMessageBuilder withAnswer(boolean answer) { this.answer = answer; return this; } - + public PushsaferMessageBuilder withAnswerForce(boolean answerforce) { this.answerforce = answerforce; return this; } - + public PushsaferMessageBuilder withAnswerOptions(String answeroptions) { this.answeroptions = answeroptions; return this; @@ -320,10 +320,10 @@ public ContentProvider build() throws PushsaferCommunicationException { body.addFieldPart(MESSAGE_KEY_CONFIRM, new StringContentProvider(String.valueOf(confirm)), null); body.addFieldPart(MESSAGE_KEY_ANSWER, new StringContentProvider(String.valueOf(answer)), null); - - body.addFieldPart(MESSAGE_KEY_ANSWEROPTIONS, new StringContentProvider(String.valueOf(answeroptions)), null); - - body.addFieldPart(MESSAGE_KEY_ANSWERFORCE, new StringContentProvider(String.valueOf(answerforce)), null); + + body.addFieldPart(MESSAGE_KEY_ANSWEROPTIONS, new StringContentProvider(String.valueOf(answeroptions)), null); + + body.addFieldPart(MESSAGE_KEY_ANSWERFORCE, new StringContentProvider(String.valueOf(answerforce)), null); body.addFieldPart(MESSAGE_KEY_TIME2LIVE, new StringContentProvider(String.valueOf(time2live)), null); From ee8012b9785aa2d2ef0a13bca3a1d6c874b7ebb8 Mon Sep 17 00:00:00 2001 From: Kevin Siml Date: Sat, 11 Mar 2023 22:50:08 +0100 Subject: [PATCH 24/51] Update addon.xml --- .../src/main/resources/OH-INF/addon/addon.xml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/addon/addon.xml index 72293eddaf35e..03a370f8df0cc 100644 --- a/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/addon/addon.xml +++ b/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/addon/addon.xml @@ -5,8 +5,6 @@ binding Pushsafer Binding - With Pushsafer you can send & receive push notifications in real time, easily and securely on your - iPhone, iPad, Android, Windows mobile or Windows desktop device, Telegram as well as on your browser (Chrome, Firefox, Opera - & Yandex)! + With Pushsafer you can send & receive push notifications in real time, easily and securely on your iPhone, iPad, Android, Windows mobile or Windows desktop device, Telegram as well as on your browser (Chrome, Firefox, Opera & Yandex)! From 5de67fc23ea3cbab2d112a4fd96973c0136ec1ff Mon Sep 17 00:00:00 2001 From: Kevin Siml Date: Thu, 16 Mar 2023 15:22:36 +0100 Subject: [PATCH 25/51] Add files via upload --- .../main/resources/OH-INF/config/config.xml | 220 +++++++++--------- 1 file changed, 110 insertions(+), 110 deletions(-) diff --git a/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/config/config.xml b/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/config/config.xml index 374fbbe7f8667..a454f883aba22 100644 --- a/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/config/config.xml +++ b/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/config/config.xml @@ -1,110 +1,110 @@ - - - - - - password - - Your Private or Alias to access the Pushsafer Message API. - - - - Your username or email address to validate against the Pushsafer Message API. - - - - Device ID or Device Group ID to which devices you want to send push-notifications ("a" for all available - devices). - a - - - - The default title of a message. - openHAB - - - - The default format of a message. - none - - - - - - - - - The default notification sound on target device. - 1 - - - - How often the device should vibrate. empty=device default or a number 1-3 - 1 - - - - The default notification icon on target device. - 1 - - - - The color (hexadecimal) of notification icon (e.g. #FF0000). - - - - - URL or URL Scheme send with notification. - - - - Title of URL. - - - true - - Integer 0-43200: Time in minutes, after a message automatically gets purged. - 0 - - - true - - Integer 60-10800 (60s steps): Time in seconds, after the retry/resend should stop. - 0 - - - true - - Integer 10-10800 (10s steps): Time in seconds after which a message should be sent again before it is - confirmed. - 0 - - - true - - Time in minutes, after a message automatically gets purged. - 0 - - - true - - true = Enable reply to push notifications, false otherwise. - false - - - true - - specify predefined answer options divided by a pipe character, e.g. Yes|No|Maybe - - - true - - true = force an answer. The user will be prompted to answer, the message will be open directly. - false - - - - + + + + + + password + + Your Private or Alias to access the Pushsafer Message API. + + + + Your username or email address to validate against the Pushsafer Message API. + + + + Device ID or Device Group ID to which devices you want to send push-notifications ("a" for all available + devices). + a + + + + The default title of a message. + openHAB + + + + The default format of a message. + none + + + + + + + + + The default notification sound on target device. + 1 + + + + How often the device should vibrate. empty=device default or a number 1-3 + 1 + + + + The default notification icon on target device. + 1 + + + + The color (hexadecimal) of notification icon (e.g. #FF0000). + + + + + URL or URL Scheme send with notification. + + + + Title of URL. + + + true + + Integer 0-43200: Time in minutes, after a message automatically gets purged. + 0 + + + true + + Integer 60-10800 (60s steps): Time in seconds, after the retry/resend should stop. + 0 + + + true + + Integer 10-10800 (10s steps): Time in seconds after which a message should be sent again before it is + confirmed. + 0 + + + true + + Time in minutes, after a message automatically gets purged. + 0 + + + true + + true = Enable reply to push notifications, false otherwise. + false + + + true + + specify predefined answer options divided by a pipe character, e.g. Yes|No|Maybe + + + true + + true = force an answer. The user will be prompted to answer, the message will be open directly. + false + + + + From d86fd0f13426d8ad03523be149b8f5cbe9a17d22 Mon Sep 17 00:00:00 2001 From: Kevin Siml Date: Thu, 16 Mar 2023 18:34:12 +0100 Subject: [PATCH 26/51] Add files via upload --- .../src/main/resources/OH-INF/addon/addon.xml | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/addon/addon.xml index 03a370f8df0cc..74f5da01183a3 100644 --- a/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/addon/addon.xml +++ b/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/addon/addon.xml @@ -1,10 +1,12 @@ - - - - binding - Pushsafer Binding - With Pushsafer you can send & receive push notifications in real time, easily and securely on your iPhone, iPad, Android, Windows mobile or Windows desktop device, Telegram as well as on your browser (Chrome, Firefox, Opera & Yandex)! - - + + + + binding + Pushsafer Binding + With Pushsafer you can send & receive push notifications in real time, easily and securely on your + iPhone, iPad, Android, Windows mobile or Windows desktop device, Telegram as well as on your browser (Chrome, Firefox, + Opera & Yandex)! + + From 1036bf20a8baeab2e491adbb7e79befefab27a55 Mon Sep 17 00:00:00 2001 From: Kevin Siml Date: Thu, 16 Mar 2023 19:06:26 +0100 Subject: [PATCH 27/51] Update addon.xml --- .../src/main/resources/OH-INF/addon/addon.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/addon/addon.xml index 74f5da01183a3..365e2098961d8 100644 --- a/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/addon/addon.xml +++ b/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/addon/addon.xml @@ -6,7 +6,7 @@ binding Pushsafer Binding With Pushsafer you can send & receive push notifications in real time, easily and securely on your - iPhone, iPad, Android, Windows mobile or Windows desktop device, Telegram as well as on your browser (Chrome, Firefox, - Opera & Yandex)! + iPhone, iPad, Android, Windows mobile or Windows desktop device as well as on your browser (Chrome, Firefox, Opera + & Yandex)! From 02ced188337f04688990bf1382bad939510f695c Mon Sep 17 00:00:00 2001 From: Kevin Siml Date: Thu, 16 Mar 2023 19:10:24 +0100 Subject: [PATCH 28/51] Update addon.xml --- .../src/main/resources/OH-INF/addon/addon.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/addon/addon.xml index 365e2098961d8..00bf48b2090ad 100644 --- a/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/addon/addon.xml +++ b/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/addon/addon.xml @@ -6,7 +6,7 @@ binding Pushsafer Binding With Pushsafer you can send & receive push notifications in real time, easily and securely on your - iPhone, iPad, Android, Windows mobile or Windows desktop device as well as on your browser (Chrome, Firefox, Opera + iPhone, iPad, Android, Windows mobile or desktop device, Telegram as well as on your browser (Chrome, Firefox, Opera & Yandex)! From 5551e945b903b1c030df65df28f100e6ea3e5d9e Mon Sep 17 00:00:00 2001 From: Kevin Siml Date: Sat, 15 Apr 2023 15:37:33 +0200 Subject: [PATCH 29/51] Add files via upload --- .../src/main/resources/OH-INF/addon/addon.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/addon/addon.xml index 00bf48b2090ad..74f5da01183a3 100644 --- a/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/addon/addon.xml +++ b/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/addon/addon.xml @@ -6,7 +6,7 @@ binding Pushsafer Binding With Pushsafer you can send & receive push notifications in real time, easily and securely on your - iPhone, iPad, Android, Windows mobile or desktop device, Telegram as well as on your browser (Chrome, Firefox, Opera - & Yandex)! + iPhone, iPad, Android, Windows mobile or Windows desktop device, Telegram as well as on your browser (Chrome, Firefox, + Opera & Yandex)! From 6f97c385813153dd57fd7d18564b175e24380763 Mon Sep 17 00:00:00 2001 From: Kevin Siml Date: Sat, 15 Apr 2023 15:38:03 +0200 Subject: [PATCH 30/51] Add files via upload From 6ff7ead8dca78e159351cfe3a04bd431c29e35a6 Mon Sep 17 00:00:00 2001 From: Kevin Siml Date: Sat, 11 Mar 2023 15:24:34 +0100 Subject: [PATCH 31/51] Update PushsaferAccountConfiguration.java Signed-off-by: Pushsafer.com (Kevin Siml) --- .../internal/config/PushsaferAccountConfiguration.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bundles/org.openhab.binding.pushsafer/src/main/java/org/openhab/binding/pushsafer/internal/config/PushsaferAccountConfiguration.java b/bundles/org.openhab.binding.pushsafer/src/main/java/org/openhab/binding/pushsafer/internal/config/PushsaferAccountConfiguration.java index c6c65f1259e9d..2deb456511487 100644 --- a/bundles/org.openhab.binding.pushsafer/src/main/java/org/openhab/binding/pushsafer/internal/config/PushsaferAccountConfiguration.java +++ b/bundles/org.openhab.binding.pushsafer/src/main/java/org/openhab/binding/pushsafer/internal/config/PushsaferAccountConfiguration.java @@ -35,6 +35,8 @@ public class PushsaferAccountConfiguration { public String url = DEFAULT_URL; public String urlTitle = DEFAULT_URLTITLE; public boolean answer = DEFAULT_ANSWER; + public String answeroptions = DEFAULT_ANSWEROPTIONS; + public boolean answerforce = DEFAULT_ANSWERFORCE; public int confirm = DEFAULT_CONFIRM; public int time2live = DEFAULT_TIME2LIVE; public String vibration = DEFAULT_VIBRATION; From 5bc70bbcba1b7d33a9c3c748a2c33971c011a895 Mon Sep 17 00:00:00 2001 From: Kevin Siml Date: Sat, 11 Mar 2023 15:31:11 +0100 Subject: [PATCH 32/51] Update PushsaferMessageBuilder.java Signed-off-by: Pushsafer.com (Kevin Siml) --- .../connection/PushsaferMessageBuilder.java | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/bundles/org.openhab.binding.pushsafer/src/main/java/org/openhab/binding/pushsafer/internal/connection/PushsaferMessageBuilder.java b/bundles/org.openhab.binding.pushsafer/src/main/java/org/openhab/binding/pushsafer/internal/connection/PushsaferMessageBuilder.java index b9d2c3c786ab3..76d49b529dd45 100644 --- a/bundles/org.openhab.binding.pushsafer/src/main/java/org/openhab/binding/pushsafer/internal/connection/PushsaferMessageBuilder.java +++ b/bundles/org.openhab.binding.pushsafer/src/main/java/org/openhab/binding/pushsafer/internal/connection/PushsaferMessageBuilder.java @@ -57,6 +57,8 @@ public class PushsaferMessageBuilder { private static final String MESSAGE_KEY_SOUND = "s"; private static final String MESSAGE_KEY_TIME2LIVE = "l"; private static final String MESSAGE_KEY_ANSWER = "a"; + private static final String MESSAGE_KEY_ANSWEROPTIONS = "ao"; + private static final String MESSAGE_KEY_ANSWERFORCE = "af"; private static final String MESSAGE_KEY_CONFIRM = "cr"; private static final String MESSAGE_KEY_ATTACHMENT = "p"; public static final String MESSAGE_KEY_HTML = "html"; @@ -90,6 +92,8 @@ public class PushsaferMessageBuilder { private int confirm; private int time2live; private boolean answer; + private @Nullable String answeroptions; + private boolean answerforce; private @Nullable String color; private @Nullable String vibration; private @Nullable String attachment; @@ -180,6 +184,21 @@ public PushsaferMessageBuilder withAnswer(boolean answer) { this.answer = answer; return this; } + + public PushsaferMessageBuilder withAnswerForce(boolean answerforce) { + this.answerforce = answerforce; + return this; + } + + public PushsaferMessageBuilder withAnswerOptions(String answeroptions) { + this.answeroptions = answeroptions; + return this; + } + + public PushsaferMessageBuilder withAnswer(boolean answer) { + this.answer = answer; + return this; + } public PushsaferMessageBuilder withTime2live(int time2live) { this.time2live = time2live; @@ -306,6 +325,10 @@ public ContentProvider build() throws PushsaferCommunicationException { body.addFieldPart(MESSAGE_KEY_CONFIRM, new StringContentProvider(String.valueOf(confirm)), null); body.addFieldPart(MESSAGE_KEY_ANSWER, new StringContentProvider(String.valueOf(answer)), null); + + body.addFieldPart(MESSAGE_KEY_ANSWEROPTIONS, new StringContentProvider(String.valueOf(answeroptions)), null); + + body.addFieldPart(MESSAGE_KEY_ANSWERFORCE, new StringContentProvider(String.valueOf(answerforce)), null); body.addFieldPart(MESSAGE_KEY_TIME2LIVE, new StringContentProvider(String.valueOf(time2live)), null); From a32cf52a1af581a74df1ff457bf9f466a70457f4 Mon Sep 17 00:00:00 2001 From: Kevin Siml Date: Sat, 11 Mar 2023 15:33:28 +0100 Subject: [PATCH 33/51] Update PushsaferAccountHandler.java Signed-off-by: Pushsafer.com (Kevin Siml) --- .../internal/handler/PushsaferAccountHandler.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/bundles/org.openhab.binding.pushsafer/src/main/java/org/openhab/binding/pushsafer/internal/handler/PushsaferAccountHandler.java b/bundles/org.openhab.binding.pushsafer/src/main/java/org/openhab/binding/pushsafer/internal/handler/PushsaferAccountHandler.java index 04ff15cbec1da..11b3ea0e72382 100644 --- a/bundles/org.openhab.binding.pushsafer/src/main/java/org/openhab/binding/pushsafer/internal/handler/PushsaferAccountHandler.java +++ b/bundles/org.openhab.binding.pushsafer/src/main/java/org/openhab/binding/pushsafer/internal/handler/PushsaferAccountHandler.java @@ -182,6 +182,14 @@ public PushsaferMessageBuilder getDefaultPushsaferMessageBuilder(String message) if (DEFAULT_ANSWER != config.answer) { builder.withAnswer(config.answer); } + // add answeroptions if defined + if (DEFAULT_ANSWEROPTIONS != config.answeroptions) { + builder.withAnswerOptions(config.answeroptions); + } + // add answerforce if defined + if (DEFAULT_ANSWERFORCE != config.answerforce) { + builder.withAnswerForce(config.answerforce); + } // add time2live if defined if (DEFAULT_TIME2LIVE != config.time2live) { builder.withTime2live(config.time2live); From 1878b8c41150b302b1e9ff11c8f54c36477300fb Mon Sep 17 00:00:00 2001 From: Kevin Siml Date: Sat, 11 Mar 2023 15:37:28 +0100 Subject: [PATCH 34/51] Update PushsaferBindingConstants.java Signed-off-by: Pushsafer.com (Kevin Siml) --- .../binding/pushsafer/internal/PushsaferBindingConstants.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bundles/org.openhab.binding.pushsafer/src/main/java/org/openhab/binding/pushsafer/internal/PushsaferBindingConstants.java b/bundles/org.openhab.binding.pushsafer/src/main/java/org/openhab/binding/pushsafer/internal/PushsaferBindingConstants.java index f8e723ac76761..09661d34013c8 100644 --- a/bundles/org.openhab.binding.pushsafer/src/main/java/org/openhab/binding/pushsafer/internal/PushsaferBindingConstants.java +++ b/bundles/org.openhab.binding.pushsafer/src/main/java/org/openhab/binding/pushsafer/internal/PushsaferBindingConstants.java @@ -39,6 +39,8 @@ public class PushsaferBindingConstants { public static final String DEFAULT_VIBRATION = "1"; public static final int DEFAULT_CONFIRM = 0; public static final boolean DEFAULT_ANSWER = false; + public static final String DEFAULT_ANSWEROPTIONS = ""; + public static final boolean DEFAULT_ANSWERFORCE = false; public static final int DEFAULT_TIME2LIVE = 0; public static final String DEFAULT_TITLE = "openHAB"; } From e38dd955fae371720bc7f255608e9f35064733e9 Mon Sep 17 00:00:00 2001 From: Kevin Siml Date: Sat, 11 Mar 2023 15:39:27 +0100 Subject: [PATCH 35/51] Update addon.xml Signed-off-by: Pushsafer.com (Kevin Siml) --- .../src/main/resources/OH-INF/addon/addon.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/addon/addon.xml index 745f5bb0b1a05..72293eddaf35e 100644 --- a/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/addon/addon.xml +++ b/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/addon/addon.xml @@ -6,7 +6,7 @@ binding Pushsafer Binding With Pushsafer you can send & receive push notifications in real time, easily and securely on your - iPhone, iPad, Android, Windows mobile or Windows desktop device as well as on your browser (Chrome, Firefox, Opera + iPhone, iPad, Android, Windows mobile or Windows desktop device, Telegram as well as on your browser (Chrome, Firefox, Opera & Yandex)! From bd33e08280e237cffca2d5ca7f30fb50e93e895a Mon Sep 17 00:00:00 2001 From: Kevin Siml Date: Sat, 11 Mar 2023 15:41:19 +0100 Subject: [PATCH 36/51] Update config.xml Signed-off-by: Pushsafer.com (Kevin Siml) --- .../src/main/resources/OH-INF/config/config.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/config/config.xml b/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/config/config.xml index 6f362b8b3c587..374fbbe7f8667 100644 --- a/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/config/config.xml +++ b/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/config/config.xml @@ -94,6 +94,17 @@ true = Enable reply to push notifications, false otherwise. false + + true + + specify predefined answer options divided by a pipe character, e.g. Yes|No|Maybe + + + true + + true = force an answer. The user will be prompted to answer, the message will be open directly. + false + From 04418ed3c4e8d56eb4bf51e10cb67b982f1ab2b4 Mon Sep 17 00:00:00 2001 From: Kevin Siml Date: Sat, 11 Mar 2023 15:43:20 +0100 Subject: [PATCH 37/51] Update pushsafer.properties Signed-off-by: Pushsafer.com (Kevin Siml) --- .../src/main/resources/OH-INF/i18n/pushsafer.properties | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/i18n/pushsafer.properties b/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/i18n/pushsafer.properties index b3c88546ee64a..a3388a322753f 100644 --- a/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/i18n/pushsafer.properties +++ b/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/i18n/pushsafer.properties @@ -12,6 +12,10 @@ thing-type.pushsafer.pushsafer-account.description = Provides access to the Push thing-type.config.pushsafer.pushsafer-account.answer.label = Answer thing-type.config.pushsafer.pushsafer-account.answer.description = true = Enable reply to push notifications, false otherwise. +thing-type.config.pushsafer.pushsafer-account.answeroptions.label = Answer Options +thing-type.config.pushsafer.pushsafer-account.answeroptions.description = specify predefined answer options divided by a pipe character, e.g. Yes|No|Maybe. +thing-type.config.pushsafer.pushsafer-account.answerforce.label = Answer Force +thing-type.config.pushsafer.pushsafer-account.answerforce.description = true = force an answer. The user will be prompted to answer, the message will be open directly. thing-type.config.pushsafer.pushsafer-account.apikey.label = Private or Alias Key thing-type.config.pushsafer.pushsafer-account.apikey.description = Your Private or Alias to access the Pushsafer Message API. thing-type.config.pushsafer.pushsafer-account.color.label = Icon Color From 7211f499385a848622e7d04b3e60434e6cecf33d Mon Sep 17 00:00:00 2001 From: Kevin Siml Date: Sat, 11 Mar 2023 15:45:44 +0100 Subject: [PATCH 38/51] Update pushsafer_de.properties Signed-off-by: Pushsafer.com (Kevin Siml) --- .../src/main/resources/OH-INF/i18n/pushsafer_de.properties | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/i18n/pushsafer_de.properties b/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/i18n/pushsafer_de.properties index 4aa0a86f46e7d..dbf72a4a77eb0 100644 --- a/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/i18n/pushsafer_de.properties +++ b/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/i18n/pushsafer_de.properties @@ -12,6 +12,10 @@ thing-type.pushsafer.pushsafer-account.description = Ermöglicht den Zugriff auf thing-type.config.pushsafer.pushsafer-account.answer.label = Antwort thing-type.config.pushsafer.pushsafer-account.answer.description = true \= Aktiviere Antworten auf Push-Benachrichtigungen, sonst false. +thing-type.config.pushsafer.pushsafer-account.answeroptions.label = Antwort Optionen +thing-type.config.pushsafer.pushsafer-account.answeroptions.description = vordefinierte Antwortmöglichkeiten getrennt mit einem Pipe-Zeichen z.B. Ja|Nein|Vielleicht. +thing-type.config.pushsafer.pushsafer-account.answerforce.label = Antwort erzwingen +thing-type.config.pushsafer.pushsafer-account.answerforce.description = true \= erzwingt eine Antwort, der Nutzer wird aufgefordert zu antworten, die Nachricht wird direkt geöffnet, sonst false. thing-type.config.pushsafer.pushsafer-account.apikey.label = Privater Schlüssel thing-type.config.pushsafer.pushsafer-account.apikey.description = Ihr privater Schlüssel für den Zugriff auf die Pushsafer Nachrichten-API. thing-type.config.pushsafer.pushsafer-account.color.label = Icon-Farbe From c4b772216f97a94dbcd886070b882484e005da4e Mon Sep 17 00:00:00 2001 From: Kevin Siml Date: Sat, 11 Mar 2023 15:48:26 +0100 Subject: [PATCH 39/51] Update PushsaferMessageBuilder.java Signed-off-by: Pushsafer.com (Kevin Siml) --- .../internal/connection/PushsaferMessageBuilder.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/bundles/org.openhab.binding.pushsafer/src/main/java/org/openhab/binding/pushsafer/internal/connection/PushsaferMessageBuilder.java b/bundles/org.openhab.binding.pushsafer/src/main/java/org/openhab/binding/pushsafer/internal/connection/PushsaferMessageBuilder.java index 76d49b529dd45..b3eea8e212511 100644 --- a/bundles/org.openhab.binding.pushsafer/src/main/java/org/openhab/binding/pushsafer/internal/connection/PushsaferMessageBuilder.java +++ b/bundles/org.openhab.binding.pushsafer/src/main/java/org/openhab/binding/pushsafer/internal/connection/PushsaferMessageBuilder.java @@ -185,20 +185,15 @@ public PushsaferMessageBuilder withAnswer(boolean answer) { return this; } - public PushsaferMessageBuilder withAnswerForce(boolean answerforce) { + public PushsaferMessageBuilder withAnswerForce(boolean answerforce) { this.answerforce = answerforce; return this; } - public PushsaferMessageBuilder withAnswerOptions(String answeroptions) { + public PushsaferMessageBuilder withAnswerOptions(String answeroptions) { this.answeroptions = answeroptions; return this; } - - public PushsaferMessageBuilder withAnswer(boolean answer) { - this.answer = answer; - return this; - } public PushsaferMessageBuilder withTime2live(int time2live) { this.time2live = time2live; From bccc64088303ef41b3492336b3014dbc9a4e1a42 Mon Sep 17 00:00:00 2001 From: Kevin Siml Date: Sat, 11 Mar 2023 15:56:11 +0100 Subject: [PATCH 40/51] Update README.md Signed-off-by: Pushsafer.com (Kevin Siml) --- bundles/org.openhab.binding.pushsafer/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundles/org.openhab.binding.pushsafer/README.md b/bundles/org.openhab.binding.pushsafer/README.md index 276deaeab81bd..c91c6f71ca4c0 100644 --- a/bundles/org.openhab.binding.pushsafer/README.md +++ b/bundles/org.openhab.binding.pushsafer/README.md @@ -32,7 +32,7 @@ You are able to create multiple instances of this Thing to broadcast to differen | `answeroptions` | text | specify predefined answer options divided by a pipe character, e.g. Yes|No|Maybe **advanced** | | `answerforce` | integer | 1 = force an answer. The user will be prompted to answer, the message will be open directly. (default: `0`). **advanced** | -The `retry`, `expire` and `confirm` parameters are only used for emergency-priority notifications. +The `retry` and `expire` parameters are only used for emergency-priority notifications. ## Channels From 2079697a49eef7b1ce2404549c8e5e8ef41ecff0 Mon Sep 17 00:00:00 2001 From: Kevin Siml Date: Sat, 11 Mar 2023 22:31:03 +0100 Subject: [PATCH 41/51] Update README.md Signed-off-by: Pushsafer.com (Kevin Siml) --- bundles/org.openhab.binding.pushsafer/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bundles/org.openhab.binding.pushsafer/README.md b/bundles/org.openhab.binding.pushsafer/README.md index c91c6f71ca4c0..3ef0753913ae5 100644 --- a/bundles/org.openhab.binding.pushsafer/README.md +++ b/bundles/org.openhab.binding.pushsafer/README.md @@ -29,8 +29,8 @@ You are able to create multiple instances of this Thing to broadcast to differen | `confirm` | integer | Integer 10-10800 (10s steps) Time in seconds after which a message should be sent again before it is confirmed. (default: `0`). **advanced** | | `time2live` | integer | Time in minutes, after a message automatically gets purged (default: `0`). **advanced** | | `answer` | integer | 1 = enables reply to push notifications (default: `0`). **advanced** | -| `answeroptions` | text | specify predefined answer options divided by a pipe character, e.g. Yes|No|Maybe **advanced** | -| `answerforce` | integer | 1 = force an answer. The user will be prompted to answer, the message will be open directly. (default: `0`). **advanced** | +| `answeroptions` | text | specify predefined answer options divided by a pipe character, e.g. Yes\|No\|Maybe **advanced** | +| `answerforce` | integer | 1 = force an answer. The user will be prompted to answer, the message will be open directly. (default: `0`). **advanced** | The `retry` and `expire` parameters are only used for emergency-priority notifications. From fe3ad48b0629d3cb0fd48691db56b82fa904ecad Mon Sep 17 00:00:00 2001 From: Kevin Siml Date: Sat, 11 Mar 2023 22:33:40 +0100 Subject: [PATCH 42/51] Update PushsaferMessageBuilder.java Signed-off-by: Pushsafer.com (Kevin Siml) --- .../internal/connection/PushsaferMessageBuilder.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/bundles/org.openhab.binding.pushsafer/src/main/java/org/openhab/binding/pushsafer/internal/connection/PushsaferMessageBuilder.java b/bundles/org.openhab.binding.pushsafer/src/main/java/org/openhab/binding/pushsafer/internal/connection/PushsaferMessageBuilder.java index b3eea8e212511..f9e31c72a4591 100644 --- a/bundles/org.openhab.binding.pushsafer/src/main/java/org/openhab/binding/pushsafer/internal/connection/PushsaferMessageBuilder.java +++ b/bundles/org.openhab.binding.pushsafer/src/main/java/org/openhab/binding/pushsafer/internal/connection/PushsaferMessageBuilder.java @@ -184,12 +184,12 @@ public PushsaferMessageBuilder withAnswer(boolean answer) { this.answer = answer; return this; } - + public PushsaferMessageBuilder withAnswerForce(boolean answerforce) { this.answerforce = answerforce; return this; } - + public PushsaferMessageBuilder withAnswerOptions(String answeroptions) { this.answeroptions = answeroptions; return this; @@ -320,10 +320,10 @@ public ContentProvider build() throws PushsaferCommunicationException { body.addFieldPart(MESSAGE_KEY_CONFIRM, new StringContentProvider(String.valueOf(confirm)), null); body.addFieldPart(MESSAGE_KEY_ANSWER, new StringContentProvider(String.valueOf(answer)), null); - - body.addFieldPart(MESSAGE_KEY_ANSWEROPTIONS, new StringContentProvider(String.valueOf(answeroptions)), null); - - body.addFieldPart(MESSAGE_KEY_ANSWERFORCE, new StringContentProvider(String.valueOf(answerforce)), null); + + body.addFieldPart(MESSAGE_KEY_ANSWEROPTIONS, new StringContentProvider(String.valueOf(answeroptions)), null); + + body.addFieldPart(MESSAGE_KEY_ANSWERFORCE, new StringContentProvider(String.valueOf(answerforce)), null); body.addFieldPart(MESSAGE_KEY_TIME2LIVE, new StringContentProvider(String.valueOf(time2live)), null); From 31baf0b031f185a3da5d7aacf8f4aeb3ba272d91 Mon Sep 17 00:00:00 2001 From: Kevin Siml Date: Sat, 11 Mar 2023 22:50:08 +0100 Subject: [PATCH 43/51] Update addon.xml Signed-off-by: Pushsafer.com (Kevin Siml) --- .../src/main/resources/OH-INF/addon/addon.xml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/addon/addon.xml index 72293eddaf35e..03a370f8df0cc 100644 --- a/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/addon/addon.xml +++ b/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/addon/addon.xml @@ -5,8 +5,6 @@ binding Pushsafer Binding - With Pushsafer you can send & receive push notifications in real time, easily and securely on your - iPhone, iPad, Android, Windows mobile or Windows desktop device, Telegram as well as on your browser (Chrome, Firefox, Opera - & Yandex)! + With Pushsafer you can send & receive push notifications in real time, easily and securely on your iPhone, iPad, Android, Windows mobile or Windows desktop device, Telegram as well as on your browser (Chrome, Firefox, Opera & Yandex)! From 542c08bd64f5e96a8f7839cb06d58b2ad36c8653 Mon Sep 17 00:00:00 2001 From: Kevin Siml Date: Thu, 16 Mar 2023 15:22:36 +0100 Subject: [PATCH 44/51] Add files via upload Signed-off-by: Pushsafer.com (Kevin Siml) --- .../main/resources/OH-INF/config/config.xml | 220 +++++++++--------- 1 file changed, 110 insertions(+), 110 deletions(-) diff --git a/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/config/config.xml b/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/config/config.xml index 374fbbe7f8667..a454f883aba22 100644 --- a/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/config/config.xml +++ b/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/config/config.xml @@ -1,110 +1,110 @@ - - - - - - password - - Your Private or Alias to access the Pushsafer Message API. - - - - Your username or email address to validate against the Pushsafer Message API. - - - - Device ID or Device Group ID to which devices you want to send push-notifications ("a" for all available - devices). - a - - - - The default title of a message. - openHAB - - - - The default format of a message. - none - - - - - - - - - The default notification sound on target device. - 1 - - - - How often the device should vibrate. empty=device default or a number 1-3 - 1 - - - - The default notification icon on target device. - 1 - - - - The color (hexadecimal) of notification icon (e.g. #FF0000). - - - - - URL or URL Scheme send with notification. - - - - Title of URL. - - - true - - Integer 0-43200: Time in minutes, after a message automatically gets purged. - 0 - - - true - - Integer 60-10800 (60s steps): Time in seconds, after the retry/resend should stop. - 0 - - - true - - Integer 10-10800 (10s steps): Time in seconds after which a message should be sent again before it is - confirmed. - 0 - - - true - - Time in minutes, after a message automatically gets purged. - 0 - - - true - - true = Enable reply to push notifications, false otherwise. - false - - - true - - specify predefined answer options divided by a pipe character, e.g. Yes|No|Maybe - - - true - - true = force an answer. The user will be prompted to answer, the message will be open directly. - false - - - - + + + + + + password + + Your Private or Alias to access the Pushsafer Message API. + + + + Your username or email address to validate against the Pushsafer Message API. + + + + Device ID or Device Group ID to which devices you want to send push-notifications ("a" for all available + devices). + a + + + + The default title of a message. + openHAB + + + + The default format of a message. + none + + + + + + + + + The default notification sound on target device. + 1 + + + + How often the device should vibrate. empty=device default or a number 1-3 + 1 + + + + The default notification icon on target device. + 1 + + + + The color (hexadecimal) of notification icon (e.g. #FF0000). + + + + + URL or URL Scheme send with notification. + + + + Title of URL. + + + true + + Integer 0-43200: Time in minutes, after a message automatically gets purged. + 0 + + + true + + Integer 60-10800 (60s steps): Time in seconds, after the retry/resend should stop. + 0 + + + true + + Integer 10-10800 (10s steps): Time in seconds after which a message should be sent again before it is + confirmed. + 0 + + + true + + Time in minutes, after a message automatically gets purged. + 0 + + + true + + true = Enable reply to push notifications, false otherwise. + false + + + true + + specify predefined answer options divided by a pipe character, e.g. Yes|No|Maybe + + + true + + true = force an answer. The user will be prompted to answer, the message will be open directly. + false + + + + From ae3a1e99b898374ade66e0fb7ca36e1f3077c820 Mon Sep 17 00:00:00 2001 From: Kevin Siml Date: Thu, 16 Mar 2023 18:34:12 +0100 Subject: [PATCH 45/51] Add files via upload Signed-off-by: Pushsafer.com (Kevin Siml) --- .../src/main/resources/OH-INF/addon/addon.xml | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/addon/addon.xml index 03a370f8df0cc..74f5da01183a3 100644 --- a/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/addon/addon.xml +++ b/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/addon/addon.xml @@ -1,10 +1,12 @@ - - - - binding - Pushsafer Binding - With Pushsafer you can send & receive push notifications in real time, easily and securely on your iPhone, iPad, Android, Windows mobile or Windows desktop device, Telegram as well as on your browser (Chrome, Firefox, Opera & Yandex)! - - + + + + binding + Pushsafer Binding + With Pushsafer you can send & receive push notifications in real time, easily and securely on your + iPhone, iPad, Android, Windows mobile or Windows desktop device, Telegram as well as on your browser (Chrome, Firefox, + Opera & Yandex)! + + From fbc302472eaac8def68339054a05a3e4d0fe952d Mon Sep 17 00:00:00 2001 From: Kevin Siml Date: Thu, 16 Mar 2023 19:06:26 +0100 Subject: [PATCH 46/51] Update addon.xml Signed-off-by: Pushsafer.com (Kevin Siml) --- .../src/main/resources/OH-INF/addon/addon.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/addon/addon.xml index 74f5da01183a3..365e2098961d8 100644 --- a/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/addon/addon.xml +++ b/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/addon/addon.xml @@ -6,7 +6,7 @@ binding Pushsafer Binding With Pushsafer you can send & receive push notifications in real time, easily and securely on your - iPhone, iPad, Android, Windows mobile or Windows desktop device, Telegram as well as on your browser (Chrome, Firefox, - Opera & Yandex)! + iPhone, iPad, Android, Windows mobile or Windows desktop device as well as on your browser (Chrome, Firefox, Opera + & Yandex)! From d11d16352589c2cec3e2f667a2d9d1b04ad8db41 Mon Sep 17 00:00:00 2001 From: Kevin Siml Date: Thu, 16 Mar 2023 19:10:24 +0100 Subject: [PATCH 47/51] Update addon.xml Signed-off-by: Pushsafer.com (Kevin Siml) --- .../src/main/resources/OH-INF/addon/addon.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/addon/addon.xml index 365e2098961d8..00bf48b2090ad 100644 --- a/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/addon/addon.xml +++ b/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/addon/addon.xml @@ -6,7 +6,7 @@ binding Pushsafer Binding With Pushsafer you can send & receive push notifications in real time, easily and securely on your - iPhone, iPad, Android, Windows mobile or Windows desktop device as well as on your browser (Chrome, Firefox, Opera + iPhone, iPad, Android, Windows mobile or desktop device, Telegram as well as on your browser (Chrome, Firefox, Opera & Yandex)! From a542bc3b2254d59c98689cdb4a23c25883fe2a10 Mon Sep 17 00:00:00 2001 From: Kevin Siml Date: Sat, 15 Apr 2023 15:37:33 +0200 Subject: [PATCH 48/51] Add files via upload Signed-off-by: Pushsafer.com (Kevin Siml) --- .../src/main/resources/OH-INF/addon/addon.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/addon/addon.xml index 00bf48b2090ad..74f5da01183a3 100644 --- a/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/addon/addon.xml +++ b/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/addon/addon.xml @@ -6,7 +6,7 @@ binding Pushsafer Binding With Pushsafer you can send & receive push notifications in real time, easily and securely on your - iPhone, iPad, Android, Windows mobile or desktop device, Telegram as well as on your browser (Chrome, Firefox, Opera - & Yandex)! + iPhone, iPad, Android, Windows mobile or Windows desktop device, Telegram as well as on your browser (Chrome, Firefox, + Opera & Yandex)! From 5e31eb3a5912699388416cbea1eb3a9ca05b1de5 Mon Sep 17 00:00:00 2001 From: Leo Siepel Date: Sat, 22 Mar 2025 23:54:48 +0100 Subject: [PATCH 49/51] Trivial change Signed-off-by: Leo Siepel --- .../src/main/resources/OH-INF/config/config.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/config/config.xml b/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/config/config.xml index a454f883aba22..7d43a38c337ed 100644 --- a/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/config/config.xml +++ b/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/config/config.xml @@ -97,7 +97,7 @@ true - specify predefined answer options divided by a pipe character, e.g. Yes|No|Maybe + Specify predefined answer options divided by a pipe character, e.g. Yes|No|Maybe true From bbc3e0f521b86a9d8a51938d4e50580461d04a44 Mon Sep 17 00:00:00 2001 From: Leo Siepel Date: Wed, 26 Mar 2025 20:06:37 +0100 Subject: [PATCH 50/51] Fix attempt 1 Signed-off-by: Leo Siepel --- .../main/resources/OH-INF/config/config.xml | 110 ------------------ 1 file changed, 110 deletions(-) delete mode 100644 bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/config/config.xml diff --git a/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/config/config.xml b/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/config/config.xml deleted file mode 100644 index 7d43a38c337ed..0000000000000 --- a/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/config/config.xml +++ /dev/null @@ -1,110 +0,0 @@ - - - - - - password - - Your Private or Alias to access the Pushsafer Message API. - - - - Your username or email address to validate against the Pushsafer Message API. - - - - Device ID or Device Group ID to which devices you want to send push-notifications ("a" for all available - devices). - a - - - - The default title of a message. - openHAB - - - - The default format of a message. - none - - - - - - - - - The default notification sound on target device. - 1 - - - - How often the device should vibrate. empty=device default or a number 1-3 - 1 - - - - The default notification icon on target device. - 1 - - - - The color (hexadecimal) of notification icon (e.g. #FF0000). - - - - - URL or URL Scheme send with notification. - - - - Title of URL. - - - true - - Integer 0-43200: Time in minutes, after a message automatically gets purged. - 0 - - - true - - Integer 60-10800 (60s steps): Time in seconds, after the retry/resend should stop. - 0 - - - true - - Integer 10-10800 (10s steps): Time in seconds after which a message should be sent again before it is - confirmed. - 0 - - - true - - Time in minutes, after a message automatically gets purged. - 0 - - - true - - true = Enable reply to push notifications, false otherwise. - false - - - true - - Specify predefined answer options divided by a pipe character, e.g. Yes|No|Maybe - - - true - - true = force an answer. The user will be prompted to answer, the message will be open directly. - false - - - - From 7f27975da4fe9f45c740e5ddf5a756ba9ed08e89 Mon Sep 17 00:00:00 2001 From: Leo Siepel Date: Wed, 26 Mar 2025 20:10:01 +0100 Subject: [PATCH 51/51] Add config again Signed-off-by: Leo Siepel --- .../main/resources/OH-INF/config/config.xml | 110 ++++++++++++++++++ 1 file changed, 110 insertions(+) create mode 100644 bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/config/config.xml diff --git a/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/config/config.xml b/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/config/config.xml new file mode 100644 index 0000000000000..f5247e7177a9d --- /dev/null +++ b/bundles/org.openhab.binding.pushsafer/src/main/resources/OH-INF/config/config.xml @@ -0,0 +1,110 @@ + + + + + + password + + Your Private or Alias to access the Pushsafer Message API. + + + + Your username or email address to validate against the Pushsafer Message API. + + + + Device ID or Device Group ID to which devices you want to send push-notifications ("a" for all available + devices). + a + + + + The default title of a message. + openHAB + + + + The default format of a message. + none + + + + + + + + + The default notification sound on target device. + 1 + + + + How often the device should vibrate. empty=device default or a number 1-3 + 1 + + + + The default notification icon on target device. + 1 + + + + The color (hexadecimal) of notification icon (e.g. #FF0000). + + + + + URL or URL Scheme send with notification. + + + + Title of URL. + + + true + + Integer 0-43200: Time in minutes, after a message automatically gets purged. + 0 + + + true + + Integer 60-10800 (60s steps): Time in seconds, after the retry/resend should stop. + 0 + + + true + + Integer 10-10800 (10s steps): Time in seconds after which a message should be sent again before it is + confirmed. + 0 + + + true + + Time in minutes, after a message automatically gets purged. + 0 + + + true + + true = Enable reply to push notifications, false otherwise. + false + + + true + + Specify predefined answer options divided by a pipe character, e.g. Yes|No|Maybe + + + true + + true = force an answer. The user will be prompted to answer, the message will be open directly. + false + + + +