aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/eu/siacs/conversations')
-rw-r--r--src/main/java/eu/siacs/conversations/entities/Bookmark.java14
-rw-r--r--src/main/java/eu/siacs/conversations/entities/Message.java2
-rw-r--r--src/main/java/eu/siacs/conversations/parser/AbstractParser.java47
-rw-r--r--src/main/java/eu/siacs/conversations/parser/MessageParser.java763
-rw-r--r--src/main/java/eu/siacs/conversations/services/MessageArchiveService.java12
-rw-r--r--src/main/java/eu/siacs/conversations/services/XmppConnectionService.java3
-rw-r--r--src/main/java/eu/siacs/conversations/xml/Element.java10
-rw-r--r--src/main/java/eu/siacs/conversations/xmpp/pep/Avatar.java3
-rw-r--r--src/main/java/eu/siacs/conversations/xmpp/stanzas/AbstractStanza.java4
-rw-r--r--src/main/java/eu/siacs/conversations/xmpp/stanzas/MessagePacket.java39
10 files changed, 339 insertions, 558 deletions
diff --git a/src/main/java/eu/siacs/conversations/entities/Bookmark.java b/src/main/java/eu/siacs/conversations/entities/Bookmark.java
index f81f1a87..cc6f146b 100644
--- a/src/main/java/eu/siacs/conversations/entities/Bookmark.java
+++ b/src/main/java/eu/siacs/conversations/entities/Bookmark.java
@@ -75,12 +75,7 @@ public class Bookmark extends Element implements ListItem {
}
public String getNick() {
- Element nick = this.findChild("nick");
- if (nick != null) {
- return nick.getContent();
- } else {
- return null;
- }
+ return this.findChildContent("nick");
}
public void setNick(String nick) {
@@ -96,12 +91,7 @@ public class Bookmark extends Element implements ListItem {
}
public String getPassword() {
- Element password = this.findChild("password");
- if (password != null) {
- return password.getContent();
- } else {
- return null;
- }
+ return this.findChildContent("password");
}
public void setPassword(String password) {
diff --git a/src/main/java/eu/siacs/conversations/entities/Message.java b/src/main/java/eu/siacs/conversations/entities/Message.java
index 38152edb..90b74a53 100644
--- a/src/main/java/eu/siacs/conversations/entities/Message.java
+++ b/src/main/java/eu/siacs/conversations/entities/Message.java
@@ -328,7 +328,7 @@ public class Message extends AbstractEntity {
return this.remoteMsgId == null
&& this.counterpart.equals(message.getCounterpart())
&& this.body.equals(message.getBody())
- && Math.abs(this.getTimeSent() - message.getTimeSent()) < Config.PING_TIMEOUT * 500;
+ && Math.abs(this.getTimeSent() - message.getTimeSent()) < Config.MESSAGE_MERGE_WINDOW * 1000;
}
}
diff --git a/src/main/java/eu/siacs/conversations/parser/AbstractParser.java b/src/main/java/eu/siacs/conversations/parser/AbstractParser.java
index bfe84440..24e93db1 100644
--- a/src/main/java/eu/siacs/conversations/parser/AbstractParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/AbstractParser.java
@@ -11,6 +11,7 @@ import eu.siacs.conversations.entities.Contact;
import eu.siacs.conversations.services.XmppConnectionService;
import eu.siacs.conversations.xml.Element;
import eu.siacs.conversations.xmpp.jid.Jid;
+import eu.siacs.conversations.xmpp.stanzas.MessagePacket;
public abstract class AbstractParser {
@@ -20,22 +21,23 @@ public abstract class AbstractParser {
this.mXmppConnectionService = service;
}
- protected long getTimestamp(Element packet) {
- long now = System.currentTimeMillis();
- Element delay = packet.findChild("delay");
- if (delay == null) {
- return now;
- }
- String stamp = delay.getAttribute("stamp");
- if (stamp == null) {
- return now;
- }
- try {
- long time = parseTimestamp(stamp).getTime();
- return now < time ? now : time;
- } catch (ParseException e) {
- return now;
+ public static Long getTimestamp(Element element, Long defaultValue) {
+ Element delay = element.findChild("delay","urn:xmpp:delay");
+ if (delay != null) {
+ String stamp = delay.getAttribute("stamp");
+ if (stamp != null) {
+ try {
+ return AbstractParser.parseTimestamp(delay.getAttribute("stamp")).getTime();
+ } catch (ParseException e) {
+ return defaultValue;
+ }
+ }
}
+ return defaultValue;
+ }
+
+ protected long getTimestamp(Element packet) {
+ return getTimestamp(packet,System.currentTimeMillis());
}
public static Date parseTimestamp(String timestamp) throws ParseException {
@@ -46,14 +48,11 @@ public abstract class AbstractParser {
return dateFormat.parse(timestamp);
}
- protected void updateLastseen(final Element packet, final Account account,
- final boolean presenceOverwrite) {
- final Jid from = packet.getAttributeAsJid("from");
- updateLastseen(packet, account, from, presenceOverwrite);
+ protected void updateLastseen(final Element packet, final Account account, final boolean presenceOverwrite) {
+ updateLastseen(packet, account, packet.getAttributeAsJid("from"), presenceOverwrite);
}
- protected void updateLastseen(final Element packet, final Account account, final Jid from,
- final boolean presenceOverwrite) {
+ protected void updateLastseen(final Element packet, final Account account, final Jid from, final boolean presenceOverwrite) {
final String presence = from == null || from.isBareJid() ? "" : from.getResourcepart();
final Contact contact = account.getRoster().getContact(from);
final long timestamp = getTimestamp(packet);
@@ -70,10 +69,6 @@ public abstract class AbstractParser {
if (item == null) {
return null;
}
- Element data = item.findChild("data", "urn:xmpp:avatar:data");
- if (data == null) {
- return null;
- }
- return data.getContent();
+ return item.findChildContent("data", "urn:xmpp:avatar:data");
}
}
diff --git a/src/main/java/eu/siacs/conversations/parser/MessageParser.java b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
index 7870fdbf..1e683892 100644
--- a/src/main/java/eu/siacs/conversations/parser/MessageParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
@@ -1,8 +1,12 @@
package eu.siacs.conversations.parser;
+import android.util.Log;
+import android.util.Pair;
+
import net.java.otr4j.session.Session;
import net.java.otr4j.session.SessionStatus;
+import eu.siacs.conversations.Config;
import eu.siacs.conversations.entities.Account;
import eu.siacs.conversations.entities.Contact;
import eu.siacs.conversations.entities.Conversation;
@@ -25,12 +29,12 @@ public class MessageParser extends AbstractParser implements
super(service);
}
- private boolean extractChatState(Conversation conversation, final Element element) {
- ChatState state = ChatState.parse(element);
+ private boolean extractChatState(Conversation conversation, final MessagePacket packet) {
+ ChatState state = ChatState.parse(packet);
if (state != null && conversation != null) {
final Account account = conversation.getAccount();
- Jid from = element.getAttributeAsJid("from");
- if (from != null && from.toBareJid().equals(account.getJid().toBareJid())) {
+ Jid from = packet.getFrom();
+ if (from.toBareJid().equals(account.getJid().toBareJid())) {
conversation.setOutgoingChatState(state);
return false;
} else {
@@ -40,86 +44,27 @@ public class MessageParser extends AbstractParser implements
return false;
}
- private Message parseChat(MessagePacket packet, Account account) {
- final Jid jid = packet.getFrom();
- if (jid == null) {
- return null;
- }
- Conversation conversation = mXmppConnectionService.findOrCreateConversation(account, jid.toBareJid(), false);
- String pgpBody = getPgpBody(packet);
- Message finishedMessage;
- if (pgpBody != null) {
- finishedMessage = new Message(conversation,
- pgpBody, Message.ENCRYPTION_PGP, Message.STATUS_RECEIVED);
- } else {
- finishedMessage = new Message(conversation,
- packet.getBody(), Message.ENCRYPTION_NONE,
- Message.STATUS_RECEIVED);
- }
- finishedMessage.setRemoteMsgId(packet.getId());
- finishedMessage.markable = isMarkable(packet);
- if (conversation.getMode() == Conversation.MODE_MULTI
- && !jid.isBareJid()) {
- final Jid trueCounterpart = conversation.getMucOptions()
- .getTrueCounterpart(jid.getResourcepart());
- if (trueCounterpart != null) {
- updateLastseen(packet, account, trueCounterpart, false);
- }
- finishedMessage.setType(Message.TYPE_PRIVATE);
- finishedMessage.setTrueCounterpart(trueCounterpart);
- if (conversation.hasDuplicateMessage(finishedMessage)) {
- return null;
- }
- } else {
- updateLastseen(packet, account, true);
- }
- finishedMessage.setCounterpart(jid);
- finishedMessage.setTime(getTimestamp(packet));
- extractChatState(conversation,packet);
- return finishedMessage;
- }
-
- private Message parseOtrChat(MessagePacket packet, Account account) {
- final Jid to = packet.getTo();
- final Jid from = packet.getFrom();
- if (to == null || from == null) {
- return null;
- }
- boolean properlyAddressed = !to.isBareJid() || account.countPresences() == 1;
- Conversation conversation = mXmppConnectionService
- .findOrCreateConversation(account, from.toBareJid(), false);
+ private Message parseOtrChat(String body, Jid from, String id, Conversation conversation) {
String presence;
if (from.isBareJid()) {
presence = "";
} else {
presence = from.getResourcepart();
}
- extractChatState(conversation, packet);
- updateLastseen(packet, account, true);
- String body = packet.getBody();
if (body.matches("^\\?OTRv\\d{1,2}\\?.*")) {
conversation.endOtrIfNeeded();
}
if (!conversation.hasValidOtrSession()) {
- if (properlyAddressed) {
- conversation.startOtrSession(presence,false);
- } else {
- return null;
- }
+ conversation.startOtrSession(presence,false);
} else {
- String foreignPresence = conversation.getOtrSession()
- .getSessionID().getUserID();
+ String foreignPresence = conversation.getOtrSession().getSessionID().getUserID();
if (!foreignPresence.equals(presence)) {
conversation.endOtrIfNeeded();
- if (properlyAddressed) {
- conversation.startOtrSession(presence, false);
- } else {
- return null;
- }
+ conversation.startOtrSession(presence, false);
}
}
try {
- conversation.setLastReceivedOtrMessageId(packet.getId());
+ conversation.setLastReceivedOtrMessageId(id);
Session otrSession = conversation.getOtrSession();
SessionStatus before = otrSession.getSessionStatus();
body = otrSession.transformReceiving(body);
@@ -140,12 +85,7 @@ public class MessageParser extends AbstractParser implements
conversation.setSymmetricKey(CryptoHelper.hexToBytes(key));
return null;
}
- Message finishedMessage = new Message(conversation, body, Message.ENCRYPTION_OTR,
- Message.STATUS_RECEIVED);
- finishedMessage.setTime(getTimestamp(packet));
- finishedMessage.setRemoteMsgId(packet.getId());
- finishedMessage.markable = isMarkable(packet);
- finishedMessage.setCounterpart(from);
+ Message finishedMessage = new Message(conversation, body, Message.ENCRYPTION_OTR, Message.STATUS_RECEIVED);
conversation.setLastReceivedOtrMessageId(null);
return finishedMessage;
} catch (Exception e) {
@@ -154,293 +94,6 @@ public class MessageParser extends AbstractParser implements
}
}
- private Message parseGroupchat(MessagePacket packet, Account account) {
- int status;
- final Jid from = packet.getFrom();
- if (from == null) {
- return null;
- }
- if (mXmppConnectionService.find(account.pendingConferenceLeaves,
- account, from.toBareJid()) != null) {
- return null;
- }
- Conversation conversation = mXmppConnectionService
- .findOrCreateConversation(account, from.toBareJid(), true);
- final Jid trueCounterpart = conversation.getMucOptions().getTrueCounterpart(from.getResourcepart());
- if (trueCounterpart != null) {
- updateLastseen(packet, account, trueCounterpart, false);
- }
- if (packet.hasChild("subject")) {
- conversation.setHasMessagesLeftOnServer(true);
- conversation.getMucOptions().setSubject(packet.findChild("subject").getContent());
- mXmppConnectionService.updateConversationUi();
- return null;
- }
-
- final Element x = packet.findChild("x", "http://jabber.org/protocol/muc#user");
- if (from.isBareJid() && (x == null || !x.hasChild("status"))) {
- return null;
- } else if (from.isBareJid() && x.hasChild("status")) {
- for(Element child : x.getChildren()) {
- if (child.getName().equals("status")) {
- String code = child.getAttribute("code");
- if (code.contains(MucOptions.STATUS_CODE_ROOM_CONFIG_CHANGED)) {
- mXmppConnectionService.fetchConferenceConfiguration(conversation);
- }
- }
- }
- return null;
- }
-
- if (from.getResourcepart().equals(conversation.getMucOptions().getActualNick())) {
- if (mXmppConnectionService.markMessage(conversation,
- packet.getId(), Message.STATUS_SEND_RECEIVED)) {
- return null;
- } else if (packet.getId() == null) {
- Message message = conversation.findSentMessageWithBody(packet.getBody());
- if (message != null) {
- mXmppConnectionService.markMessage(message,Message.STATUS_SEND_RECEIVED);
- return null;
- } else {
- status = Message.STATUS_SEND;
- }
- } else {
- status = Message.STATUS_SEND;
- }
- } else {
- status = Message.STATUS_RECEIVED;
- }
- String pgpBody = getPgpBody(packet);
- Message finishedMessage;
- if (pgpBody == null) {
- finishedMessage = new Message(conversation,
- packet.getBody(), Message.ENCRYPTION_NONE, status);
- } else {
- finishedMessage = new Message(conversation, pgpBody,
- Message.ENCRYPTION_PGP, status);
- }
- finishedMessage.setRemoteMsgId(packet.getId());
- finishedMessage.markable = isMarkable(packet);
- finishedMessage.setCounterpart(from);
- if (status == Message.STATUS_RECEIVED) {
- finishedMessage.setTrueCounterpart(conversation.getMucOptions()
- .getTrueCounterpart(from.getResourcepart()));
- }
- if (packet.hasChild("delay")
- && conversation.hasDuplicateMessage(finishedMessage)) {
- return null;
- }
- finishedMessage.setTime(getTimestamp(packet));
- return finishedMessage;
- }
-
- private Message parseCarbonMessage(final MessagePacket packet, final Account account) {
- int status;
- final Jid fullJid;
- Element 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", "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;
- }
- if (forwarded == null) {
- return null;
- }
- Element message = forwarded.findChild("message");
- if (message == null) {
- return null;
- }
- if (!message.hasChild("body")) {
- if (status == Message.STATUS_RECEIVED
- && message.getAttribute("from") != null) {
- parseNonMessage(message, account);
- } else if (status == Message.STATUS_SEND
- && message.hasChild("displayed", "urn:xmpp:chat-markers:0")) {
- final Jid to = message.getAttributeAsJid("to");
- if (to != null) {
- final Conversation conversation = mXmppConnectionService.find(
- mXmppConnectionService.getConversations(), account,
- to.toBareJid());
- if (conversation != null) {
- mXmppConnectionService.markRead(conversation);
- }
- }
- }
- return null;
- }
- if (status == Message.STATUS_RECEIVED) {
- fullJid = message.getAttributeAsJid("from");
- if (fullJid == null) {
- return null;
- } else {
- updateLastseen(message, account, true);
- }
- } else {
- fullJid = message.getAttributeAsJid("to");
- if (fullJid == null) {
- return null;
- }
- }
- if (message.hasChild("x","http://jabber.org/protocol/muc#user")
- && "chat".equals(message.getAttribute("type"))) {
- return null;
- }
- Conversation conversation = mXmppConnectionService
- .findOrCreateConversation(account, fullJid.toBareJid(), false);
- String pgpBody = getPgpBody(message);
- Message finishedMessage;
- if (pgpBody != null) {
- finishedMessage = new Message(conversation, pgpBody,
- Message.ENCRYPTION_PGP, status);
- } else {
- String body = message.findChild("body").getContent();
- finishedMessage = new Message(conversation, body,
- Message.ENCRYPTION_NONE, status);
- }
- extractChatState(conversation,message);
- finishedMessage.setTime(getTimestamp(message));
- finishedMessage.setRemoteMsgId(message.getAttribute("id"));
- finishedMessage.markable = isMarkable(message);
- finishedMessage.setCounterpart(fullJid);
- if (conversation.getMode() == Conversation.MODE_MULTI
- && !fullJid.isBareJid()) {
- finishedMessage.setType(Message.TYPE_PRIVATE);
- finishedMessage.setTrueCounterpart(conversation.getMucOptions()
- .getTrueCounterpart(fullJid.getResourcepart()));
- if (conversation.hasDuplicateMessage(finishedMessage)) {
- return null;
- }
- }
- return finishedMessage;
- }
-
- private Message parseMamMessage(MessagePacket packet, final Account account) {
- final Element result = packet.findChild("result","urn:xmpp:mam:0");
- if (result == null ) {
- return null;
- }
- final MessageArchiveService.Query query = this.mXmppConnectionService.getMessageArchiveService().findQuery(result.getAttribute("queryid"));
- if (query!=null) {
- query.incrementTotalCount();
- }
- final Element forwarded = result.findChild("forwarded","urn:xmpp:forward:0");
- if (forwarded == null) {
- return null;
- }
- final Element message = forwarded.findChild("message");
- if (message == null) {
- return null;
- }
- final Element body = message.findChild("body");
- if (body == null || message.hasChild("private","urn:xmpp:carbons:2") || message.hasChild("no-copy","urn:xmpp:hints")) {
- return null;
- }
- int encryption;
- String content = getPgpBody(message);
- if (content != null) {
- encryption = Message.ENCRYPTION_PGP;
- } else {
- encryption = Message.ENCRYPTION_NONE;
- content = body.getContent();
- }
- if (content == null) {
- return null;
- }
- final long timestamp = getTimestamp(forwarded);
- final Jid to = message.getAttributeAsJid("to");
- final Jid from = message.getAttributeAsJid("from");
- Jid counterpart;
- int status;
- Conversation conversation;
- if (from!=null && to != null && from.toBareJid().equals(account.getJid().toBareJid())) {
- status = Message.STATUS_SEND;
- conversation = this.mXmppConnectionService.findOrCreateConversation(account,to.toBareJid(),false,query);
- counterpart = to;
- } else if (from !=null && to != null) {
- status = Message.STATUS_RECEIVED;
- conversation = this.mXmppConnectionService.findOrCreateConversation(account,from.toBareJid(),false,query);
- counterpart = from;
- } else {
- return null;
- }
- Message finishedMessage = new Message(conversation,content,encryption,status);
- finishedMessage.setTime(timestamp);
- finishedMessage.setCounterpart(counterpart);
- finishedMessage.setRemoteMsgId(message.getAttribute("id"));
- finishedMessage.setServerMsgId(result.getAttribute("id"));
- if (conversation.hasDuplicateMessage(finishedMessage)) {
- return null;
- }
- if (query!=null) {
- query.incrementMessageCount();
- }
- return finishedMessage;
- }
-
- private void parseError(final MessagePacket packet, final Account account) {
- final Jid from = packet.getFrom();
- mXmppConnectionService.markMessage(account, from.toBareJid(),
- packet.getId(), Message.STATUS_SEND_FAILED);
- }
-
- private void parseNonMessage(Element packet, Account account) {
- final Jid from = packet.getAttributeAsJid("from");
- if (account.getJid().equals(from)) {
- return;
- }
- if (extractChatState(from == null ? null : mXmppConnectionService.find(account,from), packet)) {
- mXmppConnectionService.updateConversationUi();
- }
- Invite invite = extractInvite(packet);
- if (invite != null && invite.jid != null) {
- Conversation conversation = mXmppConnectionService.findOrCreateConversation(account, invite.jid, true);
- if (!conversation.getMucOptions().online()) {
- conversation.getMucOptions().setPassword(invite.password);
- mXmppConnectionService.databaseBackend.updateConversation(conversation);
- mXmppConnectionService.joinMuc(conversation);
- mXmppConnectionService.updateConversationUi();
- }
- }
- if (packet.hasChild("event", "http://jabber.org/protocol/pubsub#event")) {
- Element event = packet.findChild("event",
- "http://jabber.org/protocol/pubsub#event");
- parseEvent(event, from, account);
- } else if (from != null && packet.hasChild("displayed", "urn:xmpp:chat-markers:0")) {
- String id = packet
- .findChild("displayed", "urn:xmpp:chat-markers:0")
- .getAttribute("id");
- updateLastseen(packet, account, true);
- final Message displayedMessage = mXmppConnectionService.markMessage(account, from.toBareJid(), id, Message.STATUS_SEND_DISPLAYED);
- Message message = displayedMessage == null ? null :displayedMessage.prev();
- while (message != null
- && message.getStatus() == Message.STATUS_SEND_RECEIVED
- && message.getTimeSent() < displayedMessage.getTimeSent()) {
- mXmppConnectionService.markMessage(message, Message.STATUS_SEND_DISPLAYED);
- message = message.prev();
- }
- } else if (from != null
- && packet.hasChild("received", "urn:xmpp:chat-markers:0")) {
- String id = packet.findChild("received", "urn:xmpp:chat-markers:0")
- .getAttribute("id");
- updateLastseen(packet, account, false);
- mXmppConnectionService.markMessage(account, from.toBareJid(),
- id, Message.STATUS_SEND_RECEIVED);
- } else if (from != null
- && packet.hasChild("received", "urn:xmpp:receipts")) {
- String id = packet.findChild("received", "urn:xmpp:receipts")
- .getAttribute("id");
- updateLastseen(packet, account, false);
- mXmppConnectionService.markMessage(account, from.toBareJid(),
- id, Message.STATUS_SEND_RECEIVED);
- }
- }
-
private class Invite {
Jid jid;
String password;
@@ -448,10 +101,24 @@ public class MessageParser extends AbstractParser implements
this.jid = jid;
this.password = password;
}
+
+ public boolean execute(Account account) {
+ if (jid != null) {
+ Conversation conversation = mXmppConnectionService.findOrCreateConversation(account, jid, true);
+ if (!conversation.getMucOptions().online()) {
+ conversation.getMucOptions().setPassword(password);
+ mXmppConnectionService.databaseBackend.updateConversation(conversation);
+ mXmppConnectionService.joinMuc(conversation);
+ mXmppConnectionService.updateConversationUi();
+ }
+ return true;
+ }
+ return false;
+ }
}
private Invite extractInvite(Element message) {
- Element x = message.findChild("x","http://jabber.org/protocol/muc#user");
+ Element x = message.findChild("x", "http://jabber.org/protocol/muc#user");
if (x != null) {
Element invite = x.findChild("invite");
if (invite != null) {
@@ -469,34 +136,23 @@ public class MessageParser extends AbstractParser implements
private void parseEvent(final Element event, final Jid from, final Account account) {
Element items = event.findChild("items");
- if (items == null) {
- return;
- }
- String node = items.getAttribute("node");
- if (node == null) {
- return;
- }
- if (node.equals("urn:xmpp:avatar:metadata")) {
+ String node = items == null ? null : items.getAttribute("node");
+ if ("urn:xmpp:avatar:metadata".equals(node)) {
Avatar avatar = Avatar.parseMetadata(items);
if (avatar != null) {
avatar.owner = from;
- if (mXmppConnectionService.getFileBackend().isAvatarCached(
- avatar)) {
+ if (mXmppConnectionService.getFileBackend().isAvatarCached(avatar)) {
if (account.getJid().toBareJid().equals(from)) {
if (account.setAvatar(avatar.getFilename())) {
- mXmppConnectionService.databaseBackend
- .updateAccount(account);
+ mXmppConnectionService.databaseBackend.updateAccount(account);
}
- mXmppConnectionService.getAvatarService().clear(
- account);
+ mXmppConnectionService.getAvatarService().clear(account);
mXmppConnectionService.updateConversationUi();
mXmppConnectionService.updateAccountUi();
} else {
- Contact contact = account.getRoster().getContact(
- from);
+ Contact contact = account.getRoster().getContact(from);
contact.setAvatar(avatar);
- mXmppConnectionService.getAvatarService().clear(
- contact);
+ mXmppConnectionService.getAvatarService().clear(contact);
mXmppConnectionService.updateConversationUi();
mXmppConnectionService.updateRosterUi();
}
@@ -504,161 +160,254 @@ public class MessageParser extends AbstractParser implements
mXmppConnectionService.fetchAvatar(account, avatar);
}
}
- } else if (node.equals("http://jabber.org/protocol/nick")) {
- Element item = items.findChild("item");
- if (item != null) {
- Element nick = item.findChild("nick",
- "http://jabber.org/protocol/nick");
- if (nick != null) {
- if (from != null) {
- Contact contact = account.getRoster().getContact(
- from);
- contact.setPresenceName(nick.getContent());
- mXmppConnectionService.getAvatarService().clear(account);
- mXmppConnectionService.updateConversationUi();
- mXmppConnectionService.updateAccountUi();
- }
- }
+ } else if ("http://jabber.org/protocol/nick".equals(node)) {
+ Element i = items.findChild("item");
+ Element nick = i == null ? null : i.findChild("nick", "http://jabber.org/protocol/nick");
+ if (nick != null) {
+ Contact contact = account.getRoster().getContact(from);
+ contact.setPresenceName(nick.getContent());
+ mXmppConnectionService.getAvatarService().clear(account);
+ mXmppConnectionService.updateConversationUi();
+ mXmppConnectionService.updateAccountUi();
}
}
}
- private String getPgpBody(Element message) {
- Element child = message.findChild("x", "jabber:x:encrypted");
- if (child == null) {
- return null;
- } else {
- return child.getContent();
+ private boolean handleErrorMessage(Account account, MessagePacket packet) {
+ if (packet.getType() == MessagePacket.TYPE_ERROR) {
+ Jid from = packet.getFrom();
+ if (from != null) {
+ mXmppConnectionService.markMessage(account, from.toBareJid(), packet.getId(), Message.STATUS_SEND_FAILED);
+ }
+ return true;
}
- }
-
- private boolean isMarkable(Element message) {
- return message.hasChild("markable", "urn:xmpp:chat-markers:0");
+ return false;
}
@Override
- public void onMessagePacketReceived(Account account, MessagePacket packet) {
- Message message = null;
- this.parseNick(packet, account);
- if ((packet.getType() == MessagePacket.TYPE_CHAT || packet.getType() == MessagePacket.TYPE_NORMAL)) {
- if ((packet.getBody() != null)
- && (packet.getBody().startsWith("?OTR"))) {
- message = this.parseOtrChat(packet, account);
- if (message != null) {
- message.markUnread();
- }
- } else if (packet.hasChild("body") && extractInvite(packet) == null) {
- message = this.parseChat(packet, account);
- if (message != null) {
- message.markUnread();
+ public void onMessagePacketReceived(Account account, MessagePacket original) {
+ if (handleErrorMessage(account, original)) {
+ return;
+ }
+ final MessagePacket packet;
+ Long timestamp = null;
+ final boolean isForwarded;
+ String serverMsgId = null;
+ final Element fin = original.findChild("fin", "urn:xmpp:mam:0");
+ if (fin != null) {
+ mXmppConnectionService.getMessageArchiveService().processFin(fin,original.getFrom());
+ return;
+ }
+ final Element result = original.findChild("result","urn:xmpp:mam:0");
+ final MessageArchiveService.Query query = result == null ? null : mXmppConnectionService.getMessageArchiveService().findQuery(result.getAttribute("queryid"));
+ if (query != null && query.validFrom(original.getFrom())) {
+ Pair<MessagePacket, Long> f = original.getForwardedMessagePacket("result", "urn:xmpp:mam:0");
+ if (f == null) {
+ return;
+ }
+ timestamp = f.second;
+ packet = f.first;
+ isForwarded = true;
+ serverMsgId = result.getAttribute("id");
+ query.incrementTotalCount();
+ } else if (query != null) {
+ Log.d(Config.LOGTAG,account.getJid().toBareJid()+": received mam result from invalid sender");
+ return;
+ } else if (original.fromServer(account)) {
+ Pair<MessagePacket, Long> f;
+ f = original.getForwardedMessagePacket("received", "urn:xmpp:carbons:2");
+ f = f == null ? original.getForwardedMessagePacket("sent", "urn:xmpp:carbons:2") : f;
+ packet = f != null ? f.first : original;
+ if (handleErrorMessage(account, packet)) {
+ return;
+ }
+ timestamp = f != null ? f.second : null;
+ isForwarded = f != null;
+ } else {
+ packet = original;
+ isForwarded = false;
+ }
+
+ if (timestamp == null) {
+ timestamp = AbstractParser.getTimestamp(packet, System.currentTimeMillis());
+ }
+ final String body = packet.getBody();
+ final String encrypted = packet.findChildContent("x", "jabber:x:encrypted");
+ int status;
+ final Jid counterpart;
+ final Jid to = packet.getTo();
+ final Jid from = packet.getFrom();
+ final String remoteMsgId = packet.getId();
+ boolean isTypeGroupChat = packet.getType() == MessagePacket.TYPE_GROUPCHAT;
+ boolean properlyAddressed = !to.isBareJid() || account.countPresences() == 1;
+ if (packet.fromAccount(account)) {
+ status = Message.STATUS_SEND;
+ counterpart = to;
+ } else {
+ status = Message.STATUS_RECEIVED;
+ counterpart = from;
+ }
+
+ if (from == null || to == null) {
+ Log.d(Config.LOGTAG,"no to or from in: "+packet.toString());
+ return;
+ }
+
+ Invite invite = extractInvite(packet);
+ if (invite != null && invite.execute(account)) {
+ return;
+ }
+
+ if (extractChatState(mXmppConnectionService.find(account,from), packet)) {
+ mXmppConnectionService.updateConversationUi();
+ }
+
+ if (body != null || encrypted != null) {
+ 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)) {
+ return;
+ } else if (remoteMsgId == null) {
+ Message message = conversation.findSentMessageWithBody(packet.getBody());
+ if (message != null) {
+ mXmppConnectionService.markMessage(message, Message.STATUS_SEND_RECEIVED);
+ return;
+ }
+ }
+ } else {
+ status = Message.STATUS_RECEIVED;
}
- } 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) {
- account.activateGracePeriod();
- mXmppConnectionService.markRead(message.getConversation());
- } else {
- message.markUnread();
+ }
+ Message message;
+ if (body != null && body.startsWith("?OTR")) {
+ if (!isForwarded && !isTypeGroupChat && properlyAddressed) {
+ message = parseOtrChat(body, from, remoteMsgId, conversation);
+ if (message == null) {
+ return;
}
+ } else {
+ message = new Message(conversation, body, Message.ENCRYPTION_NONE, status);
}
- } else if (packet.hasChild("result","urn:xmpp:mam:0")) {
- message = parseMamMessage(packet, account);
- if (message != null) {
- Conversation conversation = message.getConversation();
- conversation.add(message);
- mXmppConnectionService.databaseBackend.createMessage(message);
+ } else if (encrypted != null) {
+ message = new Message(conversation, encrypted, Message.ENCRYPTION_PGP, status);
+ } else {
+ message = new Message(conversation, body, Message.ENCRYPTION_NONE, status);
+ }
+ message.setCounterpart(counterpart);
+ message.setRemoteMsgId(remoteMsgId);
+ message.setServerMsgId(serverMsgId);
+ message.setTime(timestamp);
+ message.markable = packet.hasChild("markable", "urn:xmpp:chat-markers:0");
+ if (conversation.getMode() == Conversation.MODE_MULTI) {
+ message.setTrueCounterpart(conversation.getMucOptions().getTrueCounterpart(counterpart.getResourcepart()));
+ if (!isTypeGroupChat) {
+ message.setType(Message.TYPE_PRIVATE);
}
+ }
+ updateLastseen(packet,account,true);
+ boolean checkForDuplicates = serverMsgId != null || (isTypeGroupChat && packet.hasChild("delay","urn:xmpp:delay"));
+ if (checkForDuplicates && conversation.hasDuplicateMessage(message)) {
+ Log.d(Config.LOGTAG,"skipping duplicate message from "+message.getCounterpart().toString()+" "+message.getBody());
return;
- } else if (packet.hasChild("fin","urn:xmpp:mam:0")) {
- Element fin = packet.findChild("fin","urn:xmpp:mam:0");
- mXmppConnectionService.getMessageArchiveService().processFin(fin);
- } else {
- parseNonMessage(packet, account);
}
- } else if (packet.getType() == MessagePacket.TYPE_GROUPCHAT) {
- message = this.parseGroupchat(packet, account);
- if (message != null) {
- if (message.getStatus() == Message.STATUS_RECEIVED) {
- message.markUnread();
- } else {
- mXmppConnectionService.markRead(message.getConversation());
+ if (query != null) {
+ query.incrementMessageCount();
+ }
+ conversation.add(message);
+ if (serverMsgId == null) {
+ if (status == Message.STATUS_SEND) {
+ mXmppConnectionService.markRead(conversation);
account.activateGracePeriod();
+ } else {
+ message.markUnread();
}
+ mXmppConnectionService.updateConversationUi();
}
- } else if (packet.getType() == MessagePacket.TYPE_ERROR) {
- this.parseError(packet, account);
- return;
- } else if (packet.getType() == MessagePacket.TYPE_HEADLINE) {
- this.parseHeadline(packet, account);
- return;
- }
- if ((message == null) || (message.getBody() == null)) {
- return;
- }
- if ((mXmppConnectionService.confirmMessages())
- && ((packet.getId() != null))) {
- if (packet.hasChild("markable", "urn:xmpp:chat-markers:0")) {
- MessagePacket receipt = mXmppConnectionService
- .getMessageGenerator().received(account, packet,
- "urn:xmpp:chat-markers:0");
- mXmppConnectionService.sendMessagePacket(account, receipt);
- }
- if (packet.hasChild("request", "urn:xmpp:receipts")) {
- MessagePacket receipt = mXmppConnectionService
- .getMessageGenerator().received(account, packet,
- "urn:xmpp:receipts");
- mXmppConnectionService.sendMessagePacket(account, receipt);
+
+ if (mXmppConnectionService.confirmMessages() && remoteMsgId != null && !isForwarded) {
+ if (packet.hasChild("markable", "urn:xmpp:chat-markers:0")) {
+ MessagePacket receipt = mXmppConnectionService
+ .getMessageGenerator().received(account, packet, "urn:xmpp:chat-markers:0");
+ mXmppConnectionService.sendMessagePacket(account, receipt);
+ }
+ if (packet.hasChild("request", "urn:xmpp:receipts")) {
+ MessagePacket receipt = mXmppConnectionService
+ .getMessageGenerator().received(account, packet, "urn:xmpp:receipts");
+ mXmppConnectionService.sendMessagePacket(account, receipt);
+ }
}
- }
- Conversation conversation = message.getConversation();
- conversation.add(message);
- if (account.getXmppConnection() != null && account.getXmppConnection().getFeatures().advancedStreamFeaturesLoaded()) {
- if (conversation.setLastMessageTransmitted(System.currentTimeMillis())) {
- mXmppConnectionService.updateConversation(conversation);
+ if (account.getXmppConnection() != null && account.getXmppConnection().getFeatures().advancedStreamFeaturesLoaded()) {
+ if (conversation.setLastMessageTransmitted(System.currentTimeMillis())) {
+ mXmppConnectionService.updateConversation(conversation);
+ }
}
- }
- if (message.getStatus() == Message.STATUS_RECEIVED
- && conversation.getOtrSession() != null
- && !conversation.getOtrSession().getSessionID().getUserID()
- .equals(message.getCounterpart().getResourcepart())) {
- conversation.endOtrIfNeeded();
- }
+ if (message.getStatus() == Message.STATUS_RECEIVED
+ && conversation.getOtrSession() != null
+ && !conversation.getOtrSession().getSessionID().getUserID()
+ .equals(message.getCounterpart().getResourcepart())) {
+ conversation.endOtrIfNeeded();
+ }
- if (packet.getType() != MessagePacket.TYPE_ERROR) {
- if (message.getEncryption() == Message.ENCRYPTION_NONE
- || mXmppConnectionService.saveEncryptedMessages()) {
+ if (message.getEncryption() == Message.ENCRYPTION_NONE || mXmppConnectionService.saveEncryptedMessages()) {
mXmppConnectionService.databaseBackend.createMessage(message);
}
+ final HttpConnectionManager manager = this.mXmppConnectionService.getHttpConnectionManager();
+ if (message.trusted() && message.bodyContainsDownloadable() && manager.getAutoAcceptFileSize() > 0) {
+ manager.createNewConnection(message);
+ } else if (!message.isRead()) {
+ mXmppConnectionService.getNotificationService().push(message);
+ }
+ } else { //no body
+ if (packet.hasChild("subject") && isTypeGroupChat) {
+ Conversation conversation = mXmppConnectionService.find(account, from.toBareJid());
+ if (conversation != null && conversation.getMode() == Conversation.MODE_MULTI) {
+ conversation.setHasMessagesLeftOnServer(true);
+ conversation.getMucOptions().setSubject(packet.findChildContent("subject"));
+ mXmppConnectionService.updateConversationUi();
+ return;
+ }
+ }
}
- final HttpConnectionManager manager = this.mXmppConnectionService.getHttpConnectionManager();
- if (message.trusted() && message.bodyContainsDownloadable() && manager.getAutoAcceptFileSize() > 0) {
- manager.createNewConnection(message);
- } else if (!message.isRead()) {
- mXmppConnectionService.getNotificationService().push(message);
+
+ Element received = packet.findChild("received", "urn:xmpp:chat-markers:0");
+ if (received == null) {
+ received = packet.findChild("received", "urn:xmpp:receipts");
+ }
+ if (received != null && !packet.fromAccount(account)) {
+ mXmppConnectionService.markMessage(account, from.toBareJid(), received.getAttribute("id"), Message.STATUS_SEND_RECEIVED);
+ }
+ Element displayed = packet.findChild("displayed", "urn:xmpp:chat-markers:0");
+ if (displayed != null) {
+ if (packet.fromAccount(account)) {
+ Conversation conversation = mXmppConnectionService.find(account,counterpart.toBareJid());
+ if (conversation != null) {
+ mXmppConnectionService.markRead(conversation);
+ }
+ } else {
+ updateLastseen(packet, account, true);
+ final Message displayedMessage = mXmppConnectionService.markMessage(account, from.toBareJid(), displayed.getAttribute("id"), Message.STATUS_SEND_DISPLAYED);
+ Message message = displayedMessage == null ? null : displayedMessage.prev();
+ while (message != null
+ && message.getStatus() == Message.STATUS_SEND_RECEIVED
+ && message.getTimeSent() < displayedMessage.getTimeSent()) {
+ mXmppConnectionService.markMessage(message, Message.STATUS_SEND_DISPLAYED);
+ message = message.prev();
+ }
+ }
}
- mXmppConnectionService.updateConversationUi();
- }
- private void parseHeadline(MessagePacket packet, Account account) {
- if (packet.hasChild("event", "http://jabber.org/protocol/pubsub#event")) {
- Element event = packet.findChild("event",
- "http://jabber.org/protocol/pubsub#event");
- parseEvent(event, packet.getFrom(), account);
+ Element event = packet.findChild("event", "http://jabber.org/protocol/pubsub#event");
+ if (event != null) {
+ parseEvent(event, from, account);
}
- }
- private void parseNick(MessagePacket packet, Account account) {
- Element nick = packet.findChild("nick",
- "http://jabber.org/protocol/nick");
+ String nick = packet.findChildContent("nick", "http://jabber.org/protocol/nick");
if (nick != null) {
- if (packet.getFrom() != null) {
- Contact contact = account.getRoster().getContact(
- packet.getFrom());
- contact.setPresenceName(nick.getContent());
- }
+ Contact contact = account.getRoster().getContact(from);
+ contact.setPresenceName(nick);
}
}
-}
+} \ No newline at end of file
diff --git a/src/main/java/eu/siacs/conversations/services/MessageArchiveService.java b/src/main/java/eu/siacs/conversations/services/MessageArchiveService.java
index f97077c4..0bc428c8 100644
--- a/src/main/java/eu/siacs/conversations/services/MessageArchiveService.java
+++ b/src/main/java/eu/siacs/conversations/services/MessageArchiveService.java
@@ -166,12 +166,12 @@ public class MessageArchiveService implements OnAdvancedStreamFeaturesLoaded {
}
}
- public void processFin(Element fin) {
+ public void processFin(Element fin, Jid from) {
if (fin == null) {
return;
}
Query query = findQuery(fin.getAttribute("queryid"));
- if (query == null) {
+ if (query == null || !query.validFrom(from)) {
return;
}
boolean complete = fin.getAttributeAsBoolean("complete");
@@ -336,6 +336,14 @@ public class MessageArchiveService implements OnAdvancedStreamFeaturesLoaded {
return this.messageCount;
}
+ public boolean validFrom(Jid from) {
+ if (muc()) {
+ return getWith().equals(from);
+ } else {
+ return (from == null) || account.getJid().toBareJid().equals(from.toBareJid());
+ }
+ }
+
@Override
public String toString() {
StringBuilder builder = new StringBuilder();
diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index 63d9ba7a..3a74b82b 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -1994,8 +1994,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
if (packet.getType() == IqPacket.TYPE.RESULT) {
Element vCard = packet.findChild("vCard","vcard-temp");
Element photo = vCard != null ? vCard.findChild("PHOTO") : null;
- Element binval = photo != null ? photo.findChild("BINVAL") : null;
- String image = binval != null ? binval.getContent() : null;
+ String image = photo != null ? photo.findChildContent("BINVAL") : null;
if (image != null) {
avatar.image = image;
if (getFileBackend().save(avatar)) {
diff --git a/src/main/java/eu/siacs/conversations/xml/Element.java b/src/main/java/eu/siacs/conversations/xml/Element.java
index 51708759..32657c66 100644
--- a/src/main/java/eu/siacs/conversations/xml/Element.java
+++ b/src/main/java/eu/siacs/conversations/xml/Element.java
@@ -57,6 +57,11 @@ public class Element {
return null;
}
+ public String findChildContent(String name) {
+ Element element = findChild(name);
+ return element == null ? null : element.getContent();
+ }
+
public Element findChild(String name, String xmlns) {
for (Element child : this.children) {
if (child.getName().equals(name)
@@ -67,6 +72,11 @@ public class Element {
return null;
}
+ public String findChildContent(String name, String xmlns) {
+ Element element = findChild(name,xmlns);
+ return element == null ? null : element.getContent();
+ }
+
public boolean hasChild(final String name) {
return findChild(name) != null;
}
diff --git a/src/main/java/eu/siacs/conversations/xmpp/pep/Avatar.java b/src/main/java/eu/siacs/conversations/xmpp/pep/Avatar.java
index 04d55bbe..74da6a9b 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/pep/Avatar.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/pep/Avatar.java
@@ -83,8 +83,7 @@ public class Avatar {
}
public static Avatar parsePresence(Element x) {
- Element photo = x != null ? x.findChild("photo") : null;
- String hash = photo != null ? photo.getContent() : null;
+ String hash = x == null ? null : x.findChildContent("photo");
if (hash == null) {
return null;
}
diff --git a/src/main/java/eu/siacs/conversations/xmpp/stanzas/AbstractStanza.java b/src/main/java/eu/siacs/conversations/xmpp/stanzas/AbstractStanza.java
index 55256ece..bd706b57 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/stanzas/AbstractStanza.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/stanzas/AbstractStanza.java
@@ -51,4 +51,8 @@ public class AbstractStanza extends Element {
|| getTo().equals(account.getJid().toBareJid())
|| getTo().equals(account.getJid());
}
+
+ public boolean fromAccount(final Account account) {
+ return getFrom() != null && getFrom().toBareJid().equals(account.getJid().toBareJid());
+ }
}
diff --git a/src/main/java/eu/siacs/conversations/xmpp/stanzas/MessagePacket.java b/src/main/java/eu/siacs/conversations/xmpp/stanzas/MessagePacket.java
index 93aaa68c..e32811af 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/stanzas/MessagePacket.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/stanzas/MessagePacket.java
@@ -1,5 +1,10 @@
package eu.siacs.conversations.xmpp.stanzas;
+import android.util.Pair;
+
+import java.text.ParseException;
+
+import eu.siacs.conversations.parser.AbstractParser;
import eu.siacs.conversations.xml.Element;
public class MessagePacket extends AbstractStanza {
@@ -14,12 +19,7 @@ public class MessagePacket extends AbstractStanza {
}
public String getBody() {
- Element body = this.findChild("body");
- if (body != null) {
- return body.getContent();
- } else {
- return null;
- }
+ return findChildContent("body");
}
public void setBody(String text) {
@@ -66,4 +66,31 @@ public class MessagePacket extends AbstractStanza {
return TYPE_NORMAL;
}
}
+
+ public Pair<MessagePacket,Long> getForwardedMessagePacket(String name, String namespace) {
+ Element wrapper = findChild(name, namespace);
+ if (wrapper == null) {
+ return null;
+ }
+ Element forwarded = wrapper.findChild("forwarded", "urn:xmpp:forward:0");
+ if (forwarded == null) {
+ return null;
+ }
+ MessagePacket packet = create(forwarded.findChild("message"));
+ if (packet == null) {
+ return null;
+ }
+ Long timestamp = AbstractParser.getTimestamp(forwarded,null);
+ return new Pair(packet,timestamp);
+ }
+
+ public static MessagePacket create(Element element) {
+ if (element == null) {
+ return null;
+ }
+ MessagePacket packet = new MessagePacket();
+ packet.setAttributes(element.getAttributes());
+ packet.setChildren(element.getChildren());
+ return packet;
+ }
}