d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-22 19:08:58 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix duplicate notification category identifier

Browse source
This commit is contained in:
Nicolas Werner 2023-05-29 00:51:24 +02:00
parent 3f4d384220
commit 43df8f3501
No known key found for this signature in database
GPG key ID: C8D75E610773F2D9
1 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/notifications/ManagerMac.mm
View file

@ -3,9 +3,9 @@
// //
// SPDX-License-Identifier: GPL-3.0-or-later // SPDX-License-Identifier: GPL-3.0-or-later
#include "notifications/NotificationManagerProxy.h"
#include "notifications/MacNotificationDelegate.h" #include "notifications/MacNotificationDelegate.h"
#include "notifications/Manager.h" #include "notifications/Manager.h"
#include "notifications/NotificationManagerProxy.h"
#include "ChatPage.h" #include "ChatPage.h"
@ -106,18 +106,14 @@ void NotificationsManager::objCxxPostNotification(
textInputButtonTitle:sendStr.toNSString() textInputButtonTitle:sendStr.toNSString()
textInputPlaceholder:placeholder.toNSString()]; textInputPlaceholder:placeholder.toNSString()];
UNNotificationCategory* category; UNNotificationCategory* replyCategory = [UNNotificationCategory categoryWithIdentifier:@"ReplyCategory"
if(!room_id.isEmpty()){ actions:@[ replyAction ]
category = [UNNotificationCategory categoryWithIdentifier:@"ReplyCategory" intentIdentifiers:@[]
actions:@[ replyAction ] options:UNNotificationCategoryOptionNone];
intentIdentifiers:@[] UNNotificationCategory* summaryCategory = [UNNotificationCategory categoryWithIdentifier:@"SummaryCategory"
options:UNNotificationCategoryOptionNone]; actions:@[]
}else{ intentIdentifiers:@[]
category = [UNNotificationCategory categoryWithIdentifier:@"ReplyCategory" options:UNNotificationCategoryOptionNone];
actions:@[]
intentIdentifiers:@[]
options:UNNotificationCategoryOptionNone];
}
NSString* title = room_name.toNSString(); NSString* title = room_name.toNSString();
NSString* sub = subtitle.toNSString(); NSString* sub = subtitle.toNSString();
@ -126,7 +122,7 @@ void NotificationsManager::objCxxPostNotification(
NSString* identifier = event_id.toNSString(); NSString* identifier = event_id.toNSString();
NSString* imgUrl = bodyImagePath.toNSString(); NSString* imgUrl = bodyImagePath.toNSString();
NSSet* categories = [NSSet setWithObject:category]; NSSet* categories = [NSSet setWithObjects:summaryCategory, replyCategory, nil];
[center setNotificationCategories:categories]; [center setNotificationCategories:categories];
[center getNotificationSettingsWithCompletionHandler:^( [center getNotificationSettingsWithCompletionHandler:^(
UNNotificationSettings* _Nonnull settings) { UNNotificationSettings* _Nonnull settings) {
@ -140,8 +136,12 @@ void NotificationsManager::objCxxPostNotification(
if (enableSound) { if (enableSound) {
content.sound = [UNNotificationSound defaultSound]; content.sound = [UNNotificationSound defaultSound];
} }
content.threadIdentifier = threadIdentifier; if (!room_id.isEmpty()) {
content.categoryIdentifier = @"ReplyCategory"; content.threadIdentifier = threadIdentifier;
content.categoryIdentifier = @"ReplyCategory";
} else {
content.categoryIdentifier = @"SummaryCategory";
}
if ([imgUrl length] != 0) { if ([imgUrl length] != 0) {
NSURL* imageURL = [NSURL fileURLWithPath:imgUrl]; NSURL* imageURL = [NSURL fileURLWithPath:imgUrl];