From d7404cf32fee11caf1a2f2ffbe8d090b4f2cd7bd Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Mon, 28 Nov 2022 12:02:25 -0400
Subject: [PATCH] Prevent empty or all-whitespace string from being sent as a
 gift message.

---
 .../main/java/org/thoughtcrime/securesms/jobs/GiftSendJob.kt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/GiftSendJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/GiftSendJob.kt
index 7067fd179a..9f12f0e513 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/GiftSendJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/GiftSendJob.kt
@@ -75,12 +75,13 @@ class GiftSendJob private constructor(parameters: Parameters, private val recipi
     return if (didInsert) {
       Log.i(TAG, "Successfully inserted outbox message for gift", true)
 
-      if (additionalMessage != null) {
+      val trimmedMessage = additionalMessage?.trim()
+      if (!trimmedMessage.isNullOrBlank()) {
         Log.i(TAG, "Sending additional message...")
 
         val result = MultiShareSender.sendSync(
           MultiShareArgs.Builder(setOf(ContactSearchKey.RecipientSearchKey.KnownRecipient(recipientId)))
-            .withDraftText(additionalMessage)
+            .withDraftText(trimmedMessage)
             .build()
         )