It builds again!

Sam Whited created 11 years ago

Change summary

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

Detailed changes

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();

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);

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);
 					}
 				}

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() + ")");