diff options
author | Daniel Gultsch <daniel@gultsch.de> | 2015-08-26 11:39:18 +0200 |
---|---|---|
committer | Daniel Gultsch <daniel@gultsch.de> | 2015-08-26 11:39:18 +0200 |
commit | 3e0636367a733285526c709138110ddb86899196 (patch) | |
tree | 73ab8ef95bfc86da9ffe9b2dccc3220d003d1175 /src | |
parent | 4424a818dfdda1b7f0b8f02afabd6a8f14e39104 (diff) |
Revert "improved compatibility with muc components that change the message id"
This reverts commit df86b0fc47cb7af8e97826f97d0e202405cff414.
Diffstat (limited to '')
-rw-r--r-- | src/main/java/eu/siacs/conversations/parser/MessageParser.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/main/java/eu/siacs/conversations/parser/MessageParser.java b/src/main/java/eu/siacs/conversations/parser/MessageParser.java index 025ed1e7..ec900de4 100644 --- a/src/main/java/eu/siacs/conversations/parser/MessageParser.java +++ b/src/main/java/eu/siacs/conversations/parser/MessageParser.java @@ -311,10 +311,9 @@ public class MessageParser extends AbstractParser implements status = Message.STATUS_SEND_RECEIVED; if (mXmppConnectionService.markMessage(conversation, remoteMsgId, status)) { return; - } else { - Message message = conversation.findSentMessageWithBody(body); + } else if (remoteMsgId == null) { + Message message = conversation.findSentMessageWithBody(packet.getBody()); if (message != null) { - message.setRemoteMsgId(remoteMsgId); mXmppConnectionService.markMessage(message, status); return; } |