diff --git a/linphone-app/ui/modules/Linphone/Contact/Contact.qml b/linphone-app/ui/modules/Linphone/Contact/Contact.qml index 7b60fd468..b1886dd82 100644 --- a/linphone-app/ui/modules/Linphone/Contact/Contact.qml +++ b/linphone-app/ui/modules/Linphone/Contact/Contact.qml @@ -22,6 +22,7 @@ Rectangle { property bool displayUnreadMessageCount: false property bool showContactAddress : true + property bool showAuxData : false // A entry from `SipAddressesModel` or an `SipAddressObserver`. property var entry @@ -114,9 +115,12 @@ Rectangle { Layout.leftMargin: ContactStyle.spacing sipAddress: (entry && item.showContactAddress - && (entry.isOneToOne == undefined || entry.isOneToOne) && (entry.haveEncryption == undefined || !entry.haveEncryption) - ? entry.sipAddress || entry.fullPeerAddress || entry.peerAddress || '' - : '') + && (item.showAuxData + ? entry.auxDataToShow || '' + : (entry.isOneToOne == undefined || entry.isOneToOne) && (entry.haveEncryption == undefined || !entry.haveEncryption) + ? entry.sipAddress || entry.fullPeerAddress || entry.peerAddress || '' + : '') + ) || '' participants: entry && item.showContactAddress && sipAddress == '' && entry.isOneToOne && entry.participants ? entry.participants.addressesToString : '' username: item.username } diff --git a/linphone-app/ui/modules/Linphone/Notifications/NotificationReceivedMessage.qml b/linphone-app/ui/modules/Linphone/Notifications/NotificationReceivedMessage.qml index cdc664c86..5cc9fab19 100644 --- a/linphone-app/ui/modules/Linphone/Notifications/NotificationReceivedMessage.qml +++ b/linphone-app/ui/modules/Linphone/Notifications/NotificationReceivedMessage.qml @@ -40,13 +40,14 @@ Notification { property ChatRoomModel chatRoomModel : notification.timelineModel.getChatRoomModel() //entry: notification.fullPeerAddress? SipAddressesModel.getSipAddressObserver(notification.fullPeerAddress, notification.fullLocalAddress): notification.timelineModel.getChatRoomModel() property var sipObserver: SipAddressesModel.getSipAddressObserver(notification.fullPeerAddress, notification.fullLocalAddress) - + showAuxData: !chatRoomModel.isOneToOne entry: ({ sipAddress: sipObserver.peerAddress, contactModel: sipObserver.contact, isOneToOne: chatRoomModel.isOneToOne, haveEncryption: chatRoomModel.haveEncryption, - securityLevel: chatRoomModel.securityLevel + securityLevel: chatRoomModel.securityLevel, + auxDataToShow: '- ' + chatRoomModel.subject+' -' }) }