mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-01-17 19:38:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(src/components/chat/ChatModel): handle correctly call state

Browse source
This commit is contained in:
Ronan Abhamon 2017-04-12 11:15:34 +02:00
parent 71b04c5ece
commit 8fedfb58ac
5 changed files with 24 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
linphone-desktop/src/components/chat/ChatModel.cpp
View file

@ -176,25 +176,8 @@ ChatModel::ChatModel (QObject *parent) : QAbstractListModel(parent) {
core->getSipAddressesModel()->connectToChatModel(this);
QObject::connect(
&(*m_core_handlers), &CoreHandlers::messageReceived,
this, [this](const shared_ptr<linphone::ChatMessage> &message) {
if (m_chat_room == message->getChatRoom()) {
insertMessageAtEnd(message);
resetMessagesCount();
emit messageReceived(message);
}
}
);
QObject::connect(
&(*m_core_handlers), &CoreHandlers::callStateChanged,
this, [this](const std::shared_ptr<linphone::Call> &call, linphone::CallState state) {
if (state == linphone::CallStateEnd || state == linphone::CallStateError)
insertCall(call->getCallLog());
}
);
QObject::connect(&(*m_core_handlers), &CoreHandlers::messageReceived, this, &ChatModel::handleMessageReceived);
QObject::connect(&(*m_core_handlers), &CoreHandlers::callStateChanged, this, &ChatModel::handleCallStateChanged);
}
ChatModel::~ChatModel () {
@ -580,3 +563,19 @@ void ChatModel::resetMessagesCount () {
m_chat_room->markAsRead();
emit messagesCountReset();
}
// -----------------------------------------------------------------------------
void ChatModel::handleCallStateChanged (const std::shared_ptr<linphone::Call> &call, linphone::CallState state) {
if (m_chat_room == call->getChatRoom() && (state == linphone::CallStateEnd || state == linphone::CallStateError))
insertCall(call->getCallLog());
}
void ChatModel::handleMessageReceived (const std::shared_ptr<linphone::ChatMessage> &message) {
if (m_chat_room == message->getChatRoom()) {
insertMessageAtEnd(message);
resetMessagesCount();
emit messageReceived(message);
}
}

3
linphone-desktop/src/components/chat/ChatModel.hpp
View file

@ -122,6 +122,9 @@ private:
void resetMessagesCount ();
void handleCallStateChanged (const std::shared_ptr<linphone::Call> &call, linphone::CallState state);
void handleMessageReceived (const std::shared_ptr<linphone::ChatMessage> &message);
QList<ChatEntryData> m_entries;
std::shared_ptr<linphone::ChatRoom> m_chat_room;

2
submodules/bctoolbox

@ -1 +1 @@
Subproject commit cb6314384fd108ce206e1467e9c253bc8cddd161
Subproject commit e93227f56dc0c2299de20ac1460bfdb72e8e695b

2
submodules/bzrtp

@ -1 +1 @@
Subproject commit b64ed01b6d7a276fb39d3692ec9e737048135805
Subproject commit 4c37a23c805e7f08c8874d848525a720c165c906

2
submodules/linphone

@ -1 +1 @@
Subproject commit cca2555ca61485dc6ba4cdfb9a5cb17d48665049
Subproject commit 15bc305047eacfc9ff7f8c733bdeef21b0a5842c