Merge branch 'jb37378' into 'master'

[devicelock] Reset authentication state when unregistered. Contributes to JB#37378 See merge request !10
sailfishos · Feb 17, 2017 · 0c31122 · 0c31122
2 parents efe64f9 + 1e25e25
commit 0c31122
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/src/nemo-devicelock/authenticationinput.cpp b/src/nemo-devicelock/authenticationinput.cpp
@@ -302,6 +302,13 @@ void AuthenticationInput::setRegistered(bool registered)
 
         call(QStringLiteral("SetRegistered"), m_localPath, registered);
 
+        // A cancel is implicit in unregistering, reset the state to idle.
+        if (m_status != Idle) {
+            m_status = Idle;
+
+            emit statusChanged();
+        }
+
         emit registeredChanged();
     }
 }

diff --git a/src/nemo-devicelock/host/hostdevicelock.cpp b/src/nemo-devicelock/host/hostdevicelock.cpp
@@ -385,6 +385,11 @@ void HostDeviceLock::availabilityChanged()
 {
     const auto available = availability();
 
+    propertyChanged(
+                QStringLiteral("org.nemomobile.devicelock.DeviceLock"),
+                QStringLiteral("Enabled"),
+                available != AuthenticationNotRequired);
+
     switch (available) {
     case AuthenticationNotRequired:
         switch (m_state) {
@@ -481,10 +486,6 @@ void HostDeviceLock::availabilityChanged()
         break;
     }
 
-    propertyChanged(
-                QStringLiteral("org.nemomobile.devicelock.DeviceLock"),
-                QStringLiteral("Enabled"),
-                available != AuthenticationNotRequired);
     stateChanged();
 }