Move AutoStart under the save scope in settings

Linphone/core/setting/SettingsCore.cpp

@@ -64,6 +64,9 @@ SettingsCore::SettingsCore(QObject *parent) : QObject(parent) {
 	// Network
 	mIpv6Enabled = settingsModel->getIpv6Enabled();
 
+	// Advanced
+	mAutoStart = settingsModel->getAutoStart();
+
 	// Audio
 	mCaptureDevices = settingsModel->getCaptureDevices();
 	mPlaybackDevices = settingsModel->getPlaybackDevices();
@@ -135,7 +138,6 @@ SettingsCore::SettingsCore(QObject *parent) : QObject(parent) {
 	INIT_CORE_MEMBER(AutoStart, settingsModel)
 	INIT_CORE_MEMBER(ExitOnClose, settingsModel)
 	INIT_CORE_MEMBER(SyncLdapContacts, settingsModel)
-	INIT_CORE_MEMBER(Ipv6Enabled, settingsModel)
 	INIT_CORE_MEMBER(ConfigLocale, settingsModel)
 	INIT_CORE_MEMBER(DownloadFolder, settingsModel)
 
@@ -165,9 +167,6 @@ SettingsCore::SettingsCore(const SettingsCore &settingsCore) {
 	mAutoDownloadReceivedFiles = settingsCore.mAutoDownloadReceivedFiles;
 	mAutomaticallyRecordCallsEnabled = settingsCore.mAutomaticallyRecordCallsEnabled;
 
-	// Network
-	mIpv6Enabled = settingsCore.mIpv6Enabled;
-
 	// Audio
 	mCaptureDevices = settingsCore.mCaptureDevices;
 	mPlaybackDevices = settingsCore.mPlaybackDevices;
@@ -216,10 +215,10 @@ SettingsCore::SettingsCore(const SettingsCore &settingsCore) {
 	mAssistantGoDirectlyToThirdPartySipAccountLogin = settingsCore.mAssistantGoDirectlyToThirdPartySipAccountLogin;
 	mAssistantThirdPartySipAccountDomain = settingsCore.mAssistantThirdPartySipAccountDomain;
 	mAssistantThirdPartySipAccountTransport = settingsCore.mAssistantThirdPartySipAccountTransport;
-	mAutoStart = settingsCore.mAutoStart;
 	mExitOnClose = settingsCore.mExitOnClose;
 	mSyncLdapContacts = settingsCore.mSyncLdapContacts;
 	mIpv6Enabled = settingsCore.mIpv6Enabled;
+	mAutoStart = settingsCore.mAutoStart;
 	mConfigLocale = settingsCore.mConfigLocale;
 	mDownloadFolder = settingsCore.mDownloadFolder;
 	mShortcutCount = settingsCore.mShortcutCount;
@@ -266,11 +265,20 @@ void SettingsCore::setSelf(QSharedPointer<SettingsCore> me) {
 		    mSettingsModelConnection->invokeToCore([this, enabled]() { setEchoCancellationEnabled(enabled); });
 	    });
 
-	// IP V6
+	// IPV6
 	mSettingsModelConnection->makeConnectToModel(&SettingsModel::ipv6EnabledChanged, [this](const bool enabled) {
 		mSettingsModelConnection->invokeToCore([this, enabled]() { setIpv6Enabled(enabled); });
 	});
 
+	// AutoStart
+	mSettingsModelConnection->makeConnectToModel(&SettingsModel::autoStartChanged, [this](const bool enabled) {
+		mSettingsModelConnection->invokeToCore([this, enabled]() {
+			bool emitSignal = mAutoStart != enabled;
+			setAutoStart(enabled);
+			if (emitSignal) emit autoStartChanged();
+		});
+	});
+
 	// Auto download incoming files
 	mSettingsModelConnection->makeConnectToModel(
 	    &SettingsModel::autoDownloadReceivedFilesChanged, [this](const bool enabled) {
@@ -461,8 +469,6 @@ void SettingsCore::setSelf(QSharedPointer<SettingsCore> me) {
 	                           ExitOnClose)
 	DEFINE_CORE_GETSET_CONNECT(mSettingsModelConnection, SettingsCore, SettingsModel, settingsModel, bool,
 	                           syncLdapContacts, SyncLdapContacts)
-	DEFINE_CORE_GETSET_CONNECT(mSettingsModelConnection, SettingsCore, SettingsModel, settingsModel, bool, ipv6Enabled,
-	                           Ipv6Enabled)
 	DEFINE_CORE_GETSET_CONNECT(mSettingsModelConnection, SettingsCore, SettingsModel, settingsModel, QString,
 	                           configLocale, ConfigLocale)
 	DEFINE_CORE_GETSET_CONNECT(mSettingsModelConnection, SettingsCore, SettingsModel, settingsModel, QString,
@@ -519,9 +525,6 @@ void SettingsCore::reset(const SettingsCore &settingsCore) {
 	setEchoCancellationEnabled(settingsCore.mEchoCancellationEnabled);
 	setAutomaticallyRecordCallsEnabled(settingsCore.mAutomaticallyRecordCallsEnabled);
 
-	// Network
-	setIpv6Enabled(settingsCore.mIpv6Enabled);
-
 	setAutoDownloadReceivedFiles(settingsCore.mAutoDownloadReceivedFiles);
 	// Audio
 	setCaptureDevices(settingsCore.mCaptureDevices);
@@ -573,11 +576,11 @@ void SettingsCore::reset(const SettingsCore &settingsCore) {
 	setAssistantGoDirectlyToThirdPartySipAccountLogin(settingsCore.mAssistantGoDirectlyToThirdPartySipAccountLogin);
 	setAssistantThirdPartySipAccountDomain(settingsCore.mAssistantThirdPartySipAccountDomain);
 	setAssistantThirdPartySipAccountTransport(settingsCore.mAssistantThirdPartySipAccountTransport);
-	setAutoStart(settingsCore.mAutoStart);
 	setExitOnClose(settingsCore.mExitOnClose);
 	setSyncLdapContacts(settingsCore.mSyncLdapContacts);
 	setCardDAVMinCharForResearch(settingsCore.mCardDAVMinCharForResearch);
 	setIpv6Enabled(settingsCore.mIpv6Enabled);
+	setAutoStart(settingsCore.mAutoStart);
 	setConfigLocale(settingsCore.mConfigLocale);
 	setDownloadFolder(settingsCore.mDownloadFolder);
 }
@@ -646,6 +649,13 @@ void SettingsCore::setIpv6Enabled(bool enabled) {
 	}
 }
 
+void SettingsCore::setAutoStart(bool enabled) {
+	if (mAutoStart != enabled) {
+		mAutoStart = enabled;
+		setIsSaved(false);
+	}
+}
+
 void SettingsCore::setAutoDownloadReceivedFiles(bool enabled) {
 	if (mAutoDownloadReceivedFiles != enabled) {
 		mAutoDownloadReceivedFiles = enabled;
@@ -1044,10 +1054,6 @@ void SettingsCore::setShowAccountDevices(bool show) {
 	}
 }
 
-bool SettingsCore::getAutoStart() const {
-	return mAutoStart;
-}
-
 bool SettingsCore::getExitOnClose() const {
 	return mExitOnClose;
 }
@@ -1089,9 +1095,6 @@ void SettingsCore::writeIntoModel(std::shared_ptr<SettingsModel> model) const {
 	model->setEchoCancellationEnabled(mEchoCancellationEnabled);
 	model->setAutomaticallyRecordCallsEnabled(mAutomaticallyRecordCallsEnabled);
 
-	// Network
-	model->setIpv6Enabled(mIpv6Enabled);
-
 	// Chat
 	model->setAutoDownloadReceivedFiles(mAutoDownloadReceivedFiles);
 
@@ -1139,10 +1142,10 @@ void SettingsCore::writeIntoModel(std::shared_ptr<SettingsModel> model) const {
 	model->setAssistantGoDirectlyToThirdPartySipAccountLogin(mAssistantGoDirectlyToThirdPartySipAccountLogin);
 	model->setAssistantThirdPartySipAccountDomain(mAssistantThirdPartySipAccountDomain);
 	model->setAssistantThirdPartySipAccountTransport(mAssistantThirdPartySipAccountTransport);
-	model->setAutoStart(mAutoStart);
 	model->setExitOnClose(mExitOnClose);
 	model->setSyncLdapContacts(mSyncLdapContacts);
 	model->setIpv6Enabled(mIpv6Enabled);
+	model->setAutoStart(mAutoStart);
 	model->setConfigLocale(mConfigLocale);
 	model->setDownloadFolder(mDownloadFolder);
 }
@@ -1163,8 +1166,8 @@ void SettingsCore::writeFromModel(const std::shared_ptr<SettingsModel> &model) {
 	mRingtoneFileName =
 	    ringtone.exists() ? ringtone.fileName() : mRingtonePath.right(mRingtonePath.lastIndexOf(QDir::separator()));
 
-	// Network
+	// Advanced
-	mIpv6Enabled = model->getIpv6Enabled();
+	mAutoStart = model->getAutoStart();
 
 	// Chat
 	mAutoDownloadReceivedFiles = model->getAutoDownloadReceivedFiles();
@@ -1224,6 +1227,7 @@ void SettingsCore::writeFromModel(const std::shared_ptr<SettingsModel> &model) {
 	mSyncLdapContacts = model->getSyncLdapContacts();
 	mCardDAVMinCharForResearch = model->getCardDAVMinCharResearch();
 	mIpv6Enabled = model->getIpv6Enabled();
+	mAutoStart = model->getAutoStart();
 	mConfigLocale = model->getConfigLocale();
 	mDownloadFolder = model->getDownloadFolder();
 }
@@ -1235,6 +1239,7 @@ bool SettingsCore::isCheckForUpdateAvailable() const {
 void SettingsCore::save() {
 	mustBeInMainThread(getClassName() + Q_FUNC_INFO);
 	SettingsCore *thisCopy = new SettingsCore(*this);
+	emit autoStartChanged();
 	if (SettingsModel::getInstance()) {
 		mSettingsModelConnection->invokeToModel([this, thisCopy] {
 			mustBeInLinphoneThread(getClassName() + Q_FUNC_INFO);

Linphone/core/setting/SettingsCore.hpp

@@ -65,6 +65,9 @@ public:
 	// Network
 	Q_PROPERTY(bool ipv6Enabled READ getIpv6Enabled WRITE setIpv6Enabled NOTIFY ipv6EnabledChanged)
 
+	// Advanced
+	Q_PROPERTY(bool autoStart READ getAutoStart WRITE setAutoStart NOTIFY autoStartChanged)
+
 	Q_PROPERTY(
 	    QVariantMap conferenceLayout READ getConferenceLayout WRITE setConferenceLayout NOTIFY conferenceLayoutChanged)
 	Q_PROPERTY(
@@ -205,6 +208,13 @@ public:
 	}
 	void setIpv6Enabled(bool enabled);
 
+	// Advanced. --------------------------------------------------------------------
+
+	bool getAutoStart() {
+		return mAutoStart;
+	}
+	void setAutoStart(bool enabled);
+
 	bool getLogsEnabled() const;
 	void setLogsEnabled(bool enabled);
 
@@ -252,7 +262,6 @@ public:
 	                           AssistantGoDirectlyToThirdPartySipAccountLogin)
 	DECLARE_CORE_GETSET_MEMBER(QString, assistantThirdPartySipAccountDomain, AssistantThirdPartySipAccountDomain)
 	DECLARE_CORE_GETSET_MEMBER(QString, assistantThirdPartySipAccountTransport, AssistantThirdPartySipAccountTransport)
-	DECLARE_CORE_GETSET(bool, autoStart, AutoStart)
 	DECLARE_CORE_GETSET(bool, exitOnClose, ExitOnClose)
 	DECLARE_CORE_GETSET(bool, syncLdapContacts, SyncLdapContacts)
 	DECLARE_CORE_GETSET(QString, configLocale, ConfigLocale)
@@ -298,6 +307,9 @@ signals:
 	// Network
 	void ipv6EnabledChanged();
 
+	// Advanced
+	void autoStartChanged();
+
 	void conferenceLayoutsChanged(const QVariantList &layouts);
 	void mediaEncryptionsChanged(const QVariantList &encryptions);
 
@@ -399,6 +411,9 @@ private:
 	// Network
 	bool mIpv6Enabled;
 
+	// Advanced
+	bool mAutoStart;
+
 	// Debug logs
 	bool mLogsEnabled;
 	bool mFullLogsEnabled;