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

catch state changing error when sending timeout to iq callbacks

Browse source
This commit is contained in:
Daniel Gultsch 2017-07-03 19:44:01 +02:00
parent 7cf360fabf
commit 5cac4397dd
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
View file

@ -1086,7 +1086,12 @@ public class XmppConnection implements Runnable {
} }
} }
for(OnIqPacketReceived callback : callbacks) { for(OnIqPacketReceived callback : callbacks) {
try {
callback.onIqPacketReceived(account, failurePacket); callback.onIqPacketReceived(account, failurePacket);
} catch (StateChangingError error) {
Log.d(Config.LOGTAG,account.getJid().toBareJid()+": caught StateChangingError("+error.state.toString()+") while clearing callbacks");
//ignore
}
} }
Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": done clearing iq callbacks. " + this.packetCallbacks.size() + " left"); Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": done clearing iq callbacks. " + this.packetCallbacks.size() + " left");
} }
@ -1322,8 +1327,7 @@ public class XmppConnection implements Runnable {
public synchronized String sendUnmodifiedIqPacket(final IqPacket packet, final OnIqPacketReceived callback) { public synchronized String sendUnmodifiedIqPacket(final IqPacket packet, final OnIqPacketReceived callback) {
if (packet.getId() == null) { if (packet.getId() == null) {
final String id = nextRandomId(); packet.setAttribute("id", nextRandomId());
packet.setAttribute("id", id);
} }
if (callback != null) { if (callback != null) {
synchronized (this.packetCallbacks) { synchronized (this.packetCallbacks) {