diff --git a/linphone-app/src/components/settings/SettingsModel.cpp b/linphone-app/src/components/settings/SettingsModel.cpp index 96dfd3468..d29c26a6f 100644 --- a/linphone-app/src/components/settings/SettingsModel.cpp +++ b/linphone-app/src/components/settings/SettingsModel.cpp @@ -71,23 +71,23 @@ SettingsModel::SettingsModel (QObject *parent) : QObject(parent) { connect(&mVfsUtils, &VfsUtils::keyRead, this, [&](const QString& key, const QString& value){ if(key == mVfsUtils.getApplicationVfsEncryptionKey()){ - if(!mVfsEncrypted){ - mVfsEncrypted = true; + if(!getVfsEncrypted()){ + mConfig->setBool(UiSection, "vfs_encryption_enabled", true); emit vfsEncryptedChanged(); } } }); connect(&mVfsUtils, &VfsUtils::keyWritten, this, [&](const QString& key){ if(key == mVfsUtils.getApplicationVfsEncryptionKey()){ - if(!mVfsEncrypted){ - mVfsEncrypted = true; + if(!getVfsEncrypted()){ + mConfig->setBool(UiSection, "vfs_encryption_enabled", true); emit vfsEncryptedChanged(); } } }); connect(&mVfsUtils, &VfsUtils::keyDeleted, this, [&](const QString& key){ if(key == mVfsUtils.getApplicationVfsEncryptionKey()){ - mVfsEncrypted = false; + mConfig->setBool(UiSection, "vfs_encryption_enabled", false); emit vfsEncryptedChanged(); if(mVfsUtils.needToDeleteUserData()) Utils::deleteAllUserData(); @@ -1731,8 +1731,7 @@ bool SettingsModel::getLogsEnabled (const shared_ptr &config) // --------------------------------------------------------------------------- bool SettingsModel::getVfsEncrypted (){ - mVfsUtils.readKey(mVfsUtils.getApplicationVfsEncryptionKey()); - return mVfsEncrypted; + return mConfig->getBool(UiSection, "vfs_encryption_enabled", false); } void SettingsModel::setVfsEncrypted (bool encrypted, const bool deleteUserData){ diff --git a/linphone-app/src/components/settings/SettingsModel.hpp b/linphone-app/src/components/settings/SettingsModel.hpp index 3ad985b55..f4167db3e 100644 --- a/linphone-app/src/components/settings/SettingsModel.hpp +++ b/linphone-app/src/components/settings/SettingsModel.hpp @@ -816,7 +816,6 @@ private: MediastreamerUtils::SimpleCaptureGraph *mSimpleCaptureGraph = nullptr; int mCaptureGraphListenerCount = 0; VfsUtils mVfsUtils; - bool mVfsEncrypted = false; std::shared_ptr mConfig; };