aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
diff options
context:
space:
mode:
authorSam Whited <sam@samwhited.com>2014-11-06 14:49:39 -0500
committerSam Whited <sam@samwhited.com>2014-11-09 07:00:40 -0500
commit9db624ec7b6323c7e55aab6f8ec8489d1068fb5f (patch)
tree8a2f424c3bb8a91cd38fb462a53f860d3575adf0 /src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
parent864f319500937fb46d86104b12ce767dd6725f64 (diff)
It builds again!
Diffstat (limited to '')
-rw-r--r--src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
index 9c160384..11cbca81 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
@@ -851,11 +851,7 @@ public class XmppConnection implements Runnable {
Element streamError = tagReader.readElement(currentTag);
if (streamError != null && streamError.hasChild("conflict")) {
final String resource = account.getResource().split("\\.")[0];
- try {
- account.setResource(resource + "." + nextRandomId());
- } catch (final InvalidJidException ignored) {
- // Should never reach here.
- }
+ account.setResource(resource + "." + nextRandomId());
Log.d(Config.LOGTAG,
account.getJid() + ": switching resource due to conflict ("
+ account.getResource() + ")");