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

[Tiago Salem Herrmann]

Add support for sim lock detection

Add support for sim lock detection

--Checklist--
Are there any related MPs required for this MP to build/function as expected? Please list.
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/dialer-app) 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?
Will be done later.

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

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

295. By Tiago Salem Herrmann on 2014-09-25

remove commented code

296. By Tiago Salem Herrmann on 2014-09-25

dont check for sim lock if on greeter mode and if this is an emergency number

297. By Tiago Salem Herrmann on 2014-09-25

perform the same check on call()

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:295
http://jenkins.qa.ubuntu.com/job/dialer-app-ci/465/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-utopic-i386-ci/236
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5188
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3785
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4936
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6440
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6440/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13763
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3170
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4096
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4096/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:297
http://jenkins.qa.ubuntu.com/job/dialer-app-ci/466/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-utopic-i386-ci/237
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5201
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3795
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4941
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6453
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6453/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13769
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3180
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4106
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4106/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/dialer-app-ci/466/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, but not related to the MR

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

Code looks good and works as expected!

review: Approve

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

298. By Tiago Salem Herrmann on 2014-10-01

Disable unlock button for now

299. By Tiago Salem Herrmann on 2014-10-01

change dialog message

=== modified file 'src/qml/DialerPage/DialerPage.qml'
--- src/qml/DialerPage/DialerPage.qml	2014-09-19 18:11:24 +0000
+++ src/qml/DialerPage/DialerPage.qml	2014-10-01 15:58:56 +0000
@@ -383,6 +383,13 @@
                     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)

=== added file 'src/qml/Dialogs/SimLockedDialog.qml'
--- src/qml/Dialogs/SimLockedDialog.qml	1970-01-01 00:00:00 +0000
+++ src/qml/Dialogs/SimLockedDialog.qml	2014-10-01 15:58:56 +0000
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2012-2013 Canonical Ltd.
+ *
+ * This file is part of dialer-app.
+ *
+ * dialer-app is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * dialer-app is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 1.1
+import Ubuntu.Components.Popups 0.1
+
+Component {
+    Dialog {
+        id: dialogue
+        title: i18n.tr("SIM Card is locked")
+        Column {
+            anchors.left: parent.left
+            anchors.right: parent.right
+            spacing: units.gu(2)
+
+            Label {
+                anchors.left: parent.left
+                anchors.right: parent.right
+                height: paintedHeight
+                verticalAlignment: Text.AlignVCenter
+                text: i18n.tr("Please unlock your SIM card to call or send a message. You can unlock your SIM card from the Network Indicator at the top of the screen or by visiting <a href=\"system_settings\">System Settings &gt; Security &amp; Privacy</a>.")
+                wrapMode: Text.WordWrap
+                onLinkActivated: {
+                    PopupUtils.close(dialogue)
+                    Qt.openUrlExternally("settings:///system/security-privacy")
+                }
+            }
+            Row {
+                spacing: units.gu(4)
+                anchors.horizontalCenter: parent.horizontalCenter
+                Button {
+                    objectName: "okSimLockedDialog"
+                    text: i18n.tr("Ok")
+                    color: UbuntuColors.orange
+                    onClicked: {
+                        PopupUtils.close(dialogue)
+                    }
+                }
+                // Please, reenable this once lp:1374215 gets fixed
+                /*Button {
+                    objectName: "unlockSimLockedDialog"
+                    text: i18n.tr("Unlock")
+                    color: UbuntuColors.orange
+                    onClicked: {
+                        PopupUtils.close(dialogue)
+                        telepathyHelper.unlockSimCards()
+                    }
+                }*/
+            }
+        }
+    }
+}

=== modified file 'src/qml/dialer-app.qml'
--- src/qml/dialer-app.qml	2014-09-17 17:50:00 +0000
+++ src/qml/dialer-app.qml	2014-10-01 15:58:56 +0000
@@ -202,13 +202,18 @@
             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;
         }
 
-        var account = telepathyHelper.accountForId(accountId);
         if (!account) {
             account = telepathyHelper.accounts[0];
         }