Commit f10be304 authored by pvuorela's avatar pvuorela

Merge branch 'omp-jb53701' into 'master'

[nemo-qml-plugin-devicelock] Handle SecurityCodeExpired while Unlocking. Contributes to JB#53701

See merge request !58
parents 3569d10d 7d639853
......@@ -160,7 +160,13 @@ void HostDeviceLock::enterSecurityCode(const QString &code)
case LockedOut:
lockedOut();
break;
default:
case Evaluating:
// Set currentCode to use it as oldCode in case evaluation
// reveals it is expired and must be changed with a newCode
m_currentCode = code;
unlockFinished(result, Authenticator::SecurityCode);
break;
default:
unlockFinished(result, Authenticator::SecurityCode);
break;
}
......@@ -241,6 +247,9 @@ void HostDeviceLock::unlockFinished(int result, Authenticator::Method method)
}
break;
case SecurityCodeExpired:
enterCodeChangeState(&HostAuthenticationInput::feedback);
authenticationResumed(AuthenticationInput::SecurityCodeExpired, QVariantMap(), Authenticator::SecurityCode);
break;
case SecurityCodeInHistory:
case LockedOut:
if (m_state == Canceled) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment