From acc825971b01cb5ff5945f97751cd3b7f97a6977 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Thu, 1 Jul 2021 14:42:21 -0400
Subject: [PATCH] Handle additional places where MSL entries need to be
 deleted.

---
 .../securesms/database/MessageSendLogDatabase.kt            | 6 ++++++
 .../securesms/database/helpers/SQLCipherOpenHelper.java     | 1 +
 2 files changed, 7 insertions(+)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/MessageSendLogDatabase.kt b/app/src/main/java/org/thoughtcrime/securesms/database/MessageSendLogDatabase.kt
index e354c66ec6..afe7896894 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/MessageSendLogDatabase.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/MessageSendLogDatabase.kt
@@ -91,6 +91,12 @@ class MessageSendLogDatabase constructor(context: Context?, databaseHelper: SQLC
         BEGIN 
         	DELETE FROM $TABLE_NAME WHERE $ID IN (SELECT ${MessageTable.PAYLOAD_ID} FROM ${MessageTable.TABLE_NAME} WHERE ${MessageTable.MESSAGE_ID} = old.${MmsDatabase.ID} AND ${MessageTable.IS_MMS} = 1);
         END
+      """,
+      """
+        CREATE TRIGGER msl_attachment_delete AFTER DELETE ON ${AttachmentDatabase.TABLE_NAME}
+        BEGIN
+        	DELETE FROM $TABLE_NAME WHERE $ID IN (SELECT ${MessageTable.PAYLOAD_ID} FROM ${MessageTable.TABLE_NAME} WHERE ${MessageTable.MESSAGE_ID} = old.${AttachmentDatabase.MMS_ID} AND ${MessageTable.IS_MMS} = 1);
+        END
       """
     )
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java
index be264b19dd..9772118ac2 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java
@@ -1632,6 +1632,7 @@ public class SQLCipherOpenHelper extends SQLiteOpenHelper implements SignalDatab
 
         db.execSQL("CREATE TRIGGER msl_sms_delete AFTER DELETE ON sms BEGIN DELETE FROM msl_payload WHERE _id IN (SELECT payload_id FROM msl_message WHERE message_id = old._id AND is_mms = 0); END");
         db.execSQL("CREATE TRIGGER msl_mms_delete AFTER DELETE ON mms BEGIN DELETE FROM msl_payload WHERE _id IN (SELECT payload_id FROM msl_message WHERE message_id = old._id AND is_mms = 1); END");
+        db.execSQL("CREATE TRIGGER msl_attachment_delete AFTER DELETE ON part BEGIN DELETE FROM msl_payload WHERE _id IN (SELECT payload_id FROM msl_message WHERE message_id = old.mid AND is_mms = 1); END");
       }
 
       db.setTransactionSuccessful();