Merge lp:~tiagosh/dialer-app/fix-1218311 into lp:dialer-app

[Tiago Salem Herrmann]

Push views to the pagestack even before the telepathy channel is created.

Push views to the pagestack even before the telepathy channel is created.

This MR changes the way we create the live call views. We push it to the page stack when an user tries to call a number (from dialer-app or from other apps), and not when the telepathy channel is created.
It feels more responsive in general.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:48
http://jenkins.qa.ubuntu.com/job/dialer-app-ci/56/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-saucy-amd64-ci/56
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-saucy-armhf-ci/56
        deb: http://jenkins.qa.ubuntu.com/job/dialer-app-saucy-armhf-ci/56/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-saucy-i386-ci/56

Click here to trigger a rebuild:
http://s-jenkins:8080/job/dialer-app-ci/56/rebuild

review: Approve (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

23 + interval: 3000

I think we could increase that to 5 seconds or even more just to be on the safe side. Maybe we can use 10 seconds for now?

review: Needs Fixing

[lp:~tiagosh/dialer-app/fix-1218311]

49. By Tiago Salem Herrmann on 2013-09-26

update timeout to 10 seconds

[Gustavo Pichorim Boiko (boiko)]

Looks good and works as expected!

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:49
http://jenkins.qa.ubuntu.com/job/dialer-app-ci/57/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-saucy-amd64-ci/57
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-saucy-armhf-ci/57
        deb: http://jenkins.qa.ubuntu.com/job/dialer-app-saucy-armhf-ci/57/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-saucy-i386-ci/57

Click here to trigger a rebuild:
http://s-jenkins:8080/job/dialer-app-ci/57/rebuild

review: Approve (continuous-integration)

=== modified file 'src/qml/DialerPage/DialerPage.qml'
--- src/qml/DialerPage/DialerPage.qml	2013-09-24 19:40:57 +0000
+++ src/qml/DialerPage/DialerPage.qml	2013-09-26 21:39:41 +0000
@@ -171,7 +171,7 @@
                 anchors.horizontalCenter: parent.horizontalCenter
                 onClicked: {
                     console.log("Starting a call to " + keypadEntry.value);
-                    callManager.startCall(keypadEntry.value);
+                    mainView.call(keypadEntry.value);
                     keypadEntry.value = "";
                 }
                 enabled: dialNumber != "" && telepathyHelper.connected

=== modified file 'src/qml/LiveCallPage/LiveCall.qml'
--- src/qml/LiveCallPage/LiveCall.qml	2013-09-18 21:12:30 +0000
+++ src/qml/LiveCallPage/LiveCall.qml	2013-09-26 21:39:41 +0000
@@ -37,6 +37,18 @@
     property bool dtmfVisible: false
     property string phoneNumberSubTypeLabel: ""
     Component.onDestruction: mainView.switchToCallLogView()
+    Timer {
+        id: callWatcher
+        interval: 10000
+        repeat: false
+        running: true
+        onTriggered: {
+            if (!call) {
+                // TODO: notify about failed call
+                pageStack.pop()
+            }
+        }
+    }
 
     // TRANSLATORS: %1 is the duration of the call
     title: contactWatcher.alias != "" ? contactWatcher.alias : contactWatcher.phoneNumber

=== modified file 'src/qml/VoicemailPage/VoicemailPage.qml'
--- src/qml/VoicemailPage/VoicemailPage.qml	2013-09-18 21:12:30 +0000
+++ src/qml/VoicemailPage/VoicemailPage.qml	2013-09-26 21:39:41 +0000
@@ -28,6 +28,18 @@
     property QtObject call: callManager.foregroundCall
     property string number: callManager.voicemailNumber
     Component.onDestruction: mainView.switchToCallLogView()
+    Timer {
+        id: callWatcher
+        interval: 10000
+        repeat: false
+        running: true
+        onTriggered: {
+            if (!call) {
+                // TODO: notify about failed call
+                pageStack.pop()
+            }
+        }
+    }
 
     title: i18n.tr("Voicemail")
 

=== modified file 'src/qml/dialer-app.qml'
--- src/qml/dialer-app.qml	2013-09-18 21:27:00 +0000
+++ src/qml/dialer-app.qml	2013-09-26 21:39:41 +0000
@@ -39,10 +39,25 @@
     }
 
     function callVoicemail() {
+        if (!telepathyHelper.connected || callManager.voicemailNumber === "") {
+            return
+        }
+        if (pageStack.depth === 1 && !callManager.hasCalls) {
+            pageStack.push(Qt.resolvedUrl("VoicemailPage/VoicemailPage.qml"))
+        }
         callManager.startCall(callManager.voicemailNumber);
     }
 
     function call(number) {
+        if (!telepathyHelper.connected) {
+            return
+        }
+        if (number === callManager.voicemailNumber) {
+            callVoicemail()
+        }
+        if (pageStack.depth === 1 && !callManager.hasCalls)  {
+            pageStack.push(Qt.resolvedUrl("LiveCallPage/LiveCall.qml"), {"number": number})
+        }
         callManager.startCall(number);
     }