Skip to content

Commit 6badcb9

Browse files
committed
Fix IAM preview message id NPE
* messageDisplayQueue.contains was returning NPE in a preview case, due to message id being null * message can be null if preview display fails * Add message null check and preview check
1 parent 9cab6af commit 6badcb9

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

OneSignalSDK/onesignal/src/main/java/com/onesignal/OSInAppMessageController.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -750,8 +750,8 @@ private void dismissCurrentMessage(@Nullable OSInAppMessage message) {
750750

751751
inAppMessageShowing = false;
752752
synchronized (messageDisplayQueue) {
753-
if (messageDisplayQueue.size() > 0) {
754-
if (message != null && !messageDisplayQueue.contains(message)) {
753+
if (message != null && !message.isPreview && messageDisplayQueue.size() > 0) {
754+
if (!messageDisplayQueue.contains(message)) {
755755
logger.debug("Message already removed from the queue!");
756756
return;
757757
} else {

0 commit comments

Comments
 (0)