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

[Gustavo Pichorim Boiko]

In order to make it clear that emergency calls are possible in a sim locked situation,
show "Emergency Calls" in the header together with a sim locked icon.

In order to make it clear that emergency calls are possible in a sim locked situation,
show "Emergency Calls" in the header together with a sim locked icon.

[lp:~boiko/dialer-app/show_emergency_calls_when_sim_locked]

526. By Gustavo Pichorim Boiko on 2016-04-29

Update copyright header.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:526
http://jenkins.qa.ubuntu.com/job/dialer-app-ci/645/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-vivid-i386-ci/158
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6896
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/5223
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6907
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6907/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/28150

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:526
http://jenkins.qa.ubuntu.com/job/dialer-app-ci/646/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-vivid-i386-ci/159
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6901
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/5225
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6912
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6912/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/28152

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

review: Needs Fixing (continuous-integration)

[Tiago Salem Herrmann (tiagosh)]

looks good to me.

review: Approve

=== modified file 'src/qml/DialerPage/DialerPage.qml'
--- src/qml/DialerPage/DialerPage.qml	2016-02-11 17:58:29 +0000
+++ src/qml/DialerPage/DialerPage.qml	2016-04-29 21:33:35 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2013 Canonical Ltd.
+ * Copyright 2012-2016 Canonical Ltd.
  *
  * This file is part of dialer-app.
  *
@@ -71,15 +71,34 @@
 
     ]
     head.actions: mainView.greeterMode ? actionsGreeter : actionsNormal
-    head.backAction: Action {
+
+    Action {
+        id: backAction
+        objectName: "backAction"
         iconName: "back"
         text: i18n.tr("Close")
-        visible: mainView.greeterMode
         onTriggered: {
             greeter.showGreeter()
             dialNumber = "";
         }
     }
+    Action {
+        id: simLockedAction
+        objectName: "simLockedAction"
+        iconName: "simcard-locked"
+        onTriggered: {
+            mainView.showSimLockedDialog()
+        }
+    }
+
+    head.backAction: {
+        if (mainView.greeterMode) {
+            return backAction
+        } else if (mainView.simLocked) {
+            return simLockedAction
+        }
+        return null
+    }
 
     objectName: "dialerPage"
 
@@ -97,7 +116,10 @@
         } else if (telepathyHelper.flightMode) {
             return i18n.tr("Flight Mode")
         } else if (mainView.account && mainView.account.simLocked) {
-            return i18n.tr("SIM Locked")
+            // just in case we need it back in the future somewhere, keep the original string
+            var oldTitle = i18n.tr("SIM Locked")
+            // show Emergency Calls for sim locked too. There is going to be an icon indicating it is locked
+            return i18n.tr("Emergency Calls")
         } else if (mainView.account && mainView.account.networkName != "") {
             return mainView.account.networkName
         } else if (multiplePhoneAccounts && !mainView.account) {

=== modified file 'src/qml/Dialogs/SimLockedDialog.qml'
--- src/qml/Dialogs/SimLockedDialog.qml	2015-09-07 15:40:45 +0000
+++ src/qml/Dialogs/SimLockedDialog.qml	2016-04-29 21:33:35 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2013 Canonical Ltd.
+ * Copyright 2012-2016 Canonical Ltd.
  *
  * This file is part of dialer-app.
  *
@@ -23,6 +23,7 @@
 Component {
     Dialog {
         id: dialogue
+        objectName: "simLockedDialog"
         title: i18n.tr("SIM Card is locked")
         Column {
             anchors.left: parent.left

=== modified file 'src/qml/dialer-app.qml'
--- src/qml/dialer-app.qml	2016-03-17 22:01:50 +0000
+++ src/qml/dialer-app.qml	2016-04-29 21:33:35 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2013 Canonical Ltd.
+ * Copyright 2012-2016 Canonical Ltd.
  *
  * This file is part of dialer-app.
  *
@@ -43,6 +43,7 @@
     }
 
     property QtObject account: defaultPhoneAccount()
+    property bool simLocked: account && account.simLocked
     property bool greeterMode: (state == "greeterMode")
     property bool lastHasCalls: callManager.hasCalls
     property bool telepathyReady: false
@@ -365,9 +366,7 @@
         }
 
         if (mainView.account && !mainView.greeterMode && mainView.account.simLocked) {
-            var properties = {}
-            properties["accountId"] = mainView.account.accountId
-            PopupUtils.open(Qt.createComponent("Dialogs/SimLockedDialog.qml").createObject(mainView), mainView, properties)
+            showSimLockedDialog();
             return
         }
 
@@ -473,6 +472,12 @@
         PopupUtils.open(Qt.resolvedUrl("Dialogs/NotificationDialog.qml"), mainView, {title: title, text: text});
     }
 
+    function showSimLockedDialog() {
+        var properties = {}
+        properties["accountId"] = mainView.account.accountId
+        PopupUtils.open(Qt.createComponent("Dialogs/SimLockedDialog.qml").createObject(mainView), mainView, properties)
+    }
+
     Component.onCompleted: {
         i18n.domain = "dialer-app"
         i18n.bindtextdomain("dialer-app", i18nDirectory)

=== modified file 'tests/qml/tst_DialerPage.qml'
--- tests/qml/tst_DialerPage.qml	2015-10-19 18:02:58 +0000
+++ tests/qml/tst_DialerPage.qml	2016-04-29 21:33:35 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2014-2016 Canonical Ltd.
  *
  * This file is part of dialer-app.
  *
@@ -114,6 +114,28 @@
 
             mainViewLoader.item.applicationActive = false
             tryCompare(mainViewLoader.item.currentStack.currentPage, 'title', ' ')
+            mainViewLoader.item.applicationActive = true
+        }
+
+        function test_dialerPageWhenSimLocked() {
+            mainViewLoader.item.switchToKeypadView()
+            tryCompare(mainViewLoader.item, 'applicationActive', true)
+            tryCompare(mainViewLoader.item.currentStack, 'depth', 1)
+
+            mainViewLoader.item.telepathyReady = true
+            greeter.greeterActive = false
+            testAccount.simLocked = true
+
+            var dialerPage = mainViewLoader.item.currentStack.currentPage
+            tryCompare(dialerPage, 'title', i18n.tr('Emergency Calls'))
+            tryCompare(dialerPage.head.backAction, 'objectName', 'simLockedAction')
+
+            // click the action to see if the dialog is shown
+            dialerPage.head.backAction.trigger()
+            var simLockedDialog = findChild(root, 'simLockedDialog')
+            tryCompare(simLockedDialog, 'visible', true)
+            var okButton = findChild(simLockedDialog, 'okSimLockedDialog')
+            mouseClick(okButton)
         }
 
         /*