From f45fc98c212f99e34ffe4e4c05929bd67b74513f Mon Sep 17 00:00:00 2001
From: Gaelle Braud <gaelle.braud@belledonne-communications.com>
Date: Thu, 30 May 2024 15:03:15 +0200
Subject: [PATCH] merge : use remote audio video conf uri if any

---
 Linphone/core/call/CallCore.cpp                | 8 +++++---
 Linphone/core/call/CallList.cpp                | 9 ++++++++-
 Linphone/view/Item/Contact/ContactEdition.qml  | 2 +-
 Linphone/view/Layout/Contact/ContactLayout.qml | 2 +-
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/Linphone/core/call/CallCore.cpp b/Linphone/core/call/CallCore.cpp
index eb3c0322d..2bf21af17 100644
--- a/Linphone/core/call/CallCore.cpp
+++ b/Linphone/core/call/CallCore.cpp
@@ -243,9 +243,11 @@ void CallCore::setSelf(QSharedPointer<CallCore> me) {
 				    setRemoteSas(remoteToken);
 			    }
 			    setEncryption(encryption);
-			    setIsSecured((encryption == LinphoneEnums::MediaEncryption::Zrtp && tokenVerified) ||
-			                 encryption == LinphoneEnums::MediaEncryption::Srtp ||
-			                 encryption == LinphoneEnums::MediaEncryption::Dtls);
+			    setIsSecured((encryption == LinphoneEnums::MediaEncryption::Zrtp &&
+			                  tokenVerified)); // ||
+			                                   //  encryption == LinphoneEnums::MediaEncryption::Srtp ||
+			                                   //  encryption == LinphoneEnums::MediaEncryption::Dtls);
+			                                   // TODO : change this when api available in sdk
 		    });
 	    });
 	mCallModelConnection->makeConnectToCore(&CallCore::lSetSpeakerVolumeGain, [this](float gain) {
diff --git a/Linphone/core/call/CallList.cpp b/Linphone/core/call/CallList.cpp
index e6729d57c..b19bceccc 100644
--- a/Linphone/core/call/CallList.cpp
+++ b/Linphone/core/call/CallList.cpp
@@ -98,8 +98,15 @@ void CallList::setSelf(QSharedPointer<CallList> me) {
 			if (currentCall) enablingVideo = currentCall->getCurrentParams()->videoEnabled();
 			if (!conference) {
 				auto parameters = core->createConferenceParams(conference);
+				auto audioVideoConfFactoryUri =
+				    core->getDefaultAccount()->getParams()->getAudioVideoConferenceFactoryAddress();
+				if (audioVideoConfFactoryUri) {
+					parameters->setConferenceFactoryAddress(audioVideoConfFactoryUri);
+					parameters->setSubject("Meeting");
+				} else {
+					parameters->setSubject("Local meeting");
+				}
 				parameters->enableVideo(enablingVideo);
-				parameters->setSubject("Meeting");
 				conference = core->createConferenceWithParams(parameters);
 			}
 
diff --git a/Linphone/view/Item/Contact/ContactEdition.qml b/Linphone/view/Item/Contact/ContactEdition.qml
index 83781f485..76cf7d24d 100644
--- a/Linphone/view/Item/Contact/ContactEdition.qml
+++ b/Linphone/view/Item/Contact/ContactEdition.qml
@@ -273,7 +273,7 @@ RightPanelLayout {
 			Layout.bottomMargin: 100 * DefaultStyle.dp
 			Layout.preferredWidth: 165 * DefaultStyle.dp
 			Layout.alignment: Qt.AlignHCenter
-			enabled: mainItem.contact && mainItem.contact.core.givenName.length > 0
+			enabled: mainItem.contact && mainItem.contact.core.givenName.length > 0 && mainItem.contact.core.allAddresses.length > 0
 			text: mainItem.saveButtonText
 			leftPadding: 20 * DefaultStyle.dp
 			rightPadding: 20 * DefaultStyle.dp
diff --git a/Linphone/view/Layout/Contact/ContactLayout.qml b/Linphone/view/Layout/Contact/ContactLayout.qml
index 5d11a5976..29f90fb1d 100644
--- a/Linphone/view/Layout/Contact/ContactLayout.qml
+++ b/Linphone/view/Layout/Contact/ContactLayout.qml
@@ -126,7 +126,7 @@ ColumnLayout {
 		Layout.preferredHeight: childrenRect.height
 		Button {
 			visible: mainItem.isConference
-			anchors.horizontalCenter: parent.horizontalCenter
+			Layout.alignment: Qt.AlignHCenter
 			text: qsTr("Rejoindre la réunion")
 			color: DefaultStyle.main2_200
 			pressedColor: DefaultStyle.main2_400