Group file download notifications in Notification Centre

Author: Eitot

Vienna/Sources/Download window/DownloadManager.m

@@ -29,6 +29,8 @@
 #import "Preferences.h"
 #import "Vienna-Swift.h"
 
+static NSString * const VNAUserNotificationFileDownloadThreadIdentifier = @"FileDownloadThreadIdentifier";
+
 @interface DownloadManager ()
 
 // Private properties
@@ -311,6 +313,9 @@ - (void)deliverNotificationForDownloadItem:(DownloadItem *)item {
             VNAUserNotificationRequest *request =
                 [[VNAUserNotificationRequest alloc] initWithIdentifier:item.fileURL.absoluteString
                                                                  title:title];
+            // Use a thread identifier to group all file download notifications
+            // (this can be disabled by the user in System Settings).
+            request.threadIdentifier = VNAUserNotificationFileDownloadThreadIdentifier;
             request.body = body;
             request.playSound = settings.isSoundEnabled;
             request.userInfo = userInfo;

Vienna/Sources/UserNotifications/UserNotificationCenter.swift

@@ -154,6 +154,9 @@ class UserNotificationCenter: NSObject {
         if let userInfo = request.userInfo {
             content.userInfo = userInfo
         }
+        if let threadIdentifier = request.threadIdentifier {
+            content.threadIdentifier = threadIdentifier
+        }
         content.sound = request.playSound ? .default : nil
         let notificationRequest = UNNotificationRequest(
             identifier: request.identifier,
@@ -178,6 +181,7 @@ class UserNotificationCenter: NSObject {
                 let request = notification.request
                 return UserNotificationResponse(
                     identifier: request.identifier,
+                    threadIdentifier: request.content.threadIdentifier,
                     userInfo: request.content.userInfo
                 )
             }
@@ -229,9 +233,11 @@ extension UserNotificationCenter: UNUserNotificationCenterDelegate {
         }
         let request = response.notification.request
         let identifier = request.identifier
+        let threadIdentifier = request.content.threadIdentifier
         let userInfo = request.content.userInfo as? [String: AnyHashable]
         let response = UserNotificationResponse(
             identifier: identifier,
+            threadIdentifier: threadIdentifier,
             userInfo: userInfo
         )
         delegate.userNotificationCenter(self, didReceive: response)

Vienna/Sources/UserNotifications/UserNotificationRequest.swift

@@ -25,6 +25,9 @@ class UserNotificationRequest: NSObject {
     /// The identifier of the notification.
     @objc let identifier: String
 
+    /// The identifier of the thread to which the notification belongs.
+    @objc var threadIdentifier: String?
+
     /// Additional user info that is attached to the notification.
     @objc var userInfo: [AnyHashable: Any]?
 

Vienna/Sources/UserNotifications/UserNotificationResponse.swift

@@ -25,14 +25,19 @@ class UserNotificationResponse: NSObject {
     /// The identifier of the notification.
     @objc let identifier: String
 
+    /// The identifier of the thread to which the notification belongs.
+    @objc let threadIdentifier: String?
+
     /// Additional user info that is attached to the notification.
     @objc let userInfo: [AnyHashable: Any]?
 
     init(
         identifier: String,
+        threadIdentifier: String? = nil,
         userInfo: [AnyHashable: Any]? = nil
     ) {
         self.identifier = identifier
+        self.threadIdentifier = threadIdentifier
         self.userInfo = userInfo
     }