From 29c70acf4e8992b0dc22b8d38f1287332fed00ef Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Wed, 8 Nov 2023 09:44:13 -0500
Subject: [PATCH] Leave attachment insert early if there are no attachments.

---
 .../thoughtcrime/securesms/database/AttachmentTable.java  | 4 ++++
 .../org/thoughtcrime/securesms/database/MessageTable.kt   | 8 ++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/AttachmentTable.java b/app/src/main/java/org/thoughtcrime/securesms/database/AttachmentTable.java
index 3af59350b4..e8cc05c4ec 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/AttachmentTable.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/AttachmentTable.java
@@ -847,6 +847,10 @@ public class AttachmentTable extends DatabaseTable {
   @NonNull Map<Attachment, AttachmentId> insertAttachmentsForMessage(long mmsId, @NonNull List<Attachment> attachments, @NonNull List<Attachment> quoteAttachment)
       throws MmsException
   {
+    if (attachments.isEmpty() && quoteAttachment.isEmpty()) {
+      return Collections.emptyMap();
+    }
+
     Log.d(TAG, "insertParts(" + attachments.size() + ")");
 
     Map<Attachment, AttachmentId> insertedAttachments = new HashMap<>();
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/MessageTable.kt b/app/src/main/java/org/thoughtcrime/securesms/database/MessageTable.kt
index 47961c5d34..69232d79d1 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/MessageTable.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/MessageTable.kt
@@ -2975,7 +2975,7 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
       val messageId = db.insert(TABLE_NAME, null, contentValues)
       if (messageId < 0) {
         Log.w(TAG, "Tried to insert media message but failed. Assuming duplicate.")
-        return@withinTransaction kotlin.Pair(-1L, null)
+        return@withinTransaction -1L to null
       }
 
       threads.markAsActiveEarly(threadId)
@@ -3009,11 +3009,11 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
         }
       }
 
-      kotlin.Pair(messageId, insertedAttachments)
+      messageId to insertedAttachments
     }
 
     if (messageId < 0) {
-      return kotlin.Pair(messageId, insertedAttachments)
+      return messageId to insertedAttachments
     }
 
     insertListener?.onComplete()
@@ -3025,7 +3025,7 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
       threads.update(threadId, unarchive)
     }
 
-    return kotlin.Pair(messageId, insertedAttachments)
+    return messageId to insertedAttachments
   }
 
   /**