Merge lp:~seb128/ubuntu-system-settings/security-confirmation-enabled into lp:ubuntu-system-settings

[Sebastien Bacher]

[security-privacy] enable the confirmation button only in the cases
described by the specification

[security-privacy] enable the confirmation button only in the cases
described by the specification

[lp:~seb128/ubuntu-system-settings/security-confirmation-enabled]

1280. By Sebastien Bacher on 2015-01-28

[security-privacy] enable the confirmation button only in the cases
described by the specification

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1280
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1941/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1042
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/211
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/921
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1040
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1040/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17556

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1941/rebuild

review: Approve (continuous-integration)

[Ken VanDine (ken-vandine)]

Thanks, that had to be painful to put together that enabled check. Looks good and I tested all the scenarios.

review: Approve

=== modified file 'plugins/security-privacy/LockSecurity.qml'
--- plugins/security-privacy/LockSecurity.qml	2015-01-27 16:35:08 +0000
+++ plugins/security-privacy/LockSecurity.qml	2015-01-28 14:36:58 +0000
@@ -353,7 +353,23 @@
                         else
                             return i18n.tr("Set")
                     }
-                    enabled: newInput.acceptableInput
+                    /* see https://wiki.ubuntu.com/SecurityAndPrivacySettings#Phone for details */
+                    enabled: /* Validate the old method, it's either swipe or a secret which needs
+                                to be valid, 4 digits for the passcode or > 0 for a passphrase */
+                             (changeSecurityDialog.oldMethod === UbuntuSecurityPrivacyPanel.Swipe ||
+                              ((changeSecurityDialog.oldMethod === UbuntuSecurityPrivacyPanel.Passcode &&
+                                currentInput.text.length === 4) ||
+                               (changeSecurityDialog.oldMethod === UbuntuSecurityPrivacyPanel.Passphrase &&
+                                currentInput.text.length > 0))) &&
+                             /* Validate the new auth method, either it's a passcode and the code needs to be 4 digits */
+                             ((changeSecurityDialog.newMethod === UbuntuSecurityPrivacyPanel.Passcode &&
+                              newInput.text.length === 4 && confirmInput.text.length === 4) ||
+                             /* or a passphrase and then > 0 */
+                             (changeSecurityDialog.newMethod === UbuntuSecurityPrivacyPanel.Passphrase &&
+                              newInput.text.length > 0 && confirmInput.text.length > 0) ||
+                             /* or to be swipe */
+                             changeSecurityDialog.newMethod === UbuntuSecurityPrivacyPanel.Swipe)
+
                     onClicked: {
                         changeSecurityDialog.enabled = false
                         incorrect.text = ""