Skip to content

fix(messaging, android): properly remove stored remote messages to avoid OOM #8776

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Nov 27, 2025
Merged

fix(messaging, android): properly remove stored remote messages to avoid OOM #8776

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2ca86df
refactor(messaging, android): rename notificationId-related items for…
mikehardy Nov 26, 2025
0b89594
refactor(messaging, android): centralize remote message removal logic
mikehardy Nov 26, 2025
4c717b4
fix(messaging, android): properly remove remote message from prefs
mikehardy Nov 26, 2025
48e32df
fix(messaging, android): properly shrink stored messages to limit
mikehardy Nov 26, 2025
7e8975e
fix(messaging, android): purge message store to limit first, add second
mikehardy Nov 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .../app/android/src/main/java/io/invertase/firebase/common/UniversalFirebasePreferences.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,8 @@ public void clearAll() {
getPreferences().edit().clear().apply();
}

// Note the caller is responsible for calling apply() or commit() on the
// returned SharedPreferences.Editor object for the remove to take affect
public SharedPreferences.Editor remove(String key) {
return getPreferences().edit().remove(key);
}
Expand Down
38 changes: 20 additions & 18 deletions .../src/main/java/io/invertase/firebase/messaging/ReactNativeFirebaseMessagingStoreImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,19 +28,21 @@ public void storeFirebaseMessage(RemoteMessage remoteMessage) {
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
Copy link
Collaborator Author

@mikehardy mikehardy Nov 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the diff for the 5th commit is easier to understand in split view, it's mostly code motion swapping the two chunks of logic, not code change

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();
}
Expand Down Expand Up @@ -76,17 +78,17 @@ public WritableMap getFirebaseMessageMap(String remoteMessageId) {
@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) {
Expand Down
Loading