diff --git a/linphone-app/cmake_builder/linphone_package/CMakeLists.txt b/linphone-app/cmake_builder/linphone_package/CMakeLists.txt index 6495b7673..b10f18255 100644 --- a/linphone-app/cmake_builder/linphone_package/CMakeLists.txt +++ b/linphone-app/cmake_builder/linphone_package/CMakeLists.txt @@ -20,7 +20,6 @@ # ################################################################################ -cmake_minimum_required(VERSION 3.1) project(LINPHONE_PACKAGE) # Dummy project. if(ENABLE_BUILD_VERBOSE) message("Linphone-packages paths : ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}") diff --git a/linphone-app/src/components/participant/ParticipantDeviceModel.cpp b/linphone-app/src/components/participant/ParticipantDeviceModel.cpp index 1effea4cf..cd4063045 100644 --- a/linphone-app/src/components/participant/ParticipantDeviceModel.cpp +++ b/linphone-app/src/components/participant/ParticipantDeviceModel.cpp @@ -77,7 +77,10 @@ QString ParticipantDeviceModel::getName() const{ } QString ParticipantDeviceModel::getDisplayName() const{ - return mParticipantDevice ? Utils::getDisplayName(mParticipantDevice->getAddress()) : ""; + auto name = mParticipantDevice ? Utils::getDisplayName(mParticipantDevice->getAddress()) : ""; + if(name.isEmpty()) + name = mParticipantDevice ? Utils::coreStringToAppString(mParticipantDevice->getName().c_str()) : ""; + return name; } int ParticipantDeviceModel::getSecurityLevel() const{ diff --git a/linphone-app/ui/modules/Linphone/Calls/IncallAvatar.qml b/linphone-app/ui/modules/Linphone/Calls/IncallAvatar.qml index bcf55a4eb..e7571af71 100644 --- a/linphone-app/ui/modules/Linphone/Calls/IncallAvatar.qml +++ b/linphone-app/ui/modules/Linphone/Calls/IncallAvatar.qml @@ -25,9 +25,11 @@ Avatar { : null property var _username: conferenceInfoModel ? conferenceInfoModel.subject - : _sipAddressObserver - ? UtilsCpp.getDisplayName(_sipAddressObserver.peerAddress) - : '' + : participantDeviceModel + ? participantDeviceModel.displayName + : _sipAddressObserver + ? UtilsCpp.getDisplayName(_sipAddressObserver.peerAddress) + : '' property bool isPaused: (call && (call.status === CallModel.CallStatusPaused)) || (participantDeviceModel && participantDeviceModel.isPaused) || false Component.onDestruction: _sipAddressObserver=null// Need to set it to null because of not calling destructor if not.