From 58118fe0bb193b5adf7efcc4b35d24193a3bade6 Mon Sep 17 00:00:00 2001 From: Mateusz Grzegorzek Date: Mon, 23 Aug 2021 14:16:36 +0200 Subject: [PATCH] [BH-799] Split DeveloperModeHelper - part I Rename DeveloperModeHelper to DeveloperModeHelperCommon --- .../service-desktop/CMakeLists.txt | 2 +- .../developerMode/DeveloperModeEndpoint.hpp | 6 ++--- ...lper.cpp => DeveloperModeHelperCommon.cpp} | 26 +++++++++---------- ...lper.hpp => DeveloperModeHelperCommon.hpp} | 8 +++--- .../developerMode/event/ATRequest.cpp | 2 +- 5 files changed, 22 insertions(+), 22 deletions(-) rename module-services/service-desktop/endpoints/developerMode/{DeveloperModeHelper.cpp => DeveloperModeHelperCommon.cpp} (93%) rename module-services/service-desktop/endpoints/developerMode/{DeveloperModeHelper.hpp => DeveloperModeHelperCommon.hpp} (91%) diff --git a/module-services/service-desktop/CMakeLists.txt b/module-services/service-desktop/CMakeLists.txt index e5536aaabf6c3ea448e07a5772327cdcf2aa47c7..a4a13996b0b85e9e015a790760c840a7a4be285f 100644 --- a/module-services/service-desktop/CMakeLists.txt +++ b/module-services/service-desktop/CMakeLists.txt @@ -16,7 +16,7 @@ set(SOURCES endpoints/contacts/ContactHelper.cpp endpoints/contacts/ContactsEndpoint.cpp endpoints/developerMode/DeveloperModeEndpoint.cpp - endpoints/developerMode/DeveloperModeHelper.cpp + endpoints/developerMode/DeveloperModeHelperCommon.cpp endpoints/developerMode/Mode/UI_Helper.cpp endpoints/developerMode/event/DomRequest.cpp endpoints/developerMode/event/ATRequest.cpp diff --git a/module-services/service-desktop/endpoints/developerMode/DeveloperModeEndpoint.hpp b/module-services/service-desktop/endpoints/developerMode/DeveloperModeEndpoint.hpp index 407de2b564cc3889e2296ede980989164c673e6e..91b3002249324c0ef1dcd5c3145ef563ba56eea0 100644 --- a/module-services/service-desktop/endpoints/developerMode/DeveloperModeEndpoint.hpp +++ b/module-services/service-desktop/endpoints/developerMode/DeveloperModeEndpoint.hpp @@ -3,7 +3,7 @@ #pragma once -#include "DeveloperModeHelper.hpp" +#include "DeveloperModeHelperCommon.hpp" #include "Mode/UI_Helper.hpp" #include #include @@ -25,12 +25,12 @@ namespace sys class DeveloperModeEndpoint : public parserFSM::Endpoint { private: - const std::unique_ptr helper; + const std::unique_ptr helper; const std::unique_ptr uiHelper; public: explicit DeveloperModeEndpoint(sys::Service *_ownerServicePtr) - : Endpoint(_ownerServicePtr), helper(std::make_unique(ownerServicePtr)), + : Endpoint(_ownerServicePtr), helper(std::make_unique(ownerServicePtr)), uiHelper(std::make_unique(ownerServicePtr)) { debugName = "DeveloperModeEndpoint"; diff --git a/module-services/service-desktop/endpoints/developerMode/DeveloperModeHelper.cpp b/module-services/service-desktop/endpoints/developerMode/DeveloperModeHelperCommon.cpp similarity index 93% rename from module-services/service-desktop/endpoints/developerMode/DeveloperModeHelper.cpp rename to module-services/service-desktop/endpoints/developerMode/DeveloperModeHelperCommon.cpp index 9cde1c92348d2e94d14468aa02f47ea457ddbe23..66c583c21aa8b6f4feed4639d142f0c9d53864f1 100644 --- a/module-services/service-desktop/endpoints/developerMode/DeveloperModeHelper.cpp +++ b/module-services/service-desktop/endpoints/developerMode/DeveloperModeHelperCommon.cpp @@ -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 "DeveloperModeHelper.hpp" +#include "DeveloperModeHelperCommon.hpp" #include "service-db/SettingsMessages.hpp" #include #include @@ -46,7 +46,7 @@ namespace } } // namespace -auto DeveloperModeHelper::processPut(Context &context) -> ProcessResult +auto DeveloperModeHelperCommon::processPut(Context &context) -> ProcessResult { auto body = context.getBody(); auto code = http::Code::BadRequest; @@ -87,7 +87,7 @@ auto DeveloperModeHelper::processPut(Context &context) -> ProcessResult path.scope = settings::SettingsScope::Global; auto msg = std::make_shared(std::move(path), std::move(value)); code = owner->bus.sendUnicast(std::move(msg), service::name::db) ? http::Code::NoContent - : http::Code::InternalServerError; + : http::Code::InternalServerError; return {sent::no, endpoint::ResponseContext{.status = code}}; } @@ -124,7 +124,7 @@ auto DeveloperModeHelper::processPut(Context &context) -> ProcessResult auto phoneLockState = body[json::developerMode::phoneLockCodeEnabled].bool_value(); auto msg = std::make_shared(phoneLockState); code = owner->bus.sendUnicast(std::move(msg), "ApplicationManager") ? http::Code::NoContent - : http::Code::InternalServerError; + : http::Code::InternalServerError; } else if (auto switchData = body[json::developerMode::switchApplication].object_items(); !switchData.empty()) { auto msg = std::make_shared( @@ -151,7 +151,7 @@ auto DeveloperModeHelper::processPut(Context &context) -> ProcessResult return {sent::no, endpoint::ResponseContext{.status = code}}; } -auto DeveloperModeHelper::processGet(Context &context) -> ProcessResult +auto DeveloperModeHelperCommon::processGet(Context &context) -> ProcessResult { auto body = context.getBody(); if (body[json::developerMode::getInfo].is_string()) { @@ -190,7 +190,7 @@ auto DeveloperModeHelper::processGet(Context &context) -> ProcessResult } } -auto DeveloperModeHelper::getKeyCode(int val) noexcept -> bsp::KeyCodes +auto DeveloperModeHelperCommon::getKeyCode(int val) noexcept -> bsp::KeyCodes { switch (val) { case 0: @@ -249,7 +249,7 @@ auto DeveloperModeHelper::getKeyCode(int val) noexcept -> bsp::KeyCodes }; } -bool DeveloperModeHelper::sendKeypress(bsp::KeyCodes keyCode, gui::InputEvent::State state) +bool DeveloperModeHelperCommon::sendKeypress(bsp::KeyCodes keyCode, gui::InputEvent::State state) { RawKey key{.state = RawKey::State::Released, .keyCode = keyCode}; @@ -259,14 +259,14 @@ bool DeveloperModeHelper::sendKeypress(bsp::KeyCodes keyCode, gui::InputEvent::S return owner->bus.sendUnicast(std::move(message), service::name::evt_manager); } -void DeveloperModeHelper::requestSimChange(const int simSelected) +void DeveloperModeHelperCommon::requestSimChange(const int simSelected) { auto arg = (simSelected == static_cast(cellular::api::SimSlot::SIM2)) ? cellular::api::SimSlot::SIM2 : cellular::api::SimSlot::SIM1; owner->bus.sendUnicast(arg); } -bool DeveloperModeHelper::requestCellularPowerStateChange(const int cellularState) +bool DeveloperModeHelperCommon::requestCellularPowerStateChange(const int cellularState) { bool res = false; if (cellularState == 1) { @@ -282,7 +282,7 @@ bool DeveloperModeHelper::requestCellularPowerStateChange(const int cellularStat } return res; } -auto DeveloperModeHelper::smsRecordFromJson(const json11::Json &msgJson) -> SMSRecord +auto DeveloperModeHelperCommon::smsRecordFromJson(const json11::Json &msgJson) -> SMSRecord { auto record = SMSRecord(); @@ -294,7 +294,7 @@ auto DeveloperModeHelper::smsRecordFromJson(const json11::Json &msgJson) -> SMSR return record; } -auto DeveloperModeHelper::prepareSMS(Context &context) -> ProcessResult +auto DeveloperModeHelperCommon::prepareSMS(Context &context) -> ProcessResult { SMSRecord record = smsRecordFromJson(context.getBody()); @@ -323,14 +323,14 @@ auto DeveloperModeHelper::prepareSMS(Context &context) -> ProcessResult return {sent::delayed, std::nullopt}; } -bool DeveloperModeHelper::requestServiceStateInfo(sys::Service *serv) +bool DeveloperModeHelperCommon::requestServiceStateInfo(sys::Service *serv) { auto event = std::make_unique(); auto msg = std::make_shared(std::move(event)); return serv->bus.sendUnicast(std::move(msg), ServiceCellular::serviceName); } -bool DeveloperModeHelper::requestCellularSleepModeInfo(sys::Service *serv) +bool DeveloperModeHelperCommon::requestCellularSleepModeInfo(sys::Service *serv) { auto event = std::make_unique(); auto msg = std::make_shared(std::move(event)); diff --git a/module-services/service-desktop/endpoints/developerMode/DeveloperModeHelper.hpp b/module-services/service-desktop/endpoints/developerMode/DeveloperModeHelperCommon.hpp similarity index 91% rename from module-services/service-desktop/endpoints/developerMode/DeveloperModeHelper.hpp rename to module-services/service-desktop/endpoints/developerMode/DeveloperModeHelperCommon.hpp index 60cd7134dd57db21b6ba017c9e2733a75ec92d03..f467d89cf737b517c88fa59ac3b4bacda224d5b7 100644 --- a/module-services/service-desktop/endpoints/developerMode/DeveloperModeHelper.hpp +++ b/module-services/service-desktop/endpoints/developerMode/DeveloperModeHelperCommon.hpp @@ -21,7 +21,7 @@ namespace sys namespace parserFSM { - class DeveloperModeHelper : public BaseHelper + class DeveloperModeHelperCommon : public BaseHelper { static auto getKeyCode(int val) noexcept -> bsp::KeyCodes; bool sendKeypress(bsp::KeyCodes keyCode, gui::InputEvent::State state); @@ -34,7 +34,7 @@ namespace parserFSM auto prepareSMS(Context &context) -> ProcessResult; public: - explicit DeveloperModeHelper(sys::Service *p) : BaseHelper(p) + explicit DeveloperModeHelperCommon(sys::Service *p) : BaseHelper(p) {} private: @@ -68,8 +68,8 @@ namespace parserFSM } // namespace switchData /// values for getInfo cmd - inline constexpr auto simStateInfo = "simState"; - inline constexpr auto cellularStateInfo = "cellularState"; + inline constexpr auto simStateInfo = "simState"; + inline constexpr auto cellularStateInfo = "cellularState"; inline constexpr auto cellularSleepModeInfo = "cellularSleepMode"; /// values for smsCommand diff --git a/module-services/service-desktop/endpoints/developerMode/event/ATRequest.cpp b/module-services/service-desktop/endpoints/developerMode/event/ATRequest.cpp index 7801468b830dc11fc14d3d874b931993ca730fc2..e21580c4fcf3f6b6a0c90a0de5c89c7136e71329 100644 --- a/module-services/service-desktop/endpoints/developerMode/event/ATRequest.cpp +++ b/module-services/service-desktop/endpoints/developerMode/event/ATRequest.cpp @@ -1,5 +1,5 @@ #include "ATRequest.hpp" -#include +#include namespace sdesktop::developerMode {