From def680ab6ee2d4aef09f55736f1f5c144200bb5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Blin?=
<sebastien.blin@savoirfairelinux.com>
Date: Tue, 1 Sep 2020 16:54:06 -0400
Subject: [PATCH] chatview: avoid to refill model for new interactions
Change-Id: I80141d22295964d1a7d3571ea2bde6b2d74faf9c
Gitlab: #24
Gitlab: #57
---
src/conversationsadapter.cpp | 9 ---------
src/conversationsadapter.h | 1 -
src/messagesadapter.cpp | 9 ++++++++-
3 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/src/conversationsadapter.cpp b/src/conversationsadapter.cpp
index 8c331b970..02114eb3a 100644
--- a/src/conversationsadapter.cpp
+++ b/src/conversationsadapter.cpp
@@ -190,7 +190,6 @@ ConversationsAdapter::connectConversationModel()
QObject::disconnect(newConversationConnection_);
QObject::disconnect(conversationRemovedConnection_);
QObject::disconnect(conversationClearedConnection);
- QObject::disconnect(newInteractionConnection_);
QObject::disconnect(interactionRemovedConnection_);
QObject::disconnect(searchStatusChangedConnection_);
QObject::disconnect(searchResultUpdatedConnection_);
@@ -258,14 +257,6 @@ ConversationsAdapter::connectConversationModel()
backToWelcomePage();
});
- newInteractionConnection_ = QObject::connect(currentConversationModel,
- &lrc::api::ConversationModel::newInteraction,
- [this] {
- conversationSmartListModel_->fillConversationsList();
- updateConversationsFilterWidget();
- QMetaObject::invokeMethod(qmlObj_, "updateConversationSmartListView");
- });
-
searchStatusChangedConnection_ = QObject::connect(currentConversationModel,
&lrc::api::ConversationModel::searchStatusChanged,
[this](const QString &status) {
diff --git a/src/conversationsadapter.h b/src/conversationsadapter.h
index 85960cdcc..1c7178485 100644
--- a/src/conversationsadapter.h
+++ b/src/conversationsadapter.h
@@ -68,7 +68,6 @@ private:
QMetaObject::Connection filterChangedConnection_;
QMetaObject::Connection newConversationConnection_;
QMetaObject::Connection conversationRemovedConnection_;
- QMetaObject::Connection newInteractionConnection_;
QMetaObject::Connection conversationClearedConnection;
QMetaObject::Connection selectedCallChanged_;
QMetaObject::Connection smartlistSelectionConnection_;
diff --git a/src/messagesadapter.cpp b/src/messagesadapter.cpp
index 314d7b933..f61c90ede 100644
--- a/src/messagesadapter.cpp
+++ b/src/messagesadapter.cpp
@@ -39,7 +39,14 @@ MessagesAdapter::MessagesAdapter(QObject *parent)
MessagesAdapter::~MessagesAdapter() {}
void
-MessagesAdapter::initQmlObject() {}
+MessagesAdapter::initQmlObject() {
+ connect(&LRCInstance::instance(),
+ &LRCInstance::currentAccountChanged,
+ [this](){
+ connectConversationModel();
+ });
+ connectConversationModel();
+}
void
MessagesAdapter::setupChatView(const QString &uid)
--
GitLab