From b3db1ac1edd974305e183a88f12eb16c35711c91 Mon Sep 17 00:00:00 2001 From: ryanzhao Date: Thu, 16 Sep 2021 10:20:40 +1000 Subject: [PATCH] cancel notification if the message is marked as read --- SessionMessagingKit/Messages/Signal/TSIncomingMessage.m | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/SessionMessagingKit/Messages/Signal/TSIncomingMessage.m b/SessionMessagingKit/Messages/Signal/TSIncomingMessage.m index ecfc9168f..9467768a7 100644 --- a/SessionMessagingKit/Messages/Signal/TSIncomingMessage.m +++ b/SessionMessagingKit/Messages/Signal/TSIncomingMessage.m @@ -14,6 +14,7 @@ #import #import #import +#import NS_ASSUME_NONNULL_BEGIN @@ -181,6 +182,11 @@ NS_ASSUME_NONNULL_BEGIN [[NSNotificationCenter defaultCenter] postNotificationNameAsync:kIncomingMessageMarkedAsReadNotification object:self]; + if (self.notificationIdentifier != NULL) { + UNUserNotificationCenter *notificationCenter = [UNUserNotificationCenter currentNotificationCenter]; + [notificationCenter removeDeliveredNotificationsWithIdentifiers:@[self.notificationIdentifier]]; + [notificationCenter removePendingNotificationRequestsWithIdentifiers:@[self.notificationIdentifier]]; + } }]; [[OWSDisappearingMessagesJob sharedJob] startAnyExpirationForMessage:self