7773b3c · unity8 · git.iko.soy

on xenial help sign in

Reset delay timer if we log in with fingerprint

7773b3cMichael Terry10 years ago

qml/Greeter/Greeter.qml+8−2

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

205 if (!locked) {

206 AccountsService.failedLogins = 0;

207 AccountsService.failedFingerprintLogins = 0;

208+

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

210+ forcedDelayTimer.stop();

211+ forcedDelayTimer.delayMinutes = 0;

208 }

212 }

209 }

213 }

210

214

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

527 restartOperation();

531 restartOperation();

528 if (!d.secureFingerprint) {

532 if (!d.secureFingerprint) {

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

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

534+ }

530− } else if (loader.item) {

535+ if (loader.item) {

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

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

537+ loader.item.showErrorMessage(msg);

532 }

538 }

533 }

539 }

534

540

qml/Greeter/NarrowView.qml+1−1

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

82 function showErrorMessage(msg) {

83 coverPage.showErrorMessage(msg);

84− lockscreen.customError = msg;

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

85 lockscreen.clear(true);

86 }