From 345492adb285dc85d55bd142dad753537a5d9e33 Mon Sep 17 00:00:00 2001 From: Julien Wadel Date: Wed, 25 May 2022 17:35:09 +0200 Subject: [PATCH] Fix encryption enabling when creating an account on the first start of the application. --- CHANGELOG.md | 1 + linphone-app/src/components/assistant/AssistantModel.cpp | 6 +++--- .../src/components/settings/AccountSettingsModel.cpp | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d241809f6..ec0be1028 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Order messages from receiving time. - Fix H264 download URL on Linux. - Hide Admin status in One-to-one chats. +- Encryption wasn't enabled after creating an account with lime url without having to restart the application. ## 4.4.1 - 2022-04-06 diff --git a/linphone-app/src/components/assistant/AssistantModel.cpp b/linphone-app/src/components/assistant/AssistantModel.cpp index 91692cc93..b7c1d3af9 100644 --- a/linphone-app/src/components/assistant/AssistantModel.cpp +++ b/linphone-app/src/components/assistant/AssistantModel.cpp @@ -414,11 +414,11 @@ void AssistantModel::setConfigFilename (const QString &configFilename) { QString configPath = Utils::coreStringToAppString(Paths::getAssistantConfigDirPath()) + configFilename; qInfo() << QStringLiteral("Set config on assistant: `%1`.").arg(configPath); - - CoreManager::getInstance()->getCore()->getConfig()->loadFromXmlFile( + auto core = CoreManager::getInstance()->getCore(); + core->getConfig()->loadFromXmlFile( Utils::appStringToCoreString(configPath) ); - + core->enableLimeX3Dh(core->getLimeX3DhServerUrl() != ""); emit configFilenameChanged(configFilename); } diff --git a/linphone-app/src/components/settings/AccountSettingsModel.cpp b/linphone-app/src/components/settings/AccountSettingsModel.cpp index 26f4aea6c..176a67c49 100644 --- a/linphone-app/src/components/settings/AccountSettingsModel.cpp +++ b/linphone-app/src/components/settings/AccountSettingsModel.cpp @@ -376,6 +376,7 @@ shared_ptr AccountSettingsModel::createProxyConfig (const shared_ptr core = CoreManager::getInstance()->getCore(); qInfo() << QStringLiteral("Set config on assistant: `%1`.").arg(assistantFile); core->getConfig()->loadFromXmlFile(Paths::getAssistantConfigDirPath() + assistantFile.toStdString()); + core->enableLimeX3Dh(core->getLimeX3DhServerUrl() != ""); return core->createProxyConfig(); }