fix #LINQT-1622 connection succeed popup

set new privacy policy and terms of use urls

fix mic volume tester visibility in call

fix #LINQT-1583 secured avatar on unsecured address in call history

fix #LINQT-1631 zrtp to verify devices

fix #LINQT-1526 title inside stackview to avoid freeze effect

fix #LINQT-1579 spacing in layouts

fix #LINQT-1625 right panel closes before new call starts

crop text sticker

fix verified icon size

Linphone/tool/Constants.hpp

@@ -66,8 +66,8 @@ public:
 	static constexpr char VersionCheckReleaseUrl[] = "https://linphone.org/releases";
 	static constexpr char VersionCheckNightlyUrl[] = "https://linphone.org/snapshots";
 	static constexpr char PasswordRecoveryUrl[] = "https://subscribe.linphone.org/recovery/email";
-	static constexpr char CguUrl[] = "https://www.linphone.org/general-terms";
+	static constexpr char CguUrl[] = "https://www.linphone.org/en/terms-of-use/";
-	static constexpr char PrivatePolicyUrl[] = "https://www.linphone.org/privacy-policy";
+	static constexpr char PrivatePolicyUrl[] = "https://www.linphone.org/en/privacy-policy/";
 	static constexpr char ContactUrl[] = "https://www.linphone.org/contact";
 	static constexpr char TranslationUrl[] = "https://weblate.linphone.org/projects/linphone-desktop/";
 

Linphone/tool/Utils.cpp

@@ -135,6 +135,8 @@ void Utils::createCall(const QString &sipAddress,
                        LinphoneEnums::MediaEncryption mediaEncryption,
                        const QString &prepareTransfertAddress,
                        const QHash<QString, QString> &headers) {
+	// if default value use the settings' value
+	if (mediaEncryption == LinphoneEnums::MediaEncryption::None)
 		mediaEncryption =
 		    App::getInstance()->getSettings()->getMediaEncryption()["id"].value<LinphoneEnums::MediaEncryption>();
 	lDebug() << "[Utils] create call with uri :" << sipAddress << mediaEncryption;

Linphone/view/Control/Container/Call/CallHistoryLayout.qml

@@ -75,7 +75,7 @@ ColumnLayout {
 				_address: mainItem.conferenceInfo
 					? mainItem.conferenceInfo.core.subject
 					: mainItem.contactAddress || mainItem.contactName
-				secured: securityLevel === LinphoneEnums.SecurityLevel.EndToEndEncrypted
+				secured: securityLevel === LinphoneEnums.SecurityLevel.EndToEndEncryptedAndVerified
 			}
 			Item {
 				id: rightButton

Linphone/view/Control/Display/Contact/AllContactListView.qml

@@ -215,7 +215,7 @@ Flickable{
 	ColumnLayout{
 		id: contentsLayout
 		width: parent.width
-		spacing: 0
+		spacing: 20 * DefaultStyle.dp
 		BusyIndicator {
 			Layout.alignment: Qt.AlignCenter
 			Layout.preferredHeight: visible ? 60 * DefaultStyle.dp : 0
@@ -228,6 +228,7 @@ Flickable{
 		
 		ContactListView{
 			id: favoritesList
+			visible: contentHeight > 0
 			Layout.fillWidth: true
 			Layout.preferredHeight: implicitHeight
 			interactive: false
@@ -259,6 +260,7 @@ Flickable{
 	
 		ContactListView{
 			id: contactsList
+			visible: contentHeight > 0
 			Layout.fillWidth: true
 			Layout.preferredHeight: implicitHeight
 			Layout.topMargin: favoritesList.height > 0 ? 4 * DefaultStyle.dp : 0
@@ -296,6 +298,7 @@ Flickable{
 		}
 		ContactListView{
 			id: suggestionsList
+			visible: contentHeight > 0
 			Layout.fillWidth: true
 			Layout.preferredHeight: implicitHeight
 			Layout.topMargin: contactsList.height + favoritesList.height > 0 ? 4 * DefaultStyle.dp : 0

Linphone/view/Control/Display/Contact/Avatar.qml

@@ -41,7 +41,7 @@ Loader{
 	property string computedAvatarUri: avatarObj ? avatarObj.value : ''
 	
 	// To get the secured property for a specific address,
-	// override it as secured: securityLevel === LinphoneEnums.SecurityLevel.EndToEndEncrypted
+	// override it as secured: securityLevel === LinphoneEnums.SecurityLevel.EndToEndEncryptedAndVerified
 	property var securityLevelObj: UtilsCpp.getFriendAddressSecurityLevel(_address)
 	property var securityLevel: securityLevelObj ? securityLevelObj.value : LinphoneEnums.SecurityLevel.None
 	property bool secured: call && call.core.encryption === LinphoneEnums.MediaEncryption.Zrtp

Linphone/view/Control/Display/Sticker.qml

@@ -245,10 +245,13 @@ Item {
 		}
 		Text {
 			anchors.left: parent.left
+			anchors.right: parent.right
 			anchors.bottom: parent.bottom
 			anchors.leftMargin: 10 * DefaultStyle.dp
+			anchors.rightMargin: 10 * DefaultStyle.dp
 			anchors.bottomMargin: 10 * DefaultStyle.dp
 			width: implicitWidth
+			maximumLineCount: 1
 			property string _text: mainItem.displayName != ''
 				? mainItem.displayName
 				: mainItem.account && mainItem.identityAddress

Linphone/view/Control/Form/Login/LoginForm.qml

@@ -8,7 +8,6 @@ import 'qrc:/qt/qml/Linphone/view/Style/buttonStyle.js' as ButtonStyle
 ColumnLayout {
 	id: mainItem
 	spacing: 10 * DefaultStyle.dp
-	signal connectionSucceed()
 
 	FormItemLayout {
 		id: username
@@ -47,11 +46,6 @@ ColumnLayout {
 						if (passwordEdit.text.length > 0 || usernameEdit.text.length > 0)
 							errorText.setText(LoginPageCpp.errorMessage)
 					}
-					function onRegistrationStateChanged() {
-						if (LoginPageCpp.registrationState === LinphoneEnums.RegistrationState.Ok) {
-							mainItem.connectionSucceed()
-						}
-					}
 				}
 			}
 		}

Linphone/view/Control/Form/Settings/MultimediaSettings.qml

@@ -227,7 +227,6 @@ ColumnLayout {
 				}
 			}
 			Connections {
-				enabled: !mainItem.call
 				target: SettingsCpp
 				onMicVolumeChanged: (value) => {
 					audioTestSlider.value = value

Linphone/view/Page/Form/Call/NewCallForm.qml

@@ -64,14 +64,12 @@ FocusScope {
 			}
 			onVisibleChanged: if (!visible) mainItem.numPadPopup.close()
 			contentItem: ColumnLayout {
-				// anchors.fill: parent
+				spacing: 38 * DefaultStyle.dp
-				spacing: 10 * DefaultStyle.dp
 				SearchBar {
 					id: searchBar
 					Layout.alignment: Qt.AlignTop
 					Layout.fillWidth: true
 					Layout.rightMargin: 39 * DefaultStyle.dp
-					//Layout.maximumWidth: mainItem.width
 					focus: true
 					color: mainItem.searchBarColor
 					borderColor: mainItem.searchBarBorderColor

Linphone/view/Page/Form/Login/LoginPage.qml

@@ -14,7 +14,6 @@ LoginLayout {
 	signal useSIPButtonClicked()
 	signal useRemoteConfigButtonClicked()
 	signal goToRegister()
-	signal connectionSucceed()
 
 	titleContent: [
 		BigButton {
@@ -82,7 +81,6 @@ LoginLayout {
 				spacing: 0
 				LoginForm {
 					id: loginForm
-					onConnectionSucceed: mainItem.connectionSucceed()
 				}
 				BigButton {
 					Layout.preferredWidth: loginForm.width

Linphone/view/Page/Form/Login/SIPLoginPage.qml

@@ -11,7 +11,6 @@ LoginLayout {
 	id: mainItem
 	signal goBack()
 	signal goToRegister()
-	signal connectionSucceed()
 	property bool showBackButton: false
 	
 	titleContent: [
@@ -271,11 +270,6 @@ LoginLayout {
 						function onErrorMessageChanged(error) {
 							errorText.setText(error)
 						}
-						function onRegistrationStateChanged() {
-							if (LoginPageCpp.registrationState === LinphoneEnums.RegistrationState.Ok) {
-								mainItem.connectionSucceed()
-							}
-						}
 					}
 				}
 

Linphone/view/Page/Form/Meeting/AddParticipantsForm.qml

@@ -28,6 +28,7 @@ FocusScope{
 		ListView {
 			id: participantList
 			Layout.fillWidth: true
+			visible: contentHeight > 0
 			Layout.preferredHeight: contentHeight
 			Layout.maximumHeight: mainItem.height / 3
 			width: mainItem.width

Linphone/view/Page/Main/Call/CallPage.qml

@@ -81,27 +81,11 @@ AbstractMainPage {
 		id: leftPanel
 		Layout.fillWidth: true
 		Layout.fillHeight: true
-		Loader {
-			id: titleLoader
-			anchors.left: parent.left
-			anchors.leftMargin: 45 * DefaultStyle.dp
-			anchors.right: parent.right
-			asynchronous: false
-			onActiveFocusChanged:{
-				if(activeFocus && item){
-					item.forceActiveFocus()
-				}
-			}
-		}
 
 		Control.StackView {
 			id: listStackView
-			anchors.top: titleLoader.bottom
+			anchors.fill: parent
-			anchors.topMargin: 18 * DefaultStyle.dp
-			anchors.left: parent.left
 			anchors.leftMargin: 45 * DefaultStyle.dp
-			anchors.right: parent.right
-			anchors.bottom: parent.bottom
 			clip: true
 			initialItem: historyListItem
 			focus: true
@@ -129,14 +113,15 @@ AbstractMainPage {
 	}
 
 	Component {
-		id: historyListTitle
+		id: historyListItem
 		FocusScope{
-			objectName: "historyListTitle"
+			objectName: "historyListItem"
-			width: parent.width
+			property alias listView: historyListView
-			height: titleCallLayout.implicitHeight
+			ColumnLayout {
+				anchors.fill: parent
+				spacing: 0
 				RowLayout {
 					id: titleCallLayout
-				anchors.fill: parent
 					spacing: 16 * DefaultStyle.dp
 					Text {
 						text: qsTr("Appels")
@@ -192,19 +177,10 @@ AbstractMainPage {
 						}
 					}
 				}
-		}
-	}
-	Component {
-		id: historyListItem
-		FocusScope{
-			objectName: "historyListItem"
-			property alias listView: historyListView
-			Control.StackView.onActivated: titleLoader.sourceComponent = historyListTitle
-			ColumnLayout {
-				anchors.fill: parent
 				SearchBar {
 					id: searchBar
 					Layout.fillWidth: true
+					Layout.topMargin: 18 * DefaultStyle.dp
 					Layout.rightMargin: 39 * DefaultStyle.dp
 					placeholderText: qsTr("Rechercher un appel")
                     visible: historyListView.count !== 0 || text.length !== 0
@@ -339,6 +315,7 @@ AbstractMainPage {
 											_address: modelData.core.conferenceInfo
 														? modelData.core.conferenceInfo.core.subject
 														: modelData.core.remoteAddress
+											secured: securityLevel === LinphoneEnums.SecurityLevel.EndToEndEncryptedAndVerified
 											width: 45 * DefaultStyle.dp
 											height: 45 * DefaultStyle.dp
 											isConference: modelData.core.isConference
@@ -446,7 +423,6 @@ AbstractMainPage {
 								Control.ScrollBar.vertical: scrollbar
 							}
 						}
-
                     }
                     ScrollBar {
                         id: scrollbar
@@ -463,13 +439,18 @@ AbstractMainPage {
 	}
 
 	Component {
-		id: newCallTitle
+		id: newCallItem
 		FocusScope{
-			objectName: "newCallTitle"
+			objectName: "newCallItem"
-			width: parent.width
+			width: parent?.width
-			height: parent.height
+			height: parent?.height
-			RowLayout {
+			Control.StackView.onActivated:{
+				callContactsList.forceActiveFocus()
+			}
+			ColumnLayout {
 				anchors.fill: parent
+				spacing: 0
+				RowLayout {
 					spacing: 10 * DefaultStyle.dp
 					Button {
 						Layout.preferredWidth: 24 * DefaultStyle.dp
@@ -494,23 +475,9 @@ AbstractMainPage {
 						Layout.fillWidth: true
 					}
 				}
-		}
-	}
-	Component {
-		id: newCallItem
-		FocusScope{
-			objectName: "newCallItem"
-			width: parent?.width
-			height: parent?.height
-			Control.StackView.onActivated:{
-				titleLoader.sourceComponent = newCallTitle
-				callContactsList.forceActiveFocus()
-			}
-			
-			ColumnLayout {
-				anchors.fill: parent
 				NewCallForm {
 					id: callContactsList
+					Layout.topMargin: 18 * DefaultStyle.dp
 					Layout.fillWidth: true
 					Layout.fillHeight: true
 					focus: true
@@ -534,20 +501,22 @@ AbstractMainPage {
 	}
 
 	Component {
-		id: groupCallTitle
+		id: groupCallItem
 		FocusScope{
-			objectName: "groupCallTitle"
+			objectName: "groupCallItem"
-			width: parent.width
+			Control.StackView.onActivated: {
-			height: parent.height
+				addParticipantsLayout.forceActiveFocus()
-			RowLayout {
+			}
+			ColumnLayout {
+				spacing: 0
 				anchors.fill: parent
+				RowLayout {
 					spacing: 10 * DefaultStyle.dp
 					visible: !SettingsCpp.disableMeetingsFeature
 					Button {
 						id: backGroupCallButton
 						style: ButtonStyle.noBackgroundOrange
 						icon.source: AppIcons.leftArrow
-					Layout.leftMargin: 21 * DefaultStyle.dp
 						Layout.preferredWidth: 24 * DefaultStyle.dp
 						Layout.preferredHeight: 24 * DefaultStyle.dp
 						KeyNavigation.down: listStackView
@@ -595,22 +564,9 @@ AbstractMainPage {
 						}
 					}
 				}
-		}
-	}
-
-	Component {
-		id: groupCallItem
-		FocusScope{
-			objectName: "groupCallItem"
-			Control.StackView.onActivated: {
-				titleLoader.sourceComponent = groupCallTitle
-				addParticipantsLayout.forceActiveFocus()
-			}
-			ColumnLayout {
-				spacing: 5 * DefaultStyle.dp
-				anchors.fill: parent
 				RowLayout {
 					spacing: 0
+					Layout.topMargin: 18 * DefaultStyle.dp
 					Layout.rightMargin: 38 * DefaultStyle.dp
 					Text {
 						font.pixelSize: 13 * DefaultStyle.dp
@@ -636,6 +592,7 @@ AbstractMainPage {
 					id: addParticipantsLayout
 					Layout.fillWidth: true
 					Layout.fillHeight: true
+					Layout.topMargin: 15 * DefaultStyle.dp
 					onSelectedParticipantsCountChanged: mainItem.selectedParticipantsCount = selectedParticipantsCount
 					focus: true
 					Connections {

Linphone/view/Page/Main/Contact/ContactPage.qml

@@ -628,11 +628,11 @@ AbstractMainPage {
 											font.pixelSize: 14 * DefaultStyle.dp
 										}
 										Item{Layout.fillWidth: true}
-										Image{
+										EffectImage {
 											visible: listViewModelData.securityLevel === LinphoneEnums.SecurityLevel.EndToEndEncryptedAndVerified
 											source: AppIcons.trusted
-											width: 22 * DefaultStyle.dp
+											Layout.preferredWidth: 22 * DefaultStyle.dp
-											height: 22 * DefaultStyle.dp
+											Layout.preferredHeight: 22 * DefaultStyle.dp
 										}
 										
 										SmallButton {

Linphone/view/Page/Main/Meeting/MeetingPage.qml

@@ -454,14 +454,18 @@ AbstractMainPage {
 		ColumnLayout {
 			property Control.StackView container
 			property ConferenceInfoGui conferenceInfoGui
+			spacing: 18 * DefaultStyle.dp
 			FocusScope{
 				Layout.fillWidth: true
-				Layout.preferredHeight: addParticipantsButtons.implicitHeight
+				Layout.preferredHeight: childrenRect.height
+				ColumnLayout {
+					spacing: 4 * DefaultStyle.dp
+					Layout.fillWidth: true
 					RowLayout {
 						id: addParticipantsButtons
-					spacing: 5 * DefaultStyle.dp
+						spacing: 10 * DefaultStyle.dp
 						Button {
-						id: removeButton
+							id: addParticipantsBackButton
 							style: ButtonStyle.noBackgroundOrange
 							icon.source: AppIcons.leftArrow
 							icon.width: 24 * DefaultStyle.dp
@@ -470,8 +474,6 @@ AbstractMainPage {
 							KeyNavigation.down: addParticipantLayout
 							onClicked: container.pop()
 						}
-					ColumnLayout {
-						spacing: 8 * DefaultStyle.dp
 						Text {
 							text: qsTr("Ajouter des participants")
 							color: DefaultStyle.main1_500_main
@@ -482,9 +484,24 @@ AbstractMainPage {
 							}
 							Layout.fillWidth: true
 						}
+						SmallButton {
+							id: addButton
+							enabled: addParticipantLayout.selectedParticipantsCount.length != 0
+							Layout.leftMargin: 11 * DefaultStyle.dp
+							focus: enabled
+							style: ButtonStyle.main
+							text: qsTr("Ajouter")
+							KeyNavigation.left: addParticipantsBackButton
+							KeyNavigation.down: addParticipantLayout
+							onClicked: {
+								mainItem.addParticipantsValidated(addParticipantLayout.selectedParticipants)
+							}
+						}
+					}
 					Text {
 						text: qsTr("%1 participant%2 sélectionné%2").arg(addParticipantLayout.selectedParticipantsCount).arg(addParticipantLayout.selectedParticipantsCount > 1 ? "s" : "")
 						color: DefaultStyle.main2_500main
+						Layout.leftMargin: addParticipantsBackButton.width + addParticipantsButtons.spacing
 						maximumLineCount: 1
 						font {
 							pixelSize: 12 * DefaultStyle.dp
@@ -493,20 +510,6 @@ AbstractMainPage {
 						Layout.fillWidth: true
 					}
 				}
-					SmallButton {
-						id: addButton
-						enabled: addParticipantLayout.selectedParticipantsCount.length != 0
-						Layout.rightMargin: 21 * DefaultStyle.dp
-						focus: enabled
-						style: ButtonStyle.main
-						text: qsTr("Ajouter")
-						KeyNavigation.left: removeButton
-						KeyNavigation.down: addParticipantLayout
-						onClicked: {
-							mainItem.addParticipantsValidated(addParticipantLayout.selectedParticipants)
-						}
-					}
-				}
 			}
 			AddParticipantsForm {
 				id: addParticipantLayout

Linphone/view/Page/Window/Call/CallsWindow.qml

@@ -647,9 +647,12 @@ AbstractWindow {
 					searchBarBorderColor: DefaultStyle.grey_200
 					numPadPopup: numericPad
 					onContactClicked: (contact) => {
-						rightPanel.visible = false
 						mainWindow.startCallWithContact(contact, false, rightPanel)
 					}
+					Connections {
+						target: mainWindow
+						function onCallChanged(){ if (newCallForm.Control.StackView.status === Control.StackView.Active) rightPanel.visible = false}
+					}
 					
 					NumericPadPopup {
 						id: numericPad

Linphone/view/Page/Window/Main/MainWindow.qml

@@ -29,8 +29,9 @@ AbstractWindow {
 	// 	color: DefaultStyle.grey_100
 	// }
 
-	function openMainPage(){
+	function openMainPage(connectionSucceed){
 		if (mainWindowStackView.currentItem.objectName !== "mainPage") mainWindowStackView.replace(mainPage, StackView.Immediate)
+		if (connectionSucceed) mainWindow.showInformationPopup(qsTr("Connexion réussie"), qsTr("Vous êtes connecté en mode %1").arg("interopérable"))
 	}
 	function goToCallHistory() {
 		openMainPage()
@@ -46,7 +47,7 @@ AbstractWindow {
 	}
 	function transferCallSucceed() {
 		openMainPage()
-		UtilsCpp.showInformationPopup(qsTr("Appel transféré"), qsTr("Votre correspondant a été transféré au contact sélectionné"))
+		mainWindow.showInformationPopup(qsTr("Appel transféré"), qsTr("Votre correspondant a été transféré au contact sélectionné"))
 	}
 	function initStackViewItem() {
 		if(accountProxy && accountProxy.isInitialized) {
@@ -96,6 +97,16 @@ AbstractWindow {
 		}
 	}
 
+	Connections {
+		target: LoginPageCpp
+		function onRegistrationStateChanged() {
+			if (LoginPageCpp.registrationState === LinphoneEnums.RegistrationState.Ok) {
+				openMainPage(true)
+				proposeH264CodecsDownload()
+			}
+		}
+	}
+
 	Loader {
 		id: accountProxyLoader
 		active: AppCpp.coreStarted
@@ -144,10 +155,6 @@ AbstractWindow {
 			onGoBack: openMainPage()
 			onUseSIPButtonClicked: mainWindowStackView.push(sipLoginPage)
 			onGoToRegister: mainWindowStackView.replace(registerPage)
-			onConnectionSucceed: {
-				openMainPage()
-				proposeH264CodecsDownload()
-			}
 			StackView.onActivated:{
 				if (accountProxy?.haveAccount) showBackButton = true
 			}
@@ -164,11 +171,6 @@ AbstractWindow {
 					mainWindowStackView.pop()
 			}
 			onGoToRegister: mainWindowStackView.replace(registerPage)
-			
-			onConnectionSucceed: {
-				openMainPage()
-				proposeH264CodecsDownload()
-			}
 			StackView.onActivated:{
 				if (!SettingsCpp.assistantGoDirectlyToThirdPartySipAccountLogin || accountProxy?.haveAccount) showBackButton = true
 			}