diff --git a/src/conversationsadapter.cpp b/src/conversationsadapter.cpp index 8c331b970e8bce937e77b6306804a806ccac6786..02114eb3a9bd5163d0ddbc275c67e7f3bcca9f5f 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 85960cdcc66301a73a04dd733511c6fd76dc3d5a..1c7178485d1616e4f9bd38265815f431befcfa5b 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 314d7b93311811847e5ffe749482aaf7454d94ea..f61c90edeb4d2e4caaf6d84c2f9830af54a1cd4d 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)