From 7522d7eab5d8e7b48031f01f91267c6f4234bb9a Mon Sep 17 00:00:00 2001 From: Phillip Davis Date: Tue, 12 Aug 2025 21:21:00 -0400 Subject: [PATCH] fix: second reply treated as separate message diagnosis: when we get a message with a element, we overwrite several fields of the replaced message. Unfortunately, this includes the remoteId of the replaced message, which is the field by which we look up the message to be replaced. All corrections to a message reference the id of the original, unedited message, so edits >= 2 find a null replacedMessage. fix is just to remove that line --- src/main/java/eu/siacs/conversations/parser/MessageParser.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/eu/siacs/conversations/parser/MessageParser.java b/src/main/java/eu/siacs/conversations/parser/MessageParser.java index 8be9c02c10e556e9dddc7797950d8db4b1093857..1f5717a4cc4f372fef350459b3cf5d3e0b86f558 100644 --- a/src/main/java/eu/siacs/conversations/parser/MessageParser.java +++ b/src/main/java/eu/siacs/conversations/parser/MessageParser.java @@ -1098,7 +1098,6 @@ public class MessageParser extends AbstractParser replacedMessage.setSubject(message.getSubject()); replacedMessage.setThread(message.getThread()); replacedMessage.putEdited(replacedMessage.getRemoteMsgId(), replacedMessage.getServerMsgId()); - replacedMessage.setRemoteMsgId(remoteMsgId); if (replaceElement != null && !replaceElement.getName().equals("replace")) { mXmppConnectionService.getFileBackend().deleteFile(replacedMessage); mXmppConnectionService.evictPreview(message.getUuid());