Skip to content

Commit 6c3f04a

Browse files
authored
E2-1673 prevent null exception in LeanplumInbox (#281)
* add null check * make vars volatile
1 parent 35ae394 commit 6c3f04a

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

AndroidSDKCore/src/main/java/com/leanplum/LeanplumInbox.java

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@ public class LeanplumInbox {
6161
static Set<String> downloadedImageUrls;
6262
static boolean isInboxImagePrefetchingEnabled = true;
6363

64-
private int unreadCount;
65-
private Map<String, LeanplumInboxMessage> messages;
66-
private boolean didLoad = false;
64+
private volatile int unreadCount;
65+
private volatile Map<String, LeanplumInboxMessage> messages;
66+
private volatile boolean didLoad = false;
6767

6868
private final List<InboxChangedCallback> changedCallbacks;
6969
private final List<InboxSyncedCallback> syncedCallbacks;
@@ -430,7 +430,10 @@ private List<LeanplumInboxMessage> allMessages(List<LeanplumInboxMessage> messag
430430
}
431431
try {
432432
for (String messageId : messagesIds()) {
433-
messages.add(messageForId(messageId));
433+
LeanplumInboxMessage message = messageForId(messageId);
434+
if (message != null) {
435+
messages.add(message);
436+
}
434437
}
435438
} catch (Throwable t) {
436439
Util.handleException(t);

0 commit comments

Comments
 (0)