Skip to content

Commit f679b87

Browse files
Jeasminenan-li
authored andcommitted
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 b65e828 commit f679b87

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
@@ -612,8 +612,8 @@ private void dismissCurrentMessage(@Nullable OSInAppMessage message) {
612612

613613
inAppMessageShowing = false;
614614
synchronized (messageDisplayQueue) {
615-
if (messageDisplayQueue.size() > 0) {
616-
if (message != null && !messageDisplayQueue.contains(message)) {
615+
if (message != null && !message.isPreview && messageDisplayQueue.size() > 0) {
616+
if (!messageDisplayQueue.contains(message)) {
617617
OneSignal.onesignalLog(OneSignal.LOG_LEVEL.DEBUG, "Message already removed from the queue!");
618618
return;
619619
} else {

0 commit comments

Comments
 (0)