~aleteoryx/muditaos: [CP-1579] Fix correct password inserted during Pure boot is not accepted

4 files changed, 7 insertions(+), 6 deletions(-)

M module-services/service-desktop/ServiceDesktop.cpp
M module-services/service-desktop/include/service-desktop/ServiceDesktop.hpp
M products/PurePhone/PurePhoneMain.cpp
M pure_changelog.md

M module-services/service-desktop/ServiceDesktop.cpp => module-services/service-desktop/ServiceDesktop.cpp +1 -1

@@ 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>

M module-services/service-desktop/include/service-desktop/ServiceDesktop.hpp => module-services/service-desktop/include/service-desktop/ServiceDesktop.hpp +1 -1

@@ 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

M products/PurePhone/PurePhoneMain.cpp => products/PurePhone/PurePhoneMain.cpp +4 -4

@@ 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

M pure_changelog.md => pure_changelog.md +1 -0

@@ 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