Merge lp:~tiagosh/dialer-app/rtm-14.09-fix-1410961 into lp:dialer-app/rtm-14.09

[Tiago Salem Herrmann]

Give some time to finish the greeter animation before removing the LiveCall view.

Give some time to finish the greeter animation before removing the LiveCall view.

Unmerged revisions

=== modified file 'src/qml/ContactsPage/ContactsPage.qml'
--- src/qml/ContactsPage/ContactsPage.qml	2014-09-03 17:07:44 +0000
+++ src/qml/ContactsPage/ContactsPage.qml	2015-01-17 02:38:49 +0000
@@ -208,7 +208,7 @@
                 Qt.openUrlExternally("message:///" + encodeURIComponent(detail.number))
                 return
             }
-            pageStack.pop()
+            pageStackNormalMode.pop()
             if (callManager.hasCalls) {
                 mainView.call(detail.number, mainView.account.accountId);
             } else {

=== modified file 'src/qml/DialerPage/DialerPage.qml'
--- src/qml/DialerPage/DialerPage.qml	2014-12-04 12:52:57 +0000
+++ src/qml/DialerPage/DialerPage.qml	2015-01-17 02:38:49 +0000
@@ -32,32 +32,37 @@
     property alias dialNumber: keypadEntry.value
     property alias input: keypadEntry.input
     property alias callAnimationRunning: callAnimation.running
+    property bool greeterMode: false
     property var mmiPlugins: []
     property list<Action> actionsGreeter
     property list<Action> actionsNormal: [
         Action {
             iconName: "contact"
             text: i18n.tr("Contacts")
-            onTriggered: pageStack.push(Qt.resolvedUrl("../ContactsPage/ContactsPage.qml"))
+            onTriggered: pageStackNormalMode.push(Qt.resolvedUrl("../ContactsPage/ContactsPage.qml"))
         },
         Action {
             iconName: "settings"
             text: i18n.tr("Settings")
             onTriggered: Qt.openUrlExternally("settings:///system/phone")
         }
+
     ]
-    head.actions: greeter.greeterActive ? actionsGreeter : actionsNormal
+    head.actions: mainView.greeterMode ? actionsGreeter : actionsNormal
     head.backAction: Action {
         iconName: "back"
         text: i18n.tr("Close")
-        visible: greeter.greeterActive
-        onTriggered: greeter.showGreeter()
+        visible: mainView.greeterMode
+        onTriggered: {
+            greeter.showGreeter()
+            dialNumber = "";
+        }
     }
 
     objectName: "dialerPage"
 
     title: {
-        if (greeter.greeterActive) {
+        if (mainView.greeterMode) {
             return i18n.tr("Emergency Calls")
         } else if (telepathyHelper.flightMode) {
             return i18n.tr("Flight mode")
@@ -73,7 +78,7 @@
         return i18n.tr("No network")
     }
 
-    state: greeter.greeterActive ? "greeterMode" : "normalMode"
+    state: mainView.state
     // -------- Greeter mode ----------
     states: [
         State {
@@ -86,10 +91,6 @@
                 target: addContact
                 visible: false
             }
-            PropertyChanges {
-                target: keypadEntry
-                value: ""
-            }
         },
         State {
             name: "normalMode"
@@ -101,12 +102,11 @@
                 target: addContact
                 visible: true
             }
-
         }
     ]
 
     // -------- Bottom Edge Setup -----
-    bottomEdgeEnabled: !greeter.greeterActive
+    bottomEdgeEnabled: !mainView.greeterMode
     bottomEdgePageSource: Qt.resolvedUrl("../HistoryPage/HistoryPage.qml")
     // NOTE: uncomment the next line to re-enable progressive bottom edge swiping.
     //bottomEdgeExpandThreshold: bottomEdgePage ? bottomEdgePage.delegateHeight * 3 : 0
@@ -181,7 +181,7 @@
 
     head.sections.model: {
         // does not show dual sim switch if there is only one sim
-        if (!multipleAccounts || greeter.greeterActive) {
+        if (!multipleAccounts || mainView.greeterMode) {
             return undefined
         }
 
@@ -388,7 +388,7 @@
                     return false;
                 }
 
-                if (greeter.greeterActive) {
+                if (mainView.greeterMode) {
                     return mainView.isEmergencyNumber(dialNumber);
                 }
 

=== modified file 'src/qml/HistoryPage/HistoryDetailsPage.qml'
--- src/qml/HistoryPage/HistoryDetailsPage.qml	2015-01-09 11:54:33 +0000
+++ src/qml/HistoryPage/HistoryDetailsPage.qml	2015-01-17 02:38:49 +0000
@@ -74,7 +74,7 @@
             text: i18n.tr("Delete")
             onTriggered: {
                 eventModel.removeEvents(events);
-                pageStack.pop();
+                pageStackNormalMode.pop();
             }
         }
 

=== modified file 'src/qml/HistoryPage/HistoryPage.qml'
--- src/qml/HistoryPage/HistoryPage.qml	2015-01-09 11:54:33 +0000
+++ src/qml/HistoryPage/HistoryPage.qml	2015-01-17 02:38:49 +0000
@@ -112,7 +112,7 @@
         onSelectedIndexChanged: {
             // NOTE: be careful on changing the way filters are assigned, if we create a
             // binding on head.sections, we might get weird results when the page moves to the bottom
-            if (pageStack.depth > 1) {
+            if (pageStackNormalMode.depth > 1) {
                 if (head.sections.selectedIndex == 0) {
                     historyEventModel.filter = emptyFilter;
                 } else {
@@ -323,7 +323,7 @@
                         iconName: "info"
                         text: i18n.tr("Details")
                         onTriggered: {
-                            pageStack.push(Qt.resolvedUrl("HistoryDetailsPage.qml"),
+                            pageStackNormalMode.push(Qt.resolvedUrl("HistoryDetailsPage.qml"),
                                                           { phoneNumber: participants[0].phoneNumber,
                                                             events: model.events,
                                                             eventModel: historyEventModel})

=== modified file 'src/qml/LiveCallPage/LiveCall.qml'
--- src/qml/LiveCallPage/LiveCall.qml	2014-12-16 01:11:54 +0000
+++ src/qml/LiveCallPage/LiveCall.qml	2015-01-17 02:38:49 +0000
@@ -60,10 +60,10 @@
         objectName: "backButton"
         iconName: "back"
         onTriggered: {
-            if (greeter.greeterActive) {
+            if (mainView.greeterMode) {
                greeter.showGreeter();
             } else {
-                pageStack.pop();
+                pageStackNormalMode.pop();
             }
         }
     }
@@ -192,7 +192,7 @@
 
         State {
             name: "closing"
-            when: closeTimer.running
+            when: closeTimer.running || greeterAnimationTimer.running
 
             PropertyChanges {
                 target: buttonsArea
@@ -255,16 +255,30 @@
     }
 
     Timer {
+        id: greeterAnimationTimer
+        interval: 1000
+        repeat: false
+        running: false
+        onTriggered: mainView.removeLiveCallView()
+    }
+ 
+    Timer {
         id: closeTimer
-        interval: 3000
+        interval: mainView.greeterMode ? 2000 : 3000
         repeat: false
         running: false
         onTriggered: {
             if (!callManager.hasCalls) {
-                mainView.switchToKeypadView();
-                pageStack.currentPage.dialNumber = pendingNumberToDial;
-                if (greeter.greeterActive) {
+                if (!mainView.greeterMode) {
+                    mainView.removeLiveCallView();
+                }
+                // TODO: we can't be sure that the currentPage is a DialerPage instance
+                if (pageStackNormalMode.currentPage.dialNumber) {
+                    pageStackNormalMode.currentPage.dialNumber = pendingNumberToDial;
+                }
+                if (mainView.greeterMode) {
                     greeter.showGreeter();
+                    greeterAnimationTimer.running = true
                 }
             }
         }
@@ -568,8 +582,8 @@
             iconSource: "add"
             iconWidth: units.gu(3)
             iconHeight: units.gu(3)
-            enabled: !greeter.greeterActive
-            onClicked: pageStack.push(Qt.resolvedUrl("../ContactsPage/ContactsPage.qml"))
+            enabled: !mainView.greeterMode
+            onClicked: pageStackNormalMode.push(Qt.resolvedUrl("../ContactsPage/ContactsPage.qml"))
         }
 
         LiveCallKeypadButton {

=== modified file 'src/qml/dialer-app.qml'
--- src/qml/dialer-app.qml	2014-12-04 13:24:23 +0000
+++ src/qml/dialer-app.qml	2015-01-17 02:38:49 +0000
@@ -32,6 +32,8 @@
     property string ussdResponseText: ""
     property bool multipleAccounts: telepathyHelper.activeAccounts.length > 1
     property QtObject account: defaultAccount()
+    property bool greeterMode: (state == "greeterMode")
+    property bool lastHasCalls: callManager.hasCalls
 
     function defaultAccount() {
         // we only use the default account property if we have more
@@ -58,8 +60,20 @@
     onApplicationActiveChanged: {
         if (applicationActive) {
             telepathyHelper.registerChannelObserver()
-            if (pageStack.currentPage.objectName == "pageLiveCall" && !callManager.hasCalls) {
-                pageStack.pop();
+
+            if (!callManager.hasCalls) {
+                // if on contacts page in a live call and no calls are found, pop it out
+                if (pageStackNormalMode.depth > 2 && pageStackNormalMode.currentPage.objectName == "contactsPage") {
+                    pageStackNormalMode.pop();
+                }
+ 
+                // pop live call views from both stacks if we have no calls.
+                if (pageStackNormalMode.depth > 1 && pageStackNormalMode.currentPage.objectName == "pageLiveCall") {
+                    pageStackNormalMode.pop();
+                }
+                if (pageStackGreeterMode.depth > 1 && pageStackGreeterMode.currentPage.objectName == "pageLiveCall") {
+                    pageStackGreeterMode.pop();
+                }
             }
         } else {
             telepathyHelper.unregisterChannelObserver()
@@ -70,7 +84,7 @@
         target: telepathyHelper
         onSetupReady: {
             if (multipleAccounts && !telepathyHelper.defaultCallAccount &&
-                settings.mainViewDontAskCount < 3 && pageStack.depth === 1) {
+                settings.mainViewDontAskCount < 3 && pageStackNormalMode.depth === 1 && !mainView.greeterMode) {
                 PopupUtils.open(Qt.createComponent("Dialogs/NoDefaultSIMCardDialog.qml").createObject(mainView))
             }
         }
@@ -104,21 +118,39 @@
     Binding {
         target: application
         property: "fullScreen"
-        value: greeter.greeterActive
+        value: mainView.greeterMode
     }
 
+    state: greeter.greeterActive ? "greeterMode" : "normalMode"
     states: [
         State {
             name: "greeterMode"
-            when: greeter.greeterActive
-
-            StateChangeScript {
-                script: {
-                    // make sure to reset the view so that the contacts page is not loaded
-                    if (callManager.hasCalls) {
-                        switchToLiveCall();
-                    } else {
-                        switchToKeypadView();
+
+            StateChangeScript {
+                script: {
+                    // preload greeter stack if not done yet
+                    if (pageStackGreeterMode.depth == 0) {
+                        pageStackGreeterMode.push(Qt.resolvedUrl("DialerPage/DialerPage.qml"))
+                    }
+                    // make sure to reset the view so that the contacts page is not loaded
+                    if (callManager.hasCalls) {
+                        switchToLiveCall();
+                    } else {
+                        removeLiveCallView();
+                    }
+                }
+            }
+        },
+        State {
+            name: "normalMode"
+
+            StateChangeScript {
+                script: {
+                    // make sure to reset the view so that the contacts page is not loaded
+                    if (callManager.hasCalls) {
+                        switchToLiveCall();
+                    } else {
+                        removeLiveCallView();
                     }
                 }
             }
@@ -160,7 +192,7 @@
     }
 
     function callVoicemail() {
-        if (greeter.greeterActive) {
+        if (mainView.greeterMode) {
             return;
         }
         call(mainView.account.voicemailNumber);
@@ -265,7 +297,7 @@
             return
         }
 
-        if (mainView.account && !greeter.greeterActive && mainView.account.simLocked) {
+        if (mainView.account && !mainView.greeterMode && mainView.account.simLocked) {
             var properties = {}
             properties["accountId"] = mainView.account.accountId
             PopupUtils.open(Qt.createComponent("Dialogs/SimLockedDialog.qml").createObject(mainView), mainView, properties)
@@ -301,49 +333,72 @@
         // FIXME: check what to do when not in the dialpad view
 
         // if not on the livecall view, go back to the dialpad
-        while (pageStack.depth > 1 && pageStack.currentPage.objectName != "pageLiveCall") {
-            pageStack.pop();
-        }
-
-        if (pageStack.currentPage && typeof(pageStack.currentPage.dialNumber) != 'undefined') {
-            pageStack.currentPage.dialNumber = number;
+        while (pageStackNormalMode.depth > 1) {
+            pageStackNormalMode.pop();
+        }
+
+        if (pageStackNormalMode.currentPage && typeof(pageStackNormalMode.currentPage.dialNumber) != 'undefined') {
+            pageStackNormalMode.currentPage.dialNumber = number;
+        }
+    }
+
+    function removeLiveCallView() {
+        // if on contacts page in a live call and no calls are found, pop it out
+        if (pageStackNormalMode.depth > 2 && pageStackNormalMode.currentPage.objectName == "contactsPage") {
+            pageStackNormalMode.pop();
+        }
+
+        if (pageStackNormalMode.depth > 1 && pageStackNormalMode.currentPage.objectName == "pageLiveCall") {
+            pageStackNormalMode.pop();
+        }
+
+        while (pageStackGreeterMode.depth > 1) {
+            pageStackGreeterMode.pop();
         }
     }
 
     function switchToKeypadView() {
-        while (pageStack.depth > 1) {
-            pageStack.pop();
+        while (pageStackNormalMode.depth > 1) {
+            pageStackNormalMode.pop();
+        }
+        while (pageStackGreeterMode.depth > 1) {
+            pageStackGreeterMode.pop();
         }
     }
 
     function animateLiveCall() {
-        if (pageStack.currentPage && pageStack.currentPage.triggerCallAnimation) {
-            pageStack.currentPage.triggerCallAnimation();
+        var stack = mainView.greeterMode ? pageStackGreeterMode : pageStackNormalMode
+        if (stack.currentPage && stack.currentPage.triggerCallAnimation) {
+            stack.currentPage.triggerCallAnimation();
         } else {
             switchToLiveCall();
         }
     }
 
     function switchToLiveCall() {
-        // pop the stack if the live call is not the visible view
-        // FIXME: using the objectName here is not pretty, change by something less prone to errors
-        while (pageStack.depth > 1 && pageStack.currentPage.objectName != "pageLiveCall") {
-            pageStack.pop();
+        var stack = mainView.greeterMode ? pageStackGreeterMode : pageStackNormalMode
+
+        if (pageStackNormalMode.depth > 2 && pageStackNormalMode.currentPage.objectName == "contactsPage") {
+            // pop contacts Page
+            stack.pop();
         }
+
         var properties = {}
         if (isEmergencyNumber(pendingNumberToDial)) {
             properties["defaultTimeout"] = 30000
         }
 
-        if (pageStack.depth === 1)  {
-            pageStack.push(Qt.resolvedUrl("LiveCallPage/LiveCall.qml"), properties)
+        if (stack.currentPage.objectName == "pageLiveCall") {
+            return;
         }
+ 
+        stack.push(Qt.resolvedUrl("LiveCallPage/LiveCall.qml"), properties)
     }
 
     Component.onCompleted: {
         i18n.domain = "dialer-app"
         i18n.bindtextdomain("dialer-app", i18nDirectory)
-        pageStack.push(Qt.createComponent("DialerPage/DialerPage.qml"))
+        pageStackNormalMode.push(Qt.createComponent("DialerPage/DialerPage.qml"))
 
         // if there are calls, even if we don't have info about them yet, push the livecall view
         if (callManager.hasCalls) {
@@ -484,16 +539,22 @@
         target: callManager
         onHasCallsChanged: {
             if (!callManager.hasCalls) {
+                mainView.lastHasCalls = callManager.hasCalls
                 return;
             }
 
+            var stack = mainView.greeterMode ? pageStackGreeterMode : pageStackNormalMode
             // if we are animating the dialpad view, do not switch to livecall directly
-            if (pageStack.currentPage && pageStack.currentPage.callAnimationRunning) {
+            if (stack.currentPage && stack.currentPage.callAnimationRunning) {
+                mainView.lastHasCalls = callManager.hasCalls
                 return;
             }
 
             // if not, just open the live call
-            switchToLiveCall();
+            if (mainView.lastHasCalls != callManager.hasCalls) {
+                mainView.lastHasCalls = callManager.hasCalls
+                switchToLiveCall();
+            }
         }
     }
 
@@ -575,7 +636,16 @@
     }
 
     PageStack {
-        id: pageStack
-        anchors.fill: parent
+        id: pageStackNormalMode
+        anchors.fill: parent
+        active:  mainView.state == "normalMode"
+        visible: active
+    }
+
+    PageStack {
+        id: pageStackGreeterMode
+        anchors.fill: parent
+        active: mainView.state == "greeterMode"
+        visible: active
     }
 }