Prevent empty or all-whitespace string from being sent as a gift mess…

…age.
signalapp · Nov 28, 2022 · d7404cf · d7404cf
1 parent ec1f771
commit d7404cf
Showing 1 changed file with 3 additions and 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
@@ -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()
         )