mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-05-07 14:44:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Update to master SDK

Browse source 
- Use Opus fix
This commit is contained in:
Julien Wadel 2020-07-29 19:09:39 +02:00
parent 093261d432
commit 4d6a854e00
5 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitlab-ci-files/job-linux-desktop-debian9.yml
View file

@ -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

2
.gitlab-ci-files/job-macosx-desktop.yml
View file

@ -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

6
linphone-app/src/components/chat/ChatModel.cpp
View file

@ -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);
}

5
linphone-app/src/components/core/CoreManager.cpp
View file

@ -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()));
}
}

2
linphone-sdk

@ -1 +1 @@
Subproject commit 459611cfda0186c2d9d1d5d54e7f4b0959ca6d18
Subproject commit 7bb4e40eaf62ec8f6b400370610833b96729a6e9