From df196bf6ff0c6c195ffb16c7fe903ff149c553c4 Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Wed, 31 May 2017 21:24:35 +0200 Subject: rename resource on bind conflict --- src/main/java/de/pixart/messenger/xmpp/XmppConnection.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src/main/java') diff --git a/src/main/java/de/pixart/messenger/xmpp/XmppConnection.java b/src/main/java/de/pixart/messenger/xmpp/XmppConnection.java index fc157cf4d..09b90b3ba 100644 --- a/src/main/java/de/pixart/messenger/xmpp/XmppConnection.java +++ b/src/main/java/de/pixart/messenger/xmpp/XmppConnection.java @@ -1074,7 +1074,13 @@ public class XmppConnection implements Runnable { } else { 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); } }); -- cgit v1.2.3