migrate to xmpp-addr

1 files changed, 4 insertions, 5 deletions

diff --git a/src/main/java/de/pixart/messenger/ui/SettingsActivity.java b/src/main/java/de/pixart/messenger/ui/SettingsActivity.java
index fc50ce444..da6373250 100644
--- a/src/main/java/de/pixart/messenger/ui/SettingsActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/SettingsActivity.java
@@ -38,8 +38,7 @@ import de.pixart.messenger.services.ExportLogsService;
 import de.pixart.messenger.services.MemorizingTrustManager;
 import de.pixart.messenger.ui.util.Color;
 import de.pixart.messenger.utils.TimeframeUtils;
-import de.pixart.messenger.xmpp.jid.InvalidJidException;
-import de.pixart.messenger.xmpp.jid.Jid;
+import rocks.xmpp.addr.Jid;
 
 public class SettingsActivity extends XmppActivity implements
         OnSharedPreferenceChangeListener {
@@ -314,7 +313,7 @@ public class SettingsActivity extends XmppActivity implements
         final List<CharSequence> accounts = new ArrayList<>();
         for (Account account : xmppConnectionService.getAccounts()) {
             if (account.isEnabled()) {
-                accounts.add(account.getJid().toBareJid().toString());
+                accounts.add(account.getJid().asBareJid().toString());
             }
         }
         final boolean[] checkedItems = new boolean[accounts.size()];
@@ -334,12 +333,12 @@ public class SettingsActivity extends XmppActivity implements
             for (int i = 0; i < checkedItems.length; ++i) {
                 if (checkedItems[i]) {
                     try {
-                        Jid jid = Jid.fromString(accounts.get(i).toString());
+                        Jid jid = Jid.of(accounts.get(i).toString());
                         Account account = xmppConnectionService.findAccountByJid(jid);
                         if (account != null) {
                             account.getAxolotlService().regenerateKeys(true);
                         }
-                    } catch (InvalidJidException e) {
+                    } catch (IllegalArgumentException e) {
                         //
                     }
                 }