1 files changed, 10 insertions, 11 deletions
diff --git a/src/main/java/de/pixart/messenger/entities/Contact.java b/src/main/java/de/pixart/messenger/entities/Contact.java
index 63d8f6352..827840442 100644
--- a/src/main/java/de/pixart/messenger/entities/Contact.java
+++ b/src/main/java/de/pixart/messenger/entities/Contact.java
@@ -18,9 +18,8 @@ import de.pixart.messenger.Config;
 import de.pixart.messenger.utils.JidHelper;
 import de.pixart.messenger.utils.UIHelper;
 import de.pixart.messenger.xml.Element;
-import de.pixart.messenger.xmpp.jid.InvalidJidException;
-import de.pixart.messenger.xmpp.jid.Jid;
 import de.pixart.messenger.xmpp.pep.Avatar;
+import rocks.xmpp.addr.Jid;
 
 public class Contact implements ListItem, Blockable {
     public static final String TABLENAME = "contacts";
@@ -93,8 +92,8 @@ public class Contact implements ListItem, Blockable {
     public static Contact fromCursor(final Cursor cursor) {
         final Jid jid;
         try {
-            jid = Jid.fromString(cursor.getString(cursor.getColumnIndex(JID)), true);
-        } catch (final InvalidJidException e) {
+            jid = Jid.of(cursor.getString(cursor.getColumnIndex(JID)));
+        } catch (final IllegalArgumentException  e) {
             // TODO: Borked DB... handle this somehow?
             return null;
         }
@@ -121,10 +120,10 @@ public class Contact implements ListItem, Blockable {
             return this.serverName;
         } else if (this.presenceName != null && !this.presenceName.isEmpty() && mutualPresenceSubscription()) {
             return this.presenceName;
-        } else if (jid.hasLocalpart()) {
+        } else if (jid.getLocal() != null) {
             return JidHelper.localPartOrFallback(jid);
         } else {
-            return jid.getDomainpart();
+            return jid.getDomain();
         }
     }
 
@@ -200,7 +199,7 @@ public class Contact implements ListItem, Blockable {
             values.put(ACCOUNT, accountUuid);
             values.put(SYSTEMNAME, systemName);
             values.put(SERVERNAME, serverName);
-            values.put(JID, jid.toPreppedString());
+            values.put(JID, jid.toString());
             values.put(OPTIONS, subscription);
             values.put(SYSTEMACCOUNT, systemAccount);
             values.put(PHOTOURI, photoUri);
@@ -453,7 +452,7 @@ public class Contact implements ListItem, Blockable {
     }
 
     public Jid getServer() {
-        return getJid().toDomainJid();
+        return Jid.ofDomain(getJid().getDomain());
     }
 
     public boolean setAvatar(Avatar avatar) {
@@ -507,20 +506,20 @@ public class Contact implements ListItem, Blockable {
 
     @Override
     public boolean isDomainBlocked() {
-        return getAccount().isBlocked(this.getJid().toDomainJid());
+        return getAccount().isBlocked(Jid.ofDomain(this.getJid().getDomain()));
     }
 
     @Override
     public Jid getBlockedJid() {
         if (isDomainBlocked()) {
-            return getJid().toDomainJid();
+            return Jid.ofDomain(getJid().getDomain());
         } else {
             return getJid();
         }
     }
 
     public boolean isSelf() {
-        return account.getJid().toBareJid().equals(getJid().toBareJid());
+        return account.getJid().asBareJid().equals(getJid().asBareJid());
     }
 
     public void setCommonName(String cn) {