Skip to content

fix(android): avoid blocking foreground delivery and consume display events #1976

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
fadi-george merged 2 commits into from
Sep 1, 2026
Merged

fix(android): avoid blocking foreground delivery and consume display events #1976

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e9bfb1d
fix(android): avoid blocking foreground delivery and consume display …
OskarEichler Aug 27, 2026
1cca47f
fix(android): remove stale prevention cache cleanup
fadi-george Sep 1, 2026
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
20 changes: 5 additions & 15 deletions android/src/main/java/com/onesignal/rnonesignalandroid/RNOneSignal.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ of this software and associated documentation files (the "Software"), to deal
import com.onesignal.user.subscriptions.IPushSubscription;
import com.onesignal.user.subscriptions.IPushSubscriptionObserver;
import com.onesignal.user.subscriptions.PushSubscriptionChangedState;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import org.json.JSONException;
Expand All @@ -82,8 +83,8 @@ public class RNOneSignal extends NativeOneSignalSpec
private boolean hasSetPushSubscriptionObserver = false;
private boolean hasSetUserStateObserver = false;

private final HashMap<String, INotificationWillDisplayEvent> notificationWillDisplayCache = new HashMap<>();
private final HashMap<String, INotificationWillDisplayEvent> preventDefaultCache = new HashMap<>();
private final Map<String, INotificationWillDisplayEvent> notificationWillDisplayCache =
Collections.synchronizedMap(new HashMap<>());

private boolean hasAddedNotificationForegroundListener = false;
private boolean hasAddedInAppMessageLifecycleListener = false;
Expand Down Expand Up @@ -214,7 +215,6 @@ public String getName() {
public void invalidate() {
removeObservers();
notificationWillDisplayCache.clear();
preventDefaultCache.clear();
if (currentInstance == this) {
currentInstance = null;
}
Expand Down Expand Up @@ -366,6 +366,7 @@ public void addNotificationForegroundLifecycleListener() {
public void onWillDisplay(INotificationWillDisplayEvent event) {
if (!this.hasAddedNotificationForegroundListener) {
event.getNotification().display();
return;
}

INotification notification = event.getNotification();
Expand All @@ -376,24 +377,14 @@ public void onWillDisplay(INotificationWillDisplayEvent event) {
try {
emitOnNotificationWillDisplay(
RNUtils.convertHashMapToWritableMap(RNUtils.convertNotificationToMap(notification)));

try {
synchronized (event) {
while (preventDefaultCache.containsKey(notificationId)) {
event.wait();
}
}
} catch (InterruptedException e) {
Logging.error("InterruptedException: " + e.toString(), null);
}
} catch (JSONException e) {
logJSONException("onNotificationWillDisplay", e);
}
}

@Override
public void displayNotification(String notificationId) {
INotificationWillDisplayEvent event = notificationWillDisplayCache.get(notificationId);
INotificationWillDisplayEvent event = notificationWillDisplayCache.remove(notificationId);
if (event == null) {
Logging.error(
"Could not find onWillDisplayNotification event for notification with id: " + notificationId, null);
Expand All @@ -411,7 +402,6 @@ public void preventDefault(String notificationId) {
return;
}
event.preventDefault();
this.preventDefaultCache.put(notificationId, event);
}

@Override
Expand Down
Loading