2 files changed, 11 insertions(+), 8 deletions(-)

M module-services/service-desktop/ServiceDesktop.cpp
M module-services/service-desktop/USBSecurityModel.cpp

@@ 220,14 220,11 @@ sys::ReturnCodes ServiceDesktop::InitHandler()
                             service::name::system_manager);
         }
 
-        if (!usbSecurityModel->isSecurityEnabled()) {
-            LOG_INFO("Endpoint security disabled.");
-            return sys::MessageNone{};
-        }
+        if (usbSecurityModel->isSecurityEnabled()) {
+            LOG_INFO("Endpoint security enabled, requesting passcode");
 
-        LOG_INFO("USB connected with endpoint security enabled. Requesting passcode.");
-        usbSecurityModel->setEndpointSecurity(EndpointSecurity::Block);
-        bus.sendUnicast(std::make_shared<locks::UnlockPhone>(), app::manager::ApplicationManager::ServiceName);
+            bus.sendUnicast(std::make_shared<locks::UnlockPhone>(), app::manager::ApplicationManager::ServiceName);
+        }
 
         return sys::MessageNone{};
     });


@@ 235,7 232,6 @@ sys::ReturnCodes ServiceDesktop::InitHandler()
     connect(sdesktop::usb::USBDisconnected(), [&](sys::Message *msg) {
         LOG_INFO("USB disconnected");
         if (usbSecurityModel->isSecurityEnabled()) {
-            LOG_INFO("Enabling secured endpoints.");
             bus.sendUnicast(std::make_shared<locks::CancelUnlockPhone>(),
                             app::manager::ApplicationManager::ServiceName);
         }

@@ 28,6 28,13 @@ namespace sdesktop
                 lockPassHash = utils::getNumericValue<unsigned int>(value);
             },
             ::settings::SettingsScope::Global);
+
+        if (isSecurityEnabled()) {
+            setEndpointSecurity(EndpointSecurity::Block);
+        }
+        else {
+            setEndpointSecurity(EndpointSecurity::Allow);
+        }
     }
 
     auto USBSecurityModel::isBound(DeviceID id) const -> bool