Allow setting a security code when one is required but not set yet.

sailfishos · Mar 20, 2017 · 5151b70 · 5151b70
1 parent 78c707f
commit 5151b70
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/nemo-devicelock/host/hostauthenticator.cpp b/src/nemo-devicelock/host/hostauthenticator.cpp
@@ -112,7 +112,13 @@ bool HostAuthenticator::authorizeSecurityCodeSettings(unsigned long)
 
 bool HostAuthenticator::isSecurityCodeSet() const
 {
-    return availability() != HostAuthenticationInput::AuthenticationNotRequired;
+    switch (availability()) {
+    case HostAuthenticationInput::AuthenticationNotRequired:
+    case HostAuthenticationInput::SecurityCodeRequired:
+        return false;
+    default:
+        return true;
+    }
 }
 
 void HostAuthenticator::authenticate(
@@ -174,14 +180,14 @@ void HostAuthenticator::handleChangeSecurityCode(const QString &client, const QV
 
     switch (availability()) {
     case AuthenticationNotRequired:
+    case SecurityCodeRequired:
         m_state = EnteringNewSecurityCode;
         authenticationStarted(Authenticator::SecurityCode, AuthenticationInput::EnterNewSecurityCode);
         break;
     case CanAuthenticateSecurityCode:
     case CanAuthenticate:
         authenticationStarted(Authenticator::SecurityCode, AuthenticationInput::EnterSecurityCode);
         break;
-    case SecurityCodeRequired:
     case ManagerLocked:
     case TemporarilyLocked:
     case PermanentlyLocked:

diff --git a/src/nemo-devicelock/host/hostdevicelock.cpp b/src/nemo-devicelock/host/hostdevicelock.cpp
@@ -371,6 +371,9 @@ void HostDeviceLock::stateChanged()
     case PermanentlyLocked:
         m_lockState = DeviceLock::PermanentLockout;
         break;
+    case SecurityCodeRequired:
+        m_lockState = DeviceLock::Locked;
+        break;
     default:
         m_lockState = isLocked()
                 ? DeviceLock::Locked