moparisthebest/Conversations
1
0
Fork 0
mirror of https://github.com/moparisthebest/Conversations synced 2024-11-30 20:52:21 -05:00
Code Issues Releases Wiki Activity

improved compatibility with muc components that change the message id

Browse Source
This commit is contained in:
Daniel Gultsch 2015-06-02 06:23:32 +02:00
parent a577ec7c31
commit df86b0fc47
1 changed files with 3 additions and 2 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

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