From a3c0791bb7b2594d28e1b27c7321671dd5647bc1 Mon Sep 17 00:00:00 2001 From: Kuba Kleczkowski Date: Wed, 9 Nov 2022 18:02:59 +0100 Subject: [PATCH] [MOS-797] Revert "[MOS-792] Added VoLTE setting in db" This reverts commit 0eb652a5152de6bdf77c897a787d037d6e6b43d4 --- image/user/db/settings_v2_002.sql | 3 +- .../service-cellular/ServiceCellular.cpp | 31 +++---------------- .../service-cellular/CellularMessage.hpp | 25 --------------- .../service-cellular/VolteState.hpp | 17 ---------- .../service-cellular/src/VolteHandler.hpp | 13 +------- .../agents/settings/SystemSettings.hpp | 1 - pure_changelog.md | 1 - 7 files changed, 7 insertions(+), 84 deletions(-) delete mode 100644 module-services/service-cellular/service-cellular/VolteState.hpp diff --git a/image/user/db/settings_v2_002.sql b/image/user/db/settings_v2_002.sql index ba79afde6a4deed7d321017d44018c4c4097041c..b10565fee0a746665637ae72bfe2bcb587fa5b58 100644 --- a/image/user/db/settings_v2_002.sql +++ b/image/user/db/settings_v2_002.sql @@ -45,8 +45,7 @@ INSERT OR IGNORE INTO settings_tab (path, value) VALUES ('gs_current_timezone_rules', ''), ('\ServiceTime\\gs_automatic_date_and_time_is_on', '1'), ('\ServiceEink\\display_inverted_mode', '0'), - ('display_lock_screen_deep_refresh_rate', '30'), - ('cl_volte_enabled', '0'); + ('display_lock_screen_deep_refresh_rate', '30'); diff --git a/module-services/service-cellular/ServiceCellular.cpp b/module-services/service-cellular/ServiceCellular.cpp index abed91a1351f54c541702550662f8f327bcce54d..6276c885a3c682c59fec0d0f0dad021af1b55bc7 100644 --- a/module-services/service-cellular/ServiceCellular.cpp +++ b/module-services/service-cellular/ServiceCellular.cpp @@ -251,11 +251,6 @@ sys::ReturnCodes ServiceCellular::InitHandler() settings::Cellular::currentUID, std::to_string(static_cast(uid)), settings::SettingsScope::Global); }; - auto rawVolteSetting = settings->getValue(settings::Cellular::volteEnabled, settings::SettingsScope::Global); - if (rawVolteSetting.empty()) { - settings->setValue(settings::Cellular::volteEnabled, "0", settings::SettingsScope::Global); - } - cpuSentinel = std::make_shared(serviceName, this); ongoingCall = @@ -600,23 +595,6 @@ void ServiceCellular::registerMessageHandlers() return std::make_shared(ongoingCall && ongoingCall->active()); }); - connect(typeid(cellular::GetVolteStateRequest), [&](sys::Message *request) -> sys::MessagePointer { - return std::make_shared(priv->volteHandler->getVolteState()); - }); - - connect(typeid(cellular::SwitchVolteOnOffRequest), [&](sys::Message *request) -> sys::MessagePointer { - auto message = static_cast(request); - auto channel = cmux->get(CellularMux::Channel::Commands); - settings->setValue( - settings::Cellular::volteEnabled, message->enable ? "1" : "0", settings::SettingsScope::Global); - if (not priv->volteHandler->switchVolte(*channel, message->enable)) { - auto notification = std::make_shared(priv->volteHandler->getVolteState()); - bus.sendMulticast(std::move(notification), sys::BusChannel::ServiceCellularNotifications); - priv->modemResetHandler->performHardReset(); - } - return sys::MessageNone{}; - }); - handle_CellularGetChannelMessage(); } @@ -892,11 +870,12 @@ bool ServiceCellular::handle_cellular_priv_init() priv->simContacts->setChannel(channel); priv->imeiGetHandler->setChannel(channel); +#if ENABLE_VOLTE == 1 + constexpr bool enableVolte = true; +#else + constexpr bool enableVolte = false; +#endif bool needReset = false; - - auto enableVolte = - settings->getValue(settings::Cellular::volteEnabled, settings::SettingsScope::Global) == "1" ? true : false; - ; try { needReset = !priv->tetheringHandler->configure() || !priv->volteHandler->switchVolte(*channel, enableVolte); } diff --git a/module-services/service-cellular/service-cellular/CellularMessage.hpp b/module-services/service-cellular/service-cellular/CellularMessage.hpp index 6e309bc034a82075ecc9c80b35d1ea2a6240de4c..f123ccff47cab7a64eb5519962e5ae162b308384 100644 --- a/module-services/service-cellular/service-cellular/CellularMessage.hpp +++ b/module-services/service-cellular/service-cellular/CellularMessage.hpp @@ -5,7 +5,6 @@ #include "SignalStrength.hpp" #include -#include #include #include @@ -1056,28 +1055,4 @@ namespace cellular const bool active = false; }; - class GetVolteStateRequest : public sys::DataMessage - {}; - - struct GetVolteStateResponse : public sys::ResponseMessage - { - VolteState volteState; - explicit GetVolteStateResponse(VolteState volteState) : volteState(volteState) - {} - }; - - struct VolteStateNotification : public sys::DataMessage - { - VolteState volteState; - explicit VolteStateNotification(VolteState volteState) - : sys::DataMessage(MessageType::MessageTypeUninitialized), volteState(volteState) - {} - }; - - struct SwitchVolteOnOffRequest : public sys::DataMessage - { - bool enable = false; - SwitchVolteOnOffRequest(bool enable) : DataMessage(MessageType::MessageTypeUninitialized), enable(enable) - {} - }; } // namespace cellular diff --git a/module-services/service-cellular/service-cellular/VolteState.hpp b/module-services/service-cellular/service-cellular/VolteState.hpp deleted file mode 100644 index 1c7c6b7753e14e9cf464f087b01c49f4c1ed9a43..0000000000000000000000000000000000000000 --- a/module-services/service-cellular/service-cellular/VolteState.hpp +++ /dev/null @@ -1,17 +0,0 @@ -// Copyright (c) 2017-2022, Mudita Sp. z.o.o. All rights reserved. -// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md - -#pragma once - -namespace cellular -{ - - enum class VolteState - { - On, - Off, - SwitchingToOff, - SwitchingToOn, - Undefined - }; -} diff --git a/module-services/service-cellular/src/VolteHandler.hpp b/module-services/service-cellular/src/VolteHandler.hpp index 86a43cd520cd9c1946b487d76d0421e6d4fe57ba..b0a3998c35fafd385bc87e429e5720ddcc133958 100644 --- a/module-services/service-cellular/src/VolteHandler.hpp +++ b/module-services/service-cellular/src/VolteHandler.hpp @@ -3,7 +3,6 @@ #pragma once -#include #include #include #include @@ -36,7 +35,7 @@ namespace cellular::service template struct VolteHandler : private NonCopyable { - bool switchVolte(CmuxChannel &channel, bool enable) + bool switchVolte(CmuxChannel &channel, bool enable) const { ModemResponseParser const parser; @@ -78,25 +77,15 @@ namespace cellular::service throw std::runtime_error("[VoLTE] failed to " + std::string(enable ? "enable" : "disable") + " IMS"); } - volteState = enable ? cellular::VolteState::SwitchingToOn : cellular::VolteState::SwitchingToOff; - } - else { - volteState = enable ? cellular::VolteState::On : cellular::VolteState::Off; } return alreadyConfigured; } - auto getVolteState() -> cellular::VolteState - { - return volteState; - } - private: std::string imsStateToString(response::qcfg_ims::IMSState imsState) const { return std::to_string(magic_enum::enum_integer(imsState)); } - cellular::VolteState volteState = cellular::VolteState::Undefined; }; } // namespace cellular::service diff --git a/module-services/service-db/agents/settings/SystemSettings.hpp b/module-services/service-db/agents/settings/SystemSettings.hpp index 770a8792a60704c1239e88ca04902e966339264f..c8ab38161371c2dac2e193c85575c4fbfe2e898d 100644 --- a/module-services/service-db/agents/settings/SystemSettings.hpp +++ b/module-services/service-db/agents/settings/SystemSettings.hpp @@ -48,7 +48,6 @@ namespace settings constexpr inline auto apn_list = "cl_apn_list"; constexpr inline auto offlineMode = "cl_offline_mode"; constexpr inline auto currentUID = "cl_current_uid"; - constexpr inline auto volteEnabled = "cl_volte_enabled"; } // namespace Cellular namespace Battery diff --git a/pure_changelog.md b/pure_changelog.md index c81fb7907df40c90aae98a98d5fe3dddbd370a71..0a2c0a5648d47bc54b8ff86669ff11a2ee3e6852 100644 --- a/pure_changelog.md +++ b/pure_changelog.md @@ -41,7 +41,6 @@ * Added tethering information on the status bar * Added basic MMS handling * Added run-time statistics for tasks -* Added VoLTE state in settings database ## [1.3.0 2022-08-04]