commit 8940f3c46e38974f71e581da357d640b0ba250e4
author Sébastien Blin <sebastien.blin@savoirfairelinux.com> Thu Jul 23 17:03:11 2020 -0400
committer Sébastien Blin <sebastien.blin@savoirfairelinux.com> Tue Aug 18 14:15:14 2020 -0400
tree 26e29a366f90776d41761323d75a6556e236da48
parent 5f35e19260cc854328c1d4f77465bd8a44062b6e

callview: redesign

Change-Id: I8ce1e02be798104aaca9d09d9dc5d931133ada6d

src/mainview/MainView.qml

diff --git a/src/mainview/MainView.qml b/src/mainview/MainView.qml
index 20ac177..e948cd0 100644
--- a/src/mainview/MainView.qml
+++ b/src/mainview/MainView.qml
@@ -113,12 +113,14 @@
 
         function onCloseCallStack(accountId, convUid) {
 
-
+            var responsibleCallId = ClientWrapper.utilsAdaptor.getCallId(
+                    callStackView.responsibleAccountId, callStackView.responsibleConvUid)
+            var callId = ClientWrapper.utilsAdaptor.getCallId(
+                    callStackView.responsibleAccountId, convUid)
             /*
              * Check if call stack view is on any of the stackview.
              */
-            if (callStackView.responsibleAccountId === accountId
-                    && callStackView.responsibleConvUid === convUid) {
+            if (responsibleCallId === callId || responsibleCallId.length === 0) {
                 if (welcomeViewStack.find(function (item, index) {
                     return item.objectName === "callStackViewObject"
                 }) || sidePanelViewStack.find(function (item, index) {
@@ -156,7 +158,7 @@
             communicationPageMessageWebView.headerUserUserNameLabelText = (name !== id) ? id : ""
 
             callStackView.needToCloseInCallConversationAndPotentialWindow()
-            callStackView.setCorrspondingMessageWebView(
+            callStackView.setLinkedWebview(
                         communicationPageMessageWebView)
 
             callStackView.responsibleAccountId = accountId
@@ -283,7 +285,7 @@
              * Set up chatview.
              */
             MessagesAdapter.setupChatView(currentUID)
-            callStackView.setCorrspondingMessageWebView(
+            callStackView.setLinkedWebview(
                         communicationPageMessageWebView)
 
             if (welcomeViewStack.find(function (item, index) {
@@ -363,22 +365,6 @@
         visible: false
 
         objectName: "callStackViewObject"
-
-        onCallPageBackButtonIsClicked: {
-            mainViewWindowSidePanel.deselectConversationSmartList()
-            if (welcomeViewStack.visible)
-                welcomeViewStack.pop(welcomePage)
-            else if (sidePanelViewStack.visible)
-                sidePanelViewStack.pop(mainViewWindowSidePanel)
-        }
-
-        onOutgoingCallPageBackButtonIsClicked: {
-            mainViewWindowSidePanel.deselectConversationSmartList()
-            if (welcomeViewStack.visible)
-                welcomeViewStack.pop(welcomePage)
-            else if (sidePanelViewStack.visible)
-                sidePanelViewStack.pop(mainViewWindowSidePanel)
-        }
     }
 
     WelcomePage {