@react-native-firebase/messaging 25.1.0 → 26.0.0

package/CHANGELOG.md

@@ -3,6 +3,35 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [26.0.0](https://github.com/invertase/react-native-firebase/compare/v25.1.0...v26.0.0) (2026-07-29)
+
+### ⚠ BREAKING CHANGES
+
+- **messaging, ios:** make APNs registration timeout independent of main queue
+- **messaging:** messaging requires the React Native New Architecture.
+- **app:** App/Core modules native bridge requires New Architecture.
+
+Migrate RNFBAppModule and RNFBUtilsModule to Codegen TurboModules with
+unified resolver, lazy Proxy wrapper, and committed generated artifacts.
+Includes functions codegenConfig rename (NewArch-AD-7), test harness
+overrides, architecture decisions, and validation workflow hardening.
+
+### Features
+
+- **app:** migrate app modules to TurboModules incl general migration infra ([978168d](https://github.com/invertase/react-native-firebase/commit/978168dacecf4925d347d9757eff73ee43e1484f))
+- **messaging:** migrate messaging to TurboModules ([e56c7f4](https://github.com/invertase/react-native-firebase/commit/e56c7f406920a21c07ccd1810b0315ec0953aeff))
+
+### Bug Fixes
+
+- add ResultT codegen type alias ([ff2d68f](https://github.com/invertase/react-native-firebase/commit/ff2d68ff8f73092f8ba3c75e007049dd31be822f))
+- emit messaging_notification_opened only for default notification action on iOS. ([#8945](https://github.com/invertase/react-native-firebase/issues/8945)) ([2aec61f](https://github.com/invertase/react-native-firebase/commit/2aec61fff6b888f18379b2ba12807fd9d163b8cc))
+- **ios:** private codegen headers and bridging-safe AppCheck module ([266d7e1](https://github.com/invertase/react-native-firebase/commit/266d7e10020662bfd357d1795bc5f6cfde54f7b7))
+- **ios:** set IPHONEOS_DEPLOYMENT_TARGET to 15.0, update platform support docs/conditionals ([#9108](https://github.com/invertase/react-native-firebase/issues/9108)) ([99d0899](https://github.com/invertase/react-native-firebase/commit/99d089908e3eec6155d73ecf05ff7274ad33c46e)), closes [#8882](https://github.com/invertase/react-native-firebase/issues/8882)
+- **messaging, android:** ignore non-message broadcasts in messaging receiver ([#9105](https://github.com/invertase/react-native-firebase/issues/9105)) ([da17208](https://github.com/invertase/react-native-firebase/commit/da1720836622625acdfe8a5f0f870db688348c08)), closes [firebase-android-sdk#5410](https://github.com/invertase/firebase-android-sdk/issues/5410) [#8040](https://github.com/invertase/react-native-firebase/issues/8040)
+- **messaging, android:** make max stored notifications configurable ([#9111](https://github.com/invertase/react-native-firebase/issues/9111)) ([dc5771f](https://github.com/invertase/react-native-firebase/commit/dc5771f75e599db362c2c9916490284734746ec0)), closes [#8771](https://github.com/invertase/react-native-firebase/issues/8771)
+- **messaging, ios:** make APNs registration timeout independent of main queue ([4cbb19c](https://github.com/invertase/react-native-firebase/commit/4cbb19c68d082d2e632c8db134c79160d18aeb02))
+- **messaging:** willPresentNotification custom notification to work alongside default notification ([#9094](https://github.com/invertase/react-native-firebase/issues/9094)) ([1bad118](https://github.com/invertase/react-native-firebase/commit/1bad118f85aadc600757255d1f9ed525b11d655b))
+
 ## [25.1.0](https://github.com/invertase/react-native-firebase/compare/v25.0.1...v25.1.0) (2026-06-25)
 
 **Note:** Version bump only for package @react-native-firebase/messaging

package/RNFBMessaging.podspec

@@ -10,6 +10,7 @@ if coreVersionDetected != coreVersionRequired
 end
 firebase_ios_target = appPackage['sdkVersions']['ios']['iosTarget']
 firebase_macos_target = appPackage['sdkVersions']['ios']['macosTarget']
+firebase_tvos_target = appPackage['sdkVersions']['ios']['tvosTarget']
 
 Pod::Spec.new do |s|
   s.name                = "RNFBMessaging"
@@ -25,15 +26,28 @@ Pod::Spec.new do |s|
   s.social_media_url    = 'http://twitter.com/invertaseio'
   s.ios.deployment_target = firebase_ios_target
   s.macos.deployment_target = firebase_macos_target
-  s.source_files        = 'ios/**/*.{h,m}'
+  s.tvos.deployment_target = firebase_tvos_target
+  s.source_files        = 'ios/**/*.{h,m,mm,cpp,swift}'
+  s.public_header_files = [
+    'ios/RNFBMessaging/RNFBMessagingModule.h',
+  ]
+  s.private_header_files = [
+    'ios/RNFBMessaging/RNFBMessaging+*.h',
+    'ios/RNFBMessaging/RNFBMessagingSerializer.h',
+    'ios/generated/**/*.h',
+  ]
+  s.exclude_files       = 'ios/generated/RCTThirdPartyComponentsProvider.*', 'ios/generated/RCTAppDependencyProvider.*', 'ios/generated/RCTModuleProviders.*', 'ios/generated/RCTModulesConformingToProtocolsProvider.*', 'ios/generated/RCTUnstableModulesRequiringMainQueueSetupProvider.*'
+
+  s.pod_target_xcconfig = {
+    'HEADER_SEARCH_PATHS' => '"$(PODS_TARGET_SRCROOT)/ios/generated/RNFBMessagingTurboModules" "$(PODS_TARGET_SRCROOT)/ios/generated"',
+  }
 
   s.dependency          'RNFBApp'
 
-  # React Native dependencies
-  if defined?(install_modules_dependencies()) != nil
-    install_modules_dependencies(s);
-  else
-    s.dependency "React-Core"
+  install_modules_dependencies(s);
+
+  if defined?(ENV["RCT_NEW_ARCH_ENABLED"]) != nil && (ENV["RCT_NEW_ARCH_ENABLED"] == '0')
+     raise "#{s.name} requires New Architecture. Enable New Architecture to use this module"
   end
 
   if defined?($FirebaseSDKVersion)

package/android/build.gradle

@@ -130,6 +130,12 @@ android {
       targetCompatibility = JavaVersion.VERSION_11
     }
   }
+
+  sourceSets {
+    main {
+      java.excludes = ['**/generated/jni/**']
+    }
+  }
 }
 
 repositories {
@@ -147,3 +153,21 @@ ReactNative.shared.applyPackageVersion()
 ReactNative.shared.applyDefaultExcludes()
 ReactNative.module.applyAndroidVersions()
 ReactNative.module.applyReactNativeDependency("api")
+
+def isNewArchitectureDisabled() {
+  return project.hasProperty("newArchEnabled") && project.newArchEnabled != "true"
+}
+
+if (isNewArchitectureDisabled()) {
+  def ANSI_RED = "\u001B[31m";
+  def ANSI_RESET = "\u001B[0m";
+
+  println("\n\n\n")
+  println(ANSI_RED + "**************************************************************************************************************")
+  println("\n\n\n")
+  println("New Architecture support is required for @react-native-firebase/messaging")
+  println("\n\n\n")
+  println("**************************************************************************************************************" + ANSI_RESET)
+  println("\n\n\n")
+  System.exit(1)
+}

package/android/src/main/java/io/invertase/firebase/messaging/{ReactNativeFirebaseMessagingModule.java → NativeRNFBTurboMessaging.java}

@@ -21,10 +21,10 @@ import android.app.Activity;
 import android.content.Intent;
 import android.util.Log;
 import androidx.core.app.NotificationManagerCompat;
+import com.facebook.fbreact.specs.NativeRNFBTurboMessagingSpec;
 import com.facebook.react.bridge.ActivityEventListener;
 import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.bridge.WritableNativeMap;
@@ -34,20 +34,29 @@ import com.google.firebase.messaging.FirebaseMessaging;
 import com.google.firebase.messaging.RemoteMessage;
 import io.invertase.firebase.common.ReactNativeFirebaseEventEmitter;
 import io.invertase.firebase.common.ReactNativeFirebaseModule;
+import io.invertase.firebase.common.TaskExecutorService;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ExecutorService;
+import javax.annotation.Nullable;
 
-public class ReactNativeFirebaseMessagingModule extends ReactNativeFirebaseModule
+public class NativeRNFBTurboMessaging extends NativeRNFBTurboMessagingSpec
     implements ActivityEventListener {
   private static final String TAG = "Messaging";
   ReadableMap initialNotification = null;
-  private HashMap<String, Boolean> initialNotificationMap = new HashMap<>();
+  private final HashMap<String, Boolean> initialNotificationMap = new HashMap<>();
+  private final TaskExecutorService executorService;
 
-  ReactNativeFirebaseMessagingModule(ReactApplicationContext reactContext) {
-    super(reactContext, TAG);
+  public NativeRNFBTurboMessaging(ReactApplicationContext reactContext) {
+    super(reactContext);
+    executorService = new TaskExecutorService("NativeRNFBTurboMessaging");
     reactContext.addActivityEventListener(this);
   }
 
+  private ExecutorService getExecutor() {
+    return executorService.getExecutor();
+  }
+
   private WritableMap popRemoteMessageMapFromMessagingStore(String messageId) {
     ReactNativeFirebaseMessagingStore messagingStore =
         ReactNativeFirebaseMessagingStoreHelper.getInstance().getMessagingStore();
@@ -56,54 +65,110 @@ public class ReactNativeFirebaseMessagingModule extends ReactNativeFirebaseModul
     return remoteMessageMap;
   }
 
-  @ReactMethod
+  @Override
+  protected Map<String, Object> getTypedExportedConstants() {
+    final Map<String, Object> constants = new HashMap<>();
+    constants.put("isAutoInitEnabled", FirebaseMessaging.getInstance().isAutoInitEnabled());
+    constants.put(
+        "isDeliveryMetricsExportToBigQueryEnabled",
+        FirebaseMessaging.getInstance().deliveryMetricsExportToBigQueryEnabled());
+    constants.put(
+        "isNotificationDelegationEnabled",
+        FirebaseMessaging.getInstance().isNotificationDelegationEnabled());
+    return constants;
+  }
+
+  @Override
+  public void getDidOpenSettingsForNotification(Promise promise) {
+    promise.resolve(false);
+  }
+
+  @Override
+  public void signalBackgroundMessageHandlerSet() {
+    // iOS-only; no-op on Android
+  }
+
+  @Override
+  public void completeNotificationProcessing() {
+    // iOS-only; no-op on Android
+  }
+
+  @Override
+  public void getAPNSToken(Promise promise) {
+    promise.resolve(null);
+  }
+
+  @Override
+  public void setAPNSToken(String token, @Nullable String type, Promise promise) {
+    promise.resolve(null);
+  }
+
+  @Override
+  public void getIsHeadless(Promise promise) {
+    promise.resolve(false);
+  }
+
+  @Override
+  public void requestPermission(ReadableMap permissions, Promise promise) {
+    promise.resolve(1);
+  }
+
+  @Override
+  public void registerForRemoteNotifications(Promise promise) {
+    promise.resolve(null);
+  }
+
+  @Override
+  public void unregisterForRemoteNotifications(Promise promise) {
+    promise.resolve(null);
+  }
+
+  @Override
   public void getInitialNotification(Promise promise) {
     if (initialNotification != null) {
       promise.resolve(initialNotification);
       initialNotification = null;
       return;
-    } else {
-      Activity activity = getCurrentActivity();
-
-      if (activity != null) {
-        Intent intent = activity.getIntent();
-
-        if (intent != null && intent.getExtras() != null) {
-          // messageId can be either one...
-          String messageId = intent.getExtras().getString("google.message_id");
-          if (messageId == null) messageId = intent.getExtras().getString("message_id");
-
-          // only handle non-consumed initial notifications
-          if (messageId != null && initialNotificationMap.get(messageId) == null) {
-            WritableMap remoteMessageMap;
-            RemoteMessage remoteMessage =
-                ReactNativeFirebaseMessagingReceiver.notifications.get(messageId);
-            if (remoteMessage == null) {
-              remoteMessageMap = popRemoteMessageMapFromMessagingStore(messageId);
-            } else {
-              remoteMessageMap =
-                  ReactNativeFirebaseMessagingSerializer.remoteMessageToWritableMap(remoteMessage);
-            }
-            if (remoteMessageMap != null) {
-              promise.resolve(remoteMessageMap);
-              initialNotificationMap.put(messageId, true);
-              return;
-            }
+    }
+
+    Activity activity = getCurrentActivity();
+
+    if (activity != null) {
+      Intent intent = activity.getIntent();
+
+      if (intent != null && intent.getExtras() != null) {
+        String messageId = intent.getExtras().getString("google.message_id");
+        if (messageId == null) messageId = intent.getExtras().getString("message_id");
+
+        if (messageId != null && initialNotificationMap.get(messageId) == null) {
+          WritableMap remoteMessageMap;
+          RemoteMessage remoteMessage =
+              ReactNativeFirebaseMessagingReceiver.notifications.get(messageId);
+          if (remoteMessage == null) {
+            remoteMessageMap = popRemoteMessageMapFromMessagingStore(messageId);
+          } else {
+            remoteMessageMap =
+                ReactNativeFirebaseMessagingSerializer.remoteMessageToWritableMap(remoteMessage);
+          }
+          if (remoteMessageMap != null) {
+            promise.resolve(remoteMessageMap);
+            initialNotificationMap.put(messageId, true);
+            return;
           }
         }
-      } else {
-        Log.w(
-            TAG,
-            "Attempt to call getInitialNotification failed. The current activity is not ready, try"
-                + " calling the method later in the React lifecycle.");
       }
+    } else {
+      Log.w(
+          TAG,
+          "Attempt to call getInitialNotification failed. The current activity is not ready, try"
+              + " calling the method later in the React lifecycle.");
     }
 
     promise.resolve(null);
   }
 
-  @ReactMethod
-  public void setAutoInitEnabled(Boolean enabled, Promise promise) {
+  @Override
+  public void setAutoInitEnabled(boolean enabled, Promise promise) {
     Tasks.call(
             getExecutor(),
             () -> {
@@ -115,31 +180,29 @@ public class ReactNativeFirebaseMessagingModule extends ReactNativeFirebaseModul
               if (task.isSuccessful()) {
                 promise.resolve(FirebaseMessaging.getInstance().isAutoInitEnabled());
               } else {
-                rejectPromiseWithExceptionMap(promise, task.getException());
+                ReactNativeFirebaseModule.rejectPromiseWithExceptionMap(
+                    promise, task.getException());
               }
             });
   }
 
-  @ReactMethod
+  @Override
   public void isNotificationDelegationEnabled(Promise promise) {
     Tasks.call(
-            getExecutor(),
-            () -> {
-              FirebaseMessaging.getInstance().isNotificationDelegationEnabled();
-              return null;
-            })
+            getExecutor(), () -> FirebaseMessaging.getInstance().isNotificationDelegationEnabled())
         .addOnCompleteListener(
             task -> {
               if (task.isSuccessful()) {
                 promise.resolve(task.getResult());
               } else {
-                rejectPromiseWithExceptionMap(promise, task.getException());
+                ReactNativeFirebaseModule.rejectPromiseWithExceptionMap(
+                    promise, task.getException());
               }
             });
   }
 
-  @ReactMethod
-  public void setNotificationDelegationEnabled(Boolean enabled, Promise promise) {
+  @Override
+  public void setNotificationDelegationEnabled(boolean enabled, Promise promise) {
     Tasks.call(
             getExecutor(),
             () -> {
@@ -151,12 +214,13 @@ public class ReactNativeFirebaseMessagingModule extends ReactNativeFirebaseModul
               if (task.isSuccessful()) {
                 promise.resolve(FirebaseMessaging.getInstance().isNotificationDelegationEnabled());
               } else {
-                rejectPromiseWithExceptionMap(promise, task.getException());
+                ReactNativeFirebaseModule.rejectPromiseWithExceptionMap(
+                    promise, task.getException());
               }
             });
   }
 
-  @ReactMethod
+  @Override
   public void getToken(String appName, String senderId, Promise promise) {
     FirebaseMessaging messagingInstance =
         FirebaseApp.getInstance(appName).get(FirebaseMessaging.class);
@@ -166,12 +230,13 @@ public class ReactNativeFirebaseMessagingModule extends ReactNativeFirebaseModul
               if (task.isSuccessful()) {
                 promise.resolve(task.getResult());
               } else {
-                rejectPromiseWithExceptionMap(promise, task.getException());
+                ReactNativeFirebaseModule.rejectPromiseWithExceptionMap(
+                    promise, task.getException());
               }
             });
   }
 
-  @ReactMethod
+  @Override
   public void deleteToken(String appName, String senderId, Promise promise) {
     FirebaseMessaging messagingInstance =
         FirebaseApp.getInstance(appName).get(FirebaseMessaging.class);
@@ -186,12 +251,13 @@ public class ReactNativeFirebaseMessagingModule extends ReactNativeFirebaseModul
               if (task.isSuccessful()) {
                 promise.resolve(task.getResult());
               } else {
-                rejectPromiseWithExceptionMap(promise, task.getException());
+                ReactNativeFirebaseModule.rejectPromiseWithExceptionMap(
+                    promise, task.getException());
               }
             });
   }
 
-  @ReactMethod
+  @Override
   public void hasPermission(Promise promise) {
     Tasks.call(
             getExecutor(),
@@ -203,12 +269,13 @@ public class ReactNativeFirebaseMessagingModule extends ReactNativeFirebaseModul
               if (task.isSuccessful()) {
                 promise.resolve(task.getResult() ? 1 : 0);
               } else {
-                rejectPromiseWithExceptionMap(promise, task.getException());
+                ReactNativeFirebaseModule.rejectPromiseWithExceptionMap(
+                    promise, task.getException());
               }
             });
   }
 
-  @ReactMethod
+  @Override
   public void sendMessage(ReadableMap remoteMessageMap, Promise promise) {
     Tasks.call(
             getExecutor(),
@@ -224,12 +291,13 @@ public class ReactNativeFirebaseMessagingModule extends ReactNativeFirebaseModul
               if (task.isSuccessful()) {
                 promise.resolve(task.getResult());
               } else {
-                rejectPromiseWithExceptionMap(promise, task.getException());
+                ReactNativeFirebaseModule.rejectPromiseWithExceptionMap(
+                    promise, task.getException());
               }
             });
   }
 
-  @ReactMethod
+  @Override
   public void subscribeToTopic(String topic, Promise promise) {
     FirebaseMessaging.getInstance()
         .subscribeToTopic(topic)
@@ -238,12 +306,13 @@ public class ReactNativeFirebaseMessagingModule extends ReactNativeFirebaseModul
               if (task.isSuccessful()) {
                 promise.resolve(task.getResult());
               } else {
-                rejectPromiseWithExceptionMap(promise, task.getException());
+                ReactNativeFirebaseModule.rejectPromiseWithExceptionMap(
+                    promise, task.getException());
               }
             });
   }
 
-  @ReactMethod
+  @Override
   public void unsubscribeFromTopic(String topic, Promise promise) {
     FirebaseMessaging.getInstance()
         .unsubscribeFromTopic(topic)
@@ -252,13 +321,14 @@ public class ReactNativeFirebaseMessagingModule extends ReactNativeFirebaseModul
               if (task.isSuccessful()) {
                 promise.resolve(task.getResult());
               } else {
-                rejectPromiseWithExceptionMap(promise, task.getException());
+                ReactNativeFirebaseModule.rejectPromiseWithExceptionMap(
+                    promise, task.getException());
               }
             });
   }
 
-  @ReactMethod
-  public void setDeliveryMetricsExportToBigQuery(Boolean enabled, Promise promise) {
+  @Override
+  public void setDeliveryMetricsExportToBigQuery(boolean enabled, Promise promise) {
     Tasks.call(
             getExecutor(),
             () -> {
@@ -271,24 +341,12 @@ public class ReactNativeFirebaseMessagingModule extends ReactNativeFirebaseModul
                 promise.resolve(
                     FirebaseMessaging.getInstance().deliveryMetricsExportToBigQueryEnabled());
               } else {
-                rejectPromiseWithExceptionMap(promise, task.getException());
+                ReactNativeFirebaseModule.rejectPromiseWithExceptionMap(
+                    promise, task.getException());
               }
             });
   }
 
-  @Override
-  public Map<String, Object> getConstants() {
-    final Map<String, Object> constants = new HashMap<>();
-    constants.put("isAutoInitEnabled", FirebaseMessaging.getInstance().isAutoInitEnabled());
-    constants.put(
-        "isDeliveryMetricsExportToBigQueryEnabled",
-        FirebaseMessaging.getInstance().deliveryMetricsExportToBigQueryEnabled());
-    constants.put(
-        "isNotificationDelegationEnabled",
-        FirebaseMessaging.getInstance().isNotificationDelegationEnabled());
-    return constants;
-  }
-
   @Override
   public void onActivityResult(Activity activity, int requestCode, int resultCode, Intent data) {
     // noop
@@ -313,8 +371,6 @@ public class ReactNativeFirebaseMessagingModule extends ReactNativeFirebaseModul
         }
 
         if (remoteMessageMap != null) {
-          // WritableNativeMap not be consumed twice. But it is resolved in future and in event
-          // below. Make a copy - issue #5231
           WritableNativeMap newInitialNotification = new WritableNativeMap();
           newInitialNotification.merge(remoteMessageMap);
           initialNotification = newInitialNotification;
@@ -329,4 +385,10 @@ public class ReactNativeFirebaseMessagingModule extends ReactNativeFirebaseModul
       }
     }
   }
+
+  @Override
+  public void invalidate() {
+    super.invalidate();
+    executorService.shutdown();
+  }
 }

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

@@ -30,7 +30,7 @@ public class ReactNativeFirebaseMessagingPackage implements ReactPackage {
   @Override
   public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
     List<NativeModule> modules = new ArrayList<>();
-    modules.add(new ReactNativeFirebaseMessagingModule(reactContext));
+    modules.add(new NativeRNFBTurboMessaging(reactContext));
     return modules;
   }
 

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

@@ -26,6 +26,22 @@ public class ReactNativeFirebaseMessagingReceiver extends BroadcastReceiver {
       Log.e(TAG, "broadcast intent received with no extras");
       return;
     }
+    // Mirror the routing guards of the official FirebaseMessagingService: the
+    // c2dm RECEIVE action also carries control broadcasts (deleted_messages,
+    // send_event, send_error) and non-message intents such as the wrapped
+    // NOTIFICATION_DISMISS analytics intent that FCM attaches as deleteIntent
+    // to notifications it displays itself. The official SDK routes those to
+    // dedicated callbacks and never surfaces them through onMessageReceived;
+    // without these guards they are emitted to JS as empty remote messages.
+    String messageType = intent.getStringExtra("message_type");
+    if (messageType != null && !"gcm".equals(messageType)) {
+      Log.d(TAG, "broadcast ignored, non-message type: " + messageType);
+      return;
+    }
+    if (intent.getStringExtra("google.message_id") == null) {
+      Log.d(TAG, "broadcast ignored, no google.message_id (not an FCM message)");
+      return;
+    }
     RemoteMessage remoteMessage = new RemoteMessage(intent.getExtras());
     ReactNativeFirebaseEventEmitter emitter = ReactNativeFirebaseEventEmitter.getSharedInstance();
 

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

@@ -5,9 +5,13 @@ import static io.invertase.firebase.messaging.JsonConvert.reactToJSON;
 import static io.invertase.firebase.messaging.ReactNativeFirebaseMessagingSerializer.remoteMessageFromReadableMap;
 import static io.invertase.firebase.messaging.ReactNativeFirebaseMessagingSerializer.remoteMessageToWritableMap;
 
+import android.util.Log;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.WritableMap;
 import com.google.firebase.messaging.RemoteMessage;
+import io.invertase.firebase.common.ReactNativeFirebaseJSON;
+import io.invertase.firebase.common.ReactNativeFirebaseMeta;
+import io.invertase.firebase.common.ReactNativeFirebasePreferences;
 import io.invertase.firebase.common.UniversalFirebasePreferences;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -17,31 +21,68 @@ import org.json.JSONObject;
 
 public class ReactNativeFirebaseMessagingStoreImpl implements ReactNativeFirebaseMessagingStore {
 
+  private static final String TAG = "RNFirebaseMsgStore";
+  private static final String KEY_MAX_STORED_NOTIFICATIONS = "messaging_max_stored_notifications";
   private static final String S_KEY_ALL_NOTIFICATION_IDS = "all_notification_ids";
-  private static final int MAX_SIZE_NOTIFICATIONS = 100;
+  private static final int DEFAULT_MAX_SIZE_NOTIFICATIONS = 100;
   private final String DELIMITER = ",";
+  private static volatile int maxNotificationSize = -1;
+
+  private static int resolveMaxNotificationSize() {
+    int maxSize = DEFAULT_MAX_SIZE_NOTIFICATIONS;
+    String source = "default";
+    ReactNativeFirebaseJSON json = ReactNativeFirebaseJSON.getSharedInstance();
+    ReactNativeFirebaseMeta meta = ReactNativeFirebaseMeta.getSharedInstance();
+    ReactNativeFirebasePreferences prefs = ReactNativeFirebasePreferences.getSharedInstance();
+
+    try {
+      if (prefs.contains(KEY_MAX_STORED_NOTIFICATIONS)) {
+        maxSize = prefs.getIntValue(KEY_MAX_STORED_NOTIFICATIONS, DEFAULT_MAX_SIZE_NOTIFICATIONS);
+        source = "SharedPreferences";
+      } else if (json.contains(KEY_MAX_STORED_NOTIFICATIONS)) {
+        maxSize = json.getIntValue(KEY_MAX_STORED_NOTIFICATIONS, DEFAULT_MAX_SIZE_NOTIFICATIONS);
+        source = "firebase.json";
+      } else if (meta.contains(KEY_MAX_STORED_NOTIFICATIONS)) {
+        maxSize = meta.getIntValue(KEY_MAX_STORED_NOTIFICATIONS, DEFAULT_MAX_SIZE_NOTIFICATIONS);
+        source = "AndroidManifest";
+      }
+
+      Log.d(TAG, "messaging_max_stored_notifications: " + maxSize + " (from " + source + ")");
+      return maxSize;
+    } catch (Exception e) {
+      Log.w(
+          TAG,
+          "Error resolving max notification size, using default: " + DEFAULT_MAX_SIZE_NOTIFICATIONS,
+          e);
+      return DEFAULT_MAX_SIZE_NOTIFICATIONS;
+    }
+  }
+
+  private static int getMaxNotificationSize() {
+    if (maxNotificationSize == -1) {
+      maxNotificationSize = resolveMaxNotificationSize();
+    }
+    return maxNotificationSize;
+  }
 
   @Override
   public void storeFirebaseMessage(RemoteMessage remoteMessage) {
     try {
       String remoteMessageString =
           reactToJSON(remoteMessageToWritableMap(remoteMessage)).toString();
-      //      Log.d("storeFirebaseMessage", remoteMessageString);
       UniversalFirebasePreferences preferences = UniversalFirebasePreferences.getSharedInstance();
 
-      // remove old notifications message before store to free space as needed
+      int limit = getMaxNotificationSize();
       String notificationIds = preferences.getStringValue(S_KEY_ALL_NOTIFICATION_IDS, "");
       List<String> allNotificationList = convertToArray(notificationIds);
-      while (allNotificationList.size() > MAX_SIZE_NOTIFICATIONS - 1) {
+      while (allNotificationList.size() > limit - 1) {
         clearFirebaseMessage(allNotificationList.get(0));
         allNotificationList.remove(0);
       }
 
-      // now refetch the ids after possible removals, and store the new message
       notificationIds = preferences.getStringValue(S_KEY_ALL_NOTIFICATION_IDS, "");
       preferences.setStringValue(remoteMessage.getMessageId(), remoteMessageString);
-      // save new notification id
-      notificationIds += remoteMessage.getMessageId() + DELIMITER; // append to last
+      notificationIds += remoteMessage.getMessageId() + DELIMITER;
       preferences.setStringValue(S_KEY_ALL_NOTIFICATION_IDS, notificationIds);
     } catch (JSONException e) {
       e.printStackTrace();
@@ -63,10 +104,9 @@ public class ReactNativeFirebaseMessagingStoreImpl implements ReactNativeFirebas
     String remoteMessageString =
         UniversalFirebasePreferences.getSharedInstance().getStringValue(remoteMessageId, null);
     if (remoteMessageString != null) {
-      //      Log.d("getFirebaseMessage", remoteMessageString);
       try {
         WritableMap remoteMessageMap = jsonToReact(new JSONObject(remoteMessageString));
-        remoteMessageMap.putString("to", remoteMessageId); // fake to
+        remoteMessageMap.putString("to", remoteMessageId);
         return remoteMessageMap;
       } catch (JSONException e) {
         e.printStackTrace();
@@ -79,10 +119,9 @@ public class ReactNativeFirebaseMessagingStoreImpl implements ReactNativeFirebas
   public void clearFirebaseMessage(String remoteMessageId) {
     UniversalFirebasePreferences preferences = UniversalFirebasePreferences.getSharedInstance();
     preferences.remove(remoteMessageId).apply();
-    // check and remove old notifications message
     String notificationIds = preferences.getStringValue(S_KEY_ALL_NOTIFICATION_IDS, "");
     if (!notificationIds.isEmpty()) {
-      notificationIds = removeRemoteMessageId(remoteMessageId, notificationIds); // remove from list
+      notificationIds = removeRemoteMessageId(remoteMessageId, notificationIds);
       preferences.setStringValue(S_KEY_ALL_NOTIFICATION_IDS, notificationIds);
     }
   }