From 15f94ffdd4dbe003dc98877353c7dfeca88c1d1d Mon Sep 17 00:00:00 2001
From: Kateryna Kostiuk <kateryna.kostiuk@savoirfairelinux.com>
Date: Thu, 30 Sep 2021 13:43:34 -0400
Subject: [PATCH] Revert "conversationmodel: removeConversation only in
slotConversationRemoved"
This reverts commit bbda106696c397a16c9f7da5e0ff40821509f90a.
Reason for revert: <prevent contact removal for one_to_one>
Change-Id: I88dfa67def9af9d1bd517384df48d1f59e4c34a6
---
src/conversationmodel.cpp | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/conversationmodel.cpp b/src/conversationmodel.cpp
index 7d7bae3a..77174768 100644
--- a/src/conversationmodel.cpp
+++ b/src/conversationmodel.cpp
@@ -801,6 +801,9 @@ ConversationModel::removeConversation(const QString& uid, bool banned)
}
if (conversation.isSwarm()) {
ConfigurationManager::instance().removeConversation(owner.id, uid);
+ pimpl_->eraseConversation(conversationIdx);
+ pimpl_->invalidateModel();
+ emit conversationRemoved(uid);
// Still some other conversation, do nothing else
if (!banned && getConversationForPeerUri(peers.front()) != std::nullopt)
--
GitLab