Skip to content

Do not clear delivered notifications on app activate #6321

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
polo2187 wants to merge 1 commit into
base: main
Choose a base branch
from
+5 −5
Open

Do not clear delivered notifications on app activate #6321

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions SignalServiceKit/Notifications/UserNotificationsPresenter.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ public class UserNotificationPresenter {
}

public func clearNotificationsForAppActivate() {
Logger.info("Clearing notifications for app activate.")
Logger.info("Clearing pending notifications for app activate.")

Task {
let shouldRemoveNotificationRequestPredicate: (UNNotificationRequest) -> Bool = { request in
Expand All @@ -346,12 +346,12 @@ public class UserNotificationPresenter {
.filter { shouldRemoveNotificationRequestPredicate($0) }
.map(\.identifier)

let deliveredNotificationIDsToRemove = await Self.notificationCenter.deliveredNotifications()
.filter { shouldRemoveNotificationRequestPredicate($0.request) }
.map(\.request.identifier)
// Do not remove delivered notifications on app activate.
// Delivered notifications should remain visible in Notification Center
// until the related conversation is actually opened/read and canceled
// through the normal thread/message-specific cancellation paths.

Self.notificationCenter.removePendingNotificationRequests(withIdentifiers: pendingNotificationIDsToRemove)
Self.notificationCenter.removeDeliveredNotifications(withIdentifiers: deliveredNotificationIDsToRemove)
}
}

Expand Down