diff --git a/linphone-app/assets/languages/zh_CN.ts b/linphone-app/assets/languages/zh_CN.ts
index 115c75d54..ccb499e99 100644
--- a/linphone-app/assets/languages/zh_CN.ts
+++ b/linphone-app/assets/languages/zh_CN.ts
@@ -1450,7 +1450,7 @@ Ephemeral message is only supported in conference based chat room!'
conferenceSubjectChangedEvent
- 'New subject : %1' : Little message to show on the event when the subject of the chat romm has been changed. %1 is the new subject.
+ 'New subject : %1' : Little message to show on the event when the subject of the chat room has been changed. %1 is the new subject.
@@ -2417,7 +2417,7 @@ Ephemeral message is only supported in conference based chat room!'timelineFilterSimpleRooms
'Simple rooms' : Filter item
- Selecting it will show all simple romms
+ Selecting it will show all simple roomstimelineFilterSecureRooms
diff --git a/linphone-app/src/components/call/CallModel.cpp b/linphone-app/src/components/call/CallModel.cpp
index cac1ed024..06d309b35 100644
--- a/linphone-app/src/components/call/CallModel.cpp
+++ b/linphone-app/src/components/call/CallModel.cpp
@@ -680,6 +680,11 @@ void CallModel::callEnded(){
void CallModel::setRemoteDisplayName(const std::string& name){
mRemoteAddress->setDisplayName(name);
+ auto callLog = mCall->getCallLog();
+ if(name!= "") {
+ auto core = CoreManager::getInstance()->getCore();
+ callLog->setRemoteAddress(Utils::interpretUrl(getFullPeerAddress()));
+ }
emit fullPeerAddressChanged();
}
// -----------------------------------------------------------------------------
diff --git a/linphone-app/src/utils/Utils.cpp b/linphone-app/src/utils/Utils.cpp
index 55e51b3c8..a7ca8d37b 100644
--- a/linphone-app/src/utils/Utils.cpp
+++ b/linphone-app/src/utils/Utils.cpp
@@ -469,7 +469,14 @@ QString Utils::getDisplayName(const std::shared_ptr& ad
if(model && model->getVcardModel())
displayName = model->getVcardModel()->getUsername();
else{
- displayName = Utils::coreStringToAppString(address->getDisplayName());
+ auto callHistory = CoreManager::getInstance()->getCore()->getCallLogs();
+ auto callLog = std::find_if(callHistory.begin(), callHistory.end(), [address](std::shared_ptr& cl){
+ return cl->getRemoteAddress()->weakEqual(address);
+ });
+ if(callLog != callHistory.end())
+ displayName = Utils::coreStringToAppString((*callLog)->getRemoteAddress()->getDisplayName());
+ if(displayName == "")
+ displayName = Utils::coreStringToAppString(address->getDisplayName());
if(displayName == "")
displayName = Utils::coreStringToAppString(address->getUsername());
}
diff --git a/linphone-sdk b/linphone-sdk
index 48e870383..b1dc32321 160000
--- a/linphone-sdk
+++ b/linphone-sdk
@@ -1 +1 @@
-Subproject commit 48e87038360e272436570b6dc062c34f85625237
+Subproject commit b1dc3232192816be2d81a263be3ff5a11f91f75e