git.iko.soy/unity8
on xenial help sign in
Don't show duplicate passphrase prompts
commit35a09981237499876a039e2489720f6529c9ae07 authorMichael Terry <michael.terry@canonical.com> dateMon 20 Jun 2016, 13:37 (10 years ago) parent1edee89
2 files changed+6−16
compare with xenial
unifiedsplit
qml/Greeter/Greeter.qml+3−7 tests/qmltests/Greeter/tst_Greeter.qml+3−9
qml/Greeter/Greeter.qml+3−7
@@ -526,13 +526,9 @@ Showable {
526526 console.log("Failed to identify user by fingerprint:", reason);
527527 restartOperation();
528528 if (!d.secureFingerprint) {
529− d.startUnlock(false /* toTheRight */);
530− }
531− if (loader.item) {
532− var msg = d.secureFingerprint ? i18n.tr("Try again") :
533− d.alphanumeric ? i18n.tr("Use passphrase") :
534− i18n.tr("Use passcode");
535− loader.item.showErrorMessage(msg);
529+ d.startUnlock(false /* toTheRight */); // use normal login instead
530+ } else if (loader.item) {
531+ loader.item.showErrorMessage(i18n.tr("Try again"));
536532 }
537533 }
538534
tests/qmltests/Greeter/tst_Greeter.qml+3−9
@@ -594,8 +594,8 @@ Item {
594594 verify(biometryd.operation.running);
595595
596596 biometryd.operation.mockSuccess(LightDM.Users.data(index, LightDM.UserRoles.UidRole));
597− compare(viewShowErrorMessageSpy.count, 1);
598− compare(viewShowErrorMessageSpy.signalArguments[0][0], i18n.tr("Use passphrase"));
597+ compare(viewTryToUnlockSpy.count, 1);
598+ verify(greeter.locked);
599599 }
600600
601601 function test_forcedDisallowedFingerprint() {
@@ -635,13 +635,9 @@ Item {
635635 biometryd.operation.mockFailure("error");
636636 compare(viewTryToUnlockSpy.count, 1);
637637
638− compare(viewShowErrorMessageSpy.count, 3);
639− compare(viewShowErrorMessageSpy.signalArguments[2][0], i18n.tr("Use passphrase"));
640−
641638 // Confirm that we are stuck in this mode until next login
642639 biometryd.operation.mockSuccess(LightDM.Users.data(index, LightDM.UserRoles.UidRole));
643− compare(viewShowErrorMessageSpy.count, 4);
644− compare(viewShowErrorMessageSpy.signalArguments[3][0], i18n.tr("Use passphrase"));
640+ compare(viewTryToUnlockSpy.count, 2);
645641
646642 unlockAndShowGreeter();
647643
@@ -665,8 +661,6 @@ Item {
665661
666662 biometryd.operation.mockFailure("error");
667663 compare(viewTryToUnlockSpy.count, 1);
668−
669− compare(viewShowErrorMessageSpy.count, 5);
670664 }
671665
672666 function test_fingerprintWrongUid() {