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 branch 'sync-read' into bug-fixes

This commit is contained in:
ryanzhao 2021-09-16 14:56:04 +10:00
parent 50465c04bf 75a4dcee79
commit bfc1e96c9d
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Session/Notifications/AppNotifications.swift
View File

@ -139,7 +139,11 @@ public class NotificationPresenter: NSObject, NotificationsProtocol {
switch notification.object {
case let incomingMessage as TSIncomingMessage:
Logger.debug("canceled notification for message: \(incomingMessage)")
cancelNotifications(threadId: incomingMessage.uniqueThreadId)
if let identifier = incomingMessage.notificationIdentifier {
cancelNotification(identifier)
} else {
cancelNotifications(threadId: incomingMessage.uniqueThreadId)
}
default:
break
}

7
SessionMessagingKit/Sending & Receiving/MessageReceiver+Handling.swift
View File

@ -326,8 +326,11 @@ extension MessageReceiver {
tsMessage.openGroupServerMessageID = serverID
tsMessage.save(with: transaction)
}
// Start expiration for sync messages
if let tsOutgoingMessage = TSMessage.fetch(uniqueId: tsMessageID, transaction: transaction) as? TSOutgoingMessage {
if let tsOutgoingMessage = TSMessage.fetch(uniqueId: tsMessageID, transaction: transaction) as? TSOutgoingMessage,
let thread = TSThread.fetch(uniqueId: threadID, transaction: transaction) {
// Mark previous messages as read if there is a sync message
OWSReadReceiptManager.shared().markAsReadLocally(beforeSortId: tsOutgoingMessage.sortId, thread: thread)
// Start expiration for sync messages
OWSDisappearingMessagesJob.shared().startAnyExpiration(for: tsOutgoingMessage, expirationStartedAt: NSDate.millisecondTimestamp(), transaction: transaction)
}
// Notify the user if needed