1 files changed, 7 insertions, 8 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) {