diff --git a/Linphone/data/config/linphonerc-factory b/Linphone/data/config/linphonerc-factory index f92bca5e4..086c87507 100644 --- a/Linphone/data/config/linphonerc-factory +++ b/Linphone/data/config/linphonerc-factory @@ -22,7 +22,6 @@ username_regex=^[a-z0-9+_.\-]*$ lime_update_threshold=86400 [misc] -log_collection_upload_server_url=https://www.linphone.org:444/lft.php aggregate_imdn=1 enable_basic_to_client_group_chat_room_migration=0 enable_simple_group_chat_message_state=0 diff --git a/Linphone/model/core/CoreModel.cpp b/Linphone/model/core/CoreModel.cpp index 28453f902..117caa611 100644 --- a/Linphone/model/core/CoreModel.cpp +++ b/Linphone/model/core/CoreModel.cpp @@ -102,6 +102,8 @@ void CoreModel::start() { videoPolicy->setAutomaticallyAccept(true); videoPolicy->setAutomaticallyInitiate(false); mCore->setVideoActivationPolicy(videoPolicy); + if (mCore->getLogCollectionUploadServerUrl().empty()) + mCore->setLogCollectionUploadServerUrl(Constants::DefaultUploadLogsServer); mIterateTimer->start(); } // ----------------------------------------------------------------------------- diff --git a/Linphone/model/setting/SettingsModel.cpp b/Linphone/model/setting/SettingsModel.cpp index 38e5970a3..93d2917bd 100644 --- a/Linphone/model/setting/SettingsModel.cpp +++ b/Linphone/model/setting/SettingsModel.cpp @@ -457,6 +457,21 @@ QString SettingsModel::getLogsFolder(const shared_ptr &config) : Paths::getLogsDirPath(); } +QString SettingsModel::getLogsUploadUrl() const { + mustBeInLinphoneThread(log().arg(Q_FUNC_INFO)); + auto core = CoreModel::getInstance()->getCore(); + return Utils::coreStringToAppString(core->getLogCollectionUploadServerUrl()); +} + +void SettingsModel::setLogsUploadUrl(const QString &serverUrl) { + mustBeInLinphoneThread(log().arg(Q_FUNC_INFO)); + if (serverUrl != getLogsUploadUrl()) { + auto core = CoreModel::getInstance()->getCore(); + core->setLogCollectionUploadServerUrl(Utils::appStringToCoreString(serverUrl)); + emit logsUploadUrlChanged(); + } +} + void SettingsModel::cleanLogs() const { mustBeInLinphoneThread(log().arg(Q_FUNC_INFO)); CoreModel::getInstance()->getCore()->resetLogCollection(); diff --git a/Linphone/model/setting/SettingsModel.hpp b/Linphone/model/setting/SettingsModel.hpp index 3b4064703..64aaf623e 100644 --- a/Linphone/model/setting/SettingsModel.hpp +++ b/Linphone/model/setting/SettingsModel.hpp @@ -159,6 +159,7 @@ public: DECLARE_GETSET(QString, downloadFolder, DownloadFolder) signals: + void logsUploadUrlChanged(); // VFS. -------------------------------------------------------------------- void vfsEnabledChanged(bool enabled);