From 23ee6761ca589ebcff70de0da4a9e2ed4d19d5ae Mon Sep 17 00:00:00 2001 From: Stuart Breckenridge Date: Fri, 15 May 2020 19:53:44 +0800 Subject: [PATCH 1/2] adds grouping and summaries to notifications --- .../UserNotifications/UserNotificationManager.swift | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/Shared/UserNotifications/UserNotificationManager.swift b/Shared/UserNotifications/UserNotificationManager.swift index 2f37a2438..aa345bf4a 100644 --- a/Shared/UserNotifications/UserNotificationManager.swift +++ b/Shared/UserNotifications/UserNotificationManager.swift @@ -47,15 +47,21 @@ private extension UserNotificationManager { let content = UNMutableNotificationContent() content.title = webFeed.nameForDisplay - content.body = ArticleStringFormatter.truncatedTitle(article) - if content.body.isEmpty { - content.body = ArticleStringFormatter.truncatedSummary(article) + + if !ArticleStringFormatter.truncatedTitle(article).isEmpty { + content.subtitle = ArticleStringFormatter.truncatedTitle(article) } + + content.body = ArticleStringFormatter.truncatedSummary(article) content.sound = UNNotificationSound.default content.userInfo = [UserInfoKey.articlePath: article.pathUserInfo] + content.threadIdentifier = webFeed.webFeedID + content.summaryArgument = "\(webFeed.nameForDisplay)" + content.summaryArgumentCount = 1 let request = UNNotificationRequest.init(identifier: "articleID:\(article.articleID)", content: content, trigger: nil) + UNUserNotificationCenter.current().add(request) } From fa51fa47b469decb7e46c671761881d19f85c31a Mon Sep 17 00:00:00 2001 From: Stuart Breckenridge Date: Fri, 15 May 2020 20:32:33 +0800 Subject: [PATCH 2/2] reorged the send notification code --- Shared/UserNotifications/UserNotificationManager.swift | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Shared/UserNotifications/UserNotificationManager.swift b/Shared/UserNotifications/UserNotificationManager.swift index aa345bf4a..6ddbad025 100644 --- a/Shared/UserNotifications/UserNotificationManager.swift +++ b/Shared/UserNotifications/UserNotificationManager.swift @@ -53,15 +53,15 @@ private extension UserNotificationManager { } content.body = ArticleStringFormatter.truncatedSummary(article) - - content.sound = UNNotificationSound.default - content.userInfo = [UserInfoKey.articlePath: article.pathUserInfo] + content.threadIdentifier = webFeed.webFeedID content.summaryArgument = "\(webFeed.nameForDisplay)" content.summaryArgumentCount = 1 - - let request = UNNotificationRequest.init(identifier: "articleID:\(article.articleID)", content: content, trigger: nil) + content.sound = UNNotificationSound.default + content.userInfo = [UserInfoKey.articlePath: article.pathUserInfo] + + let request = UNNotificationRequest.init(identifier: "articleID:\(article.articleID)", content: content, trigger: nil) UNUserNotificationCenter.current().add(request) }