narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

Merge branch 'development' of github.com:siacs/Conversations into development

Browse source
This commit is contained in:
iNPUTmice 2014-09-12 23:50:49 +02:00
parent 8a36958b88 e6eef53768
commit 2127fcb902
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/eu/siacs/conversations/parser/MessageParser.java
View file

@ -186,11 +186,13 @@ public class MessageParser extends AbstractParser implements
int status; int status;
String fullJid; String fullJid;
Element forwarded; Element forwarded;
if (packet.hasChild("received")) { if (packet.hasChild("received", "urn:xmpp:carbons:2")) {
forwarded = packet.findChild("received").findChild("forwarded"); forwarded = packet.findChild("received", "urn:xmpp:carbons:2")
.findChild("forwarded", "urn:xmpp:forward:0");
status = Message.STATUS_RECEIVED; status = Message.STATUS_RECEIVED;
} else if (packet.hasChild("sent")) { } else if (packet.hasChild("sent", "urn:xmpp:carbons:2")) {
forwarded = packet.findChild("sent").findChild("forwarded"); forwarded = packet.findChild("sent", "urn:xmpp:carbons:2")
.findChild("forwarded", "urn:xmpp:forward:0");
status = Message.STATUS_SEND; status = Message.STATUS_SEND;
} else { } else {
return null; return null;
@ -392,7 +394,8 @@ public class MessageParser extends AbstractParser implements
if (message != null) { if (message != null) {
message.markUnread(); message.markUnread();
} }
} else if (packet.hasChild("received") || (packet.hasChild("sent"))) { } else if (packet.hasChild("received", "urn:xmpp:carbons:2")
|| (packet.hasChild("sent", "urn:xmpp:carbons:2"))) {
message = this.parseCarbonMessage(packet, account); message = this.parseCarbonMessage(packet, account);
if (message != null) { if (message != null) {
if (message.getStatus() == Message.STATUS_SEND) { if (message.getStatus() == Message.STATUS_SEND) {