synchronize packetCallbacks
This commit is contained in:
parent
c082066118
commit
51a2645349
|
@ -152,7 +152,6 @@ public class XmppConnection implements Runnable {
|
|||
shouldAuthenticate = shouldBind = !account.isOptionSet(Account.OPTION_REGISTER);
|
||||
tagReader = new XmlReader(wakeLock);
|
||||
tagWriter = new TagWriter();
|
||||
packetCallbacks.clear();
|
||||
this.changeStatus(Account.State.CONNECTING);
|
||||
if (DNSHelper.isIp(account.getServer().toString())) {
|
||||
socket = new Socket();
|
||||
|
@ -489,6 +488,7 @@ public class XmppConnection implements Runnable {
|
|||
this.jingleListener.onJinglePacketReceived(account,(JinglePacket) packet);
|
||||
}
|
||||
} else {
|
||||
synchronized (this.packetCallbacks) {
|
||||
if (packetCallbacks.containsKey(packet.getId())) {
|
||||
final Pair<IqPacket, OnIqPacketReceived> packetCallbackDuple = packetCallbacks.get(packet.getId());
|
||||
// Packets to the server should have responses from the server
|
||||
|
@ -497,21 +497,22 @@ public class XmppConnection implements Runnable {
|
|||
packetCallbackDuple.second.onIqPacketReceived(account, packet);
|
||||
packetCallbacks.remove(packet.getId());
|
||||
} else {
|
||||
Log.e(Config.LOGTAG,account.getJid().toBareJid().toString()+": ignoring spoofed iq packet");
|
||||
Log.e(Config.LOGTAG, account.getJid().toBareJid().toString() + ": ignoring spoofed iq packet");
|
||||
}
|
||||
} else {
|
||||
if (packet.getFrom().equals(packetCallbackDuple.first.getTo())) {
|
||||
packetCallbackDuple.second.onIqPacketReceived(account, packet);
|
||||
packetCallbacks.remove(packet.getId());
|
||||
} else {
|
||||
Log.e(Config.LOGTAG,account.getJid().toBareJid().toString()+": ignoring spoofed iq packet");
|
||||
Log.e(Config.LOGTAG, account.getJid().toBareJid().toString() + ": ignoring spoofed iq packet");
|
||||
}
|
||||
}
|
||||
} else if (packet.getType() == IqPacket.TYPE.GET|| packet.getType() == IqPacket.TYPE.SET) {
|
||||
} else if (packet.getType() == IqPacket.TYPE.GET || packet.getType() == IqPacket.TYPE.SET) {
|
||||
this.unregisteredIqListener.onIqPacketReceived(account, packet);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void processMessage(final Tag currentTag) throws XmlPullParserException, IOException {
|
||||
final MessagePacket packet = (MessagePacket) processPacket(currentTag,PACKET_MESSAGE);
|
||||
|
@ -739,15 +740,17 @@ public class XmppConnection implements Runnable {
|
|||
}
|
||||
|
||||
private void clearIqCallbacks() {
|
||||
Log.d(Config.LOGTAG,account.getJid().toBareJid()+": clearing iq iq callbacks");
|
||||
Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": clearing iq iq callbacks");
|
||||
final IqPacket failurePacket = new IqPacket(IqPacket.TYPE.ERROR);
|
||||
synchronized (this.packetCallbacks) {
|
||||
Iterator<Entry<String, Pair<IqPacket, OnIqPacketReceived>>> iterator = this.packetCallbacks.entrySet().iterator();
|
||||
while(iterator.hasNext()) {
|
||||
while (iterator.hasNext()) {
|
||||
Entry<String, Pair<IqPacket, OnIqPacketReceived>> entry = iterator.next();
|
||||
entry.getValue().second.onIqPacketReceived(account,failurePacket);
|
||||
entry.getValue().second.onIqPacketReceived(account, failurePacket);
|
||||
iterator.remove();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void sendStartSession() {
|
||||
final IqPacket startSession = new IqPacket(IqPacket.TYPE.SET);
|
||||
|
@ -917,8 +920,10 @@ public class XmppConnection implements Runnable {
|
|||
packet.setAttribute("id", id);
|
||||
}
|
||||
if (callback != null) {
|
||||
synchronized (this.packetCallbacks) {
|
||||
packetCallbacks.put(packet.getId(), new Pair<>(packet, callback));
|
||||
}
|
||||
}
|
||||
this.sendPacket(packet);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue