handle blocking and unblocking of full jids

1 files changed, 7 insertions, 9 deletions

diff --git a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
index cb18a1d7e..a0d298d47 100644
--- a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
+++ b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
@@ -4606,17 +4606,15 @@ public class XmppConnectionService extends Service {
     public boolean sendBlockRequest(final Blockable blockable, boolean reportSpam) {
         if (blockable != null && blockable.getBlockedJid() != null) {
             final Jid jid = blockable.getBlockedJid();
-            this.sendIqPacket(blockable.getAccount(), getIqGenerator().generateSetBlockRequest(jid, reportSpam), new OnIqPacketReceived() {
-
-                @Override
-                public void onIqPacketReceived(final Account account, final IqPacket packet) {
-                    if (packet.getType() == IqPacket.TYPE.RESULT) {
-                        account.getBlocklist().add(jid);
-                        updateBlocklistUi(OnUpdateBlocklist.Status.BLOCKED);
-                    }
+            this.sendIqPacket(blockable.getAccount(), getIqGenerator().generateSetBlockRequest(jid, reportSpam), (a, response) -> {
+                if (response.getType() == IqPacket.TYPE.RESULT) {
+                    a.getBlocklist().add(jid);
+                    updateBlocklistUi(OnUpdateBlocklist.Status.BLOCKED);
                 }
             });
-            if (removeBlockedConversations(blockable.getAccount(), jid)) {
+            if (blockable.getBlockedJid().isFullJid()) {
+                return false;
+            } else if (removeBlockedConversations(blockable.getAccount(), jid)) {
                 updateConversationUi();
                 return true;
             } else {