Do not update badges if action or card is hidden

Author: almenscorner

SupportCompanion/AppDelegate.swift

@@ -167,11 +167,17 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSPopoverDelegate {
     }
 
     func setupTrayMenuIconBinding() {
-        appStateManager.$pendingUpdatesCount
-            .combineLatest(appStateManager.$systemUpdateCache)
-            .map { pendingUpdatesCount, systemUpdateCache in
-                pendingUpdatesCount > 0 || systemUpdateCache.count > 0
-            }
+        Publishers.CombineLatest4(
+            appStateManager.$pendingUpdatesCount,
+            appStateManager.$systemUpdateCache,
+            appStateManager.preferences.$hiddenActions,
+            appStateManager.preferences.$hiddenCards
+        )
+        .map { pendingUpdatesCount, systemUpdateCache, hiddenActions, hiddenCards in
+            let hasPendingUpdates = !hiddenCards.contains("PendingAppUpdates") && pendingUpdatesCount > 0
+            let hasSoftwareUpdates = !hiddenActions.contains("SoftwareUpdates") && systemUpdateCache.count > 0
+            return hasPendingUpdates || hasSoftwareUpdates
+        }
             .sink { hasUpdates in
                 TrayMenuManager.shared.updateTrayIcon(hasUpdates: hasUpdates)
             }

SupportCompanion/Services/NotificationService.swift

@@ -155,7 +155,10 @@ class BadgeManager {
     private func updateBadge() {
         DispatchQueue.main.async {
             if self.badgeCount > 0 {
-                NSApplication.shared.dockTile.showsApplicationBadge = true
+                let prefs = AppStateManager.shared.preferences
+                let hasPendingUpdates = !prefs.hiddenCards.contains("PendingAppUpdates") && AppStateManager.shared.pendingUpdatesCount > 0
+                let hasSoftwareUpdates = !prefs.hiddenActions.contains("SoftwareUpdates") && AppStateManager.shared.systemUpdateCache.count > 0
+                NSApplication.shared.dockTile.showsApplicationBadge = hasPendingUpdates || hasSoftwareUpdates
                 NSApplication.shared.dockTile.badgeLabel = nil
                 NSApplication.shared.dockTile.badgeLabel = String(self.badgeCount)
             } else {