d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-10-30 17:40:47 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix macOS m.image notif crash

Browse source
This commit is contained in:
Joe Donofry 2021-11-03 02:42:19 +00:00 committed by Nicolas Werner
parent a9dde2ef68
commit e3002f7993
1 changed files with 34 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/notifications/ManagerMac.mm
View file

@ -7,6 +7,33 @@
#include <QtMac> #include <QtMac>
#include <QImage> #include <QImage>
@interface UNNotificationAttachment (UNNotificationAttachmentAdditions)
+ (UNNotificationAttachment *) createFromImageData:(NSData*)imgData identifier:(NSString *)imageFileIdentifier options:(NSDictionary*)attachmentOptions;
@end
@implementation UNNotificationAttachment (UNNotificationAttachmentAdditions)
+ (UNNotificationAttachment *) createFromImageData:(NSData*)imgData identifier:(NSString *)imageFileIdentifier options:(NSDictionary*)attachmentOptions {
NSFileManager *fileManager = [NSFileManager defaultManager];
NSString *tmpSubFolderName = [[NSProcessInfo processInfo] globallyUniqueString];
NSURL *tmpSubFolderURL = [NSURL fileURLWithPath:[NSTemporaryDirectory() stringByAppendingPathComponent:tmpSubFolderName] isDirectory:true];
NSError *error = nil;
[fileManager createDirectoryAtURL:tmpSubFolderURL withIntermediateDirectories:true attributes:nil error:&error];
if(error) {
NSLog(@"%@",[error localizedDescription]);
return nil;
}
NSURL *fileURL = [tmpSubFolderURL URLByAppendingPathComponent:imageFileIdentifier];
[imgData writeToURL:fileURL atomically:true];
UNNotificationAttachment *imageAttachment = [UNNotificationAttachment attachmentWithIdentifier:@"" URL:fileURL options:attachmentOptions error:&error];
if(error) {
NSLog(@"%@",[error localizedDescription]);
return nil;
}
return imageAttachment;
}
@end
NotificationsManager::NotificationsManager(QObject *parent): QObject(parent) NotificationsManager::NotificationsManager(QObject *parent): QObject(parent)
{ {
@ -42,14 +69,14 @@ NotificationsManager::objCxxPostNotification(const QString &room_name,
content.threadIdentifier = room_id.toNSString(); content.threadIdentifier = room_id.toNSString();
if (!bodyImagePath.isEmpty()) { if (!bodyImagePath.isEmpty()) {
NSError * _Nullable error; NSURL *imageURL = [NSURL fileURLWithPath:bodyImagePath.toNSString()];
NSURL *imageURL = [NSURL URLWithString:bodyImagePath.toNSString()]; NSData *img = [NSData dataWithContentsOfURL:imageURL];
NSArray* attachments = [NSMutableArray array]; NSArray *attachments = [NSMutableArray array];
UNNotificationAttachment *attachment = [UNNotificationAttachment attachmentWithIdentifier:@"" URL:imageURL options:nil error:&error]; UNNotificationAttachment *attachment = [UNNotificationAttachment createFromImageData:img identifier:@"attachment_image.jpeg" options:nil];
if (error) { if (attachment) {
NSLog(@"%@",[error localizedDescription]); attachments = [NSMutableArray arrayWithObjects: attachment, nil];
content.attachments = attachments;
} }
content.attachments = [attachments arrayByAddingObject:attachment];
} }
UNNotificationRequest *notificationRequest = [UNNotificationRequest requestWithIdentifier:event_id.toNSString() content:content trigger:nil]; UNNotificationRequest *notificationRequest = [UNNotificationRequest requestWithIdentifier:event_id.toNSString() content:content trigger:nil];