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

Remove Flexiapi dependency if no QRCode.

Browse source 
Fix SetThreadDescription entry point on Windows 7/8 (SDK update).
This commit is contained in:
Julien Wadel 2022-12-19 11:29:28 +01:00
parent ce2eebdd1a
commit 74d509cade
4 changed files with 24 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
CHANGELOG.md
View file

@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## 5.0.3 - 2022-12-19
### Fixed
- Missing SetThreadDescription entry point on Windows 7/8 (SDK update)
- Add more margin on message's IMDN that was behind the icon menu in chats.
- Remove JSON dependencies on unused Flexiapi.
## 5.0.2 - 2022-12-13
### Fixed

4
CMakeLists.txt
View file

@ -99,6 +99,7 @@ option(ENABLE_BUILD_EXAMPLES "Enable the build of examples" NO)
option(ENABLE_BUILD_VERBOSE "Enable the build generation to be more verbose" NO)
option(ENABLE_DAEMON "Enable the linphone daemon interface." NO)
option(ENABLE_FFMPEG "Build mediastreamer2 with ffmpeg video support." ON)
option(ENABLE_QRCODE "Enable QRCode support" NO)#Experimental
option(ENABLE_SANITIZER "Enable sanitizer." NO)
option(ENABLE_STRICT "Build with strict compilator flags e.g. -Wall -Werror" NO)
option(ENABLE_TESTS "Build with testing binaries of SDK" NO )
@ -137,9 +138,12 @@ list(APPEND APP_OPTIONS "-DENABLE_BUILD_VERBOSE=${ENABLE_BUILD_VERBOSE}")
list(APPEND APP_OPTIONS "-DENABLE_CONSOLE_UI=${ENABLE_CONSOLE_UI}")
list(APPEND APP_OPTIONS "-DENABLE_DAEMON=${ENABLE_DAEMON}")
list(APPEND APP_OPTIONS "-DENABLE_FFMPEG=${ENABLE_FFMPEG}")
list(APPEND APP_OPTIONS "-DENABLE_FLEXIAPI=${ENABLE_QRCODE}")
list(APPEND APP_OPTIONS "-DENABLE_LDAP=${ENABLE_LDAP}")
list(APPEND APP_OPTIONS "-DENABLE_NON_FREE_CODECS=${ENABLE_NON_FREE_CODECS}")
list(APPEND APP_OPTIONS "-DENABLE_OPENH264=${ENABLE_OPENH264}")
list(APPEND APP_OPTIONS "-DENABLE_QRCODE=${ENABLE_QRCODE}")
list(APPEND APP_OPTIONS "-DENABLE_SANITIZER=${ENABLE_SANITIZER}")
list(APPEND APP_OPTIONS "-DENABLE_STRICT=${ENABLE_STRICT}")
list(APPEND APP_OPTIONS "-DENABLE_TESTS=${ENABLE_TESTS}")

12
linphone-app/src/components/assistant/AssistantModel.cpp
View file

@ -28,7 +28,9 @@
#include "AssistantModel.hpp"
#ifdef ENABLE_QRCODE
#include <linphone/FlexiAPIClient.hh>
#endif
#include <QtDebug>
#include <QTimer>
@ -282,6 +284,7 @@ bool AssistantModel::addOtherSipAccount (const QVariantMap &map) {
void AssistantModel::createTestAccount(){
}
void AssistantModel::generateQRCode(){
#ifdef ENABLE_QRCODE
auto flexiAPIClient = make_shared<FlexiAPIClient>(CoreManager::getInstance()->getCore()->cPtr());
flexiAPIClient
->accountProvision()
@ -291,8 +294,10 @@ void AssistantModel::generateQRCode(){
->error([this](FlexiAPIClient::Response response){
emit newQRCodeNotReceived(Utils::coreStringToAppString(response.body), response.code);
});
#endif
}
void AssistantModel::requestQRCode(){
#ifdef ENABLE_QRCODE
auto flexiAPIClient = make_shared<FlexiAPIClient>(CoreManager::getInstance()->getCore()->cPtr());
flexiAPIClient
@ -305,6 +310,7 @@ void AssistantModel::requestQRCode(){
qWarning() << response.code << " => " << response.body.c_str();
emit newQRCodeNotReceived(Utils::coreStringToAppString(response.body), response.code);
});
#endif
}
void AssistantModel::readQRCode(){
@ -314,6 +320,7 @@ void AssistantModel::newQRCodeNotReceivedTest(){
emit newQRCodeNotReceived("Cannot generate a provisioning key",0);
}
void AssistantModel::checkLinkingAccount(){
#ifdef ENABLE_QRCODE
auto flexiAPIClient = make_shared<FlexiAPIClient>(CoreManager::getInstance()->getCore()->cPtr());
flexiAPIClient
->accountApiKeyFromAuthTokenGenerate(mToken.toStdString())
@ -322,9 +329,11 @@ void AssistantModel::checkLinkingAccount(){
})->error([this](FlexiAPIClient::Response){
QTimer::singleShot(5000, this, &AssistantModel::checkLinkingAccount);
});
#endif
}
void AssistantModel::onApiReceived(QString apiKey){
#ifdef ENABLE_QRCODE
auto flexiAPIClient = make_shared<FlexiAPIClient>(CoreManager::getInstance()->getCore()->cPtr());
flexiAPIClient->setApiKey(Utils::appStringToCoreString(apiKey).c_str())
->accountProvision()
@ -334,6 +343,7 @@ void AssistantModel::onApiReceived(QString apiKey){
//it provisioningTokenReceived("token");
emit this->newQRCodeNotReceived("Cannot generate a provisioning key"+(response.body.empty() ? "" : " : " +Utils::coreStringToAppString(response.body)), response.code);
});
#endif
}
void AssistantModel::onQRCodeFound(const std::string & result){
setIsReadingQRCode(false);
@ -341,6 +351,7 @@ void AssistantModel::onQRCodeFound(const std::string & result){
}
void AssistantModel::attachAccount(const QString& token){
#ifdef ENABLE_QRCODE
auto flexiAPIClient = make_shared<FlexiAPIClient>(CoreManager::getInstance()->getCore()->cPtr());
flexiAPIClient->
accountAuthTokenAttach(Utils::appStringToCoreString(token))
@ -351,6 +362,7 @@ void AssistantModel::attachAccount(const QString& token){
->error([this](FlexiAPIClient::Response response){
emit qRCodeNotAttached("Cannot attach"+ (response.body.empty() ? "" : " : " +Utils::coreStringToAppString(response.body)), response.code);
});
#endif
}
// -----------------------------------------------------------------------------

2
linphone-sdk

@ -1 +1 @@
Subproject commit fa98ed856aa51abb2d3f8443a6a328b905edf5fb
Subproject commit 27c02e232d7fd5facdcd21c2b15d558812ab4151