7773b3c · unity8 · git.iko.soy

git.iko.soy/unity8

Reset delay timer if we log in with fingerprint

commit7773b3ccc43cff29b57ffba0b8210fbcbe6980e1 authorMichael Terry <michael.terry@canonical.com> dateMon 20 Jun 2016, 16:23 (10 years ago) parent35a0998

2 files changed+9−3

compare with xenial

unifiedsplit

qml/Greeter/Greeter.qml+8−2 qml/Greeter/NarrowView.qml+1−1

qml/Greeter/Greeter.qml+8−2

@@ -205,6 +205,10 @@ Showable {

205205 if (!locked) {

206206 AccountsService.failedLogins = 0;

207207 AccountsService.failedFingerprintLogins = 0;

208+

209+ // Stop delay timer if they logged in with fingerprint

210+ forcedDelayTimer.stop();

211+ forcedDelayTimer.delayMinutes = 0;

208212 }

209213 }

210214

@@ -527,8 +531,10 @@ Showable {

527531 restartOperation();

528532 if (!d.secureFingerprint) {

529533 d.startUnlock(false /* toTheRight */); // use normal login instead

530− } else if (loader.item) {

531− loader.item.showErrorMessage(i18n.tr("Try again"));

534+ }

535+ if (loader.item) {

536+ var msg = d.secureFingerprint ? i18n.tr("Try again") : "";

537+ loader.item.showErrorMessage(msg);

532538 }

533539 }

534540

qml/Greeter/NarrowView.qml+1−1

@@ -81,7 +81,7 @@ FocusScope {

8181

8282 function showErrorMessage(msg) {

8383 coverPage.showErrorMessage(msg);

84− lockscreen.customError = msg;

84+ lockscreen.customError = msg ? msg : " "; // avoid default message

8585 lockscreen.clear(true);

8686 }

8787