From 3dace0cc358519ae71470deba5f1732f6333f6ad Mon Sep 17 00:00:00 2001
From: Julien Wadel <julien.wadel@belledonne-communications.com>
Date: Wed, 29 Sep 2021 12:33:24 +0200
Subject: [PATCH] Fix unbind actions on address selection

---
 .../App/Calls/Dialogs/CallSipAddress.qml      | 19 +++++++++++-----
 .../views/App/Calls/Dialogs/CallTransfer.qml  | 22 ++++++++++---------
 .../App/Calls/Dialogs/ConferenceManager.qml   | 14 ++++++++----
 3 files changed, 35 insertions(+), 20 deletions(-)

diff --git a/linphone-app/ui/views/App/Calls/Dialogs/CallSipAddress.qml b/linphone-app/ui/views/App/Calls/Dialogs/CallSipAddress.qml
index 8db60a7a7..4090c6b06 100644
--- a/linphone-app/ui/views/App/Calls/Dialogs/CallSipAddress.qml
+++ b/linphone-app/ui/views/App/Calls/Dialogs/CallSipAddress.qml
@@ -58,28 +58,35 @@ DialogPlus {
 					SipAddressesView {
 						anchors.fill: parent
 						
+						function launchVideoCall(sipAddress){
+							CallsListModel.launchVideoCall(sipAddress)
+							exit(1)
+						}
+						function launchAudioCall(sipAddress){
+							CallsListModel.launchAudioCall(sipAddress, "")
+							exit(1)
+						}
+						
 						actions: [{
 								icon: 'video_call',
 								secure:0,
 								visible:true,
 								handler: function (entry) {
-									handlerSipAddress(entry.sipAddress)
+									launchVideoCall(entry.sipAddress)
 								},
 								visible: SettingsModel.videoSupported && SettingsModel.showStartVideoCallButton,
 								handlerSipAddress: function(sipAddress) {
-									CallsListModel.launchVideoCall(sipAddress)
-									exit(1)
+									launchVideoCall(sipAddress)
 								}
 							}, {
 								icon: 'call',
 								secure:0,
 								visible:true,
 								handler: function (entry) {
-									handlerSipAddress(entry.sipAddress)
+									launchAudioCall(entry.sipAddress)
 								},
 								handlerSipAddress: function(sipAddress) {
-									CallsListModel.launchAudioCall(sipAddress, "")
-									exit(1)
+									launchAudioCall(sipAddress)
 								}
 							}]
 						
diff --git a/linphone-app/ui/views/App/Calls/Dialogs/CallTransfer.qml b/linphone-app/ui/views/App/Calls/Dialogs/CallTransfer.qml
index 798b6e31c..c4395fc7c 100644
--- a/linphone-app/ui/views/App/Calls/Dialogs/CallTransfer.qml
+++ b/linphone-app/ui/views/App/Calls/Dialogs/CallTransfer.qml
@@ -79,21 +79,23 @@ DialogPlus {
 					SipAddressesView {
 						anchors.fill: parent
 						
-						
+						function transfer(sipAddress){
+							if (attended) {
+								var call = CallsListModel.launchAudioCall(sipAddress, callTransfer.call.peerAddress)
+							} else {
+								callTransfer.call.transferTo(sipAddress)
+							}
+							exit(1)
+						}
 						actions: [{
 								icon: 'transfer',
 								secure: 0,
 								visible: true,
-								handler: function (entry) { 
-									handlerSipAddress(entry.sipAddress)
-								},
 								handlerSipAddress: function(sipAddress){
-									if (attended) {
-										var call = CallsListModel.launchAudioCall(sipAddress, callTransfer.call.peerAddress)
-									} else {
-										callTransfer.call.transferTo(sipAddress)
-									}
-									exit(1)
+									transfer(sipAddress)
+								},
+								handler: function (entry) { 
+									transfer(entry.sipAddress)
 								}
 								
 							}]
diff --git a/linphone-app/ui/views/App/Calls/Dialogs/ConferenceManager.qml b/linphone-app/ui/views/App/Calls/Dialogs/ConferenceManager.qml
index 1bf3cc7e7..473bb47be 100644
--- a/linphone-app/ui/views/App/Calls/Dialogs/ConferenceManager.qml
+++ b/linphone-app/ui/views/App/Calls/Dialogs/ConferenceManager.qml
@@ -92,15 +92,18 @@ DialogPlus {
           SipAddressesView {
             anchors.fill: parent
 
+			function transfer(sipAddress){
+				conferenceHelperModel.toAdd.addToConference(sipAddress)
+			}
             actions: [{
               icon: 'transfer',
               secure:0,
               visible: true,
               handler: function (entry) {
-				handlerSipAddress(entry.sipAddress)  
+				transfer(entry.sipAddress)  
               },
               handerSipAddress: function(sipAddress){
-				conferenceHelperModel.toAdd.addToConference(sipAddress)
+				transfer(sipAddress)
               }
               
             }]
@@ -144,15 +147,18 @@ DialogPlus {
 
         anchors.fill: parent
 
+		function cancel(sipAddress){
+			model.removeFromConference(sipAddress)
+		}
         actions: [{
           icon: 'cancel',
           visible:true,
           secure:0,
           handler: function (entry) {
-			  handlerSipAddress(entry.sipAddress)
+			  cancel(entry.sipAddress)
           },
           handlerSipAddress: function(sipAddress){
-			model.removeFromConference(sipAddress)
+			cancel(sipAddress)
           }
         }]