From 6e93a73628ee87cf4bba12098c7a27a5fd03bc64 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Tue, 31 Jan 2017 06:57:45 +0300
Subject: update dependencies

---
 .../src/main/java/com/juick/components/s2s/ConnectionIn.java  | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'juick-xmpp/src/main/java/com/juick/components/s2s/ConnectionIn.java')

diff --git a/juick-xmpp/src/main/java/com/juick/components/s2s/ConnectionIn.java b/juick-xmpp/src/main/java/com/juick/components/s2s/ConnectionIn.java
index 882cc2f7..8713aa03 100644
--- a/juick-xmpp/src/main/java/com/juick/components/s2s/ConnectionIn.java
+++ b/juick-xmpp/src/main/java/com/juick/components/s2s/ConnectionIn.java
@@ -2,11 +2,11 @@ package com.juick.components.s2s;
 
 import com.juick.components.XMPPServer;
 import com.juick.xmpp.Iq;
-import com.juick.xmpp.JID;
 import com.juick.xmpp.Message;
 import com.juick.xmpp.Presence;
 import com.juick.xmpp.utils.XmlUtils;
 import org.xmlpull.v1.XmlPullParser;
+import rocks.xmpp.addr.Jid;
 
 import javax.net.ssl.SSLException;
 import javax.net.ssl.SSLSocket;
@@ -188,12 +188,13 @@ public class ConnectionIn extends Connection implements Runnable {
         String cfrom = parser.getAttributeValue(null, "from");
         String cto = parser.getAttributeValue(null, "to");
         if (cfrom != null && cto != null && !cfrom.isEmpty() && !cto.isEmpty()) {
-            JID jidto = new JID(cto);
-            if (jidto.Host != null && jidto.Username != null && jidto.Host.equals(xmpp.HOSTNAME) && jidto.Username.matches("^[a-zA-Z0-9\\-]{2,16}$")) {
-                JID jidfrom = new JID(cfrom);
+            Jid jidto = Jid.of(cto);
+            if (jidto.getDomain() != null && jidto.getLocal() != null && jidto.getDomain().equals(xmpp.HOSTNAME)
+                    && jidto.getLocal().matches("^[a-zA-Z0-9\\-]{2,16}$")) {
+                Jid jidfrom = Jid.of(cfrom);
                 int size = from.size();
                 for (int i = 0; i < size; i++) {
-                    if (from.get(i).equals(jidfrom.Host)) {
+                    if (from.get(i).equals(jidfrom.getDomain())) {
                         return true;
                     }
                 }
-- 
cgit v1.2.3