Commit 36618bbc authored by Ronan Abhamon's avatar Ronan Abhamon

feat(src/components/chat/ChatModel): use only one handlers instance

parent d37559bb
linphone @ 6c4053d1
Subproject commit fb3c9841ee5142d1826e2674591797343bd728ff Subproject commit 6c4053d101a99ac574346ca7c5e35e2491d727dd
...@@ -74,6 +74,8 @@ ChatModel::ChatModel (QObject *parent) : QAbstractListModel(parent) { ...@@ -74,6 +74,8 @@ ChatModel::ChatModel (QObject *parent) : QAbstractListModel(parent) {
); );
m_core_handlers = CoreManager::getInstance()->getHandlers(); m_core_handlers = CoreManager::getInstance()->getHandlers();
m_message_handlers = make_shared<MessageHandlers>(this);
QObject::connect( QObject::connect(
&(*m_core_handlers), &CoreHandlers::receivedMessage, &(*m_core_handlers), &CoreHandlers::receivedMessage,
this, [this]( this, [this](
...@@ -236,8 +238,8 @@ void ChatModel::removeAllEntries () { ...@@ -236,8 +238,8 @@ void ChatModel::removeAllEntries () {
void ChatModel::sendMessage (const QString &message) { void ChatModel::sendMessage (const QString &message) {
shared_ptr<linphone::ChatMessage> _message = m_chat_room->createMessage(::Utils::qStringToLinphoneString(message)); shared_ptr<linphone::ChatMessage> _message = m_chat_room->createMessage(::Utils::qStringToLinphoneString(message));
_message->setListener(make_shared<MessageHandlers>(this)); _message->setListener(m_message_handlers);
m_chat_room->sendChatMessage(_message); m_chat_room->sendMessage(_message);
insertMessageAtEnd(_message); insertMessageAtEnd(_message);
} }
......
...@@ -96,6 +96,7 @@ private: ...@@ -96,6 +96,7 @@ private:
std::shared_ptr<linphone::ChatRoom> m_chat_room; std::shared_ptr<linphone::ChatRoom> m_chat_room;
std::shared_ptr<CoreHandlers> m_core_handlers; std::shared_ptr<CoreHandlers> m_core_handlers;
std::shared_ptr<MessageHandlers> m_message_handlers;
}; };
#endif // CHAT_MODEL_H_ #endif // CHAT_MODEL_H_
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment