fix: remove completionHandler from finish (#241)

react-native-push-notification · Nov 25, 2020 · 1506ddf · 1506ddf
1 parent 53a3ecc
commit 1506ddf
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 11 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -6,7 +6,7 @@ jobs:
     runs-on: ubuntu-18.04
     strategy:
       matrix:
-        node-version: [10,12,14]
+        node-version: [12,14]
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v1
@@ -27,7 +27,7 @@ jobs:
     runs-on: ubuntu-18.04
     strategy:
       matrix:
-        node-version: [10,12,14]
+        node-version: [12,14]
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v1
@@ -48,7 +48,7 @@ jobs:
     runs-on: ubuntu-18.04
     strategy:
       matrix:
-        node-version: [10,12,14]
+        node-version: [12,14]
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v1
@@ -69,7 +69,7 @@ jobs:
     runs-on: macos-latest
     strategy:
       matrix:
-        node-version: [10,12,14]
+        node-version: [12,14]
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v1

diff --git a/example/ios/example/AppDelegate.m b/example/ios/example/AppDelegate.m
@@ -104,6 +104,7 @@ - (void)userNotificationCenter:(UNUserNotificationCenter *)center
     didReceiveNotificationResponse:(UNNotificationResponse *)response
              withCompletionHandler:(void (^)(void))completionHandler {
   [RNCPushNotificationIOS didReceiveNotificationResponse:response];
+  completionHandler();
 }
 
 - (NSURL *)sourceURLForBridge:(RCTBridge *)bridge {

diff --git a/ios/RNCPushNotificationIOS.m b/ios/RNCPushNotificationIOS.m
@@ -168,13 +168,8 @@ - (void)handleRemoteNotificationRegistrationError:(NSNotification *)notification
   [self sendEventWithName:@"remoteNotificationRegistrationError" body:errorDetails];
 }
 
-RCT_EXPORT_METHOD(onFinishRemoteNotification:(NSString *)notificationId fetchResult:(UIBackgroundFetchResult)result) {
-  RNCRemoteNotificationCallback completionHandler = self.remoteNotificationCallbacks[notificationId];
-  if (!completionHandler) {
-    RCTLogError(@"There is no completion handler with notification id: %@", notificationId);
-    return;
-  }
-  completionHandler(result);
+RCT_EXPORT_METHOD(onFinishRemoteNotification:(NSString *)notificationId fetchResult:(UIBackgroundFetchResult)result)
+{
   [self.remoteNotificationCallbacks removeObjectForKey:notificationId];
 }