From 88948711ff79b9fe7f7ff9badc1b08a97209143f Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Thu, 14 Nov 2019 20:52:15 +0100 Subject: prevent crash when counterpart in message was null --- src/main/java/de/pixart/messenger/entities/Conversation.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/de/pixart/messenger/entities/Conversation.java b/src/main/java/de/pixart/messenger/entities/Conversation.java index 2233e22ac..13bfecfca 100644 --- a/src/main/java/de/pixart/messenger/entities/Conversation.java +++ b/src/main/java/de/pixart/messenger/entities/Conversation.java @@ -369,9 +369,13 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl synchronized (this.messages) { for (int i = this.messages.size() - 1; i >= 0; --i) { final Message message = messages.get(i); + final Jid mcp = message.getCounterpart(); + if (mcp == null) { + continue; + } final boolean counterpartMatch = mode == MODE_SINGLE ? - counterpart.asBareJid().equals(message.getCounterpart().asBareJid()) : - counterpart.equals(message.getCounterpart()); + counterpart.asBareJid().equals(mcp.asBareJid()) : + counterpart.equals(mcp); if (counterpartMatch && ((message.getStatus() == Message.STATUS_RECEIVED) == received) && (carbon == message.isCarbon() || received)) { final boolean idMatch = id.equals(message.getRemoteMsgId()) || message.remoteMsgIdMatchInEdit(id); -- cgit v1.2.3