Merge branch 'omp-jb53701' into 'master'

[nemo-qml-plugin-devicelock] Handle SecurityCodeExpired while Unlocking. Contributes to JB#53701 See merge request mer-core/nemo-qml-plugin-devicelock!58
sailfishos · May 27, 2021 · f10be30 · f10be30
2 parents 3569d10 + 7d63985
commit f10be30
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/src/nemo-devicelock/host/hostdevicelock.cpp b/src/nemo-devicelock/host/hostdevicelock.cpp
@@ -160,6 +160,12 @@ void HostDeviceLock::enterSecurityCode(const QString &code)
         case LockedOut:
             lockedOut();
             break;
+        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) {