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

[Tiago Salem Herrmann]

- do not switch to call log view on incoming calls.
- change the logic of creating/destroying live call and voicemail views.

- do not switch to call log view on incoming calls.
- change the logic of creating/destroying live call and voicemail views.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

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

42. By Tiago Salem Herrmann on 2013-09-18

also track calls using onForegroundCallChanged.
switch to call log when view is destroyed

43. By Tiago Salem Herrmann on 2013-09-18

use only foregroundcalls to track calls on the app

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

Looks good and works as expected!

review: Approve

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

=== modified file 'src/qml/LiveCallPage/LiveCall.qml'
--- src/qml/LiveCallPage/LiveCall.qml	2013-08-29 17:24:15 +0000
+++ src/qml/LiveCallPage/LiveCall.qml	2013-09-18 21:27:36 +0000
@@ -36,6 +36,7 @@
     property bool isMuted: call ? call.muted : false
     property bool dtmfVisible: false
     property string phoneNumberSubTypeLabel: ""
+    Component.onDestruction: mainView.switchToCallLogView()
 
     // 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-07-24 19:30:24 +0000
+++ src/qml/VoicemailPage/VoicemailPage.qml	2013-09-18 21:27:36 +0000
@@ -27,18 +27,10 @@
     property variant contact
     property QtObject call: callManager.foregroundCall
     property string number: callManager.voicemailNumber
+    Component.onDestruction: mainView.switchToCallLogView()
 
     title: i18n.tr("Voicemail")
 
-    Component.onDestruction: {
-        // if this view was destroyed but we still have
-        // active calls, then it means it was manually removed
-        // from the stack
-        if (previousTab != -1 && callManager.hasCalls) {
-            mainView.selectedTabIndex = previousTab
-        }
-    }
-
     function isVoicemailActive() {
         return mainView.isVoicemailActive();
     }
@@ -49,18 +41,6 @@
         }
     }
 
-    Connections {
-        target: callManager
-        onCallEnded: {
-            if (!callManager.hasCalls) {
-                if (voicemail.visible && voicemail.previousTab != -1) {
-                    mainView.selectedTabIndex = voicemail.previousTab
-                }
-                mainView.endCall();
-            }
-        }
-    }
-
     Item {
         id: container
 
 
=== modified file 'src/qml/dialer-app.qml'
--- src/qml/dialer-app.qml	2013-08-26 14:34:56 +0000
+++ src/qml/dialer-app.qml	2013-09-18 21:27:36 +0000
@@ -46,6 +46,9 @@
         callManager.startCall(number);
     }
 
+    function switchToCallLogView() {
+        pageStack.currentPage.currentTab = 2;
+    }
 
     function isVoicemailActive() {
         if (callManager.foregroundCall) {
@@ -70,22 +73,22 @@
     Connections {
         target: callManager
         onForegroundCallChanged: {
-            // if there is no call, or if the views are already loaded, do not continue processing
-            if (!callManager.foregroundCall) {
+            if(!callManager.hasCalls) {
                 while (pageStack.depth > 1) {
                     pageStack.pop();
                 }
-                pageStack.currentPage.currentTab = 2;
-                return;
-            }
-
-            if (callManager.foregroundCall.voicemail) {
-                pageStack.push(Qt.resolvedUrl("VoicemailPage/VoicemailPage.qml"))
-            } else {
-                pageStack.push(Qt.resolvedUrl("LiveCallPage/LiveCall.qml"));
-            }
-
-            application.activateWindow();
+                return
+            }
+            // if there are no calls, or if the views are already loaded, do not continue processing
+            if ((callManager.foregroundCall || callManager.backgroundCall) && pageStack.depth === 1) {
+                if ((callManager.foregroundCall && callManager.foregroundCall.voicemail)
+                        || (callManager.backgroundCall && callManager.backgroundCall.voicemail)) {
+                    pageStack.push(Qt.resolvedUrl("VoicemailPage/VoicemailPage.qml"))
+                } else  {
+                    pageStack.push(Qt.resolvedUrl("LiveCallPage/LiveCall.qml"));
+                }
+                application.activateWindow();
+            }
         }
     }