deblan-mirror/wails
1
0
Fork 0
mirror of https://github.com/wailsapp/wails.git synced 2026-03-14 22:55:48 +01:00
Code Issues Projects Releases Packages Wiki Activity

handle notif content errors

Browse source
This commit is contained in:
popaprozac 2025-03-22 17:39:20 -07:00
commit f870dcc168
1 changed files with 18 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

29
v3/pkg/services/notifications/notifications_darwin.m
View file

@ -1,4 +1,5 @@
#import "notifications_darwin.h"
#include <Foundation/Foundation.h>
#import <Cocoa/Cocoa.h>
#import <UserNotifications/UserNotifications.h>
@ -125,7 +126,7 @@ void checkNotificationAuthorization(int channelID) {
// Helper function to create notification content
UNMutableNotificationContent* createNotificationContent(const char *title, const char *subtitle,
const char *body, const char *data_json) {
const char *body, const char *data_json, NSError **contentError) {
NSString *nsTitle = [NSString stringWithUTF8String:title];
NSString *nsSubtitle = subtitle ? [NSString stringWithUTF8String:subtitle] : @"";
NSString *nsBody = [NSString stringWithUTF8String:body];
@ -146,6 +147,8 @@ UNMutableNotificationContent* createNotificationContent(const char *title, const
NSDictionary *parsedData = [NSJSONSerialization JSONObjectWithData:jsonData options:0 error:&error];
if (!error && parsedData) {
content.userInfo = parsedData;
} else if (error) {
*contentError = error;
}
}
@ -162,13 +165,16 @@ void sendNotification(int channelID, const char *identifier, const char *title,
UNUserNotificationCenter *center = [UNUserNotificationCenter currentNotificationCenter];
NSString *nsIdentifier = [NSString stringWithUTF8String:identifier];
UNMutableNotificationContent *content = createNotificationContent(title, subtitle, body, data_json);
NSMutableDictionary *customData = [NSMutableDictionary dictionary];
NSError *contentError = nil;
UNMutableNotificationContent *content = createNotificationContent(title, subtitle, body, data_json, &contentError);
if (customData.count > 0) {
content.userInfo = customData;
if (contentError) {
NSString *errorMsg = [NSString stringWithFormat:@"Error: %@", [contentError localizedDescription]];
captureResult(channelID, false, [errorMsg UTF8String]);
return;
}
UNTimeIntervalNotificationTrigger *trigger = nil;
UNNotificationRequest *request = [UNNotificationRequest requestWithIdentifier:nsIdentifier content:content trigger:trigger];
@ -195,13 +201,14 @@ void sendNotificationWithActions(int channelID, const char *identifier, const ch
NSString *nsIdentifier = [NSString stringWithUTF8String:identifier];
NSString *nsCategoryId = [NSString stringWithUTF8String:categoryId];
UNMutableNotificationContent *content = createNotificationContent(title, subtitle, body, data_json);
NSMutableDictionary *customData = [NSMutableDictionary dictionary];
content.categoryIdentifier = nsCategoryId;
NSError *contentError = nil;
UNMutableNotificationContent *content = createNotificationContent(title, subtitle, body, data_json, &contentError);
if (customData.count > 0) {
content.userInfo = customData;
if (contentError) {
NSString *errorMsg = [NSString stringWithFormat:@"Error: %@", [contentError localizedDescription]];
captureResult(channelID, false, [errorMsg UTF8String]);
return;
}
UNTimeIntervalNotificationTrigger *trigger = nil;