1 files changed, 8 insertions, 8 deletions

diff --git a/src/main/java/de/pixart/messenger/ui/ChooseContactActivity.java b/src/main/java/de/pixart/messenger/ui/ChooseContactActivity.java
index f2d25d377..4450c8759 100644
--- a/src/main/java/de/pixart/messenger/ui/ChooseContactActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/ChooseContactActivity.java
@@ -29,7 +29,7 @@ import de.pixart.messenger.entities.Contact;
 import de.pixart.messenger.entities.Conversation;
 import de.pixart.messenger.entities.ListItem;
 import de.pixart.messenger.entities.MucOptions;
-import de.pixart.messenger.xmpp.jid.Jid;
+import rocks.xmpp.addr.Jid;
 
 public class ChooseContactActivity extends AbstractSearchableListItemActivity {
     private List<String> mActivatedAccounts = new ArrayList<>();
@@ -123,7 +123,7 @@ public class ChooseContactActivity extends AbstractSearchableListItemActivity {
                 data.putExtra("contact", mListItem.getJid().toString());
                 String account = request.getStringExtra(EXTRA_ACCOUNT);
                 if (account == null && mListItem instanceof Contact) {
-                    account = ((Contact) mListItem).getAccount().getJid().toBareJid().toString();
+                    account = ((Contact) mListItem).getAccount().getJid().asBareJid().toString();
                 }
                 data.putExtra(EXTRA_ACCOUNT, account);
                 data.putExtra("conversation",
@@ -172,7 +172,7 @@ public class ChooseContactActivity extends AbstractSearchableListItemActivity {
             if (account.getStatus() != Account.State.DISABLED) {
                 for (final Contact contact : account.getRoster().getContacts()) {
                     if (contact.showInRoster() &&
-                            !filterContacts.contains(contact.getJid().toBareJid().toString())
+                            !filterContacts.contains(contact.getJid().asBareJid().toString())
                             && contact.match(this, needle)) {
                         getListItems().add(contact);
                     }
@@ -242,9 +242,9 @@ public class ChooseContactActivity extends AbstractSearchableListItemActivity {
         for (Account account : xmppConnectionService.getAccounts()) {
             if (account.getStatus() != Account.State.DISABLED) {
                 if (Config.DOMAIN_LOCK != null) {
-                    this.mActivatedAccounts.add(account.getJid().getLocalpart());
+                    this.mActivatedAccounts.add(account.getJid().getLocal());
                 } else {
-                    this.mActivatedAccounts.add(account.getJid().toBareJid().toString());
+                    this.mActivatedAccounts.add(account.getJid().asBareJid().toString());
                 }
             }
         }
@@ -258,17 +258,17 @@ public class ChooseContactActivity extends AbstractSearchableListItemActivity {
             for (MucOptions.User user : conversation.getMucOptions().getUsers(false)) {
                 Jid jid = user.getRealJid();
                 if (jid != null) {
-                    contacts.add(jid.toBareJid().toString());
+                    contacts.add(jid.asBareJid().toString());
                 }
             }
         } else {
-            contacts.add(conversation.getJid().toBareJid().toString());
+            contacts.add(conversation.getJid().asBareJid().toString());
         }
         intent.putExtra("filter_contacts", contacts.toArray(new String[contacts.size()]));
         intent.putExtra("conversation", conversation.getUuid());
         intent.putExtra("multiple", true);
         intent.putExtra("show_enter_jid", true);
-        intent.putExtra(EXTRA_ACCOUNT, conversation.getAccount().getJid().toBareJid().toString());
+        intent.putExtra(EXTRA_ACCOUNT, conversation.getAccount().getJid().asBareJid().toString());
         return intent;
     }
 }