mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-04-23 11:18:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update SDK to 4.4

Browse source 
- Add Missing fields for peerAddress and localAddress
This commit is contained in:
Julien Wadel 2020-05-11 19:35:57 +02:00
parent d0b21228a4
commit f71a7c8950
6 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -178,6 +178,7 @@ QString ChatProxyModel::getFullPeerAddress () const {
void ChatProxyModel::setFullPeerAddress (const QString &peerAddress) { void ChatProxyModel::setFullPeerAddress (const QString &peerAddress) {
mFullPeerAddress = peerAddress; mFullPeerAddress = peerAddress;
//reload();
} }
QString ChatProxyModel::getFullLocalAddress () const { QString ChatProxyModel::getFullLocalAddress () const {
@ -186,6 +187,7 @@ QString ChatProxyModel::getFullLocalAddress () const {
void ChatProxyModel::setFullLocalAddress (const QString &localAddress) { void ChatProxyModel::setFullLocalAddress (const QString &localAddress) {
mFullLocalAddress = localAddress; mFullLocalAddress = localAddress;
//reload();
} }
bool ChatProxyModel::getIsRemoteComposing () const { bool ChatProxyModel::getIsRemoteComposing () const {

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

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

4
linphone-app/ui/views/App/Main/ContactEdit.qml
View file

@ -171,7 +171,9 @@ ColumnLayout {
onSipAddressClicked: window.setView('Conversation', { onSipAddressClicked: window.setView('Conversation', {
peerAddress: sipAddress, peerAddress: sipAddress,
localAddress: AccountSettingsModel.sipAddress localAddress: AccountSettingsModel.sipAddress,
fullPeerAddress: sipAddress,
fullLocalAddress: AccountSettingsModel.fullSipAddress
}) })
} }

4
linphone-app/ui/views/App/Main/Contacts.qml
View file

@ -174,7 +174,9 @@ ColumnLayout {
function (sipAddress) { function (sipAddress) {
window.setView('Conversation', { window.setView('Conversation', {
peerAddress: sipAddress, peerAddress: sipAddress,
localAddress: AccountSettingsModel.sipAddress localAddress: AccountSettingsModel.sipAddress,
fullPeerAddress: sipAddress,
fullLocalAddress: AccountSettingsModel.fullSipAddress
}) })
} }
] ]

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

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

2
linphone-sdk

@ -1 +1 @@
Subproject commit 8b2d2c7a952f4f074b5fe154a21a46f9225e403b Subproject commit 207433fffa0f4616e3b22371c3004a9debb325c2