Fix cancelLocalNotification on iOS (#617)

wix · May 23, 2020 · fae3af0 · fae3af0
1 parent 495d738
commit fae3af0
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/lib/ios/RNBridgeModule.m b/lib/ios/RNBridgeModule.m
@@ -72,7 +72,7 @@ - (void)setBridge:(RCTBridge *)bridge {
     [_commandsHandler postLocalNotification:notification withId:notificationId];
 }
 
-RCT_EXPORT_METHOD(cancelLocalNotification:(NSString *)notificationId) {
+RCT_EXPORT_METHOD(cancelLocalNotification:(nonnull NSNumber *)notificationId) {
     [_commandsHandler cancelLocalNotification:notificationId];
 }
 

diff --git a/lib/ios/RNCommandsHandler.h b/lib/ios/RNCommandsHandler.h
@@ -25,7 +25,7 @@
 
 - (void)postLocalNotification:(NSDictionary *)notification withId:(NSNumber *)notificationId;
 
-- (void)cancelLocalNotification:(NSString *)notificationId;
+- (void)cancelLocalNotification:(NSNumber *)notificationId;
 
 - (void)cancelAllLocalNotifications;
 

diff --git a/lib/ios/RNCommandsHandler.m b/lib/ios/RNCommandsHandler.m
@@ -54,7 +54,7 @@ - (void)postLocalNotification:(NSDictionary *)notification withId:(NSNumber *)no
     [_notificationCenter postLocalNotification:notification withId:notificationId];
 }
 
-- (void)cancelLocalNotification:(NSString *)notificationId {
+- (void)cancelLocalNotification:(NSNumber *)notificationId {
     [_notificationCenter cancelLocalNotification:notificationId];
 }
 

diff --git a/lib/ios/RNNotificationCenter.h b/lib/ios/RNNotificationCenter.h
@@ -18,7 +18,7 @@ typedef void (^RCTPromiseRejectBlock)(NSString *code, NSString *message, NSError
 
 - (void)postLocalNotification:(NSDictionary *)notification withId:(NSNumber *)notificationId;
 
-- (void)cancelLocalNotification:(NSString *)notificationId;
+- (void)cancelLocalNotification:(NSNumber *)notificationId;
 
 - (void)removeAllDeliveredNotifications;
 

diff --git a/lib/ios/RNNotificationCenter.m b/lib/ios/RNNotificationCenter.m
@@ -35,9 +35,9 @@ - (void)postLocalNotification:(NSDictionary *)notification withId:(NSNumber *)no
     [[UNUserNotificationCenter currentNotificationCenter] addNotificationRequest:localNotification withCompletionHandler:nil];
 }
 
-- (void)cancelLocalNotification:(NSString *)notificationId {
+- (void)cancelLocalNotification:(NSNumber *)notificationId {
     UNUserNotificationCenter *center = [UNUserNotificationCenter currentNotificationCenter];
-    [center removePendingNotificationRequestsWithIdentifiers:@[notificationId]];
+    [center removePendingNotificationRequestsWithIdentifiers:@[[notificationId stringValue]]];
 }
 
 - (void)removeAllDeliveredNotifications {