From 19de0a5d6c355c7c88c1c722003b8e6bf08c73aa Mon Sep 17 00:00:00 2001 From: Julien Wadel Date: Fri, 4 Nov 2022 17:31:29 +0100 Subject: [PATCH] Decorrelate Lime state option from media encryption. --- linphone-app/src/components/settings/SettingsModel.cpp | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/linphone-app/src/components/settings/SettingsModel.cpp b/linphone-app/src/components/settings/SettingsModel.cpp index cbf7d438a..c599ebad6 100644 --- a/linphone-app/src/components/settings/SettingsModel.cpp +++ b/linphone-app/src/components/settings/SettingsModel.cpp @@ -983,9 +983,6 @@ void SettingsModel::setMediaEncryption (MediaEncryption encryption) { if (encryption == getMediaEncryption()) return; - if (encryption != SettingsModel::MediaEncryptionZrtp) - setLimeState(false); - CoreManager::getInstance()->getCore()->setMediaEncryption( static_cast(encryption) ); @@ -1028,10 +1025,7 @@ void SettingsModel::setLimeState (const bool& state) { if (state == getLimeState()) return; - if (state) - setMediaEncryption(SettingsModel::MediaEncryptionZrtp); - - CoreManager::getInstance()->getCore()->enableLimeX3Dh(!state); + CoreManager::getInstance()->getCore()->enableLimeX3Dh(state); emit limeStateChanged(state); }