handle blocking and unblocking of full jids

1 files changed, 6 insertions, 2 deletions

diff --git a/src/main/java/de/pixart/messenger/ui/BlockContactDialog.java b/src/main/java/de/pixart/messenger/ui/BlockContactDialog.java
index 4f768b009..562bf2efa 100644
--- a/src/main/java/de/pixart/messenger/ui/BlockContactDialog.java
+++ b/src/main/java/de/pixart/messenger/ui/BlockContactDialog.java
@@ -25,14 +25,18 @@ public final class BlockContactDialog {
 
         final String value;
         @StringRes int res;
-        if (blockable.getJid().getLocal() == null || blockable.getAccount().isBlocked(Jid.ofDomain(blockable.getJid().getDomain()))) {
+        if (blockable.getJid().isFullJid()) {
+            builder.setTitle(isBlocked ? R.string.action_unblock_participant : R.string.action_block_participant);
+            value = blockable.getJid().toEscapedString();
+            res = isBlocked ? R.string.unblock_contact_text : R.string.block_contact_text;
+        } else 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 = Jid.ofDomain(blockable.getJid().getDomain()).toString();
             res = isBlocked ? R.string.unblock_domain_text : R.string.block_domain_text;
         } 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().asBareJid().toString();
+            value = blockable.getJid().asBareJid().toEscapedString();
             res = isBlocked ? R.string.unblock_contact_text : R.string.block_contact_text;
         }
         binding.text.setText(JidDialog.style(xmppActivity, res, value));