Fix cancelLocalNotification on iOS (#617)

yogevbd · web-flow · commit fae3af0f04c3 · 2020-05-23T14:48:13.000+03:00
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 {

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ - (void)setBridge:(RCTBridge *)bridge {`
`72`	`72`	`[_commandsHandler postLocalNotification:notification withId:notificationId];`
`73`	`73`	`}`
`74`	`74`
`75`		`-RCT_EXPORT_METHOD(cancelLocalNotification:(NSString *)notificationId) {`
	`75`	`+RCT_EXPORT_METHOD(cancelLocalNotification:(nonnull NSNumber *)notificationId) {`
`76`	`76`	`[_commandsHandler cancelLocalNotification:notificationId];`
`77`	`77`	`}`
`78`	`78`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ - (void)postLocalNotification:(NSDictionary )notification withId:(NSNumber )no`
`54`	`54`	`[_notificationCenter postLocalNotification:notification withId:notificationId];`
`55`	`55`	`}`
`56`	`56`
`57`		`-- (void)cancelLocalNotification:(NSString *)notificationId {`
	`57`	`+- (void)cancelLocalNotification:(NSNumber *)notificationId {`
`58`	`58`	`[_notificationCenter cancelLocalNotification:notificationId];`
`59`	`59`	`}`
`60`	`60`
Original file line number	Diff line number	Diff line change
`@@ -35,9 +35,9 @@ - (void)postLocalNotification:(NSDictionary )notification withId:(NSNumber )no`
`35`	`35`	`[[UNUserNotificationCenter currentNotificationCenter] addNotificationRequest:localNotification withCompletionHandler:nil];`
`36`	`36`	`}`
`37`	`37`
`38`		`-- (void)cancelLocalNotification:(NSString *)notificationId {`
	`38`	`+- (void)cancelLocalNotification:(NSNumber *)notificationId {`
`39`	`39`	`UNUserNotificationCenter *center = [UNUserNotificationCenter currentNotificationCenter];`
`40`		`- [center removePendingNotificationRequestsWithIdentifiers:@[notificationId]];`
	`40`	`+ [center removePendingNotificationRequestsWithIdentifiers:@[[notificationId stringValue]]];`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`- (void)removeAllDeliveredNotifications {`