sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "improved compatibility with muc components that change the message id" 

This reverts commit df86b0fc47.
This commit is contained in:
Daniel Gultsch 2015-08-26 11:39:18 +02:00
parent 4424a818df
commit 3e0636367a
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/eu/siacs/conversations/parser/MessageParser.java
View File

@ -311,10 +311,9 @@ public class MessageParser extends AbstractParser implements
status = Message.STATUS_SEND_RECEIVED; status = Message.STATUS_SEND_RECEIVED;
if (mXmppConnectionService.markMessage(conversation, remoteMsgId, status)) { if (mXmppConnectionService.markMessage(conversation, remoteMsgId, status)) {
return; return;
} else { } else if (remoteMsgId == null) {
Message message = conversation.findSentMessageWithBody(body); Message message = conversation.findSentMessageWithBody(packet.getBody());
if (message != null) { if (message != null) {
message.setRemoteMsgId(remoteMsgId);
mXmppConnectionService.markMessage(message, status); mXmppConnectionService.markMessage(message, status);
return; return;
} }