Fix messaging store max notification size

Author: sean5940

packages/app/android/src/reactnative/java/io/invertase/firebase/common/ReactNativeFirebaseMeta.java

@@ -70,6 +70,12 @@ public String getStringValue(String key, String defaultValue) {
     return metaData.getString(META_PREFIX + key, defaultValue);
   }
 
+  public int getIntValue(String key, int defaultValue) {
+    Bundle metaData = getMetaData();
+    if (metaData == null) return defaultValue;
+    return metaData.getInt(META_PREFIX + key, defaultValue);
+  }
+
   public WritableMap getAll() {
     Bundle metaData = getMetaData();
     WritableMap map = Arguments.createMap();

packages/app/android/src/reactnative/java/io/invertase/firebase/common/ReactNativeFirebasePreferences.java

@@ -46,6 +46,14 @@ public boolean getBooleanValue(String key, boolean defaultValue) {
     return getPreferences().getBoolean(key, defaultValue);
   }
 
+  public void setIntValue(String key, int value) {
+    getPreferences().edit().putInt(key,value).apply();
+  }
+
+  public int getIntValue(String key, int defaultValue) {
+    return getPreferences().getInt(key,defaultValue);
+  }
+
   public void setLongValue(String key, long value) {
     getPreferences().edit().putLong(key, value).apply();
   }

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

@@ -5,31 +5,31 @@
 import static io.invertase.firebase.messaging.ReactNativeFirebaseMessagingSerializer.remoteMessageFromReadableMap;
 import static io.invertase.firebase.messaging.ReactNativeFirebaseMessagingSerializer.remoteMessageToWritableMap;
 
-import android.content.Context;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.WritableMap;
 import com.google.firebase.messaging.RemoteMessage;
-import io.invertase.firebase.common.UniversalFirebasePreferences;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import org.json.JSONException;
-import org.json.JSONObject;
+
+import io.invertase.firebase.common.ReactNativeFirebaseJSON;
+import io.invertase.firebase.common.ReactNativeFirebaseMeta;
+import io.invertase.firebase.common.ReactNativeFirebasePreferences;
+import io.invertase.firebase.common.UniversalFirebasePreferences;
 
 public class ReactNativeFirebaseMessagingStoreImpl implements ReactNativeFirebaseMessagingStore {
 
   private static final String KEY_MAX_STORED_NOTIFICATIONS = "rn_firebase_messaging_max_stored_notifications";
   private static final String S_KEY_ALL_NOTIFICATION_IDS = "all_notification_ids";
   private final String DELIMITER = ",";
   private static final int DEFAULT_MAX_SIZE_NOTIFICATIONS = 100;
-  private static int MAX_SIZE_NOTIFICATIONS = DEFAULT_MAX_SIZE_NOTIFICATIONS;
-  private static boolean isInitialized = false;
-
-  private int getMaxNotificationSize() {
-    if (isInitialized) return MAX_SIZE_NOTIFICATIONS;
+  private static final int maxNotificationSize = resolveMaxNotificationSize();
 
+  private static int resolveMaxNotificationSize() {
     int maxSize = DEFAULT_MAX_SIZE_NOTIFICATIONS;
     ReactNativeFirebaseJSON json = ReactNativeFirebaseJSON.getSharedInstance();
     ReactNativeFirebaseMeta meta = ReactNativeFirebaseMeta.getSharedInstance();
@@ -44,43 +44,29 @@ private int getMaxNotificationSize() {
       } else if (json.contains(KEY_MAX_STORED_NOTIFICATIONS)) {
         maxSize = json.getIntValue(KEY_MAX_STORED_NOTIFICATIONS, DEFAULT_MAX_SIZE_NOTIFICATIONS);
       } else if (meta.contains(KEY_MAX_STORED_NOTIFICATIONS)) {
-        // ReactNativeFirebaseMeta uses rnfirebase_ prefix, but we want to read the raw key
-        // So we read directly from AndroidManifest using the key as-is
-        try {
-          Context context = io.invertase.firebase.app.ReactNativeFirebaseApp.getApplicationContext();
-          ApplicationInfo appInfo = context.getPackageManager()
-              .getApplicationInfo(context.getPackageName(), PackageManager.GET_META_DATA);
-          if (appInfo != null && appInfo.metaData != null) {
-            maxSize = appInfo.metaData.getInt(KEY_MAX_STORED_NOTIFICATIONS, DEFAULT_MAX_SIZE_NOTIFICATIONS);
-          }
-        } catch (Exception e) {
-          // Ignore and use default
-        }
+        maxSize = meta.getIntValue(KEY_MAX_STORED_NOTIFICATIONS, DEFAULT_MAX_SIZE_NOTIFICATIONS);
       }
 
       // Safety cap: prevent values > 100 to avoid re-introducing OOM risk
-      MAX_SIZE_NOTIFICATIONS = Math.min(maxSize, DEFAULT_MAX_SIZE_NOTIFICATIONS);
+      return Math.min(maxSize, DEFAULT_MAX_SIZE_NOTIFICATIONS);
     } catch (Exception e) {
       // Ignore and use default
-      MAX_SIZE_NOTIFICATIONS = DEFAULT_MAX_SIZE_NOTIFICATIONS;
+      return DEFAULT_MAX_SIZE_NOTIFICATIONS;
     }
-
-    isInitialized = true;
-    return MAX_SIZE_NOTIFICATIONS;
   }
 
   @Override
   public void storeFirebaseMessage(RemoteMessage remoteMessage) {
     try {
       String remoteMessageString =
-          reactToJSON(remoteMessageToWritableMap(remoteMessage)).toString();
+        reactToJSON(remoteMessageToWritableMap(remoteMessage)).toString();
       //      Log.d("storeFirebaseMessage", remoteMessageString);
       UniversalFirebasePreferences preferences = UniversalFirebasePreferences.getSharedInstance();
 
       // 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() > getMaxNotificationSize() - 1) {
+      while (allNotificationList.size() > maxNotificationSize - 1) {
         clearFirebaseMessage(allNotificationList.get(0));
         allNotificationList.remove(0);
       }
@@ -109,7 +95,7 @@ public RemoteMessage getFirebaseMessage(String remoteMessageId) {
   @Override
   public WritableMap getFirebaseMessageMap(String remoteMessageId) {
     String remoteMessageString =
-        UniversalFirebasePreferences.getSharedInstance().getStringValue(remoteMessageId, null);
+      UniversalFirebasePreferences.getSharedInstance().getStringValue(remoteMessageId, null);
     if (remoteMessageString != null) {
       //      Log.d("getFirebaseMessage", remoteMessageString);
       try {