Skip to content

Fix actionable notifications options #3954

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

Merged
bbirman merged 1 commit into from
Dec 17, 2025
Merged

Fix actionable notifications options #3954

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
29 changes: 1 addition & 28 deletions ...alesforceSDKCore/Classes/Extensions/PushNotificationManager+ActionableNotifications.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ internal extension PushNotificationManager {
}

let categories = filterTypes
.flatMap { createNotificationCategories(from: $0) }
.flatMap { NotificationCategoryFactory.shared.createCategories(from: [$0]) }
UNUserNotificationCenter.current().setNotificationCategories(Set(categories))
}

Expand All @@ -163,34 +163,7 @@ internal extension PushNotificationManager {
}

private extension PushNotificationManager {

func createNotificationCategories(from type: NotificationType) -> [UNNotificationCategory] {
Copy link
Member Author

@bbirman bbirman Nov 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like the deleted code is duplicative of the methods in NotificationCategoryFactory.swift

Copy link
Contributor

@wmathurin wmathurin Nov 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does NotificationCategoryFactory.shared.createCategories behave differently from the duplicate?

Copy link
Member Author

@bbirman bbirman Dec 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It returns a set instead of an array but otherwise I didn't see a behavior difference until it calls into createActions. I was wondering if we should keep this and delete NotificationCategoryFactory but that one is public

Copy link
Contributor

@wmathurin wmathurin Dec 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because of semver, we can't do that (in 13.2 at least).

guard let actionGroups = type.actionGroups else { return [] }

return actionGroups.map { group in
let actions = createActions(from: group)
return UNNotificationCategory(
identifier: group.name,
actions: actions,
intentIdentifiers: []
)
}
}

func createActions(from actionGroup: ActionGroup?) -> [UNNotificationAction] {
guard let actionGroup = actionGroup else {
return []
}

return actionGroup.actions.compactMap { action in
UNNotificationAction(
identifier: action.identifier,
title: action.label,
options: [.foreground] // Ensures the app opens if needed
Copy link
Member Author

@bbirman bbirman Nov 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the line causing the issue and the updated logic is already in the other class here

)
}
}

func getNotificationType(apiName: String, account: UserAccount) -> NotificationType? {
guard let notificationTypes = account.notificationTypes else { return nil }
return notificationTypes.first { $0.apiName == apiName }
Expand Down
Loading