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

Add Display name field in Identity Address

Browse source 
- AsString() will return `"name" <sip:username@domain>;gr=gruu` if name exists. Else : `sip:username@domain;gr=gruu`
This commit is contained in:
Julien Wadel 2020-05-11 17:21:33 +02:00
parent d0b21228a4
commit fb23ed2bf3
4 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
linphone-app/src/components/chat/ChatProxyModel.cpp
View file

@ -178,6 +178,7 @@ QString ChatProxyModel::getFullPeerAddress () const {
void ChatProxyModel::setFullPeerAddress (const QString &peerAddress) {
mFullPeerAddress = peerAddress;
reload();
}
QString ChatProxyModel::getFullLocalAddress () const {
@ -186,6 +187,7 @@ QString ChatProxyModel::getFullLocalAddress () const {
void ChatProxyModel::setFullLocalAddress (const QString &localAddress) {
mFullLocalAddress = localAddress;
reload();
}
bool ChatProxyModel::getIsRemoteComposing () const {
@ -204,7 +206,7 @@ void ChatProxyModel::reload () {
QObject::disconnect(chatModel, &ChatModel::messageSent, this, &ChatProxyModel::handleMessageSent);
}
mChatModel = CoreManager::getInstance()->getChatModel(mPeerAddress, mLocalAddress);
mChatModel = CoreManager::getInstance()->getChatModel(mFullPeerAddress, mFullLocalAddress);
if (mChatModel) {
mChatModel->resetMessageCount();

2
linphone-app/ui/views/App/Calls/CallsWindow.qml
View file

@ -199,6 +199,8 @@ Window {
peerAddress: (call?call.peerAddress:'')
localAddress: (call?call.localAddress:'')
fullPeerAddress: (call?call.fullPeerAddress:'')
fullLocalAddress: (call?call.fullLocalAddress:'')
}
Connections {

8
linphone-app/ui/views/App/Main/MainWindow.qml
View file

@ -266,7 +266,9 @@ ApplicationWindow {
onEntrySelected: setView('Conversation', {
peerAddress: entry,
localAddress: AccountSettingsModel.sipAddress
localAddress: AccountSettingsModel.sipAddress,
fullPeerAddress: entry,
fullLocalAddress: AccountSettingsModel.fullSipAddress
})
}
}
@ -295,7 +297,9 @@ ApplicationWindow {
onSip: window.setView('Conversation', {
peerAddress: sipAddress,
localAddress: AccountSettingsModel.sipAddress
localAddress: AccountSettingsModel.sipAddress,
fullPeerAddress: sipAddress,
fullLocalAddress: AccountSettingsModel.fullSipAddress
})
}
}

2
linphone-sdk

@ -1 +1 @@
Subproject commit 8b2d2c7a952f4f074b5fe154a21a46f9225e403b
Subproject commit b8ee78d2ed3212cf493703e17ad8c5181edcb7e2