migrate to xmpp-addr

1 files changed, 5 insertions, 4 deletions

diff --git a/src/main/java/de/pixart/messenger/ui/BlockContactDialog.java b/src/main/java/de/pixart/messenger/ui/BlockContactDialog.java
index 0a27274fd..981b29c41 100644
--- a/src/main/java/de/pixart/messenger/ui/BlockContactDialog.java
+++ b/src/main/java/de/pixart/messenger/ui/BlockContactDialog.java
@@ -1,8 +1,8 @@
 package de.pixart.messenger.ui;
 
-import android.support.v7.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
+import android.support.v7.app.AlertDialog;
 import android.text.SpannableString;
 import android.text.Spanned;
 import android.text.style.TypefaceSpan;
@@ -16,6 +16,7 @@ import android.widget.Toast;
 import de.pixart.messenger.R;
 import de.pixart.messenger.entities.Blockable;
 import de.pixart.messenger.entities.Conversation;
+import rocks.xmpp.addr.Jid;
 
 public final class BlockContactDialog {
     public static void show(final XmppActivity xmppActivity, final Blockable blockable) {
@@ -32,14 +33,14 @@ public final class BlockContactDialog {
 
         String value;
         SpannableString spannable;
-        if (blockable.getJid().isDomainJid() || blockable.getAccount().isBlocked(blockable.getJid().toDomainJid())) {
+        if (blockable.getJid().getLocal() == null || blockable.getAccount().isBlocked(Jid.ofDomain(blockable.getJid().getDomain()))) {
             builder.setTitle(isBlocked ? R.string.action_unblock_domain : R.string.action_block_domain);
-            value = blockable.getJid().toDomainJid().toString();
+            value = Jid.ofDomain(blockable.getJid().getDomain()).toString();
             spannable = new SpannableString(xmppActivity.getString(isBlocked ? R.string.unblock_domain_text : R.string.block_domain_text, value));
         } else {
             int resBlockAction = blockable instanceof Conversation && ((Conversation) blockable).isWithStranger() ? R.string.block_stranger : R.string.action_block_contact;
             builder.setTitle(isBlocked ? R.string.action_unblock_contact : resBlockAction);
-            value = blockable.getJid().toBareJid().toString();
+            value = blockable.getJid().asBareJid().toString();
             spannable = new SpannableString(xmppActivity.getString(isBlocked ? R.string.unblock_contact_text : R.string.block_contact_text, value));
         }
         int start = spannable.toString().indexOf(value);