relikd/baRSS
1
0
Fork 0
Code Issues Pull Requests Releases Activity

feat: notification open options

Browse Source
This commit is contained in:
relikd
2025-10-29 15:10:06 +01:00
parent 831159904c
commit ccca329630
2 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
baRSS/Core Data/StoreCoordinator.m
View File

@@ -225,9 +225,11 @@
return nil; // if success == NO, do not modify unread state & exit return nil; // if success == NO, do not modify unread state & exit
} }
NSInteger countChange = 0;
for (FeedArticle *fa in list) { for (FeedArticle *fa in list) {
if (fa.unread == markRead) { // only if differs if (fa.unread == markRead) { // only if differs
fa.unread = !markRead; fa.unread = !markRead;
countChange += markRead ? -1 : +1;
} }
} }
[self saveContext:moc andParent:YES]; [self saveContext:moc andParent:YES];
@@ -242,8 +244,7 @@
} }
[moc reset]; [moc reset];
NSNumber *num = [NSNumber numberWithInteger: (markRead ? -1 : +1) * (NSInteger)list.count ]; PostNotification(kNotificationTotalUnreadCountChanged, @(countChange));
PostNotification(kNotificationTotalUnreadCountChanged, num);
return dbRefs; return dbRefs;
} }

24
baRSS/Notifications/NotifyEndpoint.m
View File

@@ -9,6 +9,11 @@
*/ */
static NSString* const kNotifyIdGlobal = @"global"; static NSString* const kNotifyIdGlobal = @"global";
static NSString* const kCategoryDismissable = @"DISMISSIBLE";
static NSString* const kActionOpenBackground = @"OPEN_IN_BACKGROUND";
static NSString* const kActionMarkRead = @"MARK_READ_DONT_OPEN";
static NSString* const kActionOpenOnly = @"OPEN_ONLY_DONT_MARK_READ";
@implementation NotifyEndpoint @implementation NotifyEndpoint
@@ -18,20 +23,27 @@ static NotificationType notifyType;
/// Ask user for permission to send notifications @b AND register delegate to respond to alert banner clicks. /// Ask user for permission to send notifications @b AND register delegate to respond to alert banner clicks.
/// @note Called every time user changes notification settings /// @note Called every time user changes notification settings
+ (void)activate { + (void)activate {
UNUserNotificationCenter *center = UNUserNotificationCenter.currentNotificationCenter;
notifyType = UserPrefsNotificationType(); notifyType = UserPrefsNotificationType();
// even if disabled, register delegate. This allows to open previously sent notifications // even if disabled, register delegate. This allows to open previously sent notifications
static dispatch_once_t onceToken; static dispatch_once_t onceToken;
dispatch_once(&onceToken, ^{ dispatch_once(&onceToken, ^{
singleton = [NotifyEndpoint new]; singleton = [NotifyEndpoint new];
UNUserNotificationCenter.currentNotificationCenter.delegate = singleton; center.delegate = singleton;
}); });
if (notifyType == NotificationTypeDisabled) { if (notifyType == NotificationTypeDisabled) {
return; return;
} }
// register action types (allow mark read without opening notification)
UNNotificationAction *openBackgroundAction = [UNNotificationAction actionWithIdentifier:kActionOpenBackground title:NSLocalizedString(@"Open in background", nil) options:UNNotificationActionOptionNone];
UNNotificationAction *dontOpenAction = [UNNotificationAction actionWithIdentifier:kActionMarkRead title:NSLocalizedString(@"Mark read & dismiss", nil) options:UNNotificationActionOptionNone];
UNNotificationAction *dontReadAction = [UNNotificationAction actionWithIdentifier:kActionOpenOnly title:NSLocalizedString(@"Open but keep unread", nil) options:UNNotificationActionOptionNone];
UNNotificationCategory *category = [UNNotificationCategory categoryWithIdentifier:kCategoryDismissable actions:@[openBackgroundAction, dontOpenAction, dontReadAction] intentIdentifiers:@[] options:UNNotificationCategoryOptionNone];
[center setNotificationCategories:[NSSet setWithObject:category]];
[UNUserNotificationCenter.currentNotificationCenter requestAuthorizationWithOptions:UNAuthorizationOptionAlert | UNAuthorizationOptionSound completionHandler:^(BOOL granted, NSError * _Nullable error) { [center requestAuthorizationWithOptions:UNAuthorizationOptionAlert | UNAuthorizationOptionSound completionHandler:^(BOOL granted, NSError * _Nullable error) {
if (error) { if (error) {
dispatch_async(dispatch_get_main_queue(), ^{ dispatch_async(dispatch_get_main_queue(), ^{
NSAlert *alert = [[NSAlert alloc] init]; NSAlert *alert = [[NSAlert alloc] init];
@@ -105,6 +117,7 @@ static NotificationType notifyType;
if (title != nil) msg.title = title; if (title != nil) msg.title = title;
if (body != nil) msg.body = body; if (body != nil) msg.body = body;
// common settings: // common settings:
msg.categoryIdentifier = kCategoryDismissable;
// TODO: make sound configurable? // TODO: make sound configurable?
msg.sound = [UNNotificationSound defaultSound]; msg.sound = [UNNotificationSound defaultSound];
[self send:identifier content: msg]; [self send:identifier content: msg];
@@ -167,7 +180,12 @@ static NotificationType notifyType;
return; return;
} }
} }
[StoreCoordinator updateArticles:articles markRead:YES andOpen:YES inContext:moc];
// open-in-background performs the same operation as a normal click
// the "background" part is triggered by _NOT_ having the UNNotificationActionOptionForeground option
BOOL dontOpen = [response.actionIdentifier isEqualToString:kActionMarkRead];
BOOL dontMarkRead = [response.actionIdentifier isEqualToString:kActionOpenOnly];
[StoreCoordinator updateArticles:articles markRead:!dontMarkRead andOpen:!dontOpen inContext:moc];
} }
@end @end