From d4729a9ae7f239ea689fd0a8ea0257f1484981d9 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sun, 20 Oct 2024 16:25:33 +0200
Subject: [PATCH] handle reactions with missing id attribute

---
 .../java/eu/siacs/conversations/parser/MessageParser.java     | 2 +-
 .../conversations/android/xmpp/model/reactions/Reactions.java | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/parser/MessageParser.java b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
index 22c9cf64c824da4b958d2844edc578ada07bd310..6de4bf10ecd3ef6d10d23ebcc499707b2aeaf51f 100644
--- a/src/main/java/eu/siacs/conversations/parser/MessageParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
@@ -1137,7 +1137,7 @@ public class MessageParser extends AbstractParser implements Consumer<im.convers
             final Conversation conversation =
                     mXmppConnectionService.find(account, counterpart.asBareJid());
 
-            if (conversation != null) {
+            if (conversation != null && reactingTo != null) {
                 if (isTypeGroupChat && conversation.getMode() == Conversational.MODE_MULTI) {
                     final var mucOptions = conversation.getMucOptions();
                     final var occupantId = occupant == null ? null : occupant.getId();
diff --git a/src/main/java/im/conversations/android/xmpp/model/reactions/Reactions.java b/src/main/java/im/conversations/android/xmpp/model/reactions/Reactions.java
index ec3ae989176bc25d1cef26cafa8137c8ef707d46..acd8dbb2471beb5f614cbb1c8381d99be4b2ed61 100644
--- a/src/main/java/im/conversations/android/xmpp/model/reactions/Reactions.java
+++ b/src/main/java/im/conversations/android/xmpp/model/reactions/Reactions.java
@@ -2,8 +2,10 @@ package im.conversations.android.xmpp.model.reactions;
 
 import com.google.common.base.Strings;
 import com.google.common.collect.Collections2;
+
 import im.conversations.android.annotation.XmlElement;
 import im.conversations.android.xmpp.model.Extension;
+
 import java.util.Collection;
 import java.util.Objects;
 
@@ -21,7 +23,7 @@ public class Reactions extends Extension {
     }
 
     public String getId() {
-        return this.getAttribute("id");
+        return Strings.emptyToNull(this.getAttribute("id"));
     }
 
     public void setId(String id) {