From 823f55ff7d828f0acfad1b779c328b32b6662285 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20K=C3=BCrten?= <sebastian@mobanisto.de>
Date: Thu, 20 Jan 2022 21:58:59 +0100
Subject: [PATCH] Avoid sending empty strings along images
---
.../briar/desktop/conversation/ConversationViewModel.kt | 4 ++--
1 file changed, 2 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 ac6638a5ce..cddd2bf08e 100644
--- a/src/main/kotlin/org/briarproject/briar/desktop/conversation/ConversationViewModel.kt
+++ b/src/main/kotlin/org/briarproject/briar/desktop/conversation/ConversationViewModel.kt
@@ -175,7 +175,7 @@ constructor(
runOnDbThreadWithTransaction(false) { txn ->
try {
val start = LogUtils.now()
- val m = createMessage(txn, contactId, groupId, trimmed, headers)
+ val m = createMessage(txn, contactId, groupId, trimmed.ifBlank { null }, headers)
messagingManager.addLocalMessage(txn, m)
LOG.logDuration("Storing message", start)
@@ -252,7 +252,7 @@ constructor(
txn: Transaction,
contactId: ContactId,
groupId: GroupId,
- text: String,
+ text: String?,
headers: List<AttachmentHeader>,
): PrivateMessage {
val timestamp = conversationManager.getTimestampForOutgoingMessage(txn, contactId)
--
GitLab