Merge lp:~mterry/unity8/expose-lockscreen-passphrase into lp:unity8

Proposed by Michael Terry
Status: Merged
Approved by: Michał Sawicz
Approved revision: 1370
Merged at revision: 1392
Proposed branch: lp:~mterry/unity8/expose-lockscreen-passphrase
Merge into: lp:unity8
Diff against target: 51 lines (+12/-0)
4 files modified
debian/changelog (+6/-0)
qml/Components/Lockscreen.qml (+2/-0)
qml/Components/PassphraseLockscreen.qml (+2/-0)
qml/Components/PinLockscreen.qml (+2/-0)
To merge this branch: bzr merge lp:~mterry/unity8/expose-lockscreen-passphrase
Reviewer Review Type Date Requested Status
Michał Sawicz Approve
PS Jenkins bot (community) continuous-integration Needs Fixing
Review via email: mp+239364@code.launchpad.net

Commit message

Expose a 'passphrase' field of Components.Lockscreen to allow consumers (like the wizard) to query the password content before the user finishes. Needed to provide a proper Continue button in the welcome wizard.

I know that passphrase isn't the *best* field name, considering it works for a passcode too. But we already expose that phrase for both in the accepted() signal. So for consistency, I kept it the same.

And I bumped the unity8 version, so that ubuntu-system-settings can depend on this new field.

Description of the change

Expose a 'passphrase' field of Components.Lockscreen to allow consumers (like the wizard) to query the password content before the user finishes. Needed to provide a proper Continue button in the welcome wizard.

I know that passphrase isn't the *best* field name, considering it works for a passcode too. But we already expose that phrase for both in the accepted() signal. So for consistency, I kept it the same.

And I bumped the unity8 version, so that ubuntu-system-settings can depend on this new field.

== Checklist ==

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

 * 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?
 I am in that team

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

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Michał Sawicz (saviq) wrote :

 * Did you perform an exploratory manual test run of the code change and any related functionality?
No functional change.
 * Did CI run pass? If not, please explain why.
Not AP :/
 * Did you make sure that the branch does not contain spurious tags?
Y

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2014-10-13 15:43:04 +0000
+++ debian/changelog 2014-10-23 13:26:46 +0000
@@ -1,3 +1,9 @@
1unity8 (8.01) UNRELEASED; urgency=medium
2
3 * Provide 'passphrase' as a field of Components.Lockscreen
4
5 -- Michael Terry <mterry@ubuntu.com> Wed, 22 Oct 2014 16:05:26 -0400
6
1unity8 (8.00+14.10.20141013.2-0ubuntu1) utopic; urgency=low7unity8 (8.00+14.10.20141013.2-0ubuntu1) utopic; urgency=low
28
3 [ Michael Terry ]9 [ Michael Terry ]
410
=== modified file 'qml/Components/Lockscreen.qml'
--- qml/Components/Lockscreen.qml 2014-10-07 08:19:36 +0000
+++ qml/Components/Lockscreen.qml 2014-10-23 13:26:46 +0000
@@ -56,6 +56,8 @@
5656
57 property url background: ""57 property url background: ""
5858
59 readonly property string passphrase: (pinPadLoader.item && pinPadLoader.item.passphrase) ? pinPadLoader.item.passphrase : ""
60
59 signal entered(string passphrase)61 signal entered(string passphrase)
60 signal cancel()62 signal cancel()
61 signal emergencyCall()63 signal emergencyCall()
6264
=== modified file 'qml/Components/PassphraseLockscreen.qml'
--- qml/Components/PassphraseLockscreen.qml 2014-09-25 13:53:52 +0000
+++ qml/Components/PassphraseLockscreen.qml 2014-10-23 13:26:46 +0000
@@ -28,6 +28,8 @@
28 property string errorText28 property string errorText
29 property bool entryEnabled: true29 property bool entryEnabled: true
3030
31 readonly property string passphrase: pinentryField.text
32
31 signal entered(string passphrase)33 signal entered(string passphrase)
32 signal cancel()34 signal cancel()
3335
3436
=== modified file 'qml/Components/PinLockscreen.qml'
--- qml/Components/PinLockscreen.qml 2014-10-08 14:31:53 +0000
+++ qml/Components/PinLockscreen.qml 2014-10-23 13:26:46 +0000
@@ -35,6 +35,8 @@
35 property int maxPinLength: -135 property int maxPinLength: -1
36 property bool showCancelButton: true36 property bool showCancelButton: true
3737
38 readonly property string passphrase: pinentryField.text
39
38 signal entered(string passphrase)40 signal entered(string passphrase)
39 signal cancel()41 signal cancel()
4042

Subscribers

People subscribed via source and target branches