From 4fcb0110d08b0b763a16cd72a5b76535be00a211 Mon Sep 17 00:00:00 2001
From: Julien Wadel <julien.wadel@belledonne-communications.com>
Date: Tue, 20 Sep 2022 19:00:56 +0200
Subject: [PATCH] Fix paused avatar. Fix getting old design on incoming call.
 Fix  "alone conference" message on one-one. Fix complex address display with
 tags in wiating room and incall.

---
 linphone-app/ui/modules/Linphone/Calls/IncallAvatar.qml | 2 +-
 linphone-app/ui/views/App/Calls/CallsWindow.js          | 4 ++--
 linphone-app/ui/views/App/Calls/Incall.qml              | 7 ++++---
 linphone-app/ui/views/App/Calls/WaitingRoom.qml         | 2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/linphone-app/ui/modules/Linphone/Calls/IncallAvatar.qml b/linphone-app/ui/modules/Linphone/Calls/IncallAvatar.qml
index 5c819c169..2706c30ff 100644
--- a/linphone-app/ui/modules/Linphone/Calls/IncallAvatar.qml
+++ b/linphone-app/ui/modules/Linphone/Calls/IncallAvatar.qml
@@ -42,7 +42,7 @@ Avatar {
 			return null;
 	}
 	
-	username: _username ? _username : ''
+	username: !mainItem.isPaused &&  _username ? _username : ''
 	Text {
 		anchors.fill: parent
 		color: CallStyle.container.pause.text.color
diff --git a/linphone-app/ui/views/App/Calls/CallsWindow.js b/linphone-app/ui/views/App/Calls/CallsWindow.js
index 8a14a0032..c06e26ae4 100644
--- a/linphone-app/ui/views/App/Calls/CallsWindow.js
+++ b/linphone-app/ui/views/App/Calls/CallsWindow.js
@@ -86,8 +86,8 @@ function getContent (call, conferenceInfoModel) {
 	}
 	var CallModel = Linphone.CallModel
 	if (status === CallModel.CallStatusIncoming) {
-		console.log("incomingCall")
-		return incomingCall
+		console.log("waitingRoom")
+		return waitingRoom
 	}
 	if( window.conferenceInfoModel != call.conferenceInfoModel) {
 		Qt.callLater(function(){window.conferenceInfoModel = call.conferenceInfoModel})
diff --git a/linphone-app/ui/views/App/Calls/Incall.qml b/linphone-app/ui/views/App/Calls/Incall.qml
index 400481ced..74759c2c0 100644
--- a/linphone-app/ui/views/App/Calls/Incall.qml
+++ b/linphone-app/ui/views/App/Calls/Incall.qml
@@ -48,7 +48,7 @@ Rectangle {
 								&& conferenceLayout.item && conferenceLayout.status == Loader.Ready
 	function updateMessageBanner(){
 		//: ''You are alone in this conference' : Text in message banner when the user is the only participant.
-		if( isReady && participantCount <= 1) messageBanner.noticeBannerText = qsTr('aloneInConference')
+		if( conferenceModel && isReady && participantCount <= 1) messageBanner.noticeBannerText = qsTr('aloneInConference')
 	}
 	Timer{
 		id: delayMessageBanner
@@ -183,11 +183,12 @@ Rectangle {
 		// Title
 		Item{
 			Layout.fillWidth: true
-			Layout.preferredHeight: title.contentHeight
+			Layout.preferredHeight: title.contentHeight + address.contentHeight
 			ColumnLayout{
 				anchors.fill: parent
 				Text{
 					id: title
+					Layout.alignment: Qt.AlignHCenter
 					Timer{
 						id: elapsedTimeRefresher
 						running: true
@@ -215,7 +216,7 @@ Rectangle {
 					horizontalAlignment: Qt.AlignHCenter
 					visible: !conferenceModel && callModel && !callModel.isConference
 					text: !conferenceModel && callModel
-								? callModel.peerAddress
+								? SipAddressesModel.cleanSipAddress(callModel.peerAddress)
 								: ''
 					color: IncallStyle.title.color
 					font.pointSize: IncallStyle.title.addressPointSize
diff --git a/linphone-app/ui/views/App/Calls/WaitingRoom.qml b/linphone-app/ui/views/App/Calls/WaitingRoom.qml
index 1ba2085fd..d37bc5f7b 100644
--- a/linphone-app/ui/views/App/Calls/WaitingRoom.qml
+++ b/linphone-app/ui/views/App/Calls/WaitingRoom.qml
@@ -201,7 +201,7 @@ Rectangle {
 			}
 			Text{
 				Layout.fillWidth: true
-				text: mainItem.callModel && mainItem.callModel.peerAddress
+				text: mainItem.callModel && SipAddressesModel.cleanSipAddress(mainItem.callModel.peerAddress)
 				color: WaitingRoomStyle.callee.color
 				font.pointSize:  WaitingRoomStyle.callee.addressPointSize
 				horizontalAlignment: Text.AlignHCenter