1 files changed, 3 insertions, 2 deletions
diff --git a/juick-xmpp/src/main/java/com/juick/components/s2s/util/DialbackUtils.java b/juick-xmpp/src/main/java/com/juick/components/s2s/util/DialbackUtils.java
index 88626606..fc08c5d6 100644
--- a/juick-xmpp/src/main/java/com/juick/components/s2s/util/DialbackUtils.java
+++ b/juick-xmpp/src/main/java/com/juick/components/s2s/util/DialbackUtils.java
@@ -19,6 +19,7 @@ package com.juick.components.s2s.util;
 
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.codec.digest.HmacUtils;
+import rocks.xmpp.addr.Jid;
 
 /**
  * Created by vitalyster on 05.12.2016.
@@ -28,8 +29,8 @@ public class DialbackUtils {
         throw new IllegalStateException();
     }
 
-    public static String generateDialbackKey(String secret, String to, String from, String id) {
+    public static String generateDialbackKey(String secret, Jid to, Jid from, String id) {
         return HmacUtils.hmacSha256Hex(DigestUtils.sha256(secret),
-                (to + " " + from + " " + id).getBytes());
+                (to.toEscapedString() + " " + from.toEscapedString() + " " + id).getBytes());
     }
 }