From 829b9b256008baebe6a556b08e726e9d05c4b739 Mon Sep 17 00:00:00 2001
From: Maciej-Mudita <maciej.gibowicz@mudita.com>
Date: Tue, 30 Aug 2022 09:20:35 +0200
Subject: [PATCH] [MOS-74] Fix wrong tethering popup order

Fix for tethering popup when charger is connected
---
 module-services/service-desktop/ServiceDesktop.cpp            | 4 +++-
 .../include/service-desktop/ServiceDesktop.hpp                | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/module-services/service-desktop/ServiceDesktop.cpp b/module-services/service-desktop/ServiceDesktop.cpp
index 8801784c05d66e383b77f627747e242d7a80cc76..414c5252d56b09edb19fe98a9cbbaea34ebdc078 100644
--- a/module-services/service-desktop/ServiceDesktop.cpp
+++ b/module-services/service-desktop/ServiceDesktop.cpp
@@ -221,6 +221,7 @@ auto ServiceDesktop::usbWorkerDeinit() -> sys::ReturnCodes
         desktopWorker->closeWorker();
         desktopWorker.reset();
         initialized = false;
+        isUsbConfigured = false;
     }
     return sys::ReturnCodes::Success;
 }
@@ -256,7 +257,7 @@ auto ServiceDesktop::handle(locks::UnlockedPhone * /*msg*/) -> std::shared_ptr<s
     LOG_INFO("Phone unlocked.");
     usbSecurityModel->setPhoneUnlocked();
 
-    if (initialized && isPlugEventUnhandled) {
+    if (isUsbConfigured && isPlugEventUnhandled) {
         bus.sendUnicast(std::make_shared<sys::TetheringStateRequest>(sys::phone_modes::Tethering::On),
                         service::name::system_manager);
         isPlugEventUnhandled = false;
@@ -353,6 +354,7 @@ auto ServiceDesktop::handle(sdesktop::FactoryMessage * /*msg*/) -> std::shared_p
 
 auto ServiceDesktop::handle(sdesktop::usb::USBConfigured *msg) -> std::shared_ptr<sys::Message>
 {
+    isUsbConfigured = true;
     if (usbSecurityModel->isSecurityEnabled()) {
         LOG_INFO("Endpoint security enabled, requesting passcode");
         bus.sendUnicast(std::make_shared<locks::UnlockPhone>(), service::name::appmgr);
diff --git a/module-services/service-desktop/include/service-desktop/ServiceDesktop.hpp b/module-services/service-desktop/include/service-desktop/ServiceDesktop.hpp
index edd7bed34b56ac8d8b8633ef1e893d96a71e8861..5e8ecc6aafa743295a4cb0de81fe7c145dd70660 100644
--- a/module-services/service-desktop/include/service-desktop/ServiceDesktop.hpp
+++ b/module-services/service-desktop/include/service-desktop/ServiceDesktop.hpp
@@ -92,6 +92,7 @@ class ServiceDesktop : public sys::Service
     static constexpr unsigned int DefaultLogFlushTimeoutInMs = 1000U;
     bool initialized                                         = false;
     bool isPlugEventUnhandled                                = false;
+    bool isUsbConfigured                                     = false;
 
     void generateDeviceUniqueId();
     auto getDeviceUniqueId() const -> std::string;