From b1d20e0879be7fc17de9e35fe2e32d28a03643f3 Mon Sep 17 00:00:00 2001
From: Julien Wadel <julien.wadel@belledonne-communications.com>
Date: Tue, 29 Jul 2025 11:47:37 +0200
Subject: [PATCH] Activate PointToPoint encryption for conferences

---
 .../src/components/conferenceInfo/ConferenceInfoModel.cpp    | 5 ++---
 linphone-app/ui/views/App/Dialog/NewConference.qml           | 1 -
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/linphone-app/src/components/conferenceInfo/ConferenceInfoModel.cpp b/linphone-app/src/components/conferenceInfo/ConferenceInfoModel.cpp
index 3ccc59fb8..bff35f828 100644
--- a/linphone-app/src/components/conferenceInfo/ConferenceInfoModel.cpp
+++ b/linphone-app/src/components/conferenceInfo/ConferenceInfoModel.cpp
@@ -64,7 +64,7 @@ ConferenceInfoModel::ConferenceInfoModel (QObject * parent) : QObject(parent){
 	mConferenceInfo = linphone::Factory::get()->createConferenceInfo();
 	mIsScheduled = false;
 	if(CoreManager::getInstance()->getSettingsModel()->getSecureChatEnabled())
-		mConferenceInfo->setSecurityLevel(linphone::Conference::SecurityLevel::EndToEnd);
+		mConferenceInfo->setSecurityLevel(linphone::Conference::SecurityLevel::PointToPoint);
 	initDateTime();
 	auto defaultAccount = CoreManager::getInstance()->getCore()->getDefaultAccount();
 	if(defaultAccount){
@@ -335,7 +335,7 @@ void ConferenceInfoModel::setIsEnded(const bool& end){
 void ConferenceInfoModel::setIsSecured(const bool& on){
 	if( on != isSecured()){
 		if(mConferenceInfo)
-			mConferenceInfo->setSecurityLevel(on ? linphone::Conference::SecurityLevel::EndToEnd : linphone::Conference::SecurityLevel::None);
+			mConferenceInfo->setSecurityLevel(on ? linphone::Conference::SecurityLevel::PointToPoint : linphone::Conference::SecurityLevel::None);
 		emit isSecuredChanged();
 	}
 }
@@ -374,7 +374,6 @@ void ConferenceInfoModel::createConference() {
 	CoreManager::getInstance()->getTimelineListModel()->mAutoSelectAfterCreation = false;
 	shared_ptr<linphone::Core> core = CoreManager::getInstance()->getCore();
 	static std::shared_ptr<linphone::Conference> conference;
-	mConferenceInfo->setSecurityLevel(linphone::Conference::SecurityLevel::None); // TODO: remove when conferences can be encrypted
 	qInfo() << "Conference creation of " << getSubject() << " at " << (int)mConferenceInfo->getSecurityLevel() << " security, organized by " << getOrganizer() << " for " << getDateTimeSystem().toString();
 	qInfo() << "Participants:";
 	for(auto p : mConferenceInfo->getParticipants())
diff --git a/linphone-app/ui/views/App/Dialog/NewConference.qml b/linphone-app/ui/views/App/Dialog/NewConference.qml
index b8b6d1967..f24707184 100644
--- a/linphone-app/ui/views/App/Dialog/NewConference.qml
+++ b/linphone-app/ui/views/App/Dialog/NewConference.qml
@@ -51,7 +51,6 @@ DialogPlus {
 			Layout.alignment: Qt.AlignLeft
 			Layout.leftMargin: 15
 			spacing:4
-			visible: false  // TODO: remove when conferences can be encrypted
 			Text {
 				Layout.fillWidth: true
 				//: 'Would you like to encrypt your meeting ?' : Ask about setting the meeting as secured.