Fix message deletion threading bug

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt

@@ -1006,7 +1006,6 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
                         }
                 }
             } else {
-                ThreadUtils.queue {
                 for (message in messages) {
                     if (message.isMms) {
                         DatabaseFactory.getMmsDatabase(this@ConversationActivityV2).delete(message.id)
@@ -1015,7 +1014,6 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
                     }
                 }
             }
-            }
             endActionMode()
         }
         builder.setNegativeButton(android.R.string.cancel) { dialog, _ ->

app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java

@@ -57,6 +57,7 @@ import org.session.libsession.utilities.recipients.Recipient;
 import org.session.libsession.utilities.recipients.RecipientFormattingException;
 import org.session.libsignal.utilities.JsonUtil;
 import org.session.libsignal.utilities.Log;
+import org.session.libsignal.utilities.ThreadUtils;
 import org.session.libsignal.utilities.guava.Optional;
 import org.thoughtcrime.securesms.attachments.MmsNotificationAttachment;
 import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
@@ -883,7 +884,7 @@ public class MmsDatabase extends MessagingDatabase {
   public boolean delete(long messageId) {
     long threadId = getThreadIdForMessage(messageId);
     AttachmentDatabase attachmentDatabase = DatabaseFactory.getAttachmentDatabase(context);
-    attachmentDatabase.deleteAttachmentsForMessage(messageId);
+    ThreadUtils.queue(() -> attachmentDatabase.deleteAttachmentsForMessage(messageId));
 
     GroupReceiptDatabase groupReceiptDatabase = DatabaseFactory.getGroupReceiptDatabase(context);
     groupReceiptDatabase.deleteRowsForMessage(messageId);

app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java

@@ -20,6 +20,8 @@ package org.thoughtcrime.securesms.database;
 import android.content.ContentValues;
 import android.content.Context;
 import android.database.Cursor;
+import android.os.Handler;
+import android.os.Looper;
 import android.text.TextUtils;
 import android.util.Pair;