migrate to xmpp-addr

7 files changed, 32 insertions, 39 deletions

diff --git a/src/main/java/de/pixart/messenger/utils/CryptoHelper.java b/src/main/java/de/pixart/messenger/utils/CryptoHelper.java
index c203aa930..f75201b78 100644
--- a/src/main/java/de/pixart/messenger/utils/CryptoHelper.java
+++ b/src/main/java/de/pixart/messenger/utils/CryptoHelper.java
@@ -31,8 +31,7 @@ import de.pixart.messenger.R;
 import de.pixart.messenger.entities.Account;
 import de.pixart.messenger.entities.Message;
 import de.pixart.messenger.http.AesGcmURLStreamHandler;
-import de.pixart.messenger.xmpp.jid.InvalidJidException;
-import de.pixart.messenger.xmpp.jid.Jid;
+import rocks.xmpp.addr.Jid;
 
 public final class CryptoHelper {
     public static final String FILETRANSFER = "?FILETRANSFERv1:";
@@ -148,7 +147,7 @@ public final class CryptoHelper {
         }
     }
 
-    public static Pair<Jid, String> extractJidAndName(X509Certificate certificate) throws CertificateEncodingException, InvalidJidException, CertificateParsingException {
+    public static Pair<Jid, String> extractJidAndName(X509Certificate certificate) throws CertificateEncodingException, IllegalArgumentException, CertificateParsingException {
         Collection<List<?>> alternativeNames = certificate.getSubjectAlternativeNames();
         List<String> emails = new ArrayList<>();
         if (alternativeNames != null) {
@@ -165,14 +164,14 @@ public final class CryptoHelper {
         }
         String name = x500name.getRDNs(BCStyle.CN).length > 0 ? IETFUtils.valueToString(x500name.getRDNs(BCStyle.CN)[0].getFirst().getValue()) : null;
         if (emails.size() >= 1) {
-            return new Pair<>(Jid.fromString(emails.get(0)), name);
+            return new Pair<>(Jid.of(emails.get(0)), name);
         } else if (name != null) {
             try {
-                Jid jid = Jid.fromString(name);
-                if (jid.isBareJid() && !jid.isDomainJid()) {
+                Jid jid = Jid.of(name);
+                if (jid.isBareJid() && jid.getLocal() != null) {
                     return new Pair<>(jid, null);
                 }
-            } catch (InvalidJidException e) {
+            } catch (IllegalArgumentException e) {
                 return null;
             }
         }
@@ -224,7 +223,7 @@ public final class CryptoHelper {
     }
 
     public static String getAccountFingerprint(Account account) {
-        return getFingerprint(account.getJid().toBareJid().toString());
+        return getFingerprint(account.getJid().asBareJid().toString());
     }
 
     public static String getFingerprint(String value) {
diff --git a/src/main/java/de/pixart/messenger/utils/ExceptionHelper.java b/src/main/java/de/pixart/messenger/utils/ExceptionHelper.java
index b1d4da78b..b1799d490 100644
--- a/src/main/java/de/pixart/messenger/utils/ExceptionHelper.java
+++ b/src/main/java/de/pixart/messenger/utils/ExceptionHelper.java
@@ -28,8 +28,7 @@ import de.pixart.messenger.entities.Conversation;
 import de.pixart.messenger.entities.Message;
 import de.pixart.messenger.services.XmppConnectionService;
 import de.pixart.messenger.ui.XmppActivity;
-import de.pixart.messenger.xmpp.jid.InvalidJidException;
-import de.pixart.messenger.xmpp.jid.Jid;
+import rocks.xmpp.addr.Jid;
 
 public class ExceptionHelper {
     private static final String FILENAME = "stacktrace.txt";
@@ -101,14 +100,14 @@ public class ExceptionHelper {
                         public void onClick(DialogInterface dialog, int which) {
 
                             Log.d(Config.LOGTAG, "using account="
-                                    + finalAccount.getJid().toBareJid()
+                                    + finalAccount.getJid().asBareJid()
                                     + " to send in stack trace");
 
                             Conversation conversation = null;
                             try {
                                 conversation = service.findOrCreateConversation(finalAccount,
-                                        Jid.fromString(Config.BUG_REPORTS), false, true);
-                            } catch (final InvalidJidException ignored) {
+                                        Jid.of(Config.BUG_REPORTS), false, true);
+                            } catch (final IllegalArgumentException ignored) {
                             }
                             Message message = new Message(conversation, report
                                     .toString(), Message.ENCRYPTION_NONE);
diff --git a/src/main/java/de/pixart/messenger/utils/GeoHelper.java b/src/main/java/de/pixart/messenger/utils/GeoHelper.java
index de8fe4dbd..f9a0b8db8 100644
--- a/src/main/java/de/pixart/messenger/utils/GeoHelper.java
+++ b/src/main/java/de/pixart/messenger/utils/GeoHelper.java
@@ -79,7 +79,7 @@ public class GeoHelper {
         locationPluginIntent.putExtra("longitude", longitude);
         if (message.getStatus() != Message.STATUS_RECEIVED) {
             locationPluginIntent.putExtra("jid", conversation.getAccount().getJid().toString());
-            locationPluginIntent.putExtra("name", conversation.getAccount().getJid().getLocalpart());
+            locationPluginIntent.putExtra("name", conversation.getAccount().getJid().getLocal());
         } else {
             Contact contact = message.getContact();
             if (contact != null) {
diff --git a/src/main/java/de/pixart/messenger/utils/JidHelper.java b/src/main/java/de/pixart/messenger/utils/JidHelper.java
index 625b56a58..a569c5960 100644
--- a/src/main/java/de/pixart/messenger/utils/JidHelper.java
+++ b/src/main/java/de/pixart/messenger/utils/JidHelper.java
@@ -34,19 +34,19 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
 
-import de.pixart.messenger.xmpp.jid.Jid;
+import rocks.xmpp.addr.Jid;
 
 public class JidHelper {
 
     private static List<String> LOCALPART_BLACKLIST = Arrays.asList("xmpp", "jabber", "me");
 
     public static String localPartOrFallback(Jid jid) {
-        if (LOCALPART_BLACKLIST.contains(jid.getLocalpart().toLowerCase(Locale.ENGLISH))) {
-            final String domain = jid.getDomainpart();
+        if (LOCALPART_BLACKLIST.contains(jid.getLocal().toLowerCase(Locale.ENGLISH))) {
+            final String domain = jid.getDomain();
             final int index = domain.lastIndexOf('.');
             return index > 1 ? domain.substring(0, index) : domain;
         } else {
-            return jid.getUnescapedLocalpart();
+            return jid.getLocal();
         }
     }
 
diff --git a/src/main/java/de/pixart/messenger/utils/NickValidityChecker.java b/src/main/java/de/pixart/messenger/utils/NickValidityChecker.java
index 5ef8d2d25..18219c93e 100644
--- a/src/main/java/de/pixart/messenger/utils/NickValidityChecker.java
+++ b/src/main/java/de/pixart/messenger/utils/NickValidityChecker.java
@@ -5,18 +5,17 @@ import java.util.List;
 import java.util.Set;
 
 import de.pixart.messenger.entities.Conversation;
-import de.pixart.messenger.xmpp.jid.InvalidJidException;
-import de.pixart.messenger.xmpp.jid.Jid;
+import rocks.xmpp.addr.Jid;
 
 public class NickValidityChecker {
 
     private static boolean check(final Conversation conversation, final String nick) {
         Jid room = conversation.getJid();
         try {
-            Jid full = Jid.fromParts(room.getLocalpart(), room.getDomainpart(), nick);
+            Jid full = Jid.of(room.getLocal(), room.getDomain(), nick);
             return conversation.hasMessageWithCounterpart(full)
                     || conversation.getMucOptions().findUserByFullJid(full) != null;
-        } catch (InvalidJidException e) {
+        } catch (IllegalArgumentException e) {
             return false;
         }
     }
diff --git a/src/main/java/de/pixart/messenger/utils/UIHelper.java b/src/main/java/de/pixart/messenger/utils/UIHelper.java
index f42d6b73e..92efe4d26 100644
--- a/src/main/java/de/pixart/messenger/utils/UIHelper.java
+++ b/src/main/java/de/pixart/messenger/utils/UIHelper.java
@@ -4,10 +4,7 @@ import android.content.Context;
 import android.text.format.DateFormat;
 import android.text.format.DateUtils;
 import android.util.Pair;
-import android.widget.PopupMenu;
 
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
 import java.math.BigInteger;
 import java.security.MessageDigest;
 import java.util.Arrays;
@@ -26,7 +23,7 @@ import de.pixart.messenger.entities.Message;
 import de.pixart.messenger.entities.MucOptions;
 import de.pixart.messenger.entities.Presence;
 import de.pixart.messenger.entities.Transferable;
-import de.pixart.messenger.xmpp.jid.Jid;
+import rocks.xmpp.addr.Jid;
 
 public class UIHelper {
 
@@ -474,7 +471,7 @@ public class UIHelper {
                 return conversation.getMucOptions().getSelf().getName();
             } else {
                 final Jid jid = conversation.getAccount().getJid();
-                return jid.hasLocalpart() ? jid.getLocalpart() : jid.toDomainJid().toString();
+                return jid.getLocal() != null ? jid.getLocal() : Jid.ofDomain(jid.getDomain()).toString();
             }
         }
     }
@@ -507,7 +504,7 @@ public class UIHelper {
         if (counterpart == null) {
             return "";
         } else if (!counterpart.isBareJid()) {
-            return counterpart.getResourcepart().trim();
+            return counterpart.getResource().trim();
         } else {
             return counterpart.toString().trim();
         }
diff --git a/src/main/java/de/pixart/messenger/utils/XmppUri.java b/src/main/java/de/pixart/messenger/utils/XmppUri.java
index 0600986c7..fec5ff039 100644
--- a/src/main/java/de/pixart/messenger/utils/XmppUri.java
+++ b/src/main/java/de/pixart/messenger/utils/XmppUri.java
@@ -8,8 +8,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
 
-import de.pixart.messenger.xmpp.jid.InvalidJidException;
-import de.pixart.messenger.xmpp.jid.Jid;
+import rocks.xmpp.addr.Jid;
 
 public class XmppUri {
 
@@ -31,8 +30,8 @@ public class XmppUri {
             parse(Uri.parse(uri));
         } catch (IllegalArgumentException e) {
             try {
-                jid = Jid.fromString(uri).toBareJid().toString();
-            } catch (InvalidJidException e2) {
+                jid = Jid.of(uri).asBareJid().toString();
+            } catch (IllegalArgumentException e2) {
                 jid = null;
             }
         }
@@ -65,7 +64,7 @@ public class XmppUri {
             if (segments.size() >= 2 && segments.get(1).contains("@")) {
                 // sample : https://conversations.im/i/foo@bar.com
                 try {
-                    jid = Jid.fromString(segments.get(1)).toString();
+                    jid = Jid.of(segments.get(1)).toString();
                 } catch (Exception e) {
                     jid = null;
                 }
@@ -107,8 +106,8 @@ public class XmppUri {
             }
         } else {
             try {
-                jid = Jid.fromString(uri.toString()).toBareJid().toString();
-            } catch (final InvalidJidException ignored) {
+                jid = Jid.of(uri.toString()).asBareJid().toString();
+            } catch (final IllegalArgumentException ignored) {
                 jid = null;
             }
         }
@@ -183,17 +182,17 @@ public class XmppUri {
 
     public Jid getJid() {
         try {
-            return this.jid == null ? null : Jid.fromString(this.jid.toLowerCase());
-        } catch (InvalidJidException e) {
+            return this.jid == null ? null : Jid.of(this.jid.toLowerCase());
+        } catch (IllegalArgumentException e) {
             return null;
         }
     }
 
     public boolean isJidValid() {
         try {
-            Jid.fromString(jid);
+            Jid.of(jid);
             return true;
-        } catch (InvalidJidException e) {
+        } catch (IllegalArgumentException e) {
             return false;
         }
     }