From 55461d4e2d4d1b269baea80a8f832f8790f35d30 Mon Sep 17 00:00:00 2001 From: Stephen Paul Weber Date: Mon, 20 Mar 2023 16:21:00 -0500 Subject: [PATCH] Fix NPE --- src/main/java/eu/siacs/conversations/entities/Conversation.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/eu/siacs/conversations/entities/Conversation.java b/src/main/java/eu/siacs/conversations/entities/Conversation.java index 4a91d0f0afaaf06faf563da00014ecd3b8fabecf..0b4f105c2df524e8af25e5499e8f3b80c3124edf 100644 --- a/src/main/java/eu/siacs/conversations/entities/Conversation.java +++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java @@ -544,6 +544,8 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl } public Message findMessageReactingTo(String id, Jid reactor) { + if (id == null) return null; + synchronized (this.messages) { for (int i = this.messages.size() - 1; i >= 0; --i) { final Message message = messages.get(i);