From 7b3c568a74529696f101ac805af97b4610710195 Mon Sep 17 00:00:00 2001
From: Julien Wadel <julien.wadel@belledonne-communications.com>
Date: Mon, 4 Jul 2022 17:36:39 +0200
Subject: [PATCH] Remove fallback displayname on logs and chat rooms. Add a
 printObject() for javascript variables.

---
 CHANGELOG.md                                  | 16 +++++++++++++++
 .../src/components/call/CallModel.cpp         | 20 +++++++++++++------
 2 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 591358206..5913408e2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Crash on exit.
 - Crash when using no account.
 - Memory stability.
+
+## 4.4.8 - 2022-07-04
+
+### Fixes
+- Display name are based on friends (coming from local or LDAP server) and caller address only.
+
+## 4.4.7 - 2022-07-01
+
+### Fixes
+- When receiving a SIP URL, copy it in Smart search bar instead of openning conversation.
+- Update SDK to prepare video conference and improve DTLS handshakes.
+
+## 4.4.6 - 2022-06-14
+
+### Fixed
+- Url version check and selection synchronisation.
 - Show display name of the caller if it exists instead of call logs.
 
 ## 4.4.4 - 2022-06-01
diff --git a/linphone-app/src/components/call/CallModel.cpp b/linphone-app/src/components/call/CallModel.cpp
index f6e7b79ef..a9e5f082a 100644
--- a/linphone-app/src/components/call/CallModel.cpp
+++ b/linphone-app/src/components/call/CallModel.cpp
@@ -94,7 +94,7 @@ CallModel::CallModel (shared_ptr<linphone::Call> call){
 	mSearch = std::make_shared<SearchListener>(this);
 	QObject::connect(mSearch.get(), SIGNAL(searchReceived(std::list<std::shared_ptr<linphone::SearchResult>> )), this, SLOT(searchReceived(std::list<std::shared_ptr<linphone::SearchResult>>)));
 	mMagicSearch->addListener(mSearch);
-	
+
 	if(mCall) {
 		mRemoteAddress = mCall->getRemoteAddress()->clone();
 		if(mCall->getConference())
@@ -103,8 +103,8 @@ CallModel::CallModel (shared_ptr<linphone::Call> call){
 		if(	conferenceInfo ){
 			mConferenceInfoModel = ConferenceInfoModel::create(conferenceInfo);
 		}
+		mMagicSearch->getContactsListAsync(mRemoteAddress->getUsername(),mRemoteAddress->getDomain(), (int)linphone::MagicSearchSource::LdapServers | (int)linphone::MagicSearchSource::Friends, linphone::MagicSearchAggregation::Friend);
 	}
-	mMagicSearch->getContactListFromFilterAsync(mRemoteAddress->getUsername(),mRemoteAddress->getDomain());
 }
 
 CallModel::~CallModel () {
@@ -851,10 +851,11 @@ void CallModel::toggleSpeakerMute(){
 // -----------------------------------------------------------------------------
 
 // Set remote display name when a search has been done
+// Local Friend > LDAP friend > Address > others
 void CallModel::searchReceived(std::list<std::shared_ptr<linphone::SearchResult>> results){
 	bool found = false;
 	for(auto it = results.begin() ; it != results.end() && !found ; ++it){
-		if((*it)->getFriend()){
+		if((*it)->getFriend()){// Local Friend
 			if((*it)->getFriend()->getAddress()->weakEqual(mRemoteAddress)){
 				setRemoteDisplayName((*it)->getFriend()->getName());
 				found = true;
@@ -862,9 +863,16 @@ void CallModel::searchReceived(std::list<std::shared_ptr<linphone::SearchResult>
 		}else{
 			if((*it)->getAddress()->weakEqual(mRemoteAddress)){
 				std::string newDisplayName = (*it)->getAddress()->getDisplayName();
-				if( ((*it)->getSourceFlags() & (int) linphone::MagicSearchSource::CallLogs) == 0 || newDisplayName.empty())
-					setRemoteDisplayName(newDisplayName);
-				found = true;
+				if(!newDisplayName.empty()){
+				// LDAP friend
+					if( ((*it)->getSourceFlags() & (int) linphone::MagicSearchSource::LdapServers) == (int) linphone::MagicSearchSource::LdapServers){
+						setRemoteDisplayName(newDisplayName);
+						found = true;
+					}else if( Utils::coreStringToAppString(mRemoteAddress->getDisplayName()).isEmpty()){
+						setRemoteDisplayName(newDisplayName);	
+						found = true;
+					}
+				}
 			}
 		}
 	}