Skip to content

fix(notification): resolve duplicate cards, focus-mode auto-dismissal, and local hide behavior #244

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

Closed
Mudit200408 wants to merge 1 commit into from
Closed

fix(notification): resolve duplicate cards, focus-mode auto-dismissal, and local hide behavior #244

Show file tree
Hide file tree
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
38 changes: 25 additions & 13 deletions airsync-mac/Core/AppState.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -943,7 +943,7 @@ class AppState: ObservableObject {
withAnimation {
self.notifications.removeAll { $0.id == notif.id }
}
self.removeNotification(notif)
UNUserNotificationCenter.current().removeDeliveredNotifications(withIdentifiers: [notif.nid])
}
}

Expand Down Expand Up @@ -1058,12 +1058,19 @@ class AppState: ObservableObject {

func addNotification(_ notif: Notification) {
DispatchQueue.main.async {
var contentChanged = true
withAnimation {
self.notifications.insert(notif, at: 0)
if let idx = self.notifications.firstIndex(where: { $0.nid == notif.nid }) {
let old = self.notifications[idx]
contentChanged = (old.title != notif.title || old.body != notif.body || old.actions != notif.actions)
self.notifications[idx] = notif
} else {
self.notifications.insert(notif, at: 0)
}
}
// Trigger native macOS notification if not silent
// Trigger native macOS notification if not silent and content actually changed/new
// Default to alerting if priority is missing (backwards compatibility)
if notif.priority != "silent" {
if notif.priority != "silent" && contentChanged {
var appIcon: NSImage? = nil
if let iconPath = self.androidApps[notif.package]?.iconUrl {
appIcon = NSImage(contentsOfFile: iconPath)
Expand Down Expand Up @@ -1196,17 +1203,22 @@ class AppState: ObservableObject {
}

func syncWithSystemNotifications() {
UNUserNotificationCenter.current().getDeliveredNotifications { systemNotifs in
let systemNIDs = Set(systemNotifs.map { $0.request.identifier })
UNUserNotificationCenter.current().getNotificationSettings { settings in
guard settings.authorizationStatus == .authorized else {
return
}
UNUserNotificationCenter.current().getDeliveredNotifications { systemNotifs in
let systemNIDs = Set(systemNotifs.map { $0.request.identifier })

DispatchQueue.main.async {
// Only sync notifications that were actually posted to system (non-silent)
let currentSystemNIDs = Set(self.notifications.filter { $0.priority != "silent" }.map { $0.nid })
let removedNIDs = currentSystemNIDs.subtracting(systemNIDs)
DispatchQueue.main.async {
// Only sync notifications that were actually posted to system (non-silent)
let currentSystemNIDs = Set(self.notifications.filter { $0.priority != "silent" }.map { $0.nid })
let removedNIDs = currentSystemNIDs.subtracting(systemNIDs)

for nid in removedNIDs {
print("[state] (notification) System notification \(nid) was dismissed manually.")
self.removeNotificationById(nid)
for nid in removedNIDs {
print("[state] (notification) System notification \(nid) was dismissed manually.")
self.removeNotificationById(nid)
}
}
}
}
Expand Down
10 changes: 0 additions & 10 deletions airsync-mac/Core/Util/NotificationDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,6 @@ import UserNotifications

@MainActor
class NotificationDelegate: NSObject, UNUserNotificationCenterDelegate {
func userNotificationCenter(_ center: UNUserNotificationCenter,
didRemoveDeliveredNotifications identifiers: [String]) {
for nid in identifiers {
print("[notification-delegate] User dismissed system notification with nid: \(nid)")
DispatchQueue.main.async {
AppState.shared.removeNotificationById(nid)
}
}
}

func userNotificationCenter(_ center: UNUserNotificationCenter,
willPresent notification: UNNotification,
withCompletionHandler completionHandler: @escaping (UNNotificationPresentationOptions) -> Void) {
Expand Down