From 0b0aa40cb339bc5c399fe810d6fcd9f52f30c5c2 Mon Sep 17 00:00:00 2001
From: Julien Wadel <julien.wadel@belledonne-communications.com>
Date: Wed, 18 Nov 2020 12:15:21 +0100
Subject: [PATCH] - Remove deprecated sending message functions - Use Opus fix

---
 linphone-app/src/components/chat/ChatModel.cpp   | 6 +++---
 linphone-app/src/components/core/CoreManager.cpp | 5 ++++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/linphone-app/src/components/chat/ChatModel.cpp b/linphone-app/src/components/chat/ChatModel.cpp
index 08f6bdfc6..d50d576eb 100644
--- a/linphone-app/src/components/chat/ChatModel.cpp
+++ b/linphone-app/src/components/chat/ChatModel.cpp
@@ -493,7 +493,7 @@ void ChatModel::sendMessage (const QString &message) {
   _message->addListener(mMessageHandlers);
 
   insertMessageAtEnd(_message);
-  mChatRoom->sendChatMessage(_message);
+  _message->send();
 
   emit messageSent(_message);
 }
@@ -518,7 +518,7 @@ void ChatModel::resendMessage (int id) {
       shared_ptr<linphone::ChatMessage> message = static_pointer_cast<linphone::ChatMessage>(entry.second);
       message->removeListener(mMessageHandlers);// Remove old listener if already exists
       message->addListener(mMessageHandlers);
-      message->resend();
+      message->send();
 
       break;
     }
@@ -559,7 +559,7 @@ void ChatModel::sendFileMessage (const QString &path) {
   createThumbnail(message);
 
   insertMessageAtEnd(message);
-  mChatRoom->sendChatMessage(message);
+  message->send();
 
   emit messageSent(message);
 }
diff --git a/linphone-app/src/components/core/CoreManager.cpp b/linphone-app/src/components/core/CoreManager.cpp
index bcd1d0df0..7927783b8 100644
--- a/linphone-app/src/components/core/CoreManager.cpp
+++ b/linphone-app/src/components/core/CoreManager.cpp
@@ -47,6 +47,8 @@
 #include "CoreHandlers.hpp"
 #include "CoreManager.hpp"
 
+#include <linphone/core.h>
+
 // =============================================================================
 
 using namespace std;
@@ -220,7 +222,8 @@ void CoreManager::setDatabasesPaths () {
   SET_DATABASE_PATH(Friends, Paths::getFriendsListFilePath());
   SET_DATABASE_PATH(CallLogs, Paths::getCallHistoryFilePath());
   if(QFile::exists(Utils::coreStringToAppString(Paths::getMessageHistoryFilePath()))){
-	SET_DATABASE_PATH(Chat, Paths::getMessageHistoryFilePath());// Setting the message database let SDK to migrate data
+	linphone_core_set_chat_database_path(mCore->cPtr(), Paths::getMessageHistoryFilePath().c_str());
+	//SET_DATABASE_PATH(Chat, Paths::getMessageHistoryFilePath());// Setting the message database let SDK to migrate data
 	QFile::remove(Utils::coreStringToAppString(Paths::getMessageHistoryFilePath()));
   }
 }