From 5b41c0da43d7c2f18fd96aa81cd70ffe8f5970f6 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Thu, 9 Mar 2017 20:01:20 +0100
Subject: closing the corresponding conversations after blocking a contact

---
 src/main/java/de/pixart/messenger/parser/IqParser.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/main/java/de/pixart/messenger/parser')

diff --git a/src/main/java/de/pixart/messenger/parser/IqParser.java b/src/main/java/de/pixart/messenger/parser/IqParser.java
index 073a36170..bfb2fa71e 100644
--- a/src/main/java/de/pixart/messenger/parser/IqParser.java
+++ b/src/main/java/de/pixart/messenger/parser/IqParser.java
@@ -26,7 +26,6 @@ import de.pixart.messenger.Config;
 import de.pixart.messenger.crypto.axolotl.AxolotlService;
 import de.pixart.messenger.entities.Account;
 import de.pixart.messenger.entities.Contact;
-import de.pixart.messenger.entities.Conversation;
 import de.pixart.messenger.services.XmppConnectionService;
 import de.pixart.messenger.utils.Namespace;
 import de.pixart.messenger.xml.Element;
@@ -321,11 +320,12 @@ public class IqParser extends AbstractParser implements OnIqPacketReceived {
                 }
                 account.getBlocklist().addAll(jids);
                 if (packet.getType() == IqPacket.TYPE.SET) {
+                    boolean removed = false;
                     for(Jid jid : jids) {
-                        Conversation conversation = mXmppConnectionService.find(account,jid);
-                        if (conversation != null) {
-                            mXmppConnectionService.markRead(conversation);
-                        }
+                        removed |= mXmppConnectionService.removeBlockedConversations(account, jid);
+                    }
+                    if (removed) {
+                        mXmppConnectionService.updateConversationUi();
                     }
                 }
             }
-- 
cgit v1.2.3