Merge pull request #214 from react-native-push-notification-ios/next

Naturalclar · web-flow · commit e9d7e56c116a · 2020-10-26T19:55:29.000+09:00
diff --git a/ios/RNCPushNotificationIOS.h b/ios/RNCPushNotificationIOS.h
@@ -14,7 +14,7 @@ extern NSString *const RNCRemoteNotificationReceived;
 
 typedef void (^RNCRemoteNotificationCallback)(UIBackgroundFetchResult result);
 
-#if !TARGET_OS_TV && !TARGET_OS_UIKITFORMAC
+#if !TARGET_OS_TV
 + (void)didRegisterUserNotificationSettings:(UIUserNotificationSettings *)notificationSettings;
 + (void)didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken;
 + (void)didReceiveRemoteNotification:(NSDictionary *)notification;
diff --git a/ios/RNCPushNotificationIOS.m b/ios/RNCPushNotificationIOS.m
@@ -184,11 +184,11 @@ + (UNNotificationCategory *)UNNotificationCategory:(id)json
 #else
 @interface RNCPushNotificationIOS () <NativePushNotificationManagerIOS>
 @end
-#endif //TARGET_OS_TV / TARGET_OS_UIKITFORMAC
+#endif //TARGET_OS_TV
 
 @implementation RNCPushNotificationIOS
 
-#if !TARGET_OS_TV && !TARGET_OS_UIKITFORMAC
+#if !TARGET_OS_TV
 
 /**
  * Type deprecated in iOS 10.0
@@ -288,7 +288,7 @@ @implementation RNCPushNotificationIOS
   return formattedResponse;
 }
 
-#endif //TARGET_OS_TV / TARGET_OS_UIKITFORMAC
+#endif //TARGET_OS_TV
 
 RCT_EXPORT_MODULE()
 
@@ -297,7 +297,7 @@ - (dispatch_queue_t)methodQueue
   return dispatch_get_main_queue();
 }
 
-#if !TARGET_OS_TV && !TARGET_OS_UIKITFORMAC
+#if !TARGET_OS_TV
 - (void)startObserving
 {
   [[NSNotificationCenter defaultCenter] addObserver:self
@@ -688,7 +688,7 @@ - (void)handleRemoteNotificationRegistrationError:(NSNotification *)notification
   }
 }
 
-#else //TARGET_OS_TV / TARGET_OS_UIKITFORMAC
+#else //TARGET_OS_TV
 
 RCT_EXPORT_METHOD(onFinishRemoteNotification:(NSString *)notificationId fetchResult:(NSString *)fetchResult)
 {
@@ -774,6 +774,6 @@ - (void)handleRemoteNotificationRegistrationError:(NSNotification *)notification
   return @[];
 }
 
-#endif //TARGET_OS_TV / TARGET_OS_UIKITFORMAC
+#endif //TARGET_OS_TV
 
 @end
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-native-community/push-notification-ios",
-  "version": "1.7.0",
+  "version": "1.7.1",
   "description": "React Native Push Notification API for iOS",
   "main": "js/index.js",
   "types": "index.d.ts",

Original file line number	Diff line number	Diff line change
`@@ -184,11 +184,11 @@ + (UNNotificationCategory *)UNNotificationCategory:(id)json`
`184`	`184`	`#else`
`185`	`185`	`@interface RNCPushNotificationIOS () <NativePushNotificationManagerIOS>`
`186`	`186`	`@end`
`187`		`-#endif //TARGET_OS_TV / TARGET_OS_UIKITFORMAC`
	`187`	`+#endif //TARGET_OS_TV`
`188`	`188`
`189`	`189`	`@implementation RNCPushNotificationIOS`
`190`	`190`
`191`		`-#if !TARGET_OS_TV && !TARGET_OS_UIKITFORMAC`
	`191`	`+#if !TARGET_OS_TV`
`192`	`192`
`193`	`193`	`/**`
`194`	`194`	`* Type deprecated in iOS 10.0`
`@@ -288,7 +288,7 @@ @implementation RNCPushNotificationIOS`
`288`	`288`	`return formattedResponse;`
`289`	`289`	`}`
`290`	`290`
`291`		`-#endif //TARGET_OS_TV / TARGET_OS_UIKITFORMAC`
	`291`	`+#endif //TARGET_OS_TV`
`292`	`292`
`293`	`293`	`RCT_EXPORT_MODULE()`
`294`	`294`
`@@ -297,7 +297,7 @@ - (dispatch_queue_t)methodQueue`
`297`	`297`	`return dispatch_get_main_queue();`
`298`	`298`	`}`
`299`	`299`
`300`		`-#if !TARGET_OS_TV && !TARGET_OS_UIKITFORMAC`
	`300`	`+#if !TARGET_OS_TV`
`301`	`301`	`- (void)startObserving`
`302`	`302`	`{`
`303`	`303`	`[[NSNotificationCenter defaultCenter] addObserver:self`
`@@ -688,7 +688,7 @@ - (void)handleRemoteNotificationRegistrationError:(NSNotification *)notification`
`688`	`688`	`}`
`689`	`689`	`}`
`690`	`690`
`691`		`-#else //TARGET_OS_TV / TARGET_OS_UIKITFORMAC`
	`691`	`+#else //TARGET_OS_TV`
`692`	`692`
`693`	`693`	`RCT_EXPORT_METHOD(onFinishRemoteNotification:(NSString )notificationId fetchResult:(NSString )fetchResult)`
`694`	`694`	`{`
`@@ -774,6 +774,6 @@ - (void)handleRemoteNotificationRegistrationError:(NSNotification *)notification`
`774`	`774`	`return @[];`
`775`	`775`	`}`
`776`	`776`
`777`		`-#endif //TARGET_OS_TV / TARGET_OS_UIKITFORMAC`
	`777`	`+#endif //TARGET_OS_TV`
`778`	`778`
`779`	`779`	`@end`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@react-native-community/push-notification-ios",`
`3`		`- "version": "1.7.0",`
	`3`	`+ "version": "1.7.1",`
`4`	`4`	`"description": "React Native Push Notification API for iOS",`
`5`	`5`	`"main": "js/index.js",`
`6`	`6`	`"types": "index.d.ts",`