@react-native-firebase/messaging 20.4.0 → 21.0.0

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [21.0.0](https://github.com/invertase/react-native-firebase/compare/v20.5.0...v21.0.0) (2024-09-26)
+
+**Note:** Version bump only for package @react-native-firebase/messaging
+
+## [20.5.0](https://github.com/invertase/react-native-firebase/compare/v20.4.0...v20.5.0) (2024-09-11)
+
+### Bug Fixes
+
+- **messaging, android:** handle nullable broadcast intent ([#7893](https://github.com/invertase/react-native-firebase/issues/7893)) ([#7960](https://github.com/invertase/react-native-firebase/issues/7960)) ([c1ac022](https://github.com/invertase/react-native-firebase/commit/c1ac022e4e9d3effb2f0fb3404ad375d9fcbe4b6))
+- **messaging, ios:** fixed isHeadless for react-native-navigation ([#7868](https://github.com/invertase/react-native-firebase/issues/7868)) ([3875cc6](https://github.com/invertase/react-native-firebase/commit/3875cc6077e5fd6b35e201356aca632e43a2e301))
+
 ## [20.4.0](https://github.com/invertase/react-native-firebase/compare/v20.3.0...v20.4.0) (2024-08-13)
 
 **Note:** Version bump only for package @react-native-firebase/messaging

package/android/src/main/java/io/invertase/firebase/messaging/ReactNativeFirebaseMessagingReceiver.java

@@ -22,6 +22,10 @@ public class ReactNativeFirebaseMessagingReceiver extends BroadcastReceiver {
     if (ReactNativeFirebaseApp.getApplicationContext() == null) {
       ReactNativeFirebaseApp.setApplicationContext(context.getApplicationContext());
     }
+    if (intent.getExtras() == null) {
+      Log.e(TAG, "broadcast intent received with no extras");
+      return;
+    }
     RemoteMessage remoteMessage = new RemoteMessage(intent.getExtras());
     ReactNativeFirebaseEventEmitter emitter = ReactNativeFirebaseEventEmitter.getSharedInstance();
 

package/ios/RNFBMessaging/RNFBMessaging+NSNotificationCenter.m

@@ -96,8 +96,8 @@
 
   if (notification.userInfo[UIApplicationLaunchOptionsRemoteNotificationKey]) {
     if ([UIApplication sharedApplication].applicationState == UIApplicationStateBackground) {
+      isHeadless = YES;
       if (rctRootView != nil) {
-        isHeadless = YES;
         NSMutableDictionary *appPropertiesDict = rctRootView.appProperties != nil
                                                      ? [rctRootView.appProperties mutableCopy]
                                                      : [NSMutableDictionary dictionary];
@@ -120,8 +120,8 @@
       [[UIApplication sharedApplication] registerForRemoteNotifications];
       // #endif
     } else {
+      isHeadless = NO;
       if (rctRootView != nil) {
-        isHeadless = NO;
         NSMutableDictionary *appPropertiesDict = rctRootView.appProperties != nil
                                                      ? [rctRootView.appProperties mutableCopy]
                                                      : [NSMutableDictionary dictionary];
@@ -133,8 +133,8 @@
       }
     }
   } else {
+    isHeadless = NO;
     if (rctRootView != nil) {
-      isHeadless = NO;
       NSMutableDictionary *appPropertiesDict = rctRootView.appProperties != nil
                                                    ? [rctRootView.appProperties mutableCopy]
                                                    : [NSMutableDictionary dictionary];
@@ -148,6 +148,7 @@
 }
 
 - (void)application_onDidEnterForeground {
+  isHeadless = NO;
   if ([UIApplication sharedApplication].delegate != nil &&
       [UIApplication sharedApplication].delegate.window != nil &&
       [UIApplication sharedApplication].delegate.window.rootViewController != nil &&
@@ -160,7 +161,6 @@
     if (rctRootView.appProperties != nil &&
         [rctRootView.appProperties[@"isHeadless"] isEqual:@(YES)]) {
       NSMutableDictionary *appPropertiesDict = [rctRootView.appProperties mutableCopy];
-      isHeadless = NO;
       if ([appPropertiesDict objectForKey:@"isHeadless"] != nil &&
           [appPropertiesDict[@"isHeadless"] isEqual:@([RCTConvert BOOL:@(YES)])]) {
         appPropertiesDict[@"isHeadless"] = @([RCTConvert BOOL:@(isHeadless)]);

package/ios/RNFBMessaging/RNFBMessaging+UNUserNotificationCenter.m

@@ -172,9 +172,7 @@ struct {
 - (void)userNotificationCenter:(UNUserNotificationCenter *)center
     openSettingsForNotification:(nullable UNNotification *)notification {
   if (_originalDelegate != nil && originalDelegateRespondsTo.openSettingsForNotification) {
-    if (@available(iOS 12.0, *)) {
-      [_originalDelegate userNotificationCenter:center openSettingsForNotification:notification];
-    }
+    [_originalDelegate userNotificationCenter:center openSettingsForNotification:notification];
   } else {
     NSDictionary *notificationDict = [RNFBMessagingSerializer notificationToDict:notification];
     [[RNFBRCTEventEmitter shared] sendEventWithName:@"messaging_settings_for_notification_opened"

package/ios/RNFBMessaging/RNFBMessagingModule.m

@@ -233,78 +233,58 @@ RCT_EXPORT_METHOD(requestPermission
     return;
   }
 
-  if (@available(iOS 10.0, *)) {
-    UNAuthorizationOptions options = UNAuthorizationOptionNone;
+  UNAuthorizationOptions options = UNAuthorizationOptionNone;
 
-    if ([permissions[@"alert"] isEqual:@(YES)]) {
-      options |= UNAuthorizationOptionAlert;
-    }
-
-    if ([permissions[@"badge"] isEqual:@(YES)]) {
-      options |= UNAuthorizationOptionBadge;
-    }
+  if ([permissions[@"alert"] isEqual:@(YES)]) {
+    options |= UNAuthorizationOptionAlert;
+  }
 
-    if ([permissions[@"sound"] isEqual:@(YES)]) {
-      options |= UNAuthorizationOptionSound;
-    }
+  if ([permissions[@"badge"] isEqual:@(YES)]) {
+    options |= UNAuthorizationOptionBadge;
+  }
 
-    if ([permissions[@"criticalAlert"] isEqual:@(YES)]) {
-      if (@available(iOS 12.0, *)) {
-        options |= UNAuthorizationOptionCriticalAlert;
-      }
-    }
+  if ([permissions[@"sound"] isEqual:@(YES)]) {
+    options |= UNAuthorizationOptionSound;
+  }
 
-    if ([permissions[@"provisional"] isEqual:@(YES)]) {
-      if (@available(iOS 12.0, *)) {
-        options |= UNAuthorizationOptionProvisional;
-      }
-    }
+  if ([permissions[@"criticalAlert"] isEqual:@(YES)]) {
+    options |= UNAuthorizationOptionCriticalAlert;
+  }
 
-    if ([permissions[@"announcement"] isEqual:@(YES)]) {
-      if (@available(iOS 13.0, *)) {
-#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000
-        options |= UNAuthorizationOptionAnnouncement;
-#endif
-      }
-    }
+  if ([permissions[@"provisional"] isEqual:@(YES)]) {
+    options |= UNAuthorizationOptionProvisional;
+  }
 
-    if ([permissions[@"carPlay"] isEqual:@(YES)]) {
-      options |= UNAuthorizationOptionCarPlay;
-    }
+  if ([permissions[@"announcement"] isEqual:@(YES)]) {
+    options |= UNAuthorizationOptionAnnouncement;
+  }
 
-    if ([permissions[@"providesAppNotificationSettings"] isEqual:@(YES)]) {
-      if (@available(iOS 12, macOS 10.14, macCatalyst 13, tvOS 12, watchOS 5, *)) {
-        options |= UNAuthorizationOptionProvidesAppNotificationSettings;
-      }
-    }
+  if ([permissions[@"carPlay"] isEqual:@(YES)]) {
+    options |= UNAuthorizationOptionCarPlay;
+  }
 
-    UNUserNotificationCenter *center = [UNUserNotificationCenter currentNotificationCenter];
-    [center requestAuthorizationWithOptions:options
-                          completionHandler:^(BOOL granted, NSError *_Nullable error) {
-                            if (error) {
-                              [RNFBSharedUtils rejectPromiseWithNSError:reject error:error];
-                            } else {
-                              // if we do not attempt to register immediately, registration fails
-                              // later unknown reason why, but this was the only difference between
-                              // using a react-native-permissions vs built-in permissions request in
-                              // a sequence of "request permissions" --> "register for messages" you
-                              // only want to request permission if you want to register for
-                              // messages, so we register directly now - see #7272
-                              dispatch_async(dispatch_get_main_queue(), ^{
-                                [[UIApplication sharedApplication] registerForRemoteNotifications];
-                              });
-                              [self hasPermission:resolve:reject];
-                            }
-                          }];
-  } else {
-    [RNFBSharedUtils
-        rejectPromiseWithUserInfo:reject
-                         userInfo:[@{
-                           @"code" : @"unsupported-platform-version",
-                           @"message" : @"requestPermission call failed; minimum supported version "
-                                        @"requirement not met (iOS 10)."
-                         } mutableCopy]];
+  if ([permissions[@"providesAppNotificationSettings"] isEqual:@(YES)]) {
+    options |= UNAuthorizationOptionProvidesAppNotificationSettings;
   }
+
+  UNUserNotificationCenter *center = [UNUserNotificationCenter currentNotificationCenter];
+  [center requestAuthorizationWithOptions:options
+                        completionHandler:^(BOOL granted, NSError *_Nullable error) {
+                          if (error) {
+                            [RNFBSharedUtils rejectPromiseWithNSError:reject error:error];
+                          } else {
+                            // if we do not attempt to register immediately, registration fails
+                            // later unknown reason why, but this was the only difference between
+                            // using a react-native-permissions vs built-in permissions request in
+                            // a sequence of "request permissions" --> "register for messages" you
+                            // only want to request permission if you want to register for
+                            // messages, so we register directly now - see #7272
+                            dispatch_async(dispatch_get_main_queue(), ^{
+                              [[UIApplication sharedApplication] registerForRemoteNotifications];
+                            });
+                            [self hasPermission:resolve:reject];
+                          }
+                        }];
 }
 
 RCT_EXPORT_METHOD(registerForRemoteNotifications
@@ -320,59 +300,45 @@ RCT_EXPORT_METHOD(registerForRemoteNotifications
   DLog(@"RNFBMessaging registerForRemoteNotifications ARM64 Simulator detected, attempting real "
        @"registration. macOS13+ / iOS16+ / M1 mac required or will timeout.")
 #endif
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunreachable-code"
-      if (@available(iOS 10.0, *)) {
-#pragma pop
-    if ([UIApplication sharedApplication].isRegisteredForRemoteNotifications == YES) {
-      DLog(@"RNFBMessaging registerForRemoteNotifications - already registered.");
-      resolve(@([RCTConvert BOOL:@(YES)]));
-      return;
-    } else {
-      [[RNFBMessagingAppDelegate sharedInstance] setPromiseResolve:resolve andPromiseReject:reject];
-    }
-
-    // Apple docs recommend that registerForRemoteNotifications is always called on app start
-    // regardless of current status
-    dispatch_async(dispatch_get_main_queue(), ^{
-      // Sometimes the registration never completes, which deserves separate attention in other
-      // areas. This area should protect itself against hanging forever regardless. Just in case,
-      // check in after a delay and cleanup if required
-      dispatch_after(
-          dispatch_time(DISPATCH_TIME_NOW, 10.0 * NSEC_PER_SEC), dispatch_get_main_queue(), ^{
-            if ([RNFBMessagingAppDelegate sharedInstance].registerPromiseResolver != nil) {
-              // if we got here and resolve/reject are still set, unset, log failure, reject
-              DLog(@"RNFBMessaging dispatch_after block: we appear to have timed out. Rejecting");
-              [[RNFBMessagingAppDelegate sharedInstance] setPromiseResolve:nil
-                                                          andPromiseReject:nil];
-
-              [RNFBSharedUtils
-                  rejectPromiseWithUserInfo:reject
-                                   userInfo:[@{
-                                     @"code" : @"unknown-error",
-                                     @"message" :
-                                         @"registerDeviceForRemoteMessages requested but "
-                                         @"system did not respond. Possibly missing permission."
-                                   } mutableCopy]];
-              return;
-            } else {
-              DLog(@"RNFBMessaging dispatch_after: registerDeviceForRemoteMessages handled.");
-              return;
-            }
-          });
-
-      [[UIApplication sharedApplication] registerForRemoteNotifications];
-    });
+      if ([UIApplication sharedApplication].isRegisteredForRemoteNotifications == YES) {
+    DLog(@"RNFBMessaging registerForRemoteNotifications - already registered.");
+    resolve(@([RCTConvert BOOL:@(YES)]));
+    return;
   }
   else {
-    [RNFBSharedUtils
-        rejectPromiseWithUserInfo:reject
-                         userInfo:[@{
-                           @"code" : @"unsupported-platform-version",
-                           @"message" : @"registerDeviceForRemoteMessages call failed; minimum "
-                                        @"supported version requirement not met (iOS 10)."
-                         } mutableCopy]];
+    [[RNFBMessagingAppDelegate sharedInstance] setPromiseResolve:resolve andPromiseReject:reject];
   }
+
+  // Apple docs recommend that registerForRemoteNotifications is always called on app start
+  // regardless of current status
+  dispatch_async(dispatch_get_main_queue(), ^{
+    // Sometimes the registration never completes, which deserves separate attention in other
+    // areas. This area should protect itself against hanging forever regardless. Just in case,
+    // check in after a delay and cleanup if required
+    dispatch_after(
+        dispatch_time(DISPATCH_TIME_NOW, 10.0 * NSEC_PER_SEC), dispatch_get_main_queue(), ^{
+          if ([RNFBMessagingAppDelegate sharedInstance].registerPromiseResolver != nil) {
+            // if we got here and resolve/reject are still set, unset, log failure, reject
+            DLog(@"RNFBMessaging dispatch_after block: we appear to have timed out. Rejecting");
+            [[RNFBMessagingAppDelegate sharedInstance] setPromiseResolve:nil andPromiseReject:nil];
+
+            [RNFBSharedUtils
+                rejectPromiseWithUserInfo:reject
+                                 userInfo:[@{
+                                   @"code" : @"unknown-error",
+                                   @"message" :
+                                       @"registerDeviceForRemoteMessages requested but "
+                                       @"system did not respond. Possibly missing permission."
+                                 } mutableCopy]];
+            return;
+          } else {
+            DLog(@"RNFBMessaging dispatch_after: registerDeviceForRemoteMessages handled.");
+            return;
+          }
+        });
+
+    [[UIApplication sharedApplication] registerForRemoteNotifications];
+  });
 }
 
 RCT_EXPORT_METHOD(unregisterForRemoteNotifications
@@ -383,41 +349,27 @@ RCT_EXPORT_METHOD(unregisterForRemoteNotifications
 }
 
 RCT_EXPORT_METHOD(hasPermission : (RCTPromiseResolveBlock)resolve : (RCTPromiseRejectBlock)reject) {
-  if (@available(iOS 10.0, *)) {
-    [[UNUserNotificationCenter currentNotificationCenter]
-        getNotificationSettingsWithCompletionHandler:^(UNNotificationSettings *_Nonnull settings) {
-          NSNumber *authorizedStatus = @-1;
-          if (settings.authorizationStatus == UNAuthorizationStatusNotDetermined) {
-            authorizedStatus = @-1;
-          } else if (settings.authorizationStatus == UNAuthorizationStatusDenied) {
-            authorizedStatus = @0;
-          } else if (settings.authorizationStatus == UNAuthorizationStatusAuthorized) {
-            authorizedStatus = @1;
-          }
-
-          if (@available(iOS 12.0, *)) {
-            if (settings.authorizationStatus == UNAuthorizationStatusProvisional) {
-              authorizedStatus = @2;
-            }
+  [[UNUserNotificationCenter currentNotificationCenter]
+      getNotificationSettingsWithCompletionHandler:^(UNNotificationSettings *_Nonnull settings) {
+        NSNumber *authorizedStatus = @-1;
+        if (settings.authorizationStatus == UNAuthorizationStatusNotDetermined) {
+          authorizedStatus = @-1;
+        } else if (settings.authorizationStatus == UNAuthorizationStatusDenied) {
+          authorizedStatus = @0;
+        } else if (settings.authorizationStatus == UNAuthorizationStatusAuthorized) {
+          authorizedStatus = @1;
+        } else if (settings.authorizationStatus == UNAuthorizationStatusProvisional) {
+          authorizedStatus = @2;
+        }
+
+        if (@available(iOS 14.0, macCatalyst 14.0, *)) {
+          if (settings.authorizationStatus == UNAuthorizationStatusEphemeral) {
+            authorizedStatus = @3;
           }
+        }
 
-          if (@available(iOS 14.0, macCatalyst 14.0, *)) {
-            if (settings.authorizationStatus == UNAuthorizationStatusEphemeral) {
-              authorizedStatus = @3;
-            }
-          }
-
-          resolve(authorizedStatus);
-        }];
-  } else {
-    [RNFBSharedUtils
-        rejectPromiseWithUserInfo:reject
-                         userInfo:[@{
-                           @"code" : @"unsupported-platform-version",
-                           @"message" : @"hasPermission call failed; minimum supported version "
-                                        @"requirement not met (iOS 10)."
-                         } mutableCopy]];
-  }
+        resolve(authorizedStatus);
+      }];
 }
 
 RCT_EXPORT_METHOD(subscribeToTopic

package/lib/version.js

@@ -1,2 +1,2 @@
 // Generated by genversion.
-module.exports = '20.4.0';
+module.exports = '21.0.0';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native-firebase/messaging",
-  "version": "20.4.0",
+  "version": "21.0.0",
   "author": "Invertase <oss@invertase.io> (http://invertase.io)",
   "description": "React Native Firebase - React Native Firebase provides native integration of Firebase Cloud Messaging (FCM) for both Android & iOS. FCM is a cost free service, allowing for server-device and device-device communication. The React Native Firebase Messaging module provides a simple JavaScript API to interact with FCM.",
   "main": "lib/index.js",
@@ -24,11 +24,11 @@
     "messaging"
   ],
   "peerDependencies": {
-    "@react-native-firebase/app": "20.4.0",
+    "@react-native-firebase/app": "21.0.0",
     "expo": ">=47.0.0"
   },
   "devDependencies": {
-    "expo": "^50.0.19"
+    "expo": "^50.0.21"
   },
   "peerDependenciesMeta": {
     "expo": {
@@ -38,5 +38,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "3ac3e9623674a8db52c111b4aa0a85a883260116"
+  "gitHead": "6965c40db30a832a21c3f9a93f6e5df36f137461"
 }

package/plugin/build/android/setupFirebaseNotifationIcon.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setFireBaseMessagingAndroidManifest = exports.withExpoPluginFirebaseNotification = void 0;
+exports.withExpoPluginFirebaseNotification = void 0;
+exports.setFireBaseMessagingAndroidManifest = setFireBaseMessagingAndroidManifest;
 const config_plugins_1 = require("@expo/config-plugins");
 /**
  * Determine whether a ManifestApplication has an attribute.
@@ -59,4 +60,3 @@ function setFireBaseMessagingAndroidManifest(config, application) {
     }
     return application;
 }
-exports.setFireBaseMessagingAndroidManifest = setFireBaseMessagingAndroidManifest;

package/plugin/tsconfig.tsbuildinfo

@@ -0,0 +1 @@
+{"root":["./src/index.ts","./src/android/index.ts","./src/android/setupFirebaseNotifationIcon.ts"],"version":"5.6.2"}