aboutsummaryrefslogtreecommitdiffstats
path: root/src/eu/siacs/conversations/xmpp/XmppConnection.java
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/eu/siacs/conversations/xmpp/XmppConnection.java11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/eu/siacs/conversations/xmpp/XmppConnection.java b/src/eu/siacs/conversations/xmpp/XmppConnection.java
index 36920929..e7b25e26 100644
--- a/src/eu/siacs/conversations/xmpp/XmppConnection.java
+++ b/src/eu/siacs/conversations/xmpp/XmppConnection.java
@@ -763,12 +763,15 @@ public class XmppConnection implements Runnable {
});
}
- private void processStreamError(Tag currentTag) throws XmlPullParserException, IOException {
+ private void processStreamError(Tag currentTag)
+ throws XmlPullParserException, IOException {
Element streamError = tagReader.readElement(currentTag);
- if (streamError!=null && streamError.hasChild("conflict")) {
+ if (streamError != null && streamError.hasChild("conflict")) {
String resource = account.getResource().split("\\.")[0];
- account.setResource(resource+"."+nextRandomId());
- Log.d(Config.LOGTAG,account.getJid()+": switching resource due to conflict ("+account.getResource()+")");
+ account.setResource(resource + "." + nextRandomId());
+ Log.d(Config.LOGTAG,
+ account.getJid() + ": switching resource due to conflict ("
+ + account.getResource() + ")");
}
}