@react-native-firebase/messaging 23.5.0 → 23.6.0

package/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [23.6.0](https://github.com/invertase/react-native-firebase/compare/v23.5.0...v23.6.0) (2025-12-08)
+
+### Bug Fixes
+
+- **messaging, android:** properly remove remote message from prefs ([336901b](https://github.com/invertase/react-native-firebase/commit/336901b00f0553f57fa18ce416f513f915c9a8ed))
+- **messaging, android:** properly shrink stored messages to limit ([53fb8c8](https://github.com/invertase/react-native-firebase/commit/53fb8c86e0ab2559a69c1309e7a1c9afec4bcb1f))
+- **messaging, android:** purge message store to limit first, add second ([47ea774](https://github.com/invertase/react-native-firebase/commit/47ea774e2830c0ef3e95c06acfb3960a3ae0bc74))
+
 ## [23.5.0](https://github.com/invertase/react-native-firebase/compare/v23.4.1...v23.5.0) (2025-10-30)
 
 **Note:** Version bump only for package @react-native-firebase/messaging

package/android/build.gradle

@@ -36,11 +36,8 @@ def jsonTargetSdk = appPackageJson['sdkVersions']['android']['targetSdk']
 def jsonCompileSdk = appPackageJson['sdkVersions']['android']['compileSdk']
 def coreVersionDetected = appPackageJson['version']
 def coreVersionRequired = packageJson['peerDependencies'][appPackageJson['name']]
-// Only log after build completed so log warning appears at the end
 if (coreVersionDetected != coreVersionRequired) {
-  gradle.buildFinished {
-    project.logger.warn("ReactNativeFirebase WARNING: NPM package '${packageJson['name']}' depends on '${appPackageJson['name']}' v${coreVersionRequired} but found v${coreVersionDetected}, this might cause build issues or runtime crashes.")
-  }
+  project.logger.warn("ReactNativeFirebase WARNING: NPM package '${packageJson['name']}' depends on '${appPackageJson['name']}' v${coreVersionRequired} but found v${coreVersionDetected}, this might cause build issues or runtime crashes.")
 }
 
 project.ext {

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

@@ -28,19 +28,21 @@ public class ReactNativeFirebaseMessagingStoreImpl implements ReactNativeFirebas
           reactToJSON(remoteMessageToWritableMap(remoteMessage)).toString();
       //      Log.d("storeFirebaseMessage", remoteMessageString);
       UniversalFirebasePreferences preferences = UniversalFirebasePreferences.getSharedInstance();
-      preferences.setStringValue(remoteMessage.getMessageId(), remoteMessageString);
-      // save new notification id
-      String notifications = preferences.getStringValue(S_KEY_ALL_NOTIFICATION_IDS, "");
-      notifications += remoteMessage.getMessageId() + DELIMITER; // append to last
 
-      // check and remove old notifications message
-      List<String> allNotificationList = convertToArray(notifications);
-      if (allNotificationList.size() > MAX_SIZE_NOTIFICATIONS) {
-        String firstRemoteMessageId = allNotificationList.get(0);
-        preferences.remove(firstRemoteMessageId);
-        notifications = removeRemoteMessage(firstRemoteMessageId, notifications);
+      // remove old notifications message before store to free space as needed
+      String notificationIds = preferences.getStringValue(S_KEY_ALL_NOTIFICATION_IDS, "");
+      List<String> allNotificationList = convertToArray(notificationIds);
+      while (allNotificationList.size() > MAX_SIZE_NOTIFICATIONS - 1) {
+        clearFirebaseMessage(allNotificationList.get(0));
+        allNotificationList.remove(0);
       }
-      preferences.setStringValue(S_KEY_ALL_NOTIFICATION_IDS, notifications);
+
+      // 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
+      preferences.setStringValue(S_KEY_ALL_NOTIFICATION_IDS, notificationIds);
     } catch (JSONException e) {
       e.printStackTrace();
     }
@@ -76,17 +78,17 @@ public class ReactNativeFirebaseMessagingStoreImpl implements ReactNativeFirebas
   @Override
   public void clearFirebaseMessage(String remoteMessageId) {
     UniversalFirebasePreferences preferences = UniversalFirebasePreferences.getSharedInstance();
-    preferences.remove(remoteMessageId);
+    preferences.remove(remoteMessageId).apply();
     // check and remove old notifications message
-    String notifications = preferences.getStringValue(S_KEY_ALL_NOTIFICATION_IDS, "");
-    if (!notifications.isEmpty()) {
-      notifications = removeRemoteMessage(remoteMessageId, notifications); // remove from list
-      preferences.setStringValue(S_KEY_ALL_NOTIFICATION_IDS, notifications);
+    String notificationIds = preferences.getStringValue(S_KEY_ALL_NOTIFICATION_IDS, "");
+    if (!notificationIds.isEmpty()) {
+      notificationIds = removeRemoteMessageId(remoteMessageId, notificationIds); // remove from list
+      preferences.setStringValue(S_KEY_ALL_NOTIFICATION_IDS, notificationIds);
     }
   }
 
-  private String removeRemoteMessage(String remoteMessageId, String notifications) {
-    return notifications.replace(remoteMessageId + DELIMITER, "");
+  private String removeRemoteMessageId(String remoteMessageId, String notificationIds) {
+    return notificationIds.replace(remoteMessageId + DELIMITER, "");
   }
 
   private List<String> convertToArray(String string) {

package/lib/version.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native-firebase/messaging",
-  "version": "23.5.0",
+  "version": "23.6.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": "23.5.0",
+    "@react-native-firebase/app": "23.6.0",
     "expo": ">=47.0.0"
   },
   "devDependencies": {
-    "expo": "^53.0.20"
+    "expo": "^54.0.27"
   },
   "peerDependenciesMeta": {
     "expo": {
@@ -39,5 +39,5 @@
     "access": "public",
     "provenance": true
   },
-  "gitHead": "5d27948f349d4d6c977c55036e2afd13df8d622f"
+  "gitHead": "748e89f9bfcdfbee971c627cd8a698963ba09f33"
 }

package/plugin/tsconfig.tsbuildinfo

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