data/linux.x86.linphone
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix forcing log_collection_upload_server_url

Browse source
This commit is contained in:
Julien Wadel 2024-12-03 18:53:38 +01:00
parent 6f3cd83981
commit a3221e9d8e
4 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Linphone/data/config/linphonerc-factory
View file

@ -22,7 +22,6 @@ username_regex=^[a-z0-9+_.\-]*$
lime_update_threshold=86400 lime_update_threshold=86400
[misc] [misc]
log_collection_upload_server_url=https://www.linphone.org:444/lft.php
aggregate_imdn=1 aggregate_imdn=1
enable_basic_to_client_group_chat_room_migration=0 enable_basic_to_client_group_chat_room_migration=0
enable_simple_group_chat_message_state=0 enable_simple_group_chat_message_state=0

2
Linphone/model/core/CoreModel.cpp
View file

@ -102,6 +102,8 @@ void CoreModel::start() {
videoPolicy->setAutomaticallyAccept(true); videoPolicy->setAutomaticallyAccept(true);
videoPolicy->setAutomaticallyInitiate(false); videoPolicy->setAutomaticallyInitiate(false);
mCore->setVideoActivationPolicy(videoPolicy); mCore->setVideoActivationPolicy(videoPolicy);
if (mCore->getLogCollectionUploadServerUrl().empty())
mCore->setLogCollectionUploadServerUrl(Constants::DefaultUploadLogsServer);
mIterateTimer->start(); mIterateTimer->start();
} }
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------

15
Linphone/model/setting/SettingsModel.cpp
View file

@ -457,6 +457,21 @@ QString SettingsModel::getLogsFolder(const shared_ptr<linphone::Config> &config)
: Paths::getLogsDirPath(); : 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 { void SettingsModel::cleanLogs() const {
mustBeInLinphoneThread(log().arg(Q_FUNC_INFO)); mustBeInLinphoneThread(log().arg(Q_FUNC_INFO));
CoreModel::getInstance()->getCore()->resetLogCollection(); CoreModel::getInstance()->getCore()->resetLogCollection();

1
Linphone/model/setting/SettingsModel.hpp
View file

@ -159,6 +159,7 @@ public:
DECLARE_GETSET(QString, downloadFolder, DownloadFolder) DECLARE_GETSET(QString, downloadFolder, DownloadFolder)
signals: signals:
void logsUploadUrlChanged();
// VFS. -------------------------------------------------------------------- // VFS. --------------------------------------------------------------------
void vfsEnabledChanged(bool enabled); void vfsEnabledChanged(bool enabled);