From 7fffe692e715004ac4fee6418dfe8a462e180b4b Mon Sep 17 00:00:00 2001 From: Ingrid Wang Date: Tue, 20 Feb 2024 22:23:54 -0800 Subject: [PATCH] Delete deprecated didReceiveLocal/RemoteNotification (#43117) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/43117 Changelog: [iOS][Breaking] Deleting deprecated didReceiveLocalNotification & didReceiveRemoteNotification callbacks on RCTPushNotificationManager Reviewed By: philIip Differential Revision: D52883365 fbshipit-source-id: b7136ecaf73263b8f8b633c8861a673868ac252e --- .../RCTPushNotificationManager.h | 5 --- .../RCTPushNotificationManager.mm | 37 ------------------- 2 files changed, 42 deletions(-) diff --git a/packages/react-native/Libraries/PushNotificationIOS/RCTPushNotificationManager.h b/packages/react-native/Libraries/PushNotificationIOS/RCTPushNotificationManager.h index 214e0c81fc6..3f72180dfa7 100644 --- a/packages/react-native/Libraries/PushNotificationIOS/RCTPushNotificationManager.h +++ b/packages/react-native/Libraries/PushNotificationIOS/RCTPushNotificationManager.h @@ -45,9 +45,4 @@ typedef void (^RCTRemoteNotificationCallback)(UIBackgroundFetchResult result); */ + (void)setInitialNotification:(UNNotification *)notification; -/** DEPRECATED. Use didReceiveNotification instead. */ -+ (void)didReceiveLocalNotification:(UILocalNotification *)notification RCT_DEPRECATED; -/** DEPRECATED. Use didReceiveNotification instead. */ -+ (void)didReceiveRemoteNotification:(NSDictionary *)notification RCT_DEPRECATED; - @end diff --git a/packages/react-native/Libraries/PushNotificationIOS/RCTPushNotificationManager.mm b/packages/react-native/Libraries/PushNotificationIOS/RCTPushNotificationManager.mm index d04a30cc5c6..86f11c42f60 100644 --- a/packages/react-native/Libraries/PushNotificationIOS/RCTPushNotificationManager.mm +++ b/packages/react-native/Libraries/PushNotificationIOS/RCTPushNotificationManager.mm @@ -97,26 +97,6 @@ RCT_ENUM_CONVERTER( @implementation RCTPushNotificationManager -/** DEPRECATED. UILocalNotification was deprecated in iOS 10. Please don't add new callsites. */ -static NSDictionary *RCTFormatLocalNotification(UILocalNotification *notification) -{ - NSMutableDictionary *formattedLocalNotification = [NSMutableDictionary dictionary]; - if (notification.fireDate) { - NSDateFormatter *formatter = [NSDateFormatter new]; - [formatter setDateFormat:@"yyyy-MM-dd'T'HH:mm:ss.SSSZZZZZ"]; - NSString *fireDateString = [formatter stringFromDate:notification.fireDate]; - formattedLocalNotification[@"fireDate"] = fireDateString; - } - formattedLocalNotification[@"alertAction"] = RCTNullIfNil(notification.alertAction); - formattedLocalNotification[@"alertBody"] = RCTNullIfNil(notification.alertBody); - formattedLocalNotification[@"applicationIconBadgeNumber"] = @(notification.applicationIconBadgeNumber); - formattedLocalNotification[@"category"] = RCTNullIfNil(notification.category); - formattedLocalNotification[@"soundName"] = RCTNullIfNil(notification.soundName); - formattedLocalNotification[@"userInfo"] = RCTNullIfNil(RCTJSONClean(notification.userInfo)); - formattedLocalNotification[@"remote"] = @NO; - return formattedLocalNotification; -} - /** For delivered notifications */ static NSDictionary *RCTFormatUNNotification(UNNotification *notification) { @@ -267,23 +247,6 @@ RCT_EXPORT_MODULE() kInitialNotification = notification; } -// Deprecated -+ (void)didReceiveLocalNotification:(UILocalNotification *)notification -{ - [[NSNotificationCenter defaultCenter] postNotificationName:kLocalNotificationReceived - object:self - userInfo:RCTFormatLocalNotification(notification)]; -} - -// Deprecated -+ (void)didReceiveRemoteNotification:(NSDictionary *)notification -{ - NSDictionary *userInfo = @{@"notification" : notification}; - [[NSNotificationCenter defaultCenter] postNotificationName:RCTRemoteNotificationReceived - object:self - userInfo:userInfo]; -} - - (void)invalidate { [super invalidate];