Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-20 19:18:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Leave attachment insert early if there are no attachments.

Browse Source
This commit is contained in:
Greyson Parrelli
2023-11-08 09:44:13 -05:00
committed by Cody Henthorne
parent 5cd2568776
commit 29c70acf4e
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/thoughtcrime/securesms/database/AttachmentTable.java
View File

@@ -847,6 +847,10 @@ public class AttachmentTable extends DatabaseTable {
@NonNull Map<Attachment, AttachmentId> insertAttachmentsForMessage(long mmsId, @NonNull List<Attachment> attachments, @NonNull List<Attachment> quoteAttachment) @NonNull Map<Attachment, AttachmentId> insertAttachmentsForMessage(long mmsId, @NonNull List<Attachment> attachments, @NonNull List<Attachment> quoteAttachment)
throws MmsException throws MmsException
{ {
if (attachments.isEmpty() && quoteAttachment.isEmpty()) {
return Collections.emptyMap();
}
Log.d(TAG, "insertParts(" + attachments.size() + ")"); Log.d(TAG, "insertParts(" + attachments.size() + ")");
Map<Attachment, AttachmentId> insertedAttachments = new HashMap<>(); Map<Attachment, AttachmentId> insertedAttachments = new HashMap<>();

8
app/src/main/java/org/thoughtcrime/securesms/database/MessageTable.kt
View File

@@ -2975,7 +2975,7 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
val messageId = db.insert(TABLE_NAME, null, contentValues) val messageId = db.insert(TABLE_NAME, null, contentValues)
if (messageId < 0) { if (messageId < 0) {
Log.w(TAG, "Tried to insert media message but failed. Assuming duplicate.") 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) 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) { if (messageId < 0) {
return kotlin.Pair(messageId, insertedAttachments) return messageId to insertedAttachments
} }
insertListener?.onComplete() insertListener?.onComplete()
@@ -3025,7 +3025,7 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
threads.update(threadId, unarchive) threads.update(threadId, unarchive)
} }
return kotlin.Pair(messageId, insertedAttachments) return messageId to insertedAttachments
} }
/** /**