From 315a57f4be3415d2b5a0c792c2db565ed05ce217 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20K=C3=BCrten?= <sebastian@mobanisto.de>
Date: Tue, 18 Jan 2022 12:00:59 +0100
Subject: [PATCH] Trim leading and trailing whitespace from message input
---
.../briar/desktop/conversation/ConversationViewModel.kt | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/kotlin/org/briarproject/briar/desktop/conversation/ConversationViewModel.kt b/src/main/kotlin/org/briarproject/briar/desktop/conversation/ConversationViewModel.kt
index c531358e40..14648abd47 100644
--- a/src/main/kotlin/org/briarproject/briar/desktop/conversation/ConversationViewModel.kt
+++ b/src/main/kotlin/org/briarproject/briar/desktop/conversation/ConversationViewModel.kt
@@ -126,8 +126,10 @@ constructor(
val text = _newMessage.value
val image = _newMessageImage.value
+ val trimmed = text.trim()
+
// don't send empty or blank messages
- if (text.isBlank() && image == null) return
+ if (trimmed.isBlank() && image == null) return
_newMessage.value = ""
_newMessageImage.value = null
@@ -154,7 +156,7 @@ constructor(
runOnDbThreadWithTransaction(false) { txn ->
try {
val start = LogUtils.now()
- val m = createMessage(txn, contactId, groupId!!, text, headers)
+ val m = createMessage(txn, contactId, groupId, trimmed, headers)
messagingManager.addLocalMessage(txn, m)
LOG.logDuration("Storing message", start)
--
GitLab