diff --git a/src/components/settings/SettingsModel.cpp b/src/components/settings/SettingsModel.cpp index 0810aa92c..2f5babde4 100644 --- a/src/components/settings/SettingsModel.cpp +++ b/src/components/settings/SettingsModel.cpp @@ -759,6 +759,19 @@ void SettingsModel::setLogsEnabled (bool status) { // --------------------------------------------------------------------------- +QString SettingsModel::getLogsEmail () const { + return ::Utils::coreStringToAppString( + mConfig->getString(UI_SECTION, "logs_email", "") + ); +} + +void SettingsModel::setLogsEmail (const QString &email) { + mConfig->setString(UI_SECTION, "logs_email", ::Utils::appStringToCoreString(email)); + emit logsEmailChanged(email); +} + +// --------------------------------------------------------------------------- + QString SettingsModel::getLogsFolder (const shared_ptr &config) { return ::Utils::coreStringToAppString( config->getString(UI_SECTION, "logs_folder", Paths::getLogsDirPath()) diff --git a/src/components/settings/SettingsModel.hpp b/src/components/settings/SettingsModel.hpp index de0102c1c..0b71553e7 100644 --- a/src/components/settings/SettingsModel.hpp +++ b/src/components/settings/SettingsModel.hpp @@ -125,6 +125,7 @@ class SettingsModel : public QObject { Q_PROPERTY(QString logsFolder READ getLogsFolder WRITE setLogsFolder NOTIFY logsFolderChanged); Q_PROPERTY(QString logsUploadUrl READ getLogsUploadUrl WRITE setLogsUploadUrl NOTIFY logsUploadUrlChanged); Q_PROPERTY(bool logsEnabled READ getLogsEnabled WRITE setLogsEnabled NOTIFY logsEnabledChanged); + Q_PROPERTY(QString logsEmail READ getLogsEmail WRITE setLogsEmail NOTIFY logsEmailChanged); public: enum MediaEncryption { @@ -295,6 +296,9 @@ public: bool getLogsEnabled () const; void setLogsEnabled (bool status); + QString getLogsEmail () const; + void setLogsEmail (const QString &email); + // --------------------------------------------------------------------------- static QString getLogsFolder (const std::shared_ptr &config); @@ -382,6 +386,7 @@ signals: void logsFolderChanged (const QString &folder); void logsUploadUrlChanged (const QString &url); void logsEnabledChanged (bool status); + void logsEmailChanged (const QString &email); private: std::shared_ptr mConfig; diff --git a/ui/views/App/Settings/SettingsAdvanced.js b/ui/views/App/Settings/SettingsAdvanced.js index 0e27312dd..dd6caa745 100644 --- a/ui/views/App/Settings/SettingsAdvanced.js +++ b/ui/views/App/Settings/SettingsAdvanced.js @@ -22,7 +22,8 @@ function handleLogsUploaded (url) { if (url.length) { sendLogsBlock.stop('') Qt.openUrlExternally( - 'mailto:?subject=' + encodeURIComponent('Desktop Linphone Log') + + 'mailto:' + encodeURIComponent(Linphone.SettingsModel.logsEmail) + + '?subject=' + encodeURIComponent('Desktop Linphone Log') + '&body=' + encodeURIComponent(url) ) } else {