Merge lp:~mterry/unity8/fix-greeter-retry into lp:unity8

Proposed by Michael Terry
Status: Superseded
Proposed branch: lp:~mterry/unity8/fix-greeter-retry
Merge into: lp:unity8
Prerequisite: lp:~ci-train-bot/unity8/unity8-ubuntu-xenial-landing-041
Diff against target: 12 lines (+1/-1)
1 file modified
qml/Greeter/Greeter.qml (+1/-1)
To merge this branch: bzr merge lp:~mterry/unity8/fix-greeter-retry
Reviewer Review Type Date Requested Status
Unity8 CI Bot continuous-integration Needs Fixing
Unity Team Pending
Review via email: mp+289299@code.launchpad.net

This proposal has been superseded by a proposal from 2016-03-17.

Commit message

Fix showing "Retry" in password prompt when turning on screen in tablet mode.

Description of the change

When told to show the greeter (power button press or dbus request), we forcibly reset greeter state. This lets us catch when passwords change or the like by resetting the PAM stack.

In one case, we weren't resetting state hard enough and the password prompt thought it hadn't been prompted yet by PAM but still wasn't authorized. So it showed a "Retry" button instead of the normal password prompt.

This fixes that by going through the proper channels for a reset.

= To reproduce =

- Use tablet mode
- Log in
- Lock screen
- Turn screen on
- Turn screen off
- Turn screen on

You should now see a "Retry" button in the greeter password 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?
 NA

 * 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
Unity8 CI Bot (unity8-ci-bot) wrote :
review: Needs Fixing (continuous-integration)
lp:~mterry/unity8/fix-greeter-retry updated
2279. By Michael Terry

Reset greeter state a little harder, to avoid half-done state

2280. By Michael Terry

Fix tests and add check for new behavior

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'qml/Greeter/Greeter.qml'
2--- qml/Greeter/Greeter.qml 2016-01-11 17:37:02 +0000
3+++ qml/Greeter/Greeter.qml 2016-03-17 00:58:13 +0000
4@@ -60,7 +60,7 @@
5
6 function forceShow() {
7 showNow();
8- loader.item.reset();
9+ d.selectUser(d.currentIndex, true);
10 }
11
12 function notifyAppFocused(appId) {

Subscribers

People subscribed via source and target branches