aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2015-06-02 12:21:35 +0200
committerDaniel Gultsch <daniel@gultsch.de>2015-06-02 12:21:35 +0200
commit8ac933be9f8fddfda42159636d41c7652f7b79d6 (patch)
tree513ab5a0e2f7492c3d0b3808dddae4d212cf67da
parentdf86b0fc47cb7af8e97826f97d0e202405cff414 (diff)
fixed more edge cases in muc message parser
Diffstat (limited to '')
-rw-r--r--src/main/java/eu/siacs/conversations/parser/MessageParser.java6
1 files changed, 3 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 fe42a2ae..bbb550b2 100644
--- a/src/main/java/eu/siacs/conversations/parser/MessageParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
@@ -266,14 +266,14 @@ public class MessageParser extends AbstractParser implements
Conversation conversation = mXmppConnectionService.findOrCreateConversation(account, counterpart.toBareJid(), isTypeGroupChat);
if (isTypeGroupChat) {
if (counterpart.getResourcepart().equals(conversation.getMucOptions().getActualNick())) {
- status = Message.STATUS_SEND;
- if (mXmppConnectionService.markMessage(conversation, remoteMsgId, Message.STATUS_SEND_RECEIVED)) {
+ status = Message.STATUS_SEND_RECEIVED;
+ if (mXmppConnectionService.markMessage(conversation, remoteMsgId, status)) {
return;
} else {
Message message = conversation.findSentMessageWithBody(body);
if (message != null) {
message.setRemoteMsgId(remoteMsgId);
- mXmppConnectionService.markMessage(message, Message.STATUS_SEND_RECEIVED);
+ mXmppConnectionService.markMessage(message, status);
return;
}
}