Merge lp:~boiko/dialer-app/fix_livecall_hang into lp:dialer-app

[Gustavo Pichorim Boiko]

Make sure the livecall is always in a consistent state, even after being sigstopped.

Make sure the livecall is always in a consistent state, even after being sigstopped.

== Checklist ==
Are there any related MPs required for this MP to build/function as expected? Please list.
No

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)
Yes

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?
Yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/<package-name>) on device or emulator?
Yes

If you changed the UI, was the change specified/approved by design?
N/A

If you changed UI labels, did you update the pot file?
N/A

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP?
N/A

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:310
http://jenkins.qa.ubuntu.com/job/dialer-app-ci/491/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-vivid-i386-ci/1
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/104
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/65
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/98
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/104
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/104/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15654
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/59
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/69
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/69/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Bill Filler (bfiller)]

approved

review: Approve

=== modified file 'src/qml/LiveCallPage/LiveCall.qml'
--- src/qml/LiveCallPage/LiveCall.qml	2014-10-07 17:01:28 +0000
+++ src/qml/LiveCallPage/LiveCall.qml	2014-11-10 23:08:04 +0000
@@ -101,6 +101,10 @@
         onHasCallsChanged: {
             if(!callManager.hasCalls) {
                 reportStatus({}, i18n.tr("No calls"));
+            } else {
+                closeTimer.running = false;
+                statusLabel.text = "";
+                liveCall.call = callManager.foregroundCall;
             }
         }
     }

=== modified file 'src/qml/dialer-app.qml'
--- src/qml/dialer-app.qml	2014-10-06 19:59:17 +0000
+++ src/qml/dialer-app.qml	2014-11-10 23:08:04 +0000
@@ -59,6 +59,9 @@
     onApplicationActiveChanged: {
         if (applicationActive) {
             telepathyHelper.registerChannelObserver()
+            if (pageStack.currentPage.objectName == "pageLiveCall" && !callManager.hasCalls) {
+                pageStack.pop();
+            }
         } else {
             telepathyHelper.unregisterChannelObserver()
         }