Making sure deleted control messages leave nothing behind

6 months ago · 7ed987b61a
parent 54ef260aa9
commit 7ed987b61a
1 changed files with 2 additions and 2 deletions
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationViewModel.kt
@ -312,8 +312,8 @@ class ConversationViewModel(
            .mapNotNull { it.slideDeck.audioSlide }
            .forEach(::stopMessageAudio)

-        // if the message was already marked as deleted, remove it from the db instead
-        if(messages.all { it.isDeleted }){
+        // if the message was already marked as deleted or control messages, remove it from the db instead
+        if(messages.all { it.isDeleted || it.isControlMessage }){
            // Remove the message locally (leave nothing behind)
            repository.deleteMessages(messages = messages, threadId = threadId)
        } else {