Merge pull request #1031 from felipeclopes/data-messages-fix

Fix handling of data-message once grantPermission is done
arnesson · Jan 27, 2024 · ad0f62e · ad0f62e
2 parents 542c6cd + 525ff02
commit ad0f62e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/src/ios/FirebasePlugin.m b/src/ios/FirebasePlugin.m
@@ -107,21 +107,20 @@ - (void)grantPermission:(CDVInvokedUrlCommand *)command {
 
 
 #if defined(__IPHONE_10_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_10_0
+    [UNUserNotificationCenter currentNotificationCenter].delegate = self;
     UNAuthorizationOptions authOptions = UNAuthorizationOptionAlert|UNAuthorizationOptionSound|UNAuthorizationOptionBadge;
     [[UNUserNotificationCenter currentNotificationCenter]
         requestAuthorizationWithOptions:authOptions
                       completionHandler:^(BOOL granted, NSError * _Nullable error) {
 
             if (![NSThread isMainThread]) {
                 dispatch_sync(dispatch_get_main_queue(), ^{
-                    [[FIRMessaging messaging] setDelegate:self];
                     [[UIApplication sharedApplication] registerForRemoteNotifications];
 
                     CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus: granted ? CDVCommandStatus_OK : CDVCommandStatus_ERROR];
                     [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
                 });
             } else {
-                [[FIRMessaging messaging] setDelegate:self];
                 [[UIApplication sharedApplication] registerForRemoteNotifications];
                 CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
                 [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];

diff --git a/test/platform-build.sh b/test/platform-build.sh
@@ -9,4 +9,4 @@ PLATFORM_VERSION=$3
 FOLDER=".build-$PLATFORM"
 cd $FOLDER
 
-../node_modules/.bin/cordova build $PLATFORM
+../node_modules/.bin/cordova build $PLATFORM --stacktrace --info