From 0ff0fef7edd70529908d25f56ba13b64539a2618 Mon Sep 17 00:00:00 2001
From: Julien Wadel <julien.wadel@belledonne-communications.com>
Date: Mon, 17 Jul 2023 22:00:20 +0200
Subject: [PATCH] Fix sip address selection. Come back to Home after removing
 call history.

---
 .../Linphone/SmartSearchBar/SmartSearchBar.qml    | 15 +++++----------
 linphone-app/ui/views/App/Main/HistoryView.js     |  1 +
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/linphone-app/ui/modules/Linphone/SmartSearchBar/SmartSearchBar.qml b/linphone-app/ui/modules/Linphone/SmartSearchBar/SmartSearchBar.qml
index 06d38f7a7..4e148de2c 100644
--- a/linphone-app/ui/modules/Linphone/SmartSearchBar/SmartSearchBar.qml
+++ b/linphone-app/ui/modules/Linphone/SmartSearchBar/SmartSearchBar.qml
@@ -64,9 +64,8 @@ SearchBox {
 				secure: 0,
 				visible: true,
 				handler: function (entry) {
-					var sipAddress = entry.sipAddress	// closeMenu() will remove entry. Keep it in memory
+					searchBox.launchVideoCall(entry.sipAddress)
 					searchBox.closeMenu()
-					searchBox.launchVideoCall(sipAddress)
 				},
 				visible: SettingsModel.videoEnabled && SettingsModel.outgoingCallsEnabled && SettingsModel.showStartVideoCallButton
 			}, {
@@ -74,18 +73,16 @@ SearchBox {
 				secure: 0,
 				visible: true,
 				handler: function (entry) {
-					var sipAddress = entry.sipAddress	// closeMenu() will remove entry. Keep it in memory
+					searchBox.launchCall(entry.sipAddress)
 					searchBox.closeMenu()
-					searchBox.launchCall(sipAddress)
 				},
 				visible: SettingsModel.outgoingCallsEnabled
 			}, {
 				colorSet: SettingsModel.getShowStartChatButton() ? SipAddressesViewStyle.chat : SipAddressesViewStyle.history,
 				secure: 0,
 				handler: function (entry) {
-					var sipAddress = entry.sipAddress	// closeMenu() will remove entry. Keep it in memory
+					searchBox.launchChat(entry.sipAddress)
 					searchBox.closeMenu()
-					searchBox.launchChat(sipAddress)
 				},
 				visible: SettingsModel.standardChatEnabled,
 				zz: 'toto'
@@ -94,9 +91,8 @@ SearchBox {
 				secure: 1,
 				visible: SettingsModel.secureChatEnabled && AccountSettingsModel.conferenceUri != '',
 				handler: function (entry) {
-					var sipAddress = entry.sipAddress	// closeMenu() will remove entry. Keep it in memory
+					searchBox.launchSecureChat(entry.sipAddress)
 					searchBox.closeMenu()
-					searchBox.launchSecureChat(sipAddress)
 				}
 			}
 			
@@ -117,9 +113,8 @@ SearchBox {
 		}
 		
 		onEntryClicked: {
-			var entryBackup = entry
+			searchBox.entryClicked(entry)
 			searchBox.closeMenu()
-			searchBox.entryClicked(entryBackup)
 		}
 	}
 }
diff --git a/linphone-app/ui/views/App/Main/HistoryView.js b/linphone-app/ui/views/App/Main/HistoryView.js
index e3b0ce3b8..844d644f2 100644
--- a/linphone-app/ui/views/App/Main/HistoryView.js
+++ b/linphone-app/ui/views/App/Main/HistoryView.js
@@ -34,6 +34,7 @@ function removeAllEntries () {
   }, function (status) {
     if (status) {
       historyProxyModel.removeAllEntries()
+      window.setView('Home')
     }
   })
 }