Merge lp:~unity-api-team/unity8/dual_sim_pin_unlock into lp:unity8

[Antti Kaijanmäki]

Dual SIM pin unlocking. Hook up the UI to the backend.

Dual SIM pin unlocking. Hook up the UI to the backend.

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

https://code.launchpad.net/~unity-api-team/indicator-network/dual_sim_pin_unlock/+merge/237386

 * Did you perform an exploratory manual test run of your code change and any related functionality?

Yes.

 * Did you make sure that your branch does not contain spurious tags?

Yes.

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?

N/A

 * If you changed the UI, has there been a design review?

This branch does not change the UI, just hooks it up with data.

[lp:~unity-api-team/unity8/dual_sim_pin_unlock]

1226. By Antti Kaijanmäki on 2014-10-07

update .pot

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1226
http://jenkins.qa.ubuntu.com/job/unity8-ci/4512/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5572/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1497
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1606
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1606
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5267/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6824
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6824/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14242

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4512/rebuild

review: Needs Fixing (continuous-integration)

[Michael Zanetti (mzanetti)]

Can we split the infoPopup messages into title and text instead of just having text? Sort of like this: http://i.imgur.com/tb7JNLU.png

This way it would look the same as the warning if you enter the phone lock code wrong 9 times in a row.

review: Needs Information

[Antti Kaijanmäki (kaijanmaki)]

> Can we split the infoPopup messages into title and text instead of just having
> text? Sort of like this: http://i.imgur.com/tb7JNLU.png
>
> This way it would look the same as the warning if you enter the phone lock
> code wrong 9 times in a row.

Well, we _could_ but I don't want to delay this landing any further. It would require all sorts of nastiness to happen in both unity8 and i-network side. We can land that in an OTA update or something.

[Michael Zanetti (mzanetti)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?

yes

 * Did CI run pass? If not, please explain why.

nope... seems it failed to set up the phone

 * Did you make sure that the branch does not contain spurious tags?

yes

review: Approve

=== modified file 'po/unity8.pot'
--- po/unity8.pot	2014-10-03 12:13:56 +0000
+++ po/unity8.pot	2014-10-07 08:41:46 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: unity8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-03 08:13-0400\n"
+"POT-Creation-Date: 2014-10-07 11:37+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -152,23 +152,23 @@
 "phone<br><br>Tap on the screen to start"
 msgstr ""
 
-#: qml/Components/Lockscreen.qml:218
+#: qml/Components/Lockscreen.qml:220
 msgid "Emergency Call"
 msgstr ""
 
-#: qml/Components/Lockscreen.qml:250
+#: qml/Components/Lockscreen.qml:252
 msgid "OK"
 msgstr ""
 
-#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568
+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
 msgid "See less"
 msgstr ""
 
-#: qml/Dash/GenericScopeView.qml:411
+#: qml/Dash/GenericScopeView.qml:434
 msgid "See all"
 msgstr ""
 
-#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
 #: qml/Panel/SearchIndicator.qml:27
 msgid "Search"
 msgstr ""
@@ -257,18 +257,10 @@
 msgid "Speaking..."
 msgstr ""
 
-#: qml/Notifications/NotificationMenuItemFactory.qml:108
+#: qml/Notifications/NotificationMenuItemFactory.qml:116
 msgid "Show password"
 msgstr ""
 
-#: qml/Notifications/NotificationMenuItemFactory.qml:124
-msgid "Enter SIM PIN"
-msgstr ""
-
-#: qml/Notifications/NotificationMenuItemFactory.qml:125
-msgid "Sorry, incorrect PIN"
-msgstr ""
-
 #: qml/Panel/ActiveCallHint.qml:77
 msgid "Tap to return to call..."
 msgstr ""
@@ -313,55 +305,55 @@
 msgid "Roaming"
 msgstr ""
 
-#: qml/Shell.qml:340
+#: qml/Shell.qml:346
 msgid "Enter passphrase"
 msgstr ""
 
-#: qml/Shell.qml:341
+#: qml/Shell.qml:347
 msgid "Sorry, incorrect passphrase"
 msgstr ""
 
-#: qml/Shell.qml:342
+#: qml/Shell.qml:348
 msgid "Please re-enter"
 msgstr ""
 
-#: qml/Shell.qml:344
+#: qml/Shell.qml:350
 msgid "Enter passcode"
 msgstr ""
 
-#: qml/Shell.qml:345
+#: qml/Shell.qml:351
 msgid "Sorry, incorrect passcode"
 msgstr ""
 
-#: qml/Shell.qml:348
+#: qml/Shell.qml:354
 #, qt-format
 msgid "Enter %1"
 msgstr ""
 
-#: qml/Shell.qml:349
+#: qml/Shell.qml:355
 #, qt-format
 msgid "Sorry, incorrect %1"
 msgstr ""
 
-#: qml/Shell.qml:384
+#: qml/Shell.qml:390
 msgid "Sorry, incorrect passphrase."
 msgstr ""
 
-#: qml/Shell.qml:385
+#: qml/Shell.qml:391
 msgid "Sorry, incorrect passcode."
 msgstr ""
 
-#: qml/Shell.qml:386
+#: qml/Shell.qml:392
 msgid "This will be your last attempt."
 msgstr ""
 
-#: qml/Shell.qml:388
+#: qml/Shell.qml:394
 msgid ""
 "If passphrase is entered incorrectly, your phone will conduct a factory "
 "reset and all personal data will be deleted."
 msgstr ""
 
-#: qml/Shell.qml:389
+#: qml/Shell.qml:395
 msgid ""
 "If passcode is entered incorrectly, your phone will conduct a factory reset "
 "and all personal data will be deleted."

=== modified file 'qml/Components/Lockscreen.qml'
--- qml/Components/Lockscreen.qml	2014-09-24 19:31:32 +0000
+++ qml/Components/Lockscreen.qml	2014-10-07 08:41:46 +0000
@@ -78,7 +78,9 @@
     }
 
     function showInfoPopup(title, text) {
-        PopupUtils.open(infoPopupComponent, root, {title: title, text: text})
+        var popup = PopupUtils.open(infoPopupComponent, root, {title: title, text: text})
+        // FIXME: SDK will do this internally soonish
+        popup.z = Number.MAX_VALUE
     }
 
     Rectangle {

=== modified file 'qml/Notifications/NotificationMenuItemFactory.qml'
--- qml/Notifications/NotificationMenuItemFactory.qml	2014-08-29 14:54:19 +0000
+++ qml/Notifications/NotificationMenuItemFactory.qml	2014-10-07 08:41:46 +0000
@@ -19,6 +19,7 @@
 
 import QtQuick 2.0
 import Ubuntu.Components 0.1
+import QMenuModel 0.1
 import "../Components"
 
 Loader {
@@ -26,7 +27,7 @@
 
     property QtObject menuModel: null
     property QtObject menuData: null
-    property int menuIndex
+    property int menuIndex : -1
     property int maxHeight
     readonly property bool fullscreen: menuData.type === "com.canonical.snapdecision.pinlock"
 
@@ -46,6 +47,13 @@
         }
     }
 
+    function getExtendedProperty(object, propertyName, defaultValue) {
+        if (object && object.hasOwnProperty(propertyName)) {
+            return object[propertyName];
+        }
+        return defaultValue;
+    }
+
     Component {
         id: textfield
 
@@ -121,14 +129,14 @@
                 right: parent.right
             }
             height: menuFactory.maxHeight
-            infoText: i18n.tr("Enter SIM PIN")
-            errorText: i18n.tr("Sorry, incorrect PIN")
-            minPinLength: 4
-            maxPinLength: 8
+            infoText: notification.summary
+            errorText: errorAction.valid ? errorAction.state : ""
+            retryText: notification.body
             background: shell.background
 
             onEntered: {
                 menuModel.changeState(menuIndex, passphrase);
+                clear(false);
             }
 
             onCancel: {
@@ -139,6 +147,70 @@
                 shell.activateApplication("dialer-app")
                 menuModel.activate(menuIndex, false)
             }
+
+            property var extendedData: menuData && menuData.ext || undefined
+
+            property var pinMinMaxAction : UnityMenuAction {
+                model: menuModel
+                index: menuIndex
+                name: getExtendedProperty(extendedData, "xCanonicalPinMinMax", "")
+
+                onStateChanged: {
+                    var min = pinMinMaxAction.state[0];
+                    var max =  pinMinMaxAction.state[1];
+
+                    if (min === 0) min = -1;
+                    if (max === 0) max = -1;
+
+                    minPinLength = min
+                    maxPinLength = max
+                }
+            }
+
+            property var popupAction: UnityMenuAction {
+                model: menuModel
+                index: menuIndex
+                name: getExtendedProperty(extendedData, "xCanonicalPinPopup", "")
+                onStateChanged: {
+                    if (state !== "")
+                        showInfoPopup("", state);
+                }
+            }
+            onInfoPopupConfirmed: {
+                popupAction.activate();
+            }
+
+            Timer {
+                id: errorTimer
+                interval: 4000;
+                running: false;
+                repeat: false
+                onTriggered: {
+                    errorAction.activate();
+                }
+            }
+            property var errorAction: UnityMenuAction {
+                model: menuModel
+                index: menuIndex
+                name: getExtendedProperty(extendedData, "xCanonicalPinError", "")
+                onStateChanged: {
+                    errorText = state;
+                    if (state !== "") {
+                        clear(true);
+                        errorTimer.running = true;
+                    }
+                }
+            }
+
+            function loadAttributes() {
+                if (!menuModel || menuIndex == -1) return;
+                menuModel.loadExtendedAttributes(menuIndex, {'x-canonical-pin-min-max': 'string',
+                                                             'x-canonical-pin-popup': 'string',
+                                                             'x-canonical-pin-error': 'string'});
+            }
+            Component.onCompleted: {
+                loadAttributes();
+            }
         }
     }
 }