Merge pull request #105 from urbanairship/MOBILE-2700

[MOBILE-2700] Try to fix crashs
urbanairship · Dec 2, 2021 · 6655c7a · 6655c7a
2 parents c7b4f37 + 52a4421
commit 6655c7a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 13 deletions.
diff --git a/ios/Classes/AirshipEventManager.swift b/ios/Classes/AirshipEventManager.swift
@@ -1,4 +1,5 @@
 import Foundation
+import AirshipKit
 
 class AirshipEventManager {
 
@@ -44,20 +45,13 @@ class AirshipEventManager {
 
         func notify(_ event: AirshipEvent) {
             if let sink = self.eventSink {
-                if (event.data != nil) {
-                    do {
-                        let jsonData = try JSONSerialization.data(withJSONObject: event.data!, options: JSONSerialization.WritingOptions.prettyPrinted)
-
-                        let data = String(data: jsonData, encoding: .utf8)
-
-                        sink(data)
-                    }
-                    catch {
-                        sink(nil)
-                    }
-                } else {
+                guard let eventData = event.data,
+                      let jsonData = try? JSONUtils.string(eventData, options: JSONSerialization.WritingOptions.fragmentsAllowed)
+                else {
                     sink(nil)
+                    return
                 }
+                sink(jsonData)
             } else {
                 pendinEvents.append(event)
             }

diff --git a/lib/src/airship_flutter.dart b/lib/src/airship_flutter.dart
@@ -38,7 +38,7 @@ class InboxMessage {
 }
 
 class Notification {
-  final String notificationId;
+  final String? notificationId;
   final String? alert;
   final String? title;
   final String? subtitle;