fix: a missing NULL check on new arch iOS

cristiangu · May 4, 2024 · 39c7341 · 39c7341
1 parent 2d79255
commit 39c7341
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/example/package.json b/example/package.json
@@ -7,7 +7,8 @@
     "ios": "react-native run-ios",
     "start": "react-native start",
     "build:android": "cd android && ./gradlew assembleDebug --no-daemon --console=plain -PreactNativeArchitectures=arm64-v8a",
-    "build:ios": "cd ios && xcodebuild -workspace LocalNotificationsExample.xcworkspace -scheme LocalNotificationsExample -configuration Debug -sdk iphonesimulator CC=clang CPLUSPLUS=clang++ LD=clang LDPLUSPLUS=clang++ GCC_OPTIMIZATION_LEVEL=0 GCC_PRECOMPILE_PREFIX_HEADER=YES ASSETCATALOG_COMPILER_OPTIMIZATION=time DEBUG_INFORMATION_FORMAT=dwarf COMPILER_INDEX_STORE_ENABLE=NO"
+    "build:ios": "cd ios && xcodebuild -workspace LocalNotificationsExample.xcworkspace -scheme LocalNotificationsExample -configuration Debug -sdk iphonesimulator CC=clang CPLUSPLUS=clang++ LD=clang LDPLUSPLUS=clang++ GCC_OPTIMIZATION_LEVEL=0 GCC_PRECOMPILE_PREFIX_HEADER=YES ASSETCATALOG_COMPILER_OPTIMIZATION=time DEBUG_INFORMATION_FORMAT=dwarf COMPILER_INDEX_STORE_ENABLE=NO",
+    "pod-new-arch": "cd ios && RCT_NEW_ARCH_ENABLED=1 pod install"
   },
   "dependencies": {
     "react": "18.2.0",

diff --git a/ios/LocalNotifications.mm b/ios/LocalNotifications.mm
@@ -15,14 +15,21 @@ @implementation LocalNotifications
                   reject: (RCTPromiseRejectBlock) reject)
 {
 
-    [NotificationScheduler
-     scheduleNotificationWithTitle: notification.title()
-     body: notification.body()
-     data: (NSMutableDictionary * _Nullable) notification.data()
-     scheduleId: notification.id_()
-     triggerDate: [NSDate dateWithTimeIntervalSince1970: trigger.timestamp() / 1000]
+    if(notification.title() == NULL) {
+        NSString *message = [NSString stringWithFormat:@"%@ Title prop is missing.", TAG];
+        reject(@"error", message, NULL);
+        return;
+    }
+
+    NSString *scheduleId = [NotificationScheduler
+                            scheduleNotificationWithTitle: notification.title()
+                            body: notification.body()
+                            data: (NSMutableDictionary * _Nullable) notification.data()
+                            scheduleId: notification.id_()
+                            triggerDate: [NSDate dateWithTimeIntervalSince1970: trigger.timestamp() / 1000]
     ];
-    resolve(NULL);
+
+    resolve(scheduleId);
 }
 
 #else