git.iko.soy/unity8
on xenial help sign in
Don't show duplicate passphrase prompts
35a0998Michael Terry
qml/Greeter/Greeter.qml+3−7
compare with xenial
unifiedsplit
@@ -526,13 +526,9 @@ Showable {
526 console.log("Failed to identify user by fingerprint:", reason);
526 console.log("Failed to identify user by fingerprint:", reason);
527 restartOperation();
527 restartOperation();
528 if (!d.secureFingerprint) {
528 if (!d.secureFingerprint) {
529− d.startUnlock(false /* toTheRight */);
529+ d.startUnlock(false /* toTheRight */); // use normal login instead
530− }
531− if (loader.item) {
530+ } else if (loader.item) {
532− var msg = d.secureFingerprint ? i18n.tr("Try again") :
531+ loader.item.showErrorMessage(i18n.tr("Try again"));
533− d.alphanumeric ? i18n.tr("Use passphrase") :
534− i18n.tr("Use passcode");
535− loader.item.showErrorMessage(msg);
536 }
532 }
537 }
533 }
538
534
tests/qmltests/Greeter/tst_Greeter.qml+3−9
@@ -594,8 +594,8 @@ Item {
594 verify(biometryd.operation.running);
594 verify(biometryd.operation.running);
595
595
596 biometryd.operation.mockSuccess(LightDM.Users.data(index, LightDM.UserRoles.UidRole));
596 biometryd.operation.mockSuccess(LightDM.Users.data(index, LightDM.UserRoles.UidRole));
597− compare(viewShowErrorMessageSpy.count, 1);
597+ compare(viewTryToUnlockSpy.count, 1);
598− compare(viewShowErrorMessageSpy.signalArguments[0][0], i18n.tr("Use passphrase"));
598+ verify(greeter.locked);
599 }
599 }
600
600
601 function test_forcedDisallowedFingerprint() {
601 function test_forcedDisallowedFingerprint() {
@@ -635,13 +635,9 @@ Item {
635 biometryd.operation.mockFailure("error");
635 biometryd.operation.mockFailure("error");
636 compare(viewTryToUnlockSpy.count, 1);
636 compare(viewTryToUnlockSpy.count, 1);
637
637
638− compare(viewShowErrorMessageSpy.count, 3);
639− compare(viewShowErrorMessageSpy.signalArguments[2][0], i18n.tr("Use passphrase"));
640−
641 // Confirm that we are stuck in this mode until next login
638 // Confirm that we are stuck in this mode until next login
642 biometryd.operation.mockSuccess(LightDM.Users.data(index, LightDM.UserRoles.UidRole));
639 biometryd.operation.mockSuccess(LightDM.Users.data(index, LightDM.UserRoles.UidRole));
643− compare(viewShowErrorMessageSpy.count, 4);
640+ compare(viewTryToUnlockSpy.count, 2);
644− compare(viewShowErrorMessageSpy.signalArguments[3][0], i18n.tr("Use passphrase"));
645
641
646 unlockAndShowGreeter();
642 unlockAndShowGreeter();
647
643
@@ -665,8 +661,6 @@ Item {
665
661
666 biometryd.operation.mockFailure("error");
662 biometryd.operation.mockFailure("error");
667 compare(viewTryToUnlockSpy.count, 1);
663 compare(viewTryToUnlockSpy.count, 1);
668−
669− compare(viewShowErrorMessageSpy.count, 5);
670 }
664 }
671
665
672 function test_fingerprintWrongUid() {
666 function test_fingerprintWrongUid() {