oxen-io
/
session-ios
mirror of https://github.com/oxen-io/session-ios.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #535 from RyanRory/disappearing-message-fix 

Fix duplicated disappearing message in closed groups
This commit is contained in:
RyanZhao 2021-12-14 16:13:57 +11:00 committed by GitHub
parent 523f18ec87 e24ae60d71
commit b8657eb8f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
SessionMessagingKit/Sending & Receiving/MessageSender.swift
View File

@ -355,6 +355,10 @@ public final class MessageSender : NSObject {
// Start the disappearing messages timer if needed
OWSDisappearingMessagesJob.shared().startAnyExpiration(for: tsMessage, expirationStartedAt: NSDate.millisecondTimestamp(), transaction: transaction)
}
// Prevent the same ExpirationTimerUpdate to be handled twice
if let message = message as? ExpirationTimerUpdate {
Storage.shared.addReceivedMessageTimestamp(message.sentTimestamp!, using: transaction)
}
// Sync the message if:
// • it's a visible message or an expiration timer update
// • the destination was a contact
@ -362,11 +366,7 @@ public final class MessageSender : NSObject {
let userPublicKey = getUserHexEncodedPublicKey()
if case .contact(let publicKey) = destination, !isSyncMessage {
if let message = message as? VisibleMessage { message.syncTarget = publicKey }
if let message = message as? ExpirationTimerUpdate {
message.syncTarget = publicKey
// Prevent the same ExpirationTimerUpdate to be handled twice
Storage.shared.addReceivedMessageTimestamp(message.sentTimestamp!, using: transaction)
}
if let message = message as? ExpirationTimerUpdate { message.syncTarget = publicKey }
// FIXME: Make this a job
sendToSnodeDestination(.contact(publicKey: userPublicKey), message: message, using: transaction, isSyncMessage: true).retainUntilComplete()
}