From f71a7c8950400a3e46f8473be8bd36d13acb9d44 Mon Sep 17 00:00:00 2001
From: Julien Wadel <julien.wadel@belledonne-communications.com>
Date: Mon, 11 May 2020 19:35:57 +0200
Subject: [PATCH] Update SDK to 4.4 - Add Missing fields for peerAddress and
 localAddress

---
 linphone-app/src/components/chat/ChatProxyModel.cpp | 2 ++
 linphone-app/ui/views/App/Calls/CallsWindow.qml     | 3 +++
 linphone-app/ui/views/App/Main/ContactEdit.qml      | 4 +++-
 linphone-app/ui/views/App/Main/Contacts.qml         | 4 +++-
 linphone-app/ui/views/App/Main/MainWindow.qml       | 8 ++++++--
 linphone-sdk                                        | 2 +-
 6 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/linphone-app/src/components/chat/ChatProxyModel.cpp b/linphone-app/src/components/chat/ChatProxyModel.cpp
index b9a0241b9..025ec4778 100644
--- a/linphone-app/src/components/chat/ChatProxyModel.cpp
+++ b/linphone-app/src/components/chat/ChatProxyModel.cpp
@@ -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 {
diff --git a/linphone-app/ui/views/App/Calls/CallsWindow.qml b/linphone-app/ui/views/App/Calls/CallsWindow.qml
index 10c21d671..1b3b27912 100644
--- a/linphone-app/ui/views/App/Calls/CallsWindow.qml
+++ b/linphone-app/ui/views/App/Calls/CallsWindow.qml
@@ -199,6 +199,9 @@ Window {
 
             peerAddress: (call?call.peerAddress:'')
             localAddress: (call?call.localAddress:'')
+            fullPeerAddress: (call?call.fullPeerAddress:peerAddress)
+            fullLocalAddress: (call?call.fullLocalAddress:localAddress)
+
           }
 
           Connections {
diff --git a/linphone-app/ui/views/App/Main/ContactEdit.qml b/linphone-app/ui/views/App/Main/ContactEdit.qml
index 0e870f8c9..cf462234d 100644
--- a/linphone-app/ui/views/App/Main/ContactEdit.qml
+++ b/linphone-app/ui/views/App/Main/ContactEdit.qml
@@ -171,7 +171,9 @@ ColumnLayout  {
 
     onSipAddressClicked: window.setView('Conversation', {
       peerAddress: sipAddress,
-      localAddress: AccountSettingsModel.sipAddress
+      localAddress: AccountSettingsModel.sipAddress,
+      fullPeerAddress: sipAddress,
+      fullLocalAddress: AccountSettingsModel.fullSipAddress
     })
   }
 
diff --git a/linphone-app/ui/views/App/Main/Contacts.qml b/linphone-app/ui/views/App/Main/Contacts.qml
index bdc868bcd..ce4c70c39 100644
--- a/linphone-app/ui/views/App/Main/Contacts.qml
+++ b/linphone-app/ui/views/App/Main/Contacts.qml
@@ -174,7 +174,9 @@ ColumnLayout {
               function (sipAddress) {
                 window.setView('Conversation', {
                   peerAddress: sipAddress,
-                  localAddress: AccountSettingsModel.sipAddress
+                  localAddress: AccountSettingsModel.sipAddress,
+                  fullPeerAddress: sipAddress,
+                  fullLocalAddress: AccountSettingsModel.fullSipAddress
                 })
               }
             ]
diff --git a/linphone-app/ui/views/App/Main/MainWindow.qml b/linphone-app/ui/views/App/Main/MainWindow.qml
index 6a3c5f783..936e9f001 100644
--- a/linphone-app/ui/views/App/Main/MainWindow.qml
+++ b/linphone-app/ui/views/App/Main/MainWindow.qml
@@ -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
     })
   }
 }
diff --git a/linphone-sdk b/linphone-sdk
index 8b2d2c7a9..207433fff 160000
--- a/linphone-sdk
+++ b/linphone-sdk
@@ -1 +1 @@
-Subproject commit 8b2d2c7a952f4f074b5fe154a21a46f9225e403b
+Subproject commit 207433fffa0f4616e3b22371c3004a9debb325c2