100 files changed, 198 insertions(+), 152 deletions(-)

M module-apps/application-onboarding/ApplicationOnBoarding.cpp
M module-apps/application-onboarding/CMakeLists.txt
M module-apps/application-onboarding/windows/UpdateDialogWindow.cpp
M module-apps/application-phonebook/windows/PhonebookNamecardOptions.cpp
M module-apps/application-settings/ApplicationSettings.cpp
M module-apps/application-settings/CMakeLists.txt
M module-apps/application-settings/windows/advanced/EinkModeWindow.cpp
M module-apps/application-settings/windows/display-keypad/InputLanguageWindow.cpp
M module-apps/apps-common/Application.cpp
M module-apps/apps-common/DOMResponder.cpp
M module-apps/apps-common/locks/handlers/PhoneLockHandler.cpp
M module-apps/apps-common/locks/handlers/PhoneLockSubject.cpp
M module-apps/apps-common/locks/handlers/SimLockHandler.cpp
M module-apps/apps-common/locks/handlers/SimLockSubject.cpp
M module-apps/apps-common/notifications/NotificationsHandler.cpp
M module-apps/apps-common/popups/lock-popups/PhoneLockedWindow.cpp
M module-apps/apps-common/popups/presenter/PowerOffPresenter.cpp
M module-cellular/CMakeLists.txt
M module-cellular/at/response.hpp
M module-services/service-appmgr/ApplicationManifest.cpp
M module-services/service-appmgr/CMakeLists.txt
M module-services/service-appmgr/Controller.cpp
M module-services/service-appmgr/data/CallActionsParams.cpp
M module-services/service-appmgr/data/MmiActionsParams.cpp
M module-services/service-appmgr/data/NotificationsChangedActionsParams.cpp
R module-services/service-appmgr/{ => include}/service-appmgr/Actions.hpp
R module-services/service-appmgr/{ => include}/service-appmgr/ApplicationManifest.hpp
R module-services/service-appmgr/{ => include}/service-appmgr/Controller.hpp
R module-services/service-appmgr/{ => include}/service-appmgr/StartupType.hpp
R module-services/service-appmgr/{ => include}/service-appmgr/data/CallActionsParams.hpp
R module-services/service-appmgr/{ => include}/service-appmgr/data/MmiActionsParams.hpp
R module-services/service-appmgr/{ => include}/service-appmgr/data/NotificationsChangedActionsParams.hpp
R module-services/service-appmgr/{ => include}/service-appmgr/messages/ActionRequest.hpp
R module-services/service-appmgr/{ => include}/service-appmgr/messages/ApplicationCloseRequest.hpp
R module-services/service-appmgr/{ => include}/service-appmgr/messages/ApplicationInitialised.hpp
R module-services/service-appmgr/{ => include}/service-appmgr/messages/ApplicationStatus.hpp
R module-services/service-appmgr/{ => include}/service-appmgr/messages/AutoLockRequests.hpp
R module-services/service-appmgr/{ => include}/service-appmgr/messages/BaseMessage.hpp
R module-services/service-appmgr/{ => include}/service-appmgr/messages/CloseConfirmation.hpp
R module-services/service-appmgr/{ => include}/service-appmgr/messages/DOMRequest.hpp
R module-services/service-appmgr/{ => include}/service-appmgr/messages/FinishRequest.hpp
R module-services/service-appmgr/{ => include}/service-appmgr/messages/GetAllNotificationsRequest.hpp
R module-services/service-appmgr/{ => include}/service-appmgr/messages/GetCurrentDisplayLanguageRequest.hpp
R module-services/service-appmgr/{ => include}/service-appmgr/messages/GetCurrentDisplayLanguageResponse.hpp
R module-services/service-appmgr/{ => include}/service-appmgr/messages/LanguageChangeRequest.hpp
R module-services/service-appmgr/{ => include}/service-appmgr/messages/Message.hpp
R module-services/service-appmgr/{ => include}/service-appmgr/messages/PowerSaveModeInitRequest.hpp
R module-services/service-appmgr/{ => include}/service-appmgr/messages/PreventBlockingRequest.hpp
R module-services/service-appmgr/{ => include}/service-appmgr/messages/SetOsUpdateVersion.hpp
R module-services/service-appmgr/{ => include}/service-appmgr/messages/ShutdownRequest.hpp
R module-services/service-appmgr/{ => include}/service-appmgr/messages/StartAllowedMessage.hpp
R module-services/service-appmgr/{ => include}/service-appmgr/messages/SwitchBackRequest.hpp
R module-services/service-appmgr/{ => include}/service-appmgr/messages/SwitchConfirmation.hpp
R module-services/service-appmgr/{ => include}/service-appmgr/messages/SwitchRequest.hpp
R module-services/service-appmgr/{ => include}/service-appmgr/messages/UpdateInProgress.hpp
R module-services/service-appmgr/{ => include}/service-appmgr/messages/UserPowerDownRequest.hpp
R module-services/service-appmgr/{ => include}/service-appmgr/model/ActionsRegistry.hpp
R module-services/service-appmgr/{ => include}/service-appmgr/model/ApplicationHandle.hpp
R module-services/service-appmgr/{ => include}/service-appmgr/model/ApplicationManager.hpp
R module-services/service-appmgr/{ => include}/service-appmgr/model/ApplicationStack.hpp
R module-services/service-appmgr/{ => include}/service-appmgr/model/ApplicationsRegistry.hpp
R module-services/service-appmgr/{ => include}/service-appmgr/model/OnActionPolicy.hpp
M module-services/service-appmgr/messages/ActionRequest.cpp
M module-services/service-appmgr/messages/ApplicationCloseRequest.cpp
M module-services/service-appmgr/messages/ApplicationInitialised.cpp
M module-services/service-appmgr/messages/ApplicationStatus.cpp
M module-services/service-appmgr/messages/BaseMessage.cpp
M module-services/service-appmgr/messages/CloseConfirmation.cpp
M module-services/service-appmgr/messages/DOMRequest.cpp
M module-services/service-appmgr/messages/FinishRequest.cpp
M module-services/service-appmgr/messages/LanguageChangeRequest.cpp
M module-services/service-appmgr/messages/PowerSaveModeInitRequest.cpp
M module-services/service-appmgr/messages/PreventBlockingRequest.cpp
M module-services/service-appmgr/messages/SetOsUpdateVersion.cpp
M module-services/service-appmgr/messages/ShutdownRequest.cpp
M module-services/service-appmgr/messages/StartAllowedMessage.cpp
M module-services/service-appmgr/messages/SwitchBackRequest.cpp
M module-services/service-appmgr/messages/SwitchConfirmation.cpp
M module-services/service-appmgr/messages/SwitchRequest.cpp
M module-services/service-appmgr/messages/UpdateInProgress.cpp
M module-services/service-appmgr/model/ActionsRegistry.cpp
M module-services/service-appmgr/model/ApplicationHandle.cpp
M module-services/service-appmgr/model/ApplicationManager.cpp
M module-services/service-appmgr/model/ApplicationStack.cpp
M module-services/service-appmgr/model/ApplicationsRegistry.cpp
M module-services/service-appmgr/model/OnActionPolicy.cpp
M module-services/service-appmgr/tests/test-ActionsRegistry.cpp
M module-services/service-appmgr/tests/test-ApplicationManifest.cpp
M module-services/service-appmgr/tests/test-ApplicationStack.cpp
M module-services/service-audio/CMakeLists.txt
M module-services/service-audio/service-audio/AudioMessage.hpp
M module-services/service-cellular/CMakeLists.txt
M module-services/service-cellular/service-cellular/CellularMessage.hpp
M module-services/service-desktop/CMakeLists.txt
M module-services/service-desktop/ServiceDesktop.cpp
M module-services/service-desktop/endpoints/developerMode/DeveloperModeHelper.cpp
M module-services/service-desktop/endpoints/developerMode/Mode/UI_Helper.cpp
M module-sys/SystemManager/SystemManager.cpp
M module-sys/SystemManager/data/SystemManagerActionsParams.hpp
M module-sys/SystemManager/messages/SystemManagerMessage.hpp

@@ 18,13 18,13 @@
 #include "windows/OnBoardingDateAndTimeWindow.hpp"
 #include "windows/OnBoardingChangeDateAndTimeWindow.hpp"
 
-#include <module-services/service-appmgr/service-appmgr/messages/GetCurrentDisplayLanguageResponse.hpp>
+#include <service-appmgr/messages/GetCurrentDisplayLanguageResponse.hpp>
 #include <application-settings/data/LanguagesData.hpp>
 #include <application-settings/windows/system/ChangeTimeZone.hpp>
 #include <module-services/service-db/agents/settings/SystemSettings.hpp>
 #include <apps-common/locks/data/PhoneLockMessages.hpp>
 #include <apps-common/locks/data/SimLockMessages.hpp>
-#include <service-appmgr/service-appmgr/model/ApplicationManager.hpp>
+#include <service-appmgr/model/ApplicationManager.hpp>
 
 namespace app
 {

@@ 45,9 45,3 @@ target_sources(${PROJECT_NAME}
 		"${CMAKE_CURRENT_LIST_DIR}/windows/NoSimSelectedDialogWindow.hpp"
 		"${CMAKE_CURRENT_LIST_DIR}/style/OnBoardingStyle.hpp"
 		)
-
-target_include_directories(${PROJECT_NAME}
-    PRIVATE
-        service-db
-        json::json
-)

@@ 7,7 7,7 @@
 #include <Style.hpp>
 
 #include <application-onboarding/ApplicationOnBoarding.hpp>
-#include <service-appmgr/service-appmgr/Controller.hpp>
+#include <service-appmgr/Controller.hpp>
 #include <source/version.hpp>
 
 namespace app::onBoarding

@@ 1,7 1,7 @@
 // Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include <module-services/service-appmgr/service-appmgr/Controller.hpp>
+#include <service-appmgr/Controller.hpp>
 #include "PhonebookNamecardOptions.hpp"
 #include "application-phonebook/ApplicationPhonebook.hpp"
 #include "application-phonebook/data/PhonebookItemData.hpp"

@@ 75,8 75,8 @@
 #include <module-services/service-evtmgr/service-evtmgr/ScreenLightControlMessage.hpp>
 #include <module-services/service-evtmgr/service-evtmgr/Constants.hpp>
 #include <module-services/service-evtmgr/service-evtmgr/EVMessages.hpp>
-#include <module-services/service-appmgr/service-appmgr/messages/Message.hpp>
-#include <module-services/service-appmgr/service-appmgr/model/ApplicationManager.hpp>
+#include <service-appmgr/messages/Message.hpp>
+#include <service-appmgr/model/ApplicationManager.hpp>
 #include <apps-common/messages/DialogMetadataMessage.hpp>
 #include <apps-common/windows/Dialog.hpp>
 

@@ 134,5 134,7 @@ target_link_libraries(${PROJECT_NAME}
         service-bluetooth
         eventstore
     PRIVATE
+        service-appmgr
+        service-eink
         service-time-api
 )

@@ 7,6 7,7 @@
 #include <messages/EinkModeMessage.hpp>
 #include <Application.hpp>
 #include <i18n/i18n.hpp>
+#include <service-eink/Common.hpp>
 
 namespace gui
 {

@@ 4,7 4,7 @@
 #include "InputLanguageWindow.hpp"
 
 #include <application-settings/windows/WindowNames.hpp>
-#include <service-appmgr/service-appmgr/Controller.hpp>
+#include <service-appmgr/Controller.hpp>
 #include <OptionSetting.hpp>
 
 #include <i18n/i18n.hpp>

@@ 22,7 22,7 @@
 #include <service-evtmgr/BatteryMessages.hpp>
 #include <service-evtmgr/Constants.hpp>
 #include <service-evtmgr/EVMessages.hpp>
-#include <service-appmgr/service-appmgr/messages/DOMRequest.hpp>
+#include <service-appmgr/messages/DOMRequest.hpp>
 #include <service-appmgr/messages/UserPowerDownRequest.hpp>
 #include <service-appmgr/data/NotificationsChangedActionsParams.hpp>
 #include "service-gui/messages/DrawMessage.hpp" // for DrawMessage

@@ 3,7 3,7 @@
 
 #include "DOMResponder.hpp"
 #include "service-desktop/DeveloperModeMessage.hpp"
-#include <service-appmgr/service-appmgr/messages/DOMRequest.hpp>
+#include <service-appmgr/messages/DOMRequest.hpp>
 #include <module-gui/gui/dom/Item2JsonSerializer.hpp>
 #include <memory>
 #include <Item.hpp>

@@ 3,7 3,7 @@
 
 #include "PhoneLockHandler.hpp"
 
-#include <service-appmgr/service-appmgr/Controller.hpp>
+#include <service-appmgr/Controller.hpp>
 #include <locks/widgets/LockHash.hpp>
 #include <Utils.hpp>
 #include <memory>

@@ 3,7 3,7 @@
 
 #include "PhoneLockSubject.hpp"
 
-#include <service-appmgr/service-appmgr/model/ApplicationManager.hpp>
+#include <service-appmgr/model/ApplicationManager.hpp>
 #include <locks/data/PhoneLockMessages.hpp>
 
 namespace locks

@@ 3,7 3,7 @@
 
 #include "SimLockHandler.hpp"
 
-#include <service-appmgr/service-appmgr/Controller.hpp>
+#include <service-appmgr/Controller.hpp>
 #include <Utils.hpp>
 #include <memory>
 

@@ 4,7 4,7 @@
 #include "SimLockSubject.hpp"
 
 #include <locks/data/PhoneLockMessages.hpp>
-#include <service-appmgr/service-appmgr/model/ApplicationManager.hpp>
+#include <service-appmgr/model/ApplicationManager.hpp>
 
 namespace locks
 {

@@ 5,7 5,7 @@
 #include <service-db/DBServiceAPI.hpp>
 #include <log.hpp>
 #include <service-cellular/service-cellular/CellularMessage.hpp>
-#include <service-appmgr/service-appmgr/Controller.hpp>
+#include <service-appmgr/Controller.hpp>
 #include <service-audio/AudioServiceAPI.hpp>
 #include <service-cellular/CellularServiceAPI.hpp>
 

@@ 6,7 6,7 @@
 
 #include <locks/input/PhoneLockedKeysWhitelist.hpp>
 #include <application-desktop/data/DesktopStyle.hpp>
-#include <module-services/service-appmgr/service-appmgr/Controller.hpp>
+#include <service-appmgr/Controller.hpp>
 #include <time/time_conversion_factory.hpp>
 #include <service-time/ServiceTime.hpp>
 #include <service-time/TimeMessage.hpp>

@@ 2,7 2,7 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "PowerOffPresenter.hpp"
-#include <module-services/service-appmgr/service-appmgr/messages/UserPowerDownRequest.hpp>
+#include <service-appmgr/messages/UserPowerDownRequest.hpp>
 #include <module-sys/SystemManager/Constants.hpp>
 
 namespace gui

@@ 78,6 78,7 @@ target_link_libraries(${PROJECT_NAME}
         module-sys
         module-utils
         module-vfs
+        service-appmgr
         service-cellular
         service-eink
         service-fota

@@ 9,7 9,7 @@
 #include <memory>
 #include <string>
 
-#include <service-appmgr/service-appmgr/data/MmiActionsParams.hpp>
+#include <service-appmgr/data/MmiActionsParams.hpp>
 
 namespace at
 {

@@ 1,8 1,8 @@
 // Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include "service-appmgr/Actions.hpp"
-#include "service-appmgr/ApplicationManifest.hpp"
+#include "ApplicationManifest.hpp"
+#include <service-appmgr/Actions.hpp>
 
 #include <algorithm>
 

@@ 1,40 1,77 @@
-project(service-appmgr)
-message( "${PROJECT_NAME}  ${CMAKE_CURRENT_LIST_DIR}" )
+add_library(service-appmgr STATIC)
 
-set(SOURCES
-    ApplicationManifest.cpp
-    Controller.cpp
-    data/MmiActionsParams.cpp
-    data/NotificationsChangedActionsParams.cpp
-    data/CallActionsParams.cpp
-    model/ApplicationManager.cpp
-    model/ApplicationHandle.cpp
-    model/ApplicationsRegistry.cpp
-    model/ActionsRegistry.cpp
-    model/ApplicationStack.cpp
-    model/OnActionPolicy.cpp
-    messages/ActionRequest.cpp
-    messages/FinishRequest.cpp
-    messages/ApplicationCloseRequest.cpp
-    messages/ApplicationInitialised.cpp
-    messages/ApplicationStatus.cpp
-    messages/BaseMessage.cpp
-    messages/CloseConfirmation.cpp
-    messages/LanguageChangeRequest.cpp
-    messages/PowerSaveModeInitRequest.cpp
-    messages/PreventBlockingRequest.cpp
-    messages/ShutdownRequest.cpp
-    messages/SwitchBackRequest.cpp
-    messages/SwitchConfirmation.cpp
-    messages/SwitchRequest.cpp
-    messages/UpdateInProgress.cpp
-    messages/DOMRequest.cpp
-    messages/SetOsUpdateVersion.cpp
-    messages/StartAllowedMessage.cpp)
-
-add_library(${PROJECT_NAME} STATIC ${SOURCES})
+target_sources(service-appmgr
+    PRIVATE
+        ApplicationManifest.cpp
+        Controller.cpp
+        data/CallActionsParams.cpp
+        data/MmiActionsParams.cpp
+        data/NotificationsChangedActionsParams.cpp
+        messages/ActionRequest.cpp
+        messages/ApplicationCloseRequest.cpp
+        messages/ApplicationInitialised.cpp
+        messages/ApplicationStatus.cpp
+        messages/BaseMessage.cpp
+        messages/CloseConfirmation.cpp
+        messages/DOMRequest.cpp
+        messages/FinishRequest.cpp
+        messages/LanguageChangeRequest.cpp
+        messages/PowerSaveModeInitRequest.cpp
+        messages/PreventBlockingRequest.cpp
+        messages/SetOsUpdateVersion.cpp
+        messages/ShutdownRequest.cpp
+        messages/StartAllowedMessage.cpp
+        messages/SwitchBackRequest.cpp
+        messages/SwitchConfirmation.cpp
+        messages/SwitchRequest.cpp
+        messages/UpdateInProgress.cpp
+        model/ActionsRegistry.cpp
+        model/ApplicationHandle.cpp
+        model/ApplicationManager.cpp
+        model/ApplicationStack.cpp
+        model/ApplicationsRegistry.cpp
+        model/OnActionPolicy.cpp
+    PUBLIC
+        include/service-appmgr/Actions.hpp
+        include/service-appmgr/ApplicationManifest.hpp
+        include/service-appmgr/Controller.hpp
+        include/service-appmgr/StartupType.hpp
+        include/service-appmgr/data/CallActionsParams.hpp
+        include/service-appmgr/data/MmiActionsParams.hpp
+        include/service-appmgr/data/NotificationsChangedActionsParams.hpp
+        include/service-appmgr/messages/ActionRequest.hpp
+        include/service-appmgr/messages/ApplicationCloseRequest.hpp
+        include/service-appmgr/messages/ApplicationInitialised.hpp
+        include/service-appmgr/messages/ApplicationStatus.hpp
+        include/service-appmgr/messages/AutoLockRequests.hpp
+        include/service-appmgr/messages/BaseMessage.hpp
+        include/service-appmgr/messages/CloseConfirmation.hpp
+        include/service-appmgr/messages/DOMRequest.hpp
+        include/service-appmgr/messages/FinishRequest.hpp
+        include/service-appmgr/messages/GetAllNotificationsRequest.hpp
+        include/service-appmgr/messages/GetCurrentDisplayLanguageRequest.hpp
+        include/service-appmgr/messages/GetCurrentDisplayLanguageResponse.hpp
+        include/service-appmgr/messages/LanguageChangeRequest.hpp
+        include/service-appmgr/messages/Message.hpp
+        include/service-appmgr/messages/PowerSaveModeInitRequest.hpp
+        include/service-appmgr/messages/PreventBlockingRequest.hpp
+        include/service-appmgr/messages/SetOsUpdateVersion.hpp
+        include/service-appmgr/messages/ShutdownRequest.hpp
+        include/service-appmgr/messages/StartAllowedMessage.hpp
+        include/service-appmgr/messages/SwitchBackRequest.hpp
+        include/service-appmgr/messages/SwitchConfirmation.hpp
+        include/service-appmgr/messages/SwitchRequest.hpp
+        include/service-appmgr/messages/UpdateInProgress.hpp
+        include/service-appmgr/messages/UserPowerDownRequest.hpp
+        include/service-appmgr/model/ActionsRegistry.hpp
+        include/service-appmgr/model/ApplicationHandle.hpp
+        include/service-appmgr/model/ApplicationManager.hpp
+        include/service-appmgr/model/ApplicationStack.hpp
+        include/service-appmgr/model/ApplicationsRegistry.hpp
+        include/service-appmgr/model/OnActionPolicy.hpp
+)
 
-target_link_libraries(${PROJECT_NAME}
+target_link_libraries(service-appmgr
     PRIVATE
         application-desktop
         application-special-input


@@ 48,9 85,16 @@ target_link_libraries(${PROJECT_NAME}
         time
 )
 
-target_include_directories(${PROJECT_NAME}
+target_include_directories(service-appmgr
+    PRIVATE
+        $<BUILD_INTERFACE:
+            ${CMAKE_CURRENT_SOURCE_DIR}/include/service-appmgr
+            ${CMAKE_CURRENT_SOURCE_DIR}/include/service-appmgr/data
+            ${CMAKE_CURRENT_SOURCE_DIR}/include/service-appmgr/messages
+            ${CMAKE_CURRENT_SOURCE_DIR}/include/service-appmgr/model
+        >
     PUBLIC
-        ${CMAKE_CURRENT_LIST_DIR}
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
 )
 
 if (${ENABLE_TESTS})

@@ 1,15 1,15 @@
 // Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include "service-appmgr/Controller.hpp"
+#include "Controller.hpp"
 
-#include "service-appmgr/model/ApplicationManager.hpp"
-#include "service-appmgr/messages/GetAllNotificationsRequest.hpp"
-#include "service-appmgr/messages/FinishRequest.hpp"
+#include "ApplicationManager.hpp"
+#include "FinishRequest.hpp"
+#include "GetAllNotificationsRequest.hpp"
 
 #include <Service/Service.hpp>
 
-#include <utility> // for move
+#include <utility>
 
 namespace app::manager
 {

@@ 1,7 1,7 @@
 // Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include <service-appmgr/data/CallActionsParams.hpp>
+#include "CallActionsParams.hpp"
 
 using namespace app::manager::actions;
 

@@ 1,7 1,7 @@
 // Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include <service-appmgr/data/MmiActionsParams.hpp>
+#include "MmiActionsParams.hpp"
 
 using namespace app::manager::actions;
 

@@ 1,7 1,7 @@
 // Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include <service-appmgr/data/NotificationsChangedActionsParams.hpp>
+#include "NotificationsChangedActionsParams.hpp"
 
 #include <apps-common/notifications/NotificationData.hpp>
 

@@ 3,7 3,8 @@
 
 #pragma once
 
-#include "service-appmgr/Actions.hpp"
+#include <service-appmgr/Actions.hpp>
+
 #include <apps-common/locks/handlers/LockPolicyHandler.hpp>
 
 #include <optional>

@@ 3,9 3,9 @@
 
 #pragma once
 
-#include "Actions.hpp"
-#include "messages/Message.hpp"
-#include "model/ApplicationManager.hpp"
+#include <service-appmgr/Actions.hpp>
+#include <service-appmgr/messages/Message.hpp>
+#include <service-appmgr/model/ApplicationManager.hpp>
 
 #include <module-sys/Service/Service.hpp>
 #include <SwitchData.hpp>

@@ 3,7 3,8 @@
 
 #pragma once
 
-#include <service-appmgr/service-appmgr/Actions.hpp>
+#include <service-appmgr/Actions.hpp>
+
 #include <PhoneNumber.hpp>
 
 namespace app::manager::actions

@@ 3,7 3,7 @@
 
 #pragma once
 
-#include <service-appmgr/service-appmgr/Actions.hpp>
+#include <service-appmgr/Actions.hpp>
 
 namespace mmiactions = app::manager::actions;
 

@@ 4,6 4,7 @@
 #pragma once
 
 #include <service-appmgr/Actions.hpp>
+
 #include <list>
 
 namespace notifications

@@ 4,9 4,8 @@
 #pragma once
 
 #include "BaseMessage.hpp"
-
-#include <module-services/service-appmgr/service-appmgr/Actions.hpp>
-#include <module-services/service-appmgr/service-appmgr/ApplicationManifest.hpp>
+#include <service-appmgr/Actions.hpp>
+#include <service-appmgr/ApplicationManifest.hpp>
 
 namespace app::manager
 {

@@ 5,6 5,7 @@
 
 #include "BaseMessage.hpp"
 #include <service-appmgr/StartupType.hpp>
+
 namespace app::manager
 {
     class CheckIfStartAllowedMessage : public BaseMessage

@@ 8,12 8,12 @@
 #include "ActionsRegistry.hpp"
 #include "ApplicationStack.hpp"
 #include "OnActionPolicy.hpp"
+#include <service-appmgr/messages/Message.hpp>
 
 #include <apps-common/Application.hpp>
 #include <apps-common/ApplicationLauncher.hpp>
 
 #include <bsp/keypad_backlight/keypad_backlight.hpp>
-#include <service-appmgr/messages/Message.hpp>
 #include <Service/Common.hpp>
 #include <Service/Message.hpp>
 #include <Service/Service.hpp>

@@ 1,7 1,7 @@
 // Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include <service-appmgr/messages/ActionRequest.hpp>
+#include "ActionRequest.hpp"
 
 namespace app::manager
 {

@@ 1,7 1,7 @@
 // Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include <service-appmgr/messages/ApplicationCloseRequest.hpp>
+#include "ApplicationCloseRequest.hpp"
 
 namespace app::manager
 {

@@ 1,7 1,7 @@
 // Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include <service-appmgr/messages/ApplicationInitialised.hpp>
+#include "ApplicationInitialised.hpp"
 
 namespace app::manager
 {

@@ 1,7 1,7 @@
 // Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include <service-appmgr/messages/ApplicationStatus.hpp>
+#include "ApplicationStatus.hpp"
 
 namespace app::manager
 {

@@ 1,7 1,7 @@
 // Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include <service-appmgr/messages/BaseMessage.hpp>
+#include "BaseMessage.hpp"
 
 namespace app::manager
 {

@@ 1,7 1,7 @@
 // Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include <service-appmgr/messages/CloseConfirmation.hpp>
+#include "CloseConfirmation.hpp"
 
 namespace app::manager
 {

@@ 1,8 1,9 @@
 // Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include "service-desktop/DeveloperModeMessage.hpp"
-#include <service-appmgr/messages/DOMRequest.hpp>
+#include "DOMRequest.hpp"
+
+#include <service-desktop/DeveloperModeMessage.hpp>
 
 namespace app::manager
 {

@@ 1,7 1,7 @@
 // Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include <service-appmgr/messages/FinishRequest.hpp>
+#include "FinishRequest.hpp"
 
 namespace app::manager
 {

@@ 1,7 1,8 @@
 // Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include <service-appmgr/messages/LanguageChangeRequest.hpp>
+#include "LanguageChangeRequest.hpp"
+
 #include <utility>
 
 namespace app::manager

@@ 1,7 1,7 @@
 // Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include <service-appmgr/messages/PowerSaveModeInitRequest.hpp>
+#include "PowerSaveModeInitRequest.hpp"
 
 namespace app::manager
 {

@@ 1,7 1,7 @@
 // Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include <service-appmgr/messages/PreventBlockingRequest.hpp>
+#include "PreventBlockingRequest.hpp"
 
 namespace app::manager
 {

@@ 1,7 1,7 @@
 // Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include <service-appmgr/messages/SetOsUpdateVersion.hpp>
+#include "SetOsUpdateVersion.hpp"
 
 namespace app::manager
 {

@@ 1,7 1,7 @@
 // Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include <service-appmgr/messages/ShutdownRequest.hpp>
+#include "ShutdownRequest.hpp"
 
 namespace app::manager
 {

@@ 1,7 1,7 @@
 // Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include <service-appmgr/messages/StartAllowedMessage.hpp>
+#include "StartAllowedMessage.hpp"
 
 namespace app::manager
 {

@@ 1,7 1,7 @@
 // Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include <service-appmgr/messages/SwitchBackRequest.hpp>
+#include "SwitchBackRequest.hpp"
 
 namespace app::manager
 {

@@ 1,7 1,7 @@
 // Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include <service-appmgr/messages/SwitchConfirmation.hpp>
+#include "SwitchConfirmation.hpp"
 
 namespace app::manager
 {

@@ 1,7 1,7 @@
 // Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include <service-appmgr/messages/SwitchRequest.hpp>
+#include "SwitchRequest.hpp"
 
 namespace app::manager
 {

@@ 1,7 1,7 @@
 // Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include <service-appmgr/messages/UpdateInProgress.hpp>
+#include "UpdateInProgress.hpp"
 
 namespace app::manager
 {

@@ 1,7 1,7 @@
 // Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include <service-appmgr/model/ActionsRegistry.hpp>
+#include "ActionsRegistry.hpp"
 
 #include <log.hpp>
 #include <magic_enum.hpp>

@@ 1,7 1,8 @@
 // Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include <service-appmgr/model/ApplicationHandle.hpp>
+#include "ApplicationHandle.hpp"
+
 #include <apps-common/ApplicationLauncher.hpp>
 
 namespace app::manager

@@ 1,51 1,48 @@
 // Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include <service-appmgr/model/ApplicationManager.hpp>
-#include <service-appmgr/Controller.hpp>
+#include "ApplicationManager.hpp"
+#include "ApplicationStatus.hpp"
+#include "AutoLockRequests.hpp"
+#include "Controller.hpp"
+#include "DOMRequest.hpp"
+#include "FinishRequest.hpp"
+#include "GetAllNotificationsRequest.hpp"
+#include "Message.hpp"
 
-#include <apps-common/messages/AppMessage.hpp>
-#include <apps-common/popups/data/PhoneModeParams.hpp>
-#include <apps-common/popups/data/PopupRequestParams.hpp>
 #include <Common.hpp>
 #include <Service/Message.hpp>
-#include <module-sys/Timers/TimerFactory.hpp>
 #include <SystemManager/SystemManager.hpp>
 #include <SystemManager/messages/SystemManagerMessage.hpp>
-#include <SystemManager/messages/TetheringQuestionRequest.hpp>
 #include <SystemManager/messages/TetheringPhoneModeChangeProhibitedMessage.hpp>
-#include <application-special-input/ApplicationSpecialInput.hpp>
+#include <SystemManager/messages/TetheringQuestionRequest.hpp>
 #include <application-desktop/ApplicationDesktop.hpp>
 #include <application-onboarding/ApplicationOnBoarding.hpp>
 #include <application-onboarding/data/OnBoardingMessages.hpp>
+#include <application-special-input/ApplicationSpecialInput.hpp>
+#include <apps-common/messages/AppMessage.hpp>
+#include <apps-common/popups/data/PhoneModeParams.hpp>
+#include <apps-common/popups/data/PopupRequestParams.hpp>
+#include <event-manager-api>
 #include <i18n/i18n.hpp>
 #include <log/log.hpp>
+#include <module-db/queries/notifications/QueryNotificationsGetAll.hpp>
+#include <module-services/service-audio/service-audio/AudioMessage.hpp>
+#include <module-services/service-db/agents/settings/SystemSettings.hpp>
+#include <module-sys/Timers/TimerFactory.hpp>
+#include <module-utils/Utils.hpp>
+#include <service-appmgr/StartupType.hpp>
+#include <service-cellular-api>
 #include <service-cellular/CellularMessage.hpp>
-#include <service-appmgr/messages/Message.hpp>
-#include <service-evtmgr/EventManager.hpp>
-#include <service-evtmgr/EVMessages.hpp>
-#include <service-gui/ServiceGUI.hpp>
-#include <service-eink/ServiceEink.hpp>
-#include <service-desktop/DesktopMessages.hpp>
+#include <service-db/DBNotificationMessage.hpp>
 #include <service-desktop/Constants.hpp>
-#include <service-appmgr/StartupType.hpp>
-#include <module-services/service-audio/service-audio/AudioMessage.hpp>
+#include <service-desktop/DesktopMessages.hpp>
+#include <service-eink/ServiceEink.hpp>
+#include <service-evtmgr/EVMessages.hpp>
+#include <service-evtmgr/EventManager.hpp>
 
 #include <algorithm>
-#include <limits>
 #include <utility>
-#include <module-utils/Utils.hpp>
-#include <module-services/service-db/agents/settings/SystemSettings.hpp>
-#include <service-appmgr/messages/DOMRequest.hpp>
-#include <service-appmgr/messages/GetAllNotificationsRequest.hpp>
-#include <service-appmgr/messages/AutoLockRequests.hpp>
-#include <service-appmgr/messages/FinishRequest.hpp>
-#include <service-db/DBNotificationMessage.hpp>
-#include <module-db/queries/notifications/QueryNotificationsGetAll.hpp>
-#include <service-cellular-api>
-
-#include "module-services/service-appmgr/service-appmgr/messages/ApplicationStatus.hpp"
-#include <event-manager-api>
 
 namespace app::manager
 {

@@ 1,9 1,7 @@
 // Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include <service-appmgr/model/ApplicationStack.hpp>
-
-#include <module-utils/log/Logger.hpp>
+#include "ApplicationStack.hpp"
 
 #include <algorithm>
 

@@ 1,7 1,8 @@
 // Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include <service-appmgr/model/ApplicationsRegistry.hpp>
+#include "ApplicationsRegistry.hpp"
+
 #include <apps-common/ApplicationLauncher.hpp>
 
 namespace app::manager

@@ 1,7 1,7 @@
 // Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include <service-appmgr/model/OnActionPolicy.hpp>
+#include "OnActionPolicy.hpp"
 
 namespace app::manager
 {

@@ 3,7 3,7 @@
 
 #include <catch2/catch.hpp>
 
-#include <module-services/service-appmgr/service-appmgr/model/ActionsRegistry.hpp>
+#include <service-appmgr/model/ActionsRegistry.hpp>
 
 using namespace app::manager;
 

@@ 3,7 3,7 @@
 
 #include <catch2/catch.hpp>
 
-#include <module-services/service-appmgr/service-appmgr/ApplicationManifest.hpp>
+#include <service-appmgr/ApplicationManifest.hpp>
 
 using namespace app::manager;
 

@@ 3,7 3,7 @@
 
 #include <catch2/catch.hpp>
 
-#include <module-services/service-appmgr/service-appmgr/model/ApplicationStack.hpp>
+#include <service-appmgr/model/ApplicationStack.hpp>
 
 using namespace app::manager;
 

@@ 10,6 10,7 @@ set(SOURCES
 add_library(${PROJECT_NAME} STATIC ${SOURCES})
 
 target_link_libraries(${PROJECT_NAME}
+    service-appmgr
     service-bluetooth
     service-db
     module-bluetooth

@@ 6,8 6,8 @@
 #include <Audio/AudioCommon.hpp>
 #include <Audio/decoder/Decoder.hpp>
 #include <MessageType.hpp>
-#include <service-appmgr/service-appmgr/messages/ActionRequest.hpp>
-#include <module-services/service-appmgr/service-appmgr/Actions.hpp>
+#include <service-appmgr/messages/ActionRequest.hpp>
+#include <service-appmgr/Actions.hpp>
 #include <apps-common/popups/data/PopupRequestParams.hpp>
 
 #include <Service/Message.hpp>

@@ 62,8 62,8 @@ target_link_libraries(${PROJECT_NAME}
         json::json
         time
     PUBLIC
-        utf8
         eventstore
+        utf8
     )
 
 if (${ENABLE_TESTS})

@@ 18,10 18,10 @@
 #include <memory>
 #include <string>
 
-#include <service-appmgr/service-appmgr/messages/ActionRequest.hpp>
-#include <service-appmgr/service-appmgr/Actions.hpp>
-#include <service-appmgr/service-appmgr/data/MmiActionsParams.hpp>
-#include <service-appmgr/service-appmgr/data/CallActionsParams.hpp>
+#include <service-appmgr/messages/ActionRequest.hpp>
+#include <service-appmgr/Actions.hpp>
+#include <service-appmgr/data/MmiActionsParams.hpp>
+#include <service-appmgr/data/CallActionsParams.hpp>
 
 #include <service-cellular/api/common.hpp>
 

@@ 59,6 59,7 @@ target_link_libraries(${PROJECT_NAME}
         application-desktop
         microtar
         module-utils
+        service-appmgr
         service-cellular
         service-evtmgr
         utf8

@@ 1,7 1,7 @@
 // Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include "service-appmgr/service-appmgr/messages/DOMRequest.hpp"
+#include "service-appmgr/messages/DOMRequest.hpp"
 #include "service-desktop/DesktopMessages.hpp"
 #include "service-desktop/ServiceDesktop.hpp"
 #include "service-desktop/WorkerDesktop.hpp"


@@ 22,7 22,7 @@
 #include <module-sys/SystemManager/SystemManager.hpp>
 #include <module-sys/Timers/TimerFactory.hpp>
 
-#include <module-services/service-appmgr/service-appmgr/model/ApplicationManager.hpp>
+#include <service-appmgr/model/ApplicationManager.hpp>
 #include <module-services/service-db/agents/settings/SystemSettings.hpp>
 #include <module-sys/SystemManager/Constants.hpp>
 #include <module-sys/SystemManager/messages/TetheringStateRequest.hpp>

@@ 23,7 23,7 @@
 #include <service-db/DBServiceAPI.hpp>
 #include <service-desktop/parser/MessageHandler.hpp>
 #include <service-desktop/endpoints/developerMode/event/ATRequest.hpp>
-#include <service-appmgr/service-appmgr/Controller.hpp>
+#include <service-appmgr/Controller.hpp>
 
 #include <ctime>
 

@@ 7,7 7,7 @@
 #include "service-desktop/DeveloperModeMessage.hpp"
 #include <variant>
 #include <service-appmgr/model/ApplicationManager.hpp>
-#include <service-appmgr/service-appmgr/messages/DOMRequest.hpp>
+#include <service-appmgr/messages/DOMRequest.hpp>
 
 namespace parserFSM
 {

@@ 21,7 21,7 @@
 #include <service-cellular/CellularServiceAPI.hpp>
 #include <service-cellular/CellularMessage.hpp>
 #include <service-appmgr/model/ApplicationManager.hpp>
-#include <service-appmgr/service-appmgr/Controller.hpp>
+#include <service-appmgr/Controller.hpp>
 #include "messages/CpuFrequencyMessage.hpp"
 #include "messages/DeviceRegistrationMessage.hpp"
 #include "messages/SentinelRegistrationMessage.hpp"

@@ 3,7 3,7 @@
 
 #pragma once
 
-#include <service-appmgr/service-appmgr/Actions.hpp>
+#include <service-appmgr/Actions.hpp>
 
 namespace app::manager::actions
 {

@@ 8,7 8,7 @@
 
 #include "SystemManager/Constants.hpp"
 #include "SystemManager/data/SystemManagerActionsParams.hpp"
-#include <service-appmgr/service-appmgr/Actions.hpp>
+#include <service-appmgr/Actions.hpp>
 
 namespace sys
 {