1 files changed, 14 insertions, 15 deletions

diff --git a/src/main/java/de/pixart/messenger/entities/Message.java b/src/main/java/de/pixart/messenger/entities/Message.java
index 859999309..501a394ad 100644
--- a/src/main/java/de/pixart/messenger/entities/Message.java
+++ b/src/main/java/de/pixart/messenger/entities/Message.java
@@ -23,8 +23,7 @@ import de.pixart.messenger.utils.GeoHelper;
 import de.pixart.messenger.utils.MimeUtils;
 import de.pixart.messenger.utils.UIHelper;
 import de.pixart.messenger.utils.XmppUri;
-import de.pixart.messenger.xmpp.jid.InvalidJidException;
-import de.pixart.messenger.xmpp.jid.Jid;
+import rocks.xmpp.addr.Jid;
 
 public class Message extends AbstractEntity {
 
@@ -117,7 +116,7 @@ public class Message extends AbstractEntity {
     public Message(Conversation conversation, String body, int encryption, int status) {
         this(conversation, java.util.UUID.randomUUID().toString(),
                 conversation.getUuid(),
-                conversation.getJid() == null ? null : conversation.getJid().toBareJid(),
+                conversation.getJid() == null ? null : conversation.getJid().asBareJid(),
                 null,
                 body,
                 System.currentTimeMillis(),
@@ -172,11 +171,11 @@ public class Message extends AbstractEntity {
         try {
             String value = cursor.getString(cursor.getColumnIndex(COUNTERPART));
             if (value != null) {
-                jid = Jid.fromString(value, true);
+                jid = Jid.of(value);
             } else {
                 jid = null;
             }
-        } catch (InvalidJidException e) {
+        } catch (IllegalArgumentException e) {
             jid = null;
         } catch (IllegalStateException e) {
             return null; // message too long?
@@ -185,11 +184,11 @@ public class Message extends AbstractEntity {
         try {
             String value = cursor.getString(cursor.getColumnIndex(TRUE_COUNTERPART));
             if (value != null) {
-                trueCounterpart = Jid.fromString(value, true);
+                trueCounterpart = Jid.of(value);
             } else {
                 trueCounterpart = null;
             }
-        } catch (InvalidJidException e) {
+        } catch (IllegalArgumentException e) {
             trueCounterpart = null;
         }
         return new Message(conversation,
@@ -246,12 +245,12 @@ public class Message extends AbstractEntity {
         if (counterpart == null) {
             values.putNull(COUNTERPART);
         } else {
-            values.put(COUNTERPART, counterpart.toPreppedString());
+            values.put(COUNTERPART, counterpart.toString());
         }
         if (trueCounterpart == null) {
             values.putNull(TRUE_COUNTERPART);
         } else {
-            values.put(TRUE_COUNTERPART, trueCounterpart.toPreppedString());
+            values.put(TRUE_COUNTERPART, trueCounterpart.toString());
         }
         values.put(BODY, body.length() > Config.MAX_STORAGE_MESSAGE_CHARS ? body.substring(0,Config.MAX_STORAGE_MESSAGE_CHARS) : body);
         values.put(TIME_SENT, timeSent);
@@ -439,7 +438,7 @@ public class Message extends AbstractEntity {
 
     public boolean addReadByMarker(ReadByMarker readByMarker) {
         if (readByMarker.getRealJid() != null) {
-            if (readByMarker.getRealJid().toBareJid().equals(trueCounterpart)) {
+            if (readByMarker.getRealJid().asBareJid().equals(trueCounterpart)) {
                 Log.d(Config.LOGTAG, "trying to add read marker by " + readByMarker.getRealJid() + " to " + body);
                 return false;
             }
@@ -573,7 +572,7 @@ public class Message extends AbstractEntity {
                         ((this.axolotlFingerprint == null && message.axolotlFingerprint == null) || this.axolotlFingerprint.equals(message.getFingerprint())) &&
                         UIHelper.sameDay(message.getTimeSent(), this.getTimeSent()) &&
                         this.getReadByMarkers().equals(message.getReadByMarkers()) &&
-                        !this.conversation.getJid().toBareJid().toString().equals(Config.BUG_REPORTS)
+                        !this.conversation.getJid().asBareJid().toString().equals(Config.BUG_REPORTS)
                 );
     }
 
@@ -655,15 +654,15 @@ public class Message extends AbstractEntity {
 
     public boolean fixCounterpart() {
         Presences presences = conversation.getContact().getPresences();
-        if (counterpart != null && presences.has(counterpart.getResourcepart())) {
+        if (counterpart != null && presences.has(counterpart.getResource())) {
             return true;
         } else if (presences.size() >= 1) {
             try {
-                counterpart = Jid.fromParts(conversation.getJid().getLocalpart(),
-                        conversation.getJid().getDomainpart(),
+                counterpart = Jid.of(conversation.getJid().getLocal(),
+                        conversation.getJid().getDomain(),
                         presences.toResourceArray()[0]);
                 return true;
-            } catch (InvalidJidException e) {
+            } catch (IllegalArgumentException e) {
                 counterpart = null;
                 return false;
             }