Skip to content

Commit 320f409

Browse files
Jeasmineadamschlesinger
authored andcommitted
Avoid continuing with null message Ids
* Avoid NPE for messageId contains check
1 parent 88e09ed commit 320f409

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,8 +187,10 @@ private void processInAppMessageJson(@NonNull JSONArray json) throws JSONExcepti
187187
for (int i = 0; i < json.length(); i++) {
188188
JSONObject messageJson = json.getJSONObject(i);
189189
OSInAppMessage message = new OSInAppMessage(messageJson);
190-
191-
newMessages.add(message);
190+
// Avoid null checks later if IAM already comes with null id
191+
if (message.messageId != null) {
192+
newMessages.add(message);
193+
}
192194
}
193195

194196
messages = newMessages;

0 commit comments

Comments
 (0)