dialer-app

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

fix_calling_emergency_numbers
Merge into trunk

Proposed by Gustavo Pichorim Boiko on 2014-09-29

Status:

Superseded

Proposed branch:

lp:~boiko/dialer-app/fix_calling_emergency_numbers

Merge into:

lp:dialer-app

Prerequisite:

lp:~tiagosh/dialer-app/sim-lock

Diff against target:

345 lines (+122/-62)

5 files modified

src/qml/DialerPage/DialerPage.qml (+11/-29)
src/qml/Dialogs/SetDefaultSIMCardDialog.qml (+2/-2)
src/qml/LiveCallPage/LiveCall.qml (+7/-1)
src/qml/dialer-app.qml (+98/-30)
tests/autopilot/dialer_app/tests/test_calls.py (+4/-0)

To merge this branch:

bzr merge lp:~boiko/dialer-app/fix_calling_emergency_numbers

Related bugs:

Bug #1355859: can't dial emergency call number when sim is pin protected and not unlocked	Critical	Fix Released
Bug #1369774: Can't make an emergency call when FlightMode is active	Critical	Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration	2014-09-29	Needs Fixing on 2014-09-30
Tiago Salem Herrmann (community)		2014-09-29	Approve on 2014-09-30
Review via email: mp+236434@code.launchpad.net

This proposal supersedes a proposal from 2014-09-29.

This proposal has been superseded by a proposal from 2014-10-06.

Commit message

Remove some code duplication and make sure emergency calling is always available.

Description of the change

Remove some code duplication and make sure emergency calling is always available.

== Checklist ==
Are there any related MPs required for this MP to build/function as expected? Please list.
Yes: https://code.launchpad.net/~tiagosh/telephony-service/sim-lock/+merge/235505

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?
Yes

If you changed UI labels, did you update the pot file?
No, it will be updated later

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

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-29: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-30:

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

review: Needs Fixing (continuous-integration)

lp:~boiko/dialer-app/fix_calling_emergency_numbers updated on 2014-09-30

281. By Gustavo Pichorim Boiko on 2014-09-30: Fix autopilot test.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-30:

FAILED: Continuous integration, rev:281
http://jenkins.qa.ubuntu.com/job/dialer-app-ci/469/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-utopic-i386-ci/240
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5302
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3840
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5021
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6554
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6554/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13900
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3223
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4151
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4151/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

lp:~boiko/dialer-app/fix_calling_emergency_numbers updated on 2014-09-30

282. By Gustavo Pichorim Boiko on 2014-09-30: Fix the path to the dialogs.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-30:

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

review: Needs Fixing (continuous-integration)

lp:~boiko/dialer-app/fix_calling_emergency_numbers updated on 2014-09-30

283. By Gustavo Pichorim Boiko on 2014-09-30: Fix calling the dialogs.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-30:

FAILED: Continuous integration, rev:283
http://jenkins.qa.ubuntu.com/job/dialer-app-ci/472/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-utopic-i386-ci/243
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5347
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3855
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5058
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6599
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6599/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13957
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3236
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4168
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4168/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

lp:~boiko/dialer-app/fix_calling_emergency_numbers updated on 2014-09-30

284. By Gustavo Pichorim Boiko on 2014-09-30: Use the correct variable.

Revision history for this message

Tiago Salem Herrmann (tiagosh) wrote on 2014-09-30:

Looks good and works as expected.

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

Did CI run pass? If not, please explain why.
No, but not related to the changes.

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?
Yes

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-30:

FAILED: Continuous integration, rev:284
http://jenkins.qa.ubuntu.com/job/dialer-app-ci/473/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-utopic-i386-ci/244
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5356
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3862
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5068
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6608
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6608/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13968
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3243
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4175
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4175/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

lp:~boiko/dialer-app/fix_calling_emergency_numbers updated on 2014-10-03

285. By Gustavo Pichorim Boiko on 2014-10-03: Wait longer for the calls to appear. In the case where we are leaving flight mode
the modem takes longer to be ready and to place the call.
286. By Gustavo Pichorim Boiko on 2014-10-03: Increase the waiting interval if switching from flight mode.

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Gustavo Pichorim Boiko

Ishan Joshi

Ubuntu Phablet Team

 === modified file 'src/qml/DialerPage/DialerPage.qml'
 --- src/qml/DialerPage/DialerPage.qml	2014-10-03 18:42:54 +0000
 +++ src/qml/DialerPage/DialerPage.qml	2014-10-03 18:42:55 +0000
@@ -31,6 +31,7 @@
      property alias dialNumber: keypadEntry.value
      property alias input: keypadEntry.input
++    property alias callAnimationRunning: callAnimation.running
      property var mmiPlugins: []
      property list<Action> actionsGreeter
      property list<Action> actionsNormal: [
@@ -81,6 +82,10 @@
                  target: addContact
                  visible: false
+             }
++            PropertyChanges {
++                target: keypadEntry
++                value: ""
++            }
          },
          State {
              name: "normalMode"
@@ -145,6 +150,10 @@
          return index;
+     }
++    function triggerCallAnimation() {
++        callAnimation.start();
++    }
++
      Connections {
          target: mainView
          onPendingNumberToDialChanged: {
@@ -368,34 +377,7 @@
+             }
              onClicked: {
                  console.log("Starting a call to " + keypadEntry.value);
--                // check if at least one account is selected
--                if (multipleAccounts && !mainView.account) {
--                    Qt.inputMethod.hide()
--                    PopupUtils.open(Qt.createComponent("../Dialogs/NoSIMCardSelectedDialog.qml").createObject(page))
--                    return
--                }
--
--                if (multipleAccounts && !telepathyHelper.defaultCallAccount && !settings.dialPadDontAsk) {
--                    var properties = {}
--                    properties["phoneNumber"] = dialNumber
--                    properties["accountId"] = mainView.account.accountId
--                    PopupUtils.open(Qt.createComponent("../Dialogs/SetDefaultSIMCardDialog.qml").createObject(page), footer, properties)
--                    return
--                }
--
--                if (mainView.account && !greeter.greeterActive && !mainView.isEmergencyNumber(dialNumber) && mainView.account.simLocked) {
--                    var properties = {}
--                    properties["accountId"] = mainView.account.accountId
--                    PopupUtils.open(Qt.createComponent("../Dialogs/SimLockedDialog.qml").createObject(page), footer, properties)
--                    return
--                }
--
--                // avoid cleaning the keypadEntry in case there is no signal
--                if (!mainView.account.connected) {
--                    PopupUtils.open(noNetworkDialog)
--                    return
--                }
--                callAnimation.start()
++                mainView.call(keypadEntry.value);
+             }
              enabled: {
                  if (dialNumber == "") {
@@ -436,7 +418,7 @@
+         }
          ScriptAction {
              script: {
--                mainView.call(keypadEntry.value, mainView.account.accountId);
++                mainView.switchToLiveCall()
                  keypadEntry.value = ""
                  callButton.iconRotation = 0.0
                  keypadContainer.opacity = 1.0
 === modified file 'src/qml/Dialogs/SetDefaultSIMCardDialog.qml'
 --- src/qml/Dialogs/SetDefaultSIMCardDialog.qml	2014-08-20 14:00:01 +0000
 +++ src/qml/Dialogs/SetDefaultSIMCardDialog.qml	2014-10-03 18:42:55 +0000
@@ -41,7 +41,7 @@
                      color: UbuntuColors.orange
                      onClicked: {
                          PopupUtils.close(dialogue)
--                        mainView.call(phoneNumber, accountId)
++                        mainView.call(phoneNumber, true)
                          Qt.inputMethod.hide()
+                     }
+                 }
@@ -52,7 +52,7 @@
                      onClicked: {
                          telepathyHelper.setDefaultAccount(TelepathyHelper.Call, mainView.account)
                          PopupUtils.close(dialogue)
--                        mainView.call(phoneNumber, accountId)
++                        mainView.call(phoneNumber, true)
                          Qt.inputMethod.hide()
+                     }
+                 }
 === modified file 'src/qml/LiveCallPage/LiveCall.qml'
 --- src/qml/LiveCallPage/LiveCall.qml	2014-09-22 21:55:49 +0000
 +++ src/qml/LiveCallPage/LiveCall.qml	2014-10-03 18:42:55 +0000
@@ -239,11 +239,17 @@
      Component.onCompleted: {
          callManager.callIndicatorVisible = !active;
++
++        // if this view is visible in flight mode, it is very likely an emergency call
++        // so wait longer for the call to appear before giving up
++        if (telepathyHelper.flightMode) {
++            callWatcher.interval = 30000;
++        }
+     }
      Timer {
          id: callWatcher
--        interval: 7000
++        interval: 10000
          repeat: false
          running: true
          onTriggered: {
 === modified file 'src/qml/dialer-app.qml'
 --- src/qml/dialer-app.qml	2014-10-03 18:42:54 +0000
 +++ src/qml/dialer-app.qml	2014-10-03 18:42:55 +0000
@@ -54,7 +54,6 @@
      signal closeUSSDProgressIndicator
      property string pendingNumberToDial: ""
--    property string pendingAccountId: ""
      property bool accountReady: false
      onApplicationActiveChanged: {
@@ -119,9 +118,12 @@
+     ]
      function isEmergencyNumber(number) {
--        for (var i in mainView.account.emergencyNumbers) {
--            if (phoneUtils.comparePhoneNumbers(number, mainView.account.emergencyNumbers[i])) {
--                return true;
++        for (var i in telepathyHelper.accounts) {
++            var account = telepathyHelper.accounts[i];
++            for (var j in account.emergencyNumbers) {
++                if (phoneUtils.comparePhoneNumbers(number, account.emergencyNumbers[j])) {
++                    return true;
++                }
+             }
+         }
          return false;
@@ -153,7 +155,7 @@
          if (greeter.greeterActive) {
              return;
+         }
--        call(mainView.account.voicemailNumber, mainView.account.accountId);
++        call(mainView.account.voicemailNumber);
+     }
      function checkUSSD(number) {
@@ -187,38 +189,82 @@
          return false
+     }
--    function call(number, accountId) {
++    function callEmergency(number) {
++        animateLiveCall();
++
++        // if we are in flight mode, we first need to disable it and wait for
++        // the modems to update
++        if (telepathyHelper.flightMode) {
++            pendingNumberToDial = number;
++            telepathyHelper.flightMode = false;
++            return;
++        }
++
++        // now try to use one of the connected accounts
++        var account = null;
++        if (telepathyHelper.activeAccounts.length > 0) {
++            account = telepathyHelper.activeAccounts[0];
++        } else {
++            // if no account is active, use any account that can make emergency calls
++            for (var i in telepathyHelper.accounts) {
++                if (telepathyHelper.accounts[i].emergencyCallsAvailable) {
++                    account = telepathyHelper.accounts[i];
++                    break;
++                }
++            }
++        }
++
++        // not sure what to do when no accounts can make emergency calls
++        if (account == null) {
++            pendingNumberToDial = number;
++            return;
++        }
++
++        if (!accountReady) {
++            pendingNumberToDial = number;
++            return;
++        }
++
++        callManager.startCall(number, account.accountId);
++    }
++
++    function call(number, skipDefaultSimDialog) {
          // clear the values here so that the changed signals are fired when the new value is set
          pendingNumberToDial = "";
--        pendingAccountId = "";
--
          if (number === "") {
              return
+         }
++        if (isEmergencyNumber(number)) {
++            callEmergency(number);
++            return;
++        }
++
++        // check if at least one account is selected
          if (multipleAccounts && !mainView.account) {
++            Qt.inputMethod.hide()
              PopupUtils.open(Qt.createComponent("Dialogs/NoSIMCardSelectedDialog.qml").createObject(mainView))
              return
+         }
--        var account = telepathyHelper.accountForId(accountId);
--        if (account && !greeter.greeterActive && !mainView.isEmergencyNumber(number) && account.simLocked) {
--            PopupUtils.open(Qt.createComponent("Dialogs/SimLockedDialog.qml").createObject(mainView))
--            return
--        }
--
--        if (!telepathyHelper.connected && !isEmergencyNumber((number))) {
--            pendingNumberToDial = number;
--            pendingAccountId = accountId;
--            return;
--        }
--
--        if (!account) {
--            account = telepathyHelper.accounts[0];
--        }
--
--        if (!account.connected) {
++        if (multipleAccounts && !telepathyHelper.defaultCallAccount && !settings.dialPadDontAsk && !skipDefaultSimDialog) {
++            var properties = {}
++            properties["phoneNumber"] = number
++            properties["accountId"] = mainView.account.accountId
++            PopupUtils.open(Qt.createComponent("Dialogs/SetDefaultSIMCardDialog.qml").createObject(mainView), mainView, properties)
++            return
++        }
++
++        if (mainView.account && !greeter.greeterActive && mainView.account.simLocked) {
++            var properties = {}
++            properties["accountId"] = mainView.account.accountId
++            PopupUtils.open(Qt.createComponent("Dialogs/SimLockedDialog.qml").createObject(mainView), mainView, properties)
++            return
++        }
++
++        // avoid cleaning the keypadEntry in case there is no signal
++        if (!mainView.account.connected) {
              PopupUtils.open(noNetworkDialog)
              return
+         }
@@ -229,11 +275,10 @@
              return
+         }
--        switchToLiveCall();
++        animateLiveCall();
          if (!accountReady) {
              pendingNumberToDial = number;
--            pendingAccountId = accountId;
              return;
+         }
@@ -262,6 +307,14 @@
+         }
+     }
++    function animateLiveCall() {
++        if (pageStack.currentPage && pageStack.currentPage.triggerCallAnimation) {
++            pageStack.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
@@ -373,10 +426,20 @@
+             }
              if (pendingNumberToDial != "") {
--                callManager.startCall(pendingNumberToDial, pendingAccountId);
++                callManager.startCall(pendingNumberToDial, mainView.account.accountId);
+             }
              pendingNumberToDial = "";
--            pendingAccountId = "";
++        }
++
++        onEmergencyCallsAvailableChanged: {
++            if (telepathyHelper.emergencyCallsAvailable && pendingNumberToDial !== "") {
++                if (!isEmergencyNumber(pendingNumberToDial)) {
++                    return;
++                }
++
++                callEmergency(pendingNumberToDial);
++                pendingNumberToDial = "";
++            }
+         }
+     }
@@ -387,7 +450,12 @@
                  return;
+             }
--            // load the live call
++            // if we are animating the dialpad view, do not switch to livecall directly
++            if (pageStack.currentPage && pageStack.currentPage.callAnimationRunning) {
++                return;
++            }
++
++            // if not, just open the live call
              switchToLiveCall();
+         }
+     }
 === modified file 'tests/autopilot/dialer_app/tests/test_calls.py'
 --- tests/autopilot/dialer_app/tests/test_calls.py	2014-09-02 21:09:04 +0000
 +++ tests/autopilot/dialer_app/tests/test_calls.py	2014-10-03 18:42:55 +0000
@@ -130,8 +130,12 @@
          elapsed_time = self.main_view.live_call_page.get_elapsed_call_time()
          self.assertIn("00:0", elapsed_time)
++        # wait for the live call view to be gone
++        self.main_view.dialer_page.active.wait_for(True)
++
          # after remote hangs up, should switch to call log page and show call
          # to number
++        self.main_view.dialer_page.reveal_bottom_edge_page()
          self.assertThat(self.history_list.visible, Eventually(Equals(True)))
          self.assertThat(self.history_list.count, Eventually(Equals(1)))
          self.assertThat(self.get_history_for_number(number), NotEquals(None))