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

rename resource on bind conflict

Browse source
This commit is contained in:
Daniel Gultsch 2017-05-25 14:40:59 +02:00
parent fe29b51290
commit 3ece613a5d
1 changed files with 7 additions and 1 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

@ -1044,7 +1044,13 @@ public class XmppConnection implements Runnable {
} else { } else {
Log.d(Config.LOGTAG, account.getJid() + ": disconnecting because of bind failure (" + packet.toString()); Log.d(Config.LOGTAG, account.getJid() + ": disconnecting because of bind failure (" + packet.toString());
} }
account.setResource(account.getResource().split("\\.")[0]); final Element error = packet.findChild("error");
final String resource = account.getResource().split("\\.")[0];
if (packet.getType() == IqPacket.TYPE.ERROR && error != null && error.hasChild("conflict")) {
account.setResource(resource + "." + nextRandomId());
} else {
account.setResource(resource);
}
throw new StateChangingError(Account.State.BIND_FAILURE); throw new StateChangingError(Account.State.BIND_FAILURE);
} }
}); });