From 34117285977fdfec4941aa766ea1d6a1acf87530 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Kr=C3=BCger?= <t@timkrueger.me>
Date: Wed, 2 Mar 2022 09:12:01 +0100
Subject: [PATCH] Pass 'null' for unset icon in custom status message
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
The OCS Status API expect an valid emoji or 'null' for the status icon
in a custom message:
> field: statusIcon
> type: string/null
> Description: The icon picked by the user (must be an emoji, at most one)
See [1] for more details.
Resolves: #1839
See:
[1] https://docs.nextcloud.com/server/latest/developer_manual/client_apis/OCS/ocs-status-api.html#set-a-custom-message-user-defined
Signed-off-by: Tim Krüger <t@timkrueger.me>
---
.../talk/ui/dialog/SetStatusDialogFragment.kt | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/app/src/main/java/com/nextcloud/talk/ui/dialog/SetStatusDialogFragment.kt b/app/src/main/java/com/nextcloud/talk/ui/dialog/SetStatusDialogFragment.kt
index 898564b8a..3db3be2f0 100644
--- a/app/src/main/java/com/nextcloud/talk/ui/dialog/SetStatusDialogFragment.kt
+++ b/app/src/main/java/com/nextcloud/talk/ui/dialog/SetStatusDialogFragment.kt
@@ -393,15 +393,15 @@ class SetStatusDialogFragment :
}
private fun setStatusMessage() {
- var inputText = binding.customStatusInput.text.toString()
- if (inputText.isEmpty()) {
- inputText = " "
- }
+
+ val inputText = binding.customStatusInput.text.toString().ifEmpty { " " }
+ // The endpoint '/message/custom' expects a valid emoji as string or null
+ val statusIcon = binding.emoji.text.toString().ifEmpty { null }
ncApi.setCustomStatusMessage(
credentials,
ApiUtils.getUrlForSetCustomStatus(currentUser?.baseUrl),
- binding.emoji.text.toString(),
+ statusIcon,
inputText,
clearAt
)