From 9747ce2e58f5e66452ec5c8d5145213029a08e28 Mon Sep 17 00:00:00 2001
From: Lukasz Mastalerz <lukasz.mastalerz@mudita.com>
Date: Tue, 10 Jan 2023 14:58:27 +0100
Subject: [PATCH] [CP-1579] Fix correct password inserted during Pure boot is
 not accepted

Fix the issue when the USB cable connected to the device during boot up
and Center requested a passcode before the device was fully up.
What caused a 'Wrong passcode' message after typing a passcode
via Center.
---
 module-services/service-desktop/ServiceDesktop.cpp        | 2 +-
 .../include/service-desktop/ServiceDesktop.hpp            | 2 +-
 products/PurePhone/PurePhoneMain.cpp                      | 8 ++++----
 pure_changelog.md                                         | 1 +
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/module-services/service-desktop/ServiceDesktop.cpp b/module-services/service-desktop/ServiceDesktop.cpp
index c9d6d03be3239efb5821f16f3463ca16f30d91c7..ed89668572d66e08ddea8cb61bc0e60c2ed63714 100644
--- a/module-services/service-desktop/ServiceDesktop.cpp
+++ b/module-services/service-desktop/ServiceDesktop.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2022, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2023, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include <service-desktop/ServiceDesktop.hpp>
diff --git a/module-services/service-desktop/include/service-desktop/ServiceDesktop.hpp b/module-services/service-desktop/include/service-desktop/ServiceDesktop.hpp
index 5e8ecc6aafa743295a4cb0de81fe7c145dd70660..3a561287cc59102153da0810af87625920954797 100644
--- a/module-services/service-desktop/include/service-desktop/ServiceDesktop.hpp
+++ b/module-services/service-desktop/include/service-desktop/ServiceDesktop.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2022, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2023, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #pragma once
diff --git a/products/PurePhone/PurePhoneMain.cpp b/products/PurePhone/PurePhoneMain.cpp
index 9af8c712dec1a229e081cbb75d401f8bdbb046dd..ba12368ecfec4b236c9ac5767e5a6c24bf1d7268 100644
--- a/products/PurePhone/PurePhoneMain.cpp
+++ b/products/PurePhone/PurePhoneMain.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2022, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2023, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "config.h"
@@ -185,9 +185,6 @@ int main()
 #ifdef ENABLE_SERVICE_BLUETOOTH
     systemServices.emplace_back(sys::CreatorFor<ServiceBluetooth>());
 #endif
-#ifdef ENABLE_SERVICE_DESKTOP
-    systemServices.emplace_back(sys::CreatorFor<ServiceDesktop>());
-#endif
 #ifdef ENABLE_SERVICE_TIME
     systemServices.emplace_back(sys::CreatorFor<stm::ServiceTime>(std::make_shared<alarms::AlarmOperationsFactory>()));
 #endif
@@ -198,6 +195,9 @@ int main()
     systemServices.emplace_back(
         sys::CreatorFor<service::gui::ServiceGUI>(gui::Size{BOARD_EINK_DISPLAY_RES_X, BOARD_EINK_DISPLAY_RES_Y}));
 #endif
+#ifdef ENABLE_SERVICE_DESKTOP
+    systemServices.emplace_back(sys::CreatorFor<ServiceDesktop>());
+#endif
 #if ENABLE_SERVICE_TEST
     systemServices.emplace_back(sys::CreatorFor<service::test::ServiceTest>());
 #endif
diff --git a/pure_changelog.md b/pure_changelog.md
index c4dd5ad27fe99892f12995b341d0ab811a0f339e..971fa709e919656604f4a622be1503b551a15a99 100644
--- a/pure_changelog.md
+++ b/pure_changelog.md
@@ -5,6 +5,7 @@
 ### Changed / Improved
 * Improved dialog with network via USSD
 * Added serial number and timestamp to crashdump filename
+* Changed order of starting services, ServiceDesktop moved to the back
 
 ### Fixed
 * Fixed disappearing "confirm" button in PIN entering screen