moparisthebest/Conversations
1
0
Fork 0
mirror of https://github.com/moparisthebest/Conversations synced 2024-11-28 11:42:15 -05:00
Code Issues Releases 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
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;
String fullJid;
Element forwarded;
if (packet.hasChild("received")) {
forwarded = packet.findChild("received").findChild("forwarded");
if (packet.hasChild("received", "urn:xmpp:carbons:2")) {
forwarded = packet.findChild("received", "urn:xmpp:carbons:2")
.findChild("forwarded", "urn:xmpp:forward:0");
status = Message.STATUS_RECEIVED;
} else if (packet.hasChild("sent")) {
forwarded = packet.findChild("sent").findChild("forwarded");
} else if (packet.hasChild("sent", "urn:xmpp:carbons:2")) {
forwarded = packet.findChild("sent", "urn:xmpp:carbons:2")
.findChild("forwarded", "urn:xmpp:forward:0");
status = Message.STATUS_SEND;
} else {
return null;
@ -392,7 +394,8 @@ public class MessageParser extends AbstractParser implements
if (message != null) {
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);
if (message != null) {
if (message.getStatus() == Message.STATUS_SEND) {