handle canceling push notification

4 years ago · 940e09c25b
parent 5f2890a1fc
commit 940e09c25b
1 changed files with 3 additions and 1 deletions
--- a/Receiving/MessageReceiver+Handling.swift
+++ b/Receiving/MessageReceiver+Handling.swift
@ -231,7 +231,9 @@ extension MessageReceiver {
            if let incomingMessage = messageToDelete as? TSIncomingMessage {
                incomingMessage.markAsReadNow(withSendReadReceipt: false, transaction: transaction)
                if let notificationIdentifier = incomingMessage.notificationIdentifier, !notificationIdentifier.isEmpty {
-                    SSKEnvironment.shared.notificationsManager!.cancelNotification(notificationIdentifier)
+                    UNUserNotificationCenter.current().removeDeliveredNotifications(withIdentifiers: [notificationIdentifier])
+                    UNUserNotificationCenter.current().removePendingNotificationRequests(withIdentifiers: [notificationIdentifier])
+                    
                }
            }
            if let serverHash = messageToDelete.serverHash {