Fix notifications not forwarded for e-mails with quotation marks in t…

…itle
joelekstrom · Jan 30, 2022 · d561d9f · d561d9f
1 parent 6f7b2c7
commit d561d9f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/Fastmate.xcodeproj/project.pbxproj b/Fastmate.xcodeproj/project.pbxproj
@@ -348,7 +348,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = 5RNJHF933P;
 				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = Fastmate/Info.plist;
@@ -375,7 +375,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = 5RNJHF933P;
 				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = Fastmate/Info.plist;

diff --git a/Fastmate/Fastmate.js b/Fastmate/Fastmate.js
@@ -129,7 +129,7 @@ Notification = function(title, options) {
     ++notificationID;
     var n = new originalNotification(title, options);
     Object.defineProperty(n, "onclick", { set: function(value) { Fastmate.notificationClickHandlers[notificationID.toString()] = value; }});
-    window.webkit.messageHandlers.Fastmate.postMessage('{"title": "' + title + '", "options": ' + JSON.stringify(options) + ', "notificationID": ' + notificationID + '}');
+    window.webkit.messageHandlers.Fastmate.postMessage('{"title": ' + JSON.stringify(title) + ', "options": ' + JSON.stringify(options) + ', "notificationID": ' + notificationID + '}');
     return n;
 }
 

diff --git a/Fastmate/WebViewController.m b/Fastmate/WebViewController.m
@@ -302,7 +302,11 @@ - (void)copyURLToPasteboard:(NSURL *)URL {
 }
 
 - (void)postNotificationForMessage:(WKScriptMessage *)message {
-    NSDictionary *dictionary = [NSJSONSerialization JSONObjectWithData:[message.body dataUsingEncoding:NSUTF8StringEncoding] options:0 error:nil];
+    NSError *error = nil;
+    NSDictionary *dictionary = [NSJSONSerialization JSONObjectWithData:[message.body dataUsingEncoding:NSUTF8StringEncoding] options:0 error:&error];
+    if (error) {
+        NSLog(@"Failed to decode notification with body: %@. Error: %@", message.body, error);
+    }
 
     [NotificationCenter.sharedInstance postNotificationWithIdentifier:[dictionary[@"notificationID"] stringValue]
                                                                 title:dictionary[@"title"]