From 4d6a854e0083652afbafb9dce46919ce12a16232 Mon Sep 17 00:00:00 2001
From: Julien Wadel <julien.wadel@belledonne-communications.com>
Date: Wed, 29 Jul 2020 19:09:39 +0200
Subject: [PATCH] - Update to master SDK - Use Opus fix

---
 .gitlab-ci-files/job-linux-desktop-debian9.yml   | 2 +-
 .gitlab-ci-files/job-macosx-desktop.yml          | 2 +-
 linphone-app/src/components/chat/ChatModel.cpp   | 6 +++---
 linphone-app/src/components/core/CoreManager.cpp | 5 ++++-
 linphone-sdk                                     | 2 +-
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci-files/job-linux-desktop-debian9.yml b/.gitlab-ci-files/job-linux-desktop-debian9.yml
index 1da0b08a9..0db3562f8 100644
--- a/.gitlab-ci-files/job-linux-desktop-debian9.yml
+++ b/.gitlab-ci-files/job-linux-desktop-debian9.yml
@@ -139,7 +139,7 @@ job-debian9-makefile-clang-deploy:
        - $NIGHTLY_MASTER
        - $DEPLOY_LINUX
   script:
-    - rsync -rlv --ignore-existing build/OUTPUT/Packages/*.AppImage $DEPLOY_SERVER:APPIMAGE_UPLOAD_DIRECTORY/    
+    - rsync -rlv --ignore-existing build/OUTPUT/Packages/*.AppImage $DEPLOY_SERVER:$APPIMAGE_UPLOAD_DIRECTORY/    
     
 #################################################
 # Debug
diff --git a/.gitlab-ci-files/job-macosx-desktop.yml b/.gitlab-ci-files/job-macosx-desktop.yml
index 89dffa42f..0b877bad4 100644
--- a/.gitlab-ci-files/job-macosx-desktop.yml
+++ b/.gitlab-ci-files/job-macosx-desktop.yml
@@ -114,4 +114,4 @@ job-macosx-makefile-deploy:
        - $NIGHTLY_MASTER
        - $DEPLOY_MACOSX
   script:
-    - rsync -rlv --ignore-existing build/OUTPUT/Packages/Linphone*.dmg $DEPLOY_SERVER:MACOSX_UPLOAD_DIRECTORY
+    - rsync -rlv --ignore-existing build/OUTPUT/Packages/Linphone*.dmg $DEPLOY_SERVER:$MACOSX_UPLOAD_DIRECTORY
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 fa2a35c42..2e32860fd 100644
--- a/linphone-app/src/components/core/CoreManager.cpp
+++ b/linphone-app/src/components/core/CoreManager.cpp
@@ -46,6 +46,8 @@
 #include "CoreHandlers.hpp"
 #include "CoreManager.hpp"
 
+#include <linphone/core.h>
+
 // =============================================================================
 
 using namespace std;
@@ -212,7 +214,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()));
   }
 }
diff --git a/linphone-sdk b/linphone-sdk
index 459611cfd..7bb4e40ea 160000
--- a/linphone-sdk
+++ b/linphone-sdk
@@ -1 +1 @@
-Subproject commit 459611cfda0186c2d9d1d5d54e7f4b0959ca6d18
+Subproject commit 7bb4e40eaf62ec8f6b400370610833b96729a6e9