mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-05-07 14:44:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove fallback displayname on logs and chat rooms.

Browse source 
Add a printObject() for javascript variables.
This commit is contained in:
Julien Wadel 2022-07-04 17:36:39 +02:00
parent 74932a19a7
commit 7b3c568a74
2 changed files with 30 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
CHANGELOG.md
View file

@ -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

20
linphone-app/src/components/call/CallModel.cpp
View file

@ -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;
}
}
}
}
}