From 57e8390eae8347a132cf8ea8ee49b0095ec5c480 Mon Sep 17 00:00:00 2001
From: Ronan Abhamon <ronan.abhamon@belledonne-communications.com>
Date: Wed, 29 Aug 2018 10:19:27 +0200
Subject: [PATCH] fix(SipAddressesModel): handle correctly received/sent
 messages

---
 src/components/sip-addresses/SipAddressesModel.cpp | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/components/sip-addresses/SipAddressesModel.cpp b/src/components/sip-addresses/SipAddressesModel.cpp
index ef10f7617..353c99742 100644
--- a/src/components/sip-addresses/SipAddressesModel.cpp
+++ b/src/components/sip-addresses/SipAddressesModel.cpp
@@ -287,6 +287,7 @@ void SipAddressesModel::handleSipAddressRemoved (ContactModel *contact, const QS
 }
 
 void SipAddressesModel::handleMessageReceived (const shared_ptr<linphone::ChatMessage> &message) {
+  qInfo() << "Handle message received.";
   const QString peerAddress(Utils::coreStringToAppString(message->getChatRoom()->getPeerAddress()->asStringUriOnly()));
   addOrUpdateSipAddress(peerAddress, message);
 }
@@ -405,8 +406,9 @@ void SipAddressesModel::handleMessageCountReset (ChatModel *chatModel) {
 }
 
 void SipAddressesModel::handleMessageSent (const shared_ptr<linphone::ChatMessage> &message) {
-  const QString localAddress(Utils::coreStringToAppString(message->getChatRoom()->getLocalAddress()->asStringUriOnly()));
-  addOrUpdateSipAddress(localAddress, message);
+  qInfo() << "Handle message sent.";
+  const QString peerAddress(Utils::coreStringToAppString(message->getChatRoom()->getPeerAddress()->asStringUriOnly()));
+  addOrUpdateSipAddress(peerAddress, message);
 }
 
 void SipAddressesModel::handleIsComposingChanged (const shared_ptr<linphone::ChatRoom> &chatRoom) {
@@ -455,11 +457,7 @@ void SipAddressesModel::addOrUpdateSipAddress (SipAddressEntry &sipAddressEntry,
   shared_ptr<linphone::ChatRoom> chatRoom(message->getChatRoom());
   int count = chatRoom->getUnreadMessagesCount();
 
-  QString localAddress(Utils::coreStringToAppString(
-    message->isOutgoing()
-      ? chatRoom->getPeerAddress()->asStringUriOnly()
-      : chatRoom->getLocalAddress()->asStringUriOnly()
-  ));
+  QString localAddress(Utils::coreStringToAppString(chatRoom->getLocalAddress()->asStringUriOnly()));
   qInfo() << QStringLiteral("Update (`%1`, `%2`) from chat message.").arg(sipAddressEntry.sipAddress, localAddress);
 
   ConferenceEntry &conferenceEntry = sipAddressEntry.localAddressToConferenceEntry[localAddress];