From 9db624ec7b6323c7e55aab6f8ec8489d1068fb5f Mon Sep 17 00:00:00 2001
From: Sam Whited <sam@samwhited.com>
Date: Thu, 6 Nov 2014 14:49:39 -0500
Subject: [PATCH] It builds again!

---
 .../eu/siacs/conversations/entities/Account.java   | 14 +++++++-------
 .../services/XmppConnectionService.java            |  7 ++-----
 .../siacs/conversations/ui/SettingsActivity.java   |  6 ++++--
 .../siacs/conversations/xmpp/XmppConnection.java   |  6 +-----
 4 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/entities/Account.java b/src/main/java/eu/siacs/conversations/entities/Account.java
index ee4cce803..e367b41ad 100644
--- a/src/main/java/eu/siacs/conversations/entities/Account.java
+++ b/src/main/java/eu/siacs/conversations/entities/Account.java
@@ -88,10 +88,7 @@ public class Account extends AbstractEntity {
 		this.uuid = uuid;
         this.jid = jid;
         if (jid.getResourcepart().isEmpty()) {
-            try {
-                this.setResource("mobile");
-            } catch (final InvalidJidException ignored) {
-            }
+            this.setResource("mobile");
         }
 		this.password = password;
 		this.options = options;
@@ -164,9 +161,12 @@ public class Account extends AbstractEntity {
         return getXmppConnection() != null && getStatus() > STATUS_NO_INTERNET && (getXmppConnection().getAttempt() >= 2);
 	}
 
-	public void setResource(final String resource) throws InvalidJidException {
-        jid = Jid.fromParts(jid.getLocalpart(), jid.getDomainpart(), resource);
-	}
+	public void setResource(final String resource){
+        try {
+            jid = Jid.fromParts(jid.getLocalpart(), jid.getDomainpart(), resource);
+        } catch (final InvalidJidException ignored) {
+        }
+    }
 
 	public String getResource() {
 		return jid.getResourcepart();
diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index e7897c9b9..f2f9becdd 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -535,11 +535,8 @@ public class XmppConnectionService extends Service {
 
 	public XmppConnection createConnection(Account account) {
 		SharedPreferences sharedPref = getPreferences();
-        try {
-            account.setResource(sharedPref.getString("resource", "mobile")
-                    .toLowerCase(Locale.getDefault()));
-        } catch (final InvalidJidException ignored) {
-        }
+        account.setResource(sharedPref.getString("resource", "mobile")
+                .toLowerCase(Locale.getDefault()));
         XmppConnection connection = new XmppConnection(account, this);
 		connection.setOnMessagePacketReceivedListener(this.mMessageParser);
 		connection.setOnStatusChangedListener(this.statusListener);
diff --git a/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java b/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
index fc6308fce..aba601757 100644
--- a/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
@@ -5,6 +5,8 @@ import java.util.Arrays;
 import java.util.Locale;
 
 import eu.siacs.conversations.entities.Account;
+import eu.siacs.conversations.xmpp.jid.InvalidJidException;
+
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
 import android.os.Build;
@@ -62,8 +64,8 @@ public class SettingsActivity extends XmppActivity implements
 					.toLowerCase(Locale.US);
 			if (xmppConnectionServiceBound) {
 				for (Account account : xmppConnectionService.getAccounts()) {
-					account.setResource(resource);
-					if (!account.isOptionSet(Account.OPTION_DISABLED)) {
+                    account.setResource(resource);
+                    if (!account.isOptionSet(Account.OPTION_DISABLED)) {
 						xmppConnectionService.reconnectAccount(account, false);
 					}
 				}
diff --git a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
index 9c1603846..11cbca81c 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() + ")");