Merge lp:~tiagosh/dialer-app/emergency-calls-libphonenumber into lp:dialer-app

[Tiago Salem Herrmann]

Improve emergency number validation with libphonenumber.

Improve emergency number validation with libphonenumber.

--Checklist--
Are there any related MPs required for this MP to build/function as expected? Please list.
https://code.launchpad.net/~tiagosh/telephony-service/check-contact-watcher-results/+merge/266631
https://code.launchpad.net/~tiagosh/telephony-service/use-libphonenumber/+merge/264906

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:434
http://jenkins.qa.ubuntu.com/job/dialer-app-ci/580/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-vivid-i386-ci/93
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3431
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2857
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3428
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3428/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21884

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

review: Needs Fixing (continuous-integration)

[lp:~tiagosh/dialer-app/emergency-calls-libphonenumber]

435. By Tiago Salem Herrmann on 2015-07-20

use countryCode when checking for emergency numbers

436. By Tiago Salem Herrmann on 2015-07-20

fix comments

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:436
http://jenkins.qa.ubuntu.com/job/dialer-app-ci/583/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-vivid-i386-ci/96
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3452/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2876/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3449
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3449/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21998

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

review: Needs Fixing (continuous-integration)

[lp:~tiagosh/dialer-app/emergency-calls-libphonenumber]

437. By Tiago Salem Herrmann on 2015-07-21

Use the selected account if available, otherwise fallback to any other account

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:437
http://jenkins.qa.ubuntu.com/job/dialer-app-ci/584/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-vivid-i386-ci/97
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3462
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2882
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3459
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3459/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22036

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

review: Needs Fixing (continuous-integration)

[lp:~tiagosh/dialer-app/emergency-calls-libphonenumber]

438. By Tiago Salem Herrmann on 2015-07-22

Use string comparison for emergency numbers coming from the sim card

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:438
http://jenkins.qa.ubuntu.com/job/dialer-app-ci/585/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-vivid-i386-ci/98
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3466
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2885
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3463
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3463/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22067

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

review: Needs Fixing (continuous-integration)

[lp:~tiagosh/dialer-app/emergency-calls-libphonenumber]

439. By Tiago Salem Herrmann on 2015-07-23

Keep call button always enabled
Fill entry with last called number when the entry is empty and call button is pressed

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:439
http://jenkins.qa.ubuntu.com/job/dialer-app-ci/586/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-vivid-i386-ci/99
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3470
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2888
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3467
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3467/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22076

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

review: Needs Fixing (continuous-integration)

[lp:~tiagosh/dialer-app/emergency-calls-libphonenumber]

440. By Tiago Salem Herrmann on 2015-07-23

Allow calling any number if no sims are present

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:440
http://jenkins.qa.ubuntu.com/job/dialer-app-ci/587/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-vivid-i386-ci/100
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3473
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2891
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3470
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3470/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22095

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

review: Needs Fixing (continuous-integration)

[lp:~tiagosh/dialer-app/emergency-calls-libphonenumber]

441. By Tiago Salem Herrmann on 2015-07-24

Provide initial status and phone to live call when making a call

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:441
http://jenkins.qa.ubuntu.com/job/dialer-app-ci/588/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-vivid-i386-ci/101
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3476
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2894
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3473
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3473/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22123

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

review: Needs Fixing (continuous-integration)

[lp:~tiagosh/dialer-app/emergency-calls-libphonenumber]

442. By Tiago Salem Herrmann on 2015-07-24

update method signature

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:442
http://jenkins.qa.ubuntu.com/job/dialer-app-ci/589/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-vivid-i386-ci/102
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3477
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2895
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3474
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3474/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22128

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

review: Needs Fixing (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

Just a couple remarks, other than that I think it would be nice to try to add some tests, maybe QML tests?

review: Needs Fixing

[lp:~tiagosh/dialer-app/emergency-calls-libphonenumber]

443. By Tiago Salem Herrmann on 2015-08-07

improve comparison

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:443
http://jenkins.qa.ubuntu.com/job/dialer-app-ci/592/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-vivid-i386-ci/105
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3622
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2996
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3619
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3619/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22406

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

review: Needs Fixing (continuous-integration)

[lp:~tiagosh/dialer-app/emergency-calls-libphonenumber]

444. By Tiago Salem Herrmann on 2015-08-07

add tests

445. By Tiago Salem Herrmann on 2015-08-07

remove dbus-test-runner

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:444
http://jenkins.qa.ubuntu.com/job/dialer-app-ci/593/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/dialer-app-vivid-i386-ci/106/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3623/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3620/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:445
http://jenkins.qa.ubuntu.com/job/dialer-app-ci/594/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/dialer-app-vivid-i386-ci/107/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3624/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3621/console

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

review: Needs Fixing (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

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, needs changes in telephony-service.

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

Looks good and works as expected!

review: Approve

=== modified file 'debian/control'
--- debian/control	2015-05-14 17:01:14 +0000
+++ debian/control	2015-08-07 21:34:02 +0000
@@ -3,7 +3,6 @@
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
 Build-Depends: cmake,
-               dbus-test-runner,
                debhelper (>= 9),
                dh-translations,
                pkg-config,

=== modified file 'src/dialerapplication.cpp'
--- src/dialerapplication.cpp	2015-05-12 14:33:45 +0000
+++ src/dialerapplication.cpp	2015-08-07 21:34:02 +0000
@@ -227,7 +227,7 @@
         QUrlQuery query(url);
         QString viewName = query.queryItemValue("view");
         if (viewName == "liveCall") {
-            QMetaObject::invokeMethod(mainView, "switchToLiveCall");
+            QMetaObject::invokeMethod(mainView, "switchToLiveCall", Q_ARG(QVariant, QVariant()), Q_ARG(QVariant, QVariant()));
         }
 
     }

=== modified file 'src/qml/DialerPage/DialerPage.qml'
--- src/qml/DialerPage/DialerPage.qml	2015-07-17 09:01:20 +0000
+++ src/qml/DialerPage/DialerPage.qml	2015-08-07 21:34:02 +0000
@@ -263,6 +263,7 @@
 
             KeypadEntry {
                 id: keypadEntry
+                objectName: "keypadEntry"
 
                 anchors {
                     top: parent.top
@@ -401,20 +402,49 @@
                 horizontalCenter: parent.horizontalCenter
             }
             onClicked: {
+                if (dialNumber == "") {
+                    if (mainView.greeterMode) {
+                        return;
+                    }
+                    keypadEntry.value = generalSettings.lastCalledPhoneNumber
+                    return;
+                }
+
+                if (mainView.greeterMode && !mainView.isEmergencyNumber(dialNumber)) {
+                    // we only allow users to call any number in greeter mode if there are 
+                    // no sim cards present. The operator will block the number if it thinks
+                    // it's necessary.
+                    // for phone accounts, active means the the status is not offline:
+                    // "nomodem", "nosim" or "flightmode"
+
+                    var denyEmergencyCall = false
+                    // while in flight mode we can't detect if sims are present in some devices
+                    if (telepathyHelper.flightMode) {
+                        denyEmergencyCall = true
+                    } else {
+                        for (var i in telepathyHelper.activeAccounts) {
+                            var account = telepathyHelper.activeAccounts[i]
+                            if (account.type == AccountEntry.PhoneAccount) {
+                                denyEmergencyCall = true;
+                            }
+                        }
+                    }
+                    if (denyEmergencyCall) {
+                        // if there is at least one sim card present, just ignore the call
+                        showNotification(i18n.tr("Emergency call"), i18n.tr("This is not an emergency number."))
+                        keypadEntry.value = "";
+                        return;
+                    }
+
+                    // this is a special case, we need to call using callEmergency() directly to avoid
+                    // all network and dual sim checks we have in mainView.call()
+                    mainView.callEmergency(keypadEntry.value)
+                    return;
+                }
+
                 console.log("Starting a call to " + keypadEntry.value);
                 mainView.call(keypadEntry.value);
             }
-            enabled: {
-                if (dialNumber == "") {
-                    return false;
-                }
-
-                if (mainView.greeterMode) {
-                    return mainView.isEmergencyNumber(dialNumber);
-                }
-
-                return true;
-            }
         }
     }
 
@@ -443,7 +473,7 @@
         }
         ScriptAction {
             script: {
-                mainView.switchToLiveCall()
+                mainView.switchToLiveCall(i18n.tr("Calling"), keypadEntry.value)
                 keypadEntry.value = ""
                 callButton.iconRotation = 0.0
                 keypadContainer.opacity = 1.0

=== modified file 'src/qml/Dialogs/NoDefaultSIMCardDialog.qml'
--- src/qml/Dialogs/NoDefaultSIMCardDialog.qml	2014-08-15 21:18:20 +0000
+++ src/qml/Dialogs/NoDefaultSIMCardDialog.qml	2015-08-07 21:34:02 +0000
@@ -70,7 +70,7 @@
                     text: i18n.tr("No")
                     color: UbuntuColors.orange
                     onClicked: {
-                        settings.mainViewDontAskCount = 3
+                        dualSimSettings.mainViewDontAskCount = 3
                         PopupUtils.close(dialogue)
                         Qt.inputMethod.hide()
                     }
@@ -81,7 +81,7 @@
                     color: UbuntuColors.orange
                     onClicked: {
                         PopupUtils.close(dialogue)
-                        settings.mainViewDontAskCount++
+                        dualSimSettings.mainViewDontAskCount++
                         Qt.inputMethod.hide()
                     }
                 }

=== modified file 'src/qml/LiveCallPage/LiveCall.qml'
--- src/qml/LiveCallPage/LiveCall.qml	2015-07-16 21:45:42 +0000
+++ src/qml/LiveCallPage/LiveCall.qml	2015-08-07 21:34:02 +0000
@@ -43,6 +43,8 @@
     property variant audioOutputs: call ? call.audioOutputs : null
     property string phoneNumberSubTypeLabel: ""
     property int defaultTimeout: 10000
+    property string initialStatus: ""
+    property string initialNumber: ""
     property string caller: {
         if (call && call.isConference) {
             return i18n.tr("Conference");
@@ -50,6 +52,8 @@
             return contactWatcher.alias;
         } else if (contactWatcher.identifier !== "") {
             return contactWatcher.identifier;
+        } else if (!call && initialNumber != "") {
+            return initialNumber
         } else {
             return " "
         }
@@ -444,6 +448,8 @@
                     return call.held ? i18n.tr("%1 - on hold").arg(stopWatch.elapsed) : stopWatch.elapsed;
                 } else if (call && !call.incoming) {
                     return i18n.tr("Calling")
+                } else if (!call && initialStatus !== "") {
+                    return initialStatus
                 } else {
                     return " "
                 }

=== modified file 'src/qml/dialer-app.qml'
--- src/qml/dialer-app.qml	2015-06-09 22:02:19 +0000
+++ src/qml/dialer-app.qml	2015-08-07 21:34:02 +0000
@@ -90,7 +90,7 @@
         onSetupReady: {
             telepathyReady = true
             if (multipleAccounts && !telepathyHelper.defaultCallAccount &&
-                settings.mainViewDontAskCount < 3 && pageStackNormalMode.depth === 1 && !mainView.greeterMode) {
+                dualSimSettings.mainViewDontAskCount < 3 && pageStackNormalMode.depth === 1 && !mainView.greeterMode) {
                 PopupUtils.open(Qt.createComponent("Dialogs/NoDefaultSIMCardDialog.qml").createObject(mainView))
             }
         }
@@ -111,12 +111,17 @@
     }
 
     Settings {
-        id: settings
+        id: dualSimSettings
         category: "DualSim"
         property bool dialPadDontAsk: false
         property int mainViewDontAskCount: 0
     }
 
+    Settings {
+        id: generalSettings
+        property string lastCalledPhoneNumber: ""
+    }
+
     PhoneUtils {
         id: phoneUtils
     }
@@ -166,13 +171,21 @@
     ]
 
     function isEmergencyNumber(number) {
+        // TODO should we only check for emergency numbers
+        // in the selected account?
+
+        // check for specific account emergency numbers
         for (var i in telepathyHelper.accounts) {
             var account = telepathyHelper.accounts[i];
             for (var j in account.emergencyNumbers) {
-                if (phoneUtils.comparePhoneNumbers(number, account.emergencyNumbers[j])) {
+                if (number == account.emergencyNumbers[j]) {
                     return true;
                 }
             }
+            // then check using libphonenumber
+            if (phoneUtils.isEmergencyNumber(number, account.countryCode)) {
+                return true;
+            }
         }
         return false;
     }
@@ -264,9 +277,12 @@
 
         animateLiveCall();
 
-        // now try to use one of the connected accounts
         var account = null;
-        if (telepathyHelper.activeAccounts.length > 0) {
+        // check if the selected account is active and can make emergency calls
+        if (mainView.account && mainView.account.active && mainView.account.emergencyCallsAvailable) {
+            account = mainView.account
+        } else if (telepathyHelper.activeAccounts.length > 0) {
+            // now try to use one of the connected accounts
             account = telepathyHelper.activeAccounts[0];
         } else {
             // if no account is active, use any account that can make emergency calls
@@ -317,7 +333,7 @@
             return
         }
 
-        if (multipleAccounts && !telepathyHelper.defaultCallAccount && !settings.dialPadDontAsk && !skipDefaultSimDialog) {
+        if (multipleAccounts && !telepathyHelper.defaultCallAccount && !dualSimSettings.dialPadDontAsk && !skipDefaultSimDialog) {
             var properties = {}
             properties["phoneNumber"] = number
             properties["accountId"] = mainView.account.accountId
@@ -359,6 +375,7 @@
         }
 
         if (account && account.connected) {
+            generalSettings.lastCalledPhoneNumber = number
             callManager.startCall(number, account.accountId);
         }
     }
@@ -409,13 +426,15 @@
         }
     }
 
-    function switchToLiveCall() {
+    function switchToLiveCall(initialStatus, initialNumber) {
         if (pageStackNormalMode.depth > 2 && pageStackNormalMode.currentPage.objectName == "contactsPage") {
             // pop contacts Page
             pageStackNormalMode.pop();
         }
 
         var properties = {}
+        properties["initialStatus"] = initialStatus
+        properties["initialNumber"] = initialNumber
         if (isEmergencyNumber(pendingNumberToDial)) {
             properties["defaultTimeout"] = 30000
         }

=== modified file 'tests/qml/CMakeLists.txt'
--- tests/qml/CMakeLists.txt	2015-05-21 18:52:21 +0000
+++ tests/qml/CMakeLists.txt	2015-08-07 21:34:02 +0000
@@ -15,21 +15,12 @@
     )
 endmacro()
 
-macro(DECLARE_QML_DBUS_TEST TST_NAME TST_QML_FILE)
-    add_test(NAME ${TST_NAME}
-        WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-        COMMAND ${XVFB_RUN_BIN} -a -s "-screen 0 1024x768x24" dbus-test-runner --task /usr/bin/history-daemon --ignore-return --task /usr/bin/telephony-service-handler --ignore-return --task=${QMLTESTRUNNER_BIN} --parameter=-v1 --parameter=-o --parameter=-,txt --parameter=-o --parameter=${CMAKE_BINARY_DIR}/test_${TST_NAME}.xml,xunitxml --parameter=-import --parameter=${qml_BINARY_DIR} --parameter=-input --parameter=${CMAKE_CURRENT_SOURCE_DIR}/${TST_QML_FILE}
-    )
-    set_tests_properties(${TST_NAME} PROPERTIES ENVIRONMENT "QT_QPA_FONTDIR=${CMAKE_BINARY_DIR}")
-endmacro()
-
 if(QMLTESTRUNNER_BIN AND XVFB_RUN_BIN)
     declare_qml_test("keypad_button" tst_KeypadButton.qml)
     declare_qml_test("main_view" tst_MainView.qml)
     declare_qml_test("stopwatch" tst_StopWatch.qml)
     declare_qml_test("historydelegate" tst_HistoryDelegate.qml)
-# FIXME currently disabled. There is a bug when registering the telepathy observer
-#    declare_qml_dbus_test("dialer_page" tst_DialerPage.qml)
+    declare_qml_test("dialer_page" tst_DialerPage.qml)
 else()
     if (NOT QMLTESTRUNNER_BIN)
         message(WARNING "Qml tests disabled: qmltestrunner not found")

=== modified file 'tests/qml/tst_DialerPage.qml'
--- tests/qml/tst_DialerPage.qml	2015-03-30 20:09:13 +0000
+++ tests/qml/tst_DialerPage.qml	2015-08-07 21:34:02 +0000
@@ -19,6 +19,7 @@
 import QtQuick 2.2
 import QtTest 1.0
 import Ubuntu.Test 0.1
+import Ubuntu.Telephony 0.1
 
 Item {
     id: root
@@ -38,6 +39,43 @@
         property bool greeterActive: false
     }
 
+    QtObject {
+        id: testAccount
+        property string accountId: "ofono/ofono/account0"
+        property var emergencyNumbers: [ "444", "555"]
+        property int type: AccountEntry.PhoneAccount
+        property string displayName: "SIM 1"
+        property bool connected: true
+        property bool emergencyCallsAvailable: true
+        property bool active: true
+        property string networkName: "Network name"
+        property bool simLocked: false
+    }
+
+    Item {
+        id: telepathyHelper
+        function registerChannelObserver() {}
+        function unregisterChannelObserver() {}
+        property bool emergencyCallsAvailable: true
+        property bool flightMode: false
+        property var activeAccounts: [testAccount]
+        property alias accounts: telepathyHelper.activeAccounts
+    }
+
+    Item {
+        id: callManager
+        signal callStarted
+        function startCall(phoneNumber, accountId) {
+            callManager.callStarted(phoneNumber, accountId)
+        }
+    }
+
+    SignalSpy {
+       id: callSpy
+       target: callManager
+       signalName: "callStarted"
+    }
+
     Loader {
         id: mainViewLoader
         property string i18nDirectory: ""
@@ -57,15 +95,17 @@
         }
 
         function test_dialerPageHeaderTitleWhenAppIsInBackground() {
+            mainViewLoader.item.switchToKeypadView()
             tryCompare(mainViewLoader.item, 'applicationActive', true)
             tryCompare(mainViewLoader.item.currentStack, 'depth', 1)
 
             mainViewLoader.item.telepathyReady = true
-            tryCompare(mainViewLoader.item.currentStack.currentPage, 'title', i18n.tr('No network'))
+            greeter.greeterActive = false
+            tryCompare(mainViewLoader.item.currentStack.currentPage, 'title', i18n.tr('Network name'))
 
             // we should still display the title on regular states
             mainViewLoader.item.applicationActive = false
-            tryCompare(mainViewLoader.item.currentStack.currentPage, 'title', i18n.tr('No network'))
+            tryCompare(mainViewLoader.item.currentStack.currentPage, 'title', i18n.tr('Network name'))
 
             // app must always display "emergency calls" when the greeter is active and app is in foreground
             mainViewLoader.item.applicationActive = true
@@ -75,5 +115,88 @@
             mainViewLoader.item.applicationActive = false
             tryCompare(mainViewLoader.item.currentStack.currentPage, 'title', ' ')
         }
+
+        function test_dialerPageEmergencyNumbers() {
+            tryCompare(mainViewLoader.item, 'applicationActive', true)
+            tryCompare(mainViewLoader.item.currentStack, 'depth', 1)
+
+            mainViewLoader.item.telepathyReady = true
+            mainViewLoader.item.accountReady = true
+            greeter.greeterActive = false
+            mainViewLoader.item.switchToKeypadView()
+
+            var dialerPage = mainViewLoader.item.currentStack.currentPage
+            var keypadEntry = findChild(mainViewLoader, "keypadEntry")
+            var callButton = findChild(mainViewLoader, "callButton")
+
+            // regular number when connected
+            testAccount.connected = true
+            keypadEntry.value = "123"
+            callButton.clicked()
+            compare(callSpy.count, 1)
+            callSpy.clear()
+            mainViewLoader.item.switchToKeypadView()
+
+            // regular number when disconnected
+            testAccount.connected = false
+            keypadEntry.value = "123"
+            callButton.clicked()
+            compare(callSpy.count, 0)
+            callSpy.clear()
+            mainViewLoader.item.switchToKeypadView()
+
+            // regular number in greeter mode
+            testAccount.connected = true
+            greeter.greeterActive = true
+            keypadEntry.value = "123"
+            callButton.clicked()
+            compare(callSpy.count, 0)
+            callSpy.clear()
+            mainViewLoader.item.switchToKeypadView()
+
+            // emergency number in greeter mode when connected
+            testAccount.connected = true
+            greeter.greeterActive = true
+            keypadEntry.value = "444"
+            callButton.clicked()
+            compare(callSpy.count, 1)
+            callSpy.clear()
+            mainViewLoader.item.switchToKeypadView()
+
+            // emergency number in greeter mode when disconnected
+            testAccount.connected = false
+            greeter.greeterActive = true
+            keypadEntry.value = "444"
+            callButton.clicked()
+            compare(callSpy.count, 1)
+            callSpy.clear()
+            mainViewLoader.item.switchToKeypadView()
+
+            // emergency number in flight mode
+            testAccount.connected = false
+            telepathyHelper.emergencyCallsAvailable = false
+            telepathyHelper.flightMode = true
+            greeter.greeterActive = false
+            keypadEntry.value = "444"
+            callButton.clicked()
+            telepathyHelper.emergencyCallsAvailable = true
+            wait(15000)
+            compare(callSpy.count, 1)
+            callSpy.clear()
+            mainViewLoader.item.switchToKeypadView()
+ 
+            // emergency number in flight mode and greeter mode
+            testAccount.connected = false
+            telepathyHelper.emergencyCallsAvailable = false
+            telepathyHelper.flightMode = true
+            greeter.greeterActive = true
+            keypadEntry.value = "444"
+            callButton.clicked()
+            telepathyHelper.emergencyCallsAvailable = true
+            wait(15000)
+            compare(callSpy.count, 1)
+            callSpy.clear()
+            mainViewLoader.item.switchToKeypadView()
+        }
     }
 }