made message parser and presence parser implement interface On*PacketReceived
This commit is contained in:
iNPUTmice
parent
7a26f27212
commit
789383e5cb
|
|
@ -1,5 +1,6 @@
|
|||
package eu.siacs.conversations.parser;
|
||||
|
||||
import android.os.SystemClock;
|
||||
import net.java.otr4j.session.Session;
|
||||
import net.java.otr4j.session.SessionStatus;
|
||||
import eu.siacs.conversations.entities.Account;
|
||||
|
|
@ -8,15 +9,19 @@ import eu.siacs.conversations.entities.Message;
|
|||
import eu.siacs.conversations.services.XmppConnectionService;
|
||||
import eu.siacs.conversations.utils.CryptoHelper;
|
||||
import eu.siacs.conversations.xml.Element;
|
||||
import eu.siacs.conversations.xmpp.OnMessagePacketReceived;
|
||||
import eu.siacs.conversations.xmpp.stanzas.MessagePacket;
|
||||
|
||||
public class MessageParser extends AbstractParser {
|
||||
public class MessageParser extends AbstractParser implements
|
||||
OnMessagePacketReceived {
|
||||
|
||||
private long lastCarbonMessageReceived = -XmppConnectionService.CARBON_GRACE_PERIOD;
|
||||
|
||||
public MessageParser(XmppConnectionService service) {
|
||||
super(service);
|
||||
}
|
||||
|
||||
public Message parseChat(MessagePacket packet, Account account) {
|
||||
private Message parseChat(MessagePacket packet, Account account) {
|
||||
String[] fromParts = packet.getFrom().split("/");
|
||||
Conversation conversation = mXmppConnectionService
|
||||
.findOrCreateConversation(account, fromParts[0], false);
|
||||
|
|
@ -25,8 +30,8 @@ public class MessageParser extends AbstractParser {
|
|||
String pgpBody = getPgpBody(packet);
|
||||
Message finishedMessage;
|
||||
if (pgpBody != null) {
|
||||
finishedMessage = new Message(conversation, packet.getFrom(), pgpBody,
|
||||
Message.ENCRYPTION_PGP, Message.STATUS_RECIEVED);
|
||||
finishedMessage = new Message(conversation, packet.getFrom(),
|
||||
pgpBody, Message.ENCRYPTION_PGP, Message.STATUS_RECIEVED);
|
||||
} else {
|
||||
finishedMessage = new Message(conversation, packet.getFrom(),
|
||||
packet.getBody(), Message.ENCRYPTION_NONE,
|
||||
|
|
@ -36,7 +41,7 @@ public class MessageParser extends AbstractParser {
|
|||
return finishedMessage;
|
||||
}
|
||||
|
||||
public Message parseOtrChat(MessagePacket packet, Account account) {
|
||||
private Message parseOtrChat(MessagePacket packet, Account account) {
|
||||
boolean properlyAddressed = (packet.getTo().split("/").length == 2)
|
||||
|| (account.countPresences() == 1);
|
||||
String[] fromParts = packet.getFrom().split("/");
|
||||
|
|
@ -84,9 +89,11 @@ public class MessageParser extends AbstractParser {
|
|||
conversation.setSymmetricKey(CryptoHelper.hexToBytes(key));
|
||||
return null;
|
||||
}
|
||||
conversation.setLatestMarkableMessageId(getMarkableMessageId(packet));
|
||||
Message finishedMessage = new Message(conversation, packet.getFrom(), body,
|
||||
Message.ENCRYPTION_OTR, Message.STATUS_RECIEVED);
|
||||
conversation
|
||||
.setLatestMarkableMessageId(getMarkableMessageId(packet));
|
||||
Message finishedMessage = new Message(conversation,
|
||||
packet.getFrom(), body, Message.ENCRYPTION_OTR,
|
||||
Message.STATUS_RECIEVED);
|
||||
finishedMessage.setTime(getTimestamp(packet));
|
||||
return finishedMessage;
|
||||
} catch (Exception e) {
|
||||
|
|
@ -99,7 +106,7 @@ public class MessageParser extends AbstractParser {
|
|||
}
|
||||
}
|
||||
|
||||
public Message parseGroupchat(MessagePacket packet, Account account) {
|
||||
private Message parseGroupchat(MessagePacket packet, Account account) {
|
||||
int status;
|
||||
String[] fromParts = packet.getFrom().split("/");
|
||||
Conversation conversation = mXmppConnectionService
|
||||
|
|
@ -128,8 +135,8 @@ public class MessageParser extends AbstractParser {
|
|||
conversation.setLatestMarkableMessageId(getMarkableMessageId(packet));
|
||||
Message finishedMessage;
|
||||
if (pgpBody == null) {
|
||||
finishedMessage = new Message(conversation, counterPart, packet.getBody(),
|
||||
Message.ENCRYPTION_NONE, status);
|
||||
finishedMessage = new Message(conversation, counterPart,
|
||||
packet.getBody(), Message.ENCRYPTION_NONE, status);
|
||||
} else {
|
||||
finishedMessage = new Message(conversation, counterPart, pgpBody,
|
||||
Message.ENCRYPTION_PGP, status);
|
||||
|
|
@ -138,7 +145,7 @@ public class MessageParser extends AbstractParser {
|
|||
return finishedMessage;
|
||||
}
|
||||
|
||||
public Message parseCarbonMessage(MessagePacket packet, Account account) {
|
||||
private Message parseCarbonMessage(MessagePacket packet, Account account) {
|
||||
int status;
|
||||
String fullJid;
|
||||
Element forwarded;
|
||||
|
|
@ -174,37 +181,45 @@ public class MessageParser extends AbstractParser {
|
|||
String pgpBody = getPgpBody(message);
|
||||
Message finishedMessage;
|
||||
if (pgpBody != null) {
|
||||
finishedMessage = new Message(conversation, fullJid, pgpBody,Message.ENCRYPTION_PGP, status);
|
||||
finishedMessage = new Message(conversation, fullJid, pgpBody,
|
||||
Message.ENCRYPTION_PGP, status);
|
||||
} else {
|
||||
String body = message.findChild("body").getContent();
|
||||
finishedMessage= new Message(conversation, fullJid, body,Message.ENCRYPTION_NONE, status);
|
||||
finishedMessage = new Message(conversation, fullJid, body,
|
||||
Message.ENCRYPTION_NONE, status);
|
||||
}
|
||||
finishedMessage.setTime(getTimestamp(message));
|
||||
return finishedMessage;
|
||||
}
|
||||
|
||||
public void parseError(MessagePacket packet, Account account) {
|
||||
private void parseError(MessagePacket packet, Account account) {
|
||||
String[] fromParts = packet.getFrom().split("/");
|
||||
mXmppConnectionService.markMessage(account, fromParts[0],
|
||||
packet.getId(), Message.STATUS_SEND_FAILED);
|
||||
}
|
||||
|
||||
public void parseNormal(Element packet, Account account) {
|
||||
private void parseNormal(Element packet, Account account) {
|
||||
if (packet.hasChild("displayed", "urn:xmpp:chat-markers:0")) {
|
||||
String id = packet.findChild("displayed","urn:xmpp:chat-markers:0").getAttribute("id");
|
||||
String id = packet
|
||||
.findChild("displayed", "urn:xmpp:chat-markers:0")
|
||||
.getAttribute("id");
|
||||
String[] fromParts = packet.getAttribute("from").split("/");
|
||||
updateLastseen(packet, account, true);
|
||||
mXmppConnectionService.markMessage(account,fromParts[0], id, Message.STATUS_SEND_DISPLAYED);
|
||||
mXmppConnectionService.markMessage(account, fromParts[0], id,
|
||||
Message.STATUS_SEND_DISPLAYED);
|
||||
} else if (packet.hasChild("received", "urn:xmpp:chat-markers:0")) {
|
||||
String id = packet.findChild("received","urn:xmpp:chat-markers:0").getAttribute("id");
|
||||
String id = packet.findChild("received", "urn:xmpp:chat-markers:0")
|
||||
.getAttribute("id");
|
||||
String[] fromParts = packet.getAttribute("from").split("/");
|
||||
updateLastseen(packet, account, false);
|
||||
mXmppConnectionService.markMessage(account,fromParts[0], id, Message.STATUS_SEND_RECEIVED);
|
||||
mXmppConnectionService.markMessage(account, fromParts[0], id,
|
||||
Message.STATUS_SEND_RECEIVED);
|
||||
} else if (packet.hasChild("x")) {
|
||||
Element x = packet.findChild("x");
|
||||
if (x.hasChild("invite")) {
|
||||
Conversation conversation = mXmppConnectionService.findOrCreateConversation(account, packet.getAttribute("from"),
|
||||
true);
|
||||
Conversation conversation = mXmppConnectionService
|
||||
.findOrCreateConversation(account,
|
||||
packet.getAttribute("from"), true);
|
||||
mXmppConnectionService.updateUi(conversation, false);
|
||||
}
|
||||
|
||||
|
|
@ -228,5 +243,81 @@ public class MessageParser extends AbstractParser {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public void onMessagePacketReceived(Account account, MessagePacket packet) {
|
||||
Message message = null;
|
||||
boolean notify = true;
|
||||
if (mXmppConnectionService.getPreferences().getBoolean(
|
||||
"notification_grace_period_after_carbon_received", true)) {
|
||||
notify = (SystemClock.elapsedRealtime() - lastCarbonMessageReceived) > XmppConnectionService.CARBON_GRACE_PERIOD;
|
||||
}
|
||||
|
||||
if ((packet.getType() == MessagePacket.TYPE_CHAT)) {
|
||||
if ((packet.getBody() != null)
|
||||
&& (packet.getBody().startsWith("?OTR"))) {
|
||||
message = this.parseOtrChat(packet, account);
|
||||
if (message != null) {
|
||||
message.markUnread();
|
||||
}
|
||||
} else if (packet.hasChild("body")) {
|
||||
message = this.parseChat(packet, account);
|
||||
message.markUnread();
|
||||
} else if (packet.hasChild("received") || (packet.hasChild("sent"))) {
|
||||
message = this.parseCarbonMessage(packet, account);
|
||||
if (message != null) {
|
||||
if (message.getStatus() == Message.STATUS_SEND) {
|
||||
lastCarbonMessageReceived = SystemClock
|
||||
.elapsedRealtime();
|
||||
notify = false;
|
||||
message.getConversation().markRead();
|
||||
} else {
|
||||
message.markUnread();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
} else if (packet.getType() == MessagePacket.TYPE_GROUPCHAT) {
|
||||
message = this.parseGroupchat(packet, account);
|
||||
if (message != null) {
|
||||
if (message.getStatus() == Message.STATUS_RECIEVED) {
|
||||
message.markUnread();
|
||||
} else {
|
||||
message.getConversation().markRead();
|
||||
notify = false;
|
||||
}
|
||||
}
|
||||
} else if (packet.getType() == MessagePacket.TYPE_ERROR) {
|
||||
this.parseError(packet, account);
|
||||
return;
|
||||
} else if (packet.getType() == MessagePacket.TYPE_NORMAL) {
|
||||
this.parseNormal(packet, account);
|
||||
}
|
||||
if ((message == null) || (message.getBody() == null)) {
|
||||
return;
|
||||
}
|
||||
if ((mXmppConnectionService.confirmMessages())
|
||||
&& ((packet.getId() != null))) {
|
||||
MessagePacket receivedPacket = new MessagePacket();
|
||||
receivedPacket.setType(MessagePacket.TYPE_NORMAL);
|
||||
receivedPacket.setTo(message.getCounterpart());
|
||||
receivedPacket.setFrom(account.getFullJid());
|
||||
if (packet.hasChild("markable", "urn:xmpp:chat-markers:0")) {
|
||||
Element received = receivedPacket.addChild("received",
|
||||
"urn:xmpp:chat-markers:0");
|
||||
received.setAttribute("id", packet.getId());
|
||||
account.getXmppConnection().sendMessagePacket(receivedPacket);
|
||||
} else if (packet.hasChild("request", "urn:xmpp:receipts")) {
|
||||
Element received = receivedPacket.addChild("received",
|
||||
"urn:xmpp:receipts");
|
||||
received.setAttribute("id", packet.getId());
|
||||
account.getXmppConnection().sendMessagePacket(receivedPacket);
|
||||
}
|
||||
}
|
||||
Conversation conversation = message.getConversation();
|
||||
conversation.getMessages().add(message);
|
||||
if (packet.getType() != MessagePacket.TYPE_ERROR) {
|
||||
mXmppConnectionService.databaseBackend.createMessage(message);
|
||||
}
|
||||
mXmppConnectionService.updateUi(conversation, notify);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,9 +7,11 @@ import eu.siacs.conversations.entities.Conversation;
|
|||
import eu.siacs.conversations.entities.Presences;
|
||||
import eu.siacs.conversations.services.XmppConnectionService;
|
||||
import eu.siacs.conversations.xml.Element;
|
||||
import eu.siacs.conversations.xmpp.OnPresencePacketReceived;
|
||||
import eu.siacs.conversations.xmpp.stanzas.PresencePacket;
|
||||
|
||||
public class PresenceParser extends AbstractParser {
|
||||
public class PresenceParser extends AbstractParser implements
|
||||
OnPresencePacketReceived {
|
||||
|
||||
public PresenceParser(XmppConnectionService service) {
|
||||
super(service);
|
||||
|
|
@ -102,4 +104,15 @@ public class PresenceParser extends AbstractParser {
|
|||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onPresencePacketReceived(Account account, PresencePacket packet) {
|
||||
if (packet.hasChild("x", "http://jabber.org/protocol/muc#user")) {
|
||||
this.parseConferencePresence(packet, account);
|
||||
} else if (packet.hasChild("x", "http://jabber.org/protocol/muc")) {
|
||||
this.parseConferencePresence(packet, account);
|
||||
} else {
|
||||
this.parseContactPresence(packet, account);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -43,8 +43,6 @@ import eu.siacs.conversations.xml.Element;
|
|||
import eu.siacs.conversations.xmpp.OnBindListener;
|
||||
import eu.siacs.conversations.xmpp.OnContactStatusChanged;
|
||||
import eu.siacs.conversations.xmpp.OnIqPacketReceived;
|
||||
import eu.siacs.conversations.xmpp.OnMessagePacketReceived;
|
||||
import eu.siacs.conversations.xmpp.OnPresencePacketReceived;
|
||||
import eu.siacs.conversations.xmpp.OnStatusChanged;
|
||||
import eu.siacs.conversations.xmpp.OnTLSExceptionReceived;
|
||||
import eu.siacs.conversations.xmpp.XmppConnection;
|
||||
|
|
@ -87,7 +85,7 @@ public class XmppConnectionService extends Service {
|
|||
private static final int PING_MIN_INTERVAL = 30;
|
||||
private static final int PING_TIMEOUT = 10;
|
||||
private static final int CONNECT_TIMEOUT = 90;
|
||||
private static final long CARBON_GRACE_PERIOD = 60000L;
|
||||
public static final long CARBON_GRACE_PERIOD = 60000L;
|
||||
|
||||
private static String ACTION_MERGE_PHONE_CONTACTS = "merge_phone_contacts";
|
||||
|
||||
|
|
@ -125,8 +123,6 @@ public class XmppConnectionService extends Service {
|
|||
|
||||
private SecureRandom mRandom;
|
||||
|
||||
private long lastCarbonMessageReceived = -CARBON_GRACE_PERIOD;
|
||||
|
||||
private ContentObserver contactObserver = new ContentObserver(null) {
|
||||
@Override
|
||||
public void onChange(boolean selfChange) {
|
||||
|
|
@ -139,95 +135,6 @@ public class XmppConnectionService extends Service {
|
|||
};
|
||||
|
||||
private final IBinder mBinder = new XmppConnectionBinder();
|
||||
private OnMessagePacketReceived messageListener = new OnMessagePacketReceived() {
|
||||
|
||||
@Override
|
||||
public void onMessagePacketReceived(Account account,
|
||||
MessagePacket packet) {
|
||||
Message message = null;
|
||||
boolean notify = true;
|
||||
if (getPreferences().getBoolean(
|
||||
"notification_grace_period_after_carbon_received", true)) {
|
||||
notify = (SystemClock.elapsedRealtime() - lastCarbonMessageReceived) > CARBON_GRACE_PERIOD;
|
||||
}
|
||||
|
||||
if ((packet.getType() == MessagePacket.TYPE_CHAT)) {
|
||||
if ((packet.getBody() != null)
|
||||
&& (packet.getBody().startsWith("?OTR"))) {
|
||||
message = mMessageParser.parseOtrChat(packet, account);
|
||||
if (message != null) {
|
||||
message.markUnread();
|
||||
}
|
||||
} else if (packet.hasChild("body")) {
|
||||
message = mMessageParser.parseChat(packet, account);
|
||||
message.markUnread();
|
||||
} else if (packet.hasChild("received")
|
||||
|| (packet.hasChild("sent"))) {
|
||||
message = mMessageParser
|
||||
.parseCarbonMessage(packet, account);
|
||||
if (message != null) {
|
||||
if (message.getStatus() == Message.STATUS_SEND) {
|
||||
lastCarbonMessageReceived = SystemClock
|
||||
.elapsedRealtime();
|
||||
notify = false;
|
||||
message.getConversation().markRead();
|
||||
} else {
|
||||
message.markUnread();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
} else if (packet.getType() == MessagePacket.TYPE_GROUPCHAT) {
|
||||
message = mMessageParser.parseGroupchat(packet, account);
|
||||
if (message != null) {
|
||||
if (message.getStatus() == Message.STATUS_RECIEVED) {
|
||||
message.markUnread();
|
||||
} else {
|
||||
message.getConversation().markRead();
|
||||
notify = false;
|
||||
}
|
||||
}
|
||||
} else if (packet.getType() == MessagePacket.TYPE_ERROR) {
|
||||
mMessageParser.parseError(packet, account);
|
||||
return;
|
||||
} else if (packet.getType() == MessagePacket.TYPE_NORMAL) {
|
||||
mMessageParser.parseNormal(packet, account);
|
||||
}
|
||||
if ((message == null) || (message.getBody() == null)) {
|
||||
return;
|
||||
}
|
||||
if ((confirmMessages()) && ((packet.getId() != null))) {
|
||||
MessagePacket receivedPacket = new MessagePacket();
|
||||
receivedPacket.setType(MessagePacket.TYPE_NORMAL);
|
||||
receivedPacket.setTo(message.getCounterpart());
|
||||
receivedPacket.setFrom(account.getFullJid());
|
||||
if (packet.hasChild("markable", "urn:xmpp:chat-markers:0")) {
|
||||
Element received = receivedPacket.addChild("received",
|
||||
"urn:xmpp:chat-markers:0");
|
||||
received.setAttribute("id", packet.getId());
|
||||
account.getXmppConnection().sendMessagePacket(
|
||||
receivedPacket);
|
||||
} else if (packet.hasChild("request", "urn:xmpp:receipts")) {
|
||||
Element received = receivedPacket.addChild("received",
|
||||
"urn:xmpp:receipts");
|
||||
received.setAttribute("id", packet.getId());
|
||||
account.getXmppConnection().sendMessagePacket(
|
||||
receivedPacket);
|
||||
}
|
||||
}
|
||||
Conversation conversation = message.getConversation();
|
||||
conversation.getMessages().add(message);
|
||||
if (packet.getType() != MessagePacket.TYPE_ERROR) {
|
||||
databaseBackend.createMessage(message);
|
||||
}
|
||||
if (convChangedListener != null) {
|
||||
convChangedListener.onConversationListChanged();
|
||||
} else {
|
||||
UIHelper.updateNotification(getApplicationContext(),
|
||||
getConversations(), message.getConversation(), notify);
|
||||
}
|
||||
}
|
||||
};
|
||||
private OnStatusChanged statusListener = new OnStatusChanged() {
|
||||
|
||||
@Override
|
||||
|
|
@ -270,21 +177,6 @@ public class XmppConnectionService extends Service {
|
|||
}
|
||||
};
|
||||
|
||||
private OnPresencePacketReceived presenceListener = new OnPresencePacketReceived() {
|
||||
|
||||
@Override
|
||||
public void onPresencePacketReceived(final Account account,
|
||||
PresencePacket packet) {
|
||||
if (packet.hasChild("x", "http://jabber.org/protocol/muc#user")) {
|
||||
mPresenceParser.parseConferencePresence(packet, account);
|
||||
} else if (packet.hasChild("x", "http://jabber.org/protocol/muc")) {
|
||||
mPresenceParser.parseConferencePresence(packet, account);
|
||||
} else {
|
||||
mPresenceParser.parseContactPresence(packet, account);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
private OnIqPacketReceived unknownIqListener = new OnIqPacketReceived() {
|
||||
|
||||
@Override
|
||||
|
|
@ -624,9 +516,9 @@ public class XmppConnectionService extends Service {
|
|||
account.setResource(sharedPref.getString("resource", "mobile")
|
||||
.toLowerCase(Locale.getDefault()));
|
||||
XmppConnection connection = new XmppConnection(account, this);
|
||||
connection.setOnMessagePacketReceivedListener(this.messageListener);
|
||||
connection.setOnMessagePacketReceivedListener(this.mMessageParser);
|
||||
connection.setOnStatusChangedListener(this.statusListener);
|
||||
connection.setOnPresencePacketReceivedListener(this.presenceListener);
|
||||
connection.setOnPresencePacketReceivedListener(this.mPresenceParser);
|
||||
connection
|
||||
.setOnUnregisteredIqPacketReceivedListener(this.unknownIqListener);
|
||||
connection.setOnJinglePacketReceivedListener(this.jingleListener);
|
||||
|
|
|
|||
Loading…
Reference in a new issue