Skip to content

Commit

Permalink
Making sure deleted control messages leave nothing behind (#1693)
Browse files Browse the repository at this point in the history
* Making sure deleted control messages leave nothing behind

* More control messages check
  • Loading branch information
ThomasSession authored Oct 14, 2024
1 parent 54ef260 commit 68750e6
Showing 1 changed file with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ class ConversationViewModel(
// hashes are required if wanting to delete messages from the 'storage server'
// They are not required for communities OR if all messages are outgoing
// also we can only delete deleted messages (marked as deleted) locally
val canDeleteForEveryone = messages.all{ !it.isDeleted } && (
val canDeleteForEveryone = messages.all{ !it.isDeleted && !it.isControlMessage } && (
messages.all { it.isOutgoing } ||
conversationType == MessageType.COMMUNITY ||
messages.all { lokiMessageDb.getMessageServerHash(it.id, it.isMms) != null
Expand Down Expand Up @@ -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 {
Expand Down

0 comments on commit 68750e6

Please sign in to comment.