git.iko.soy/unity8
on xenial help sign in
Fix issue where a passwordless user was logged in automatically.
a5c485fJosh Arenson
qml/Greeter/Greeter.qml+2−1
compare with xenial
unifiedsplit
@@ -278,6 +278,7 @@ Showable {
278 onSelected: {
278 onSelected: {
279 d.selectUser(index, true);
279 d.selectUser(index, true);
280 }
280 }
281+ onPromptlessLogin: d.login();
281 onResponded: {
282 onResponded: {
282 if (root.locked) {
283 if (root.locked) {
283 LightDMService.greeter.respond(response);
284 LightDMService.greeter.respond(response);
@@ -400,8 +401,8 @@ Showable {
400
401
401 if (LightDMService.greeter.authenticated) {
402 if (LightDMService.greeter.authenticated) {
402 AccountsService.failedLogins = 0;
403 AccountsService.failedLogins = 0;
403− d.login();
404 if (!LightDMService.greeter.promptless) {
404 if (!LightDMService.greeter.promptless) {
405+ d.login();
405 loader.item.hide();
406 loader.item.hide();
406 }
407 }
407 } else {
408 } else {
qml/Greeter/LoginList.qml+2
@@ -35,6 +35,7 @@ Item {
35
35
36 signal selected(int index)
36 signal selected(int index)
37 signal responded(string response)
37 signal responded(string response)
38+ signal promptlessLogin()
38
39
39 function tryToUnlock() {
40 function tryToUnlock() {
40 if (wasPrompted) {
41 if (wasPrompted) {
@@ -43,6 +44,7 @@ Item {
43 if (root.locked) {
44 if (root.locked) {
44 root.selected(currentIndex);
45 root.selected(currentIndex);
45 } else {
46 } else {
47+ promptlessLogin();
46 root.responded("");
48 root.responded("");
47 }
49 }
48 }
50 }
qml/Greeter/WideView.qml+2
@@ -37,6 +37,7 @@ FocusScope {
37 // so that it can be replaced in tests with a mock object
37 // so that it can be replaced in tests with a mock object
38 property var inputMethod: Qt.inputMethod
38 property var inputMethod: Qt.inputMethod
39
39
40+ signal promptlessLogin()
40 signal selected(int index)
41 signal selected(int index)
41 signal responded(string response)
42 signal responded(string response)
42 signal tease()
43 signal tease()
@@ -128,6 +129,7 @@ FocusScope {
128
129
129 locked: root.locked
130 locked: root.locked
130
131
132+ onPromptlessLogin: root.promptlessLogin()
131 onSelected: root.selected(index)
133 onSelected: root.selected(index)
132 onResponded: root.responded(response)
134 onResponded: root.responded(response)
133 }
135 }