handle reactions with missing id attribute

Daniel Gultsch created 1 year ago

Change summary

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

Detailed changes

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();

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) {