11 files changed, 12 insertions(+), 34 deletions(-)

M module-services/service-cellular/CellularServiceAPI.cpp
M module-services/service-cellular/ServiceCellular.cpp
M module-services/service-cellular/call/CellularCall.cpp
M module-services/service-cellular/call/api/CallTimer.hpp
M module-services/service-cellular/service-cellular/CellularServiceAPI.hpp
M module-services/service-cellular/service-cellular/ServiceCellular.hpp
M module-services/service-cellular/src/ModemResetHandler.cpp
M module-services/service-cellular/src/ModemResetHandler.hpp
M module-services/service-cellular/src/ServiceCellularPriv.cpp
M module-services/service-cellular/src/volte/VolteCapabilityHandler.cpp
M pure_changelog.md

@@ 47,13 47,6 @@ bool CellularServiceAPI::HangupCall(sys::Service *serv)
     return true;
 }
 
-bool CellularServiceAPI::DismissCall(sys::Service *serv)
-{
-    auto msg = std::make_shared<cellular::DismissCallMessage>();
-    serv->bus.sendMulticast(std::move(msg), sys::BusChannel::ServiceCellularNotifications);
-    return true;
-}
-
 std::string CellularServiceAPI::GetIMSI(sys::Service *serv, bool getFullIMSINumber)
 {
 

@@ 458,11 458,6 @@ void ServiceCellular::registerMessageHandlers()
         return sys::MessageNone{};
     });
 
-    connect(typeid(cellular::DismissCallMessage), [&](sys::Message *request) -> sys::MessagePointer {
-        handleCellularDismissCallMessage(request);
-        return sys::MessageNone{};
-    });
-
     connect(typeid(db::QueryResponse), [&](sys::Message *request) -> sys::MessagePointer {
         auto msg = static_cast<db::QueryResponse *>(request);
         return handleDBQueryResponseMessage(msg);


@@ 590,6 585,7 @@ void ServiceCellular::registerMessageHandlers()
     /// 2. from here from handle cellular hangup
     connect(typeid(cellular::CallAbortedNotification), [&](sys::Message * /*request*/) -> sys::MessagePointer {
         ongoingCall->handle(call::event::Ended{});
+        callStateTimer.stop();
         return sys::MessageNone{};
     });
 


@@ 1859,12 1855,6 @@ void ServiceCellular::handleCellularHangupCallMessage(cellular::HangupCallMessag
     callEndedRecentlyTimer.start();
 }
 
-void ServiceCellular::handleCellularDismissCallMessage(sys::Message *msg)
-{
-    LOG_INFO("%s", __PRETTY_FUNCTION__);
-    hangUpCall();
-}
-
 auto ServiceCellular::handleDBQueryResponseMessage(db::QueryResponse *msg) -> std::shared_ptr<sys::ResponseMessage>
 {
     bool responseHandled = false;


@@ 2204,15 2194,6 @@ auto ServiceCellular::handleCellularSetConnectionFrequencyMessage(sys::Message *
     return std::make_shared<cellular::ResponseMessage>(true);
 }
 
-auto ServiceCellular::hangUpCall() -> bool
-{
-    auto ret = ongoingCall->handle(call::event::Ended{});
-    if (!ret) {
-        LOG_ERROR("Failed to hang up call");
-    }
-    return ret;
-}
-
 auto ServiceCellular::hangUpCallBusy() -> bool
 {
     auto channel = cmux->get(CellularMux::Channel::Commands);

@@ 12,6 12,7 @@
 
 namespace call
 {
+    Call::~Call() = default;
 
     Call::Call()
     {}


@@ 32,9 33,6 @@ namespace call
                                                               std::move(sentinel)});
     }
 
-    Call::~Call()
-    {}
-
     Call &Call::operator=(Call &&other) noexcept
     {
         if (not other.machine) {

@@ 19,6 19,7 @@ namespace call::api
     struct TimerRing
     {
         virtual void start() = 0;
+        virtual ~TimerRing() = default;
     };
 }; // namespace call::api
 

@@ 28,7 28,6 @@ namespace CellularServiceAPI
 
     bool AnswerIncomingCall(sys::Service *serv);
     bool HangupCall(sys::Service *serv);
-    bool DismissCall(sys::Service *serv);
     /*
      * @brief Its calls sercive-cellular for selected SIM IMSI number.
      * @param serv pointer to caller service.

@@ 302,7 302,6 @@ class ServiceCellular : public sys::Service
 
     auto receiveSMS(std::string messageNumber) -> bool;
 
-    auto hangUpCall() -> bool;
     auto hangUpCallBusy() -> bool;
 
     auto tetheringTurnOffURC() -> bool;

@@ 15,6 15,7 @@ namespace cellular::service
         }
 
         procedureInProgress = ProcedureInProgress::SoftReset;
+        onAnyReset();
         onCellularStateSet(State::ST::PowerDownWaiting);
         return onSoftReset();
     }


@@ 27,6 28,7 @@ namespace cellular::service
         }
 
         procedureInProgress = ProcedureInProgress::HardReset;
+        onAnyReset();
         onCellularStateSet(State::ST::PowerDownWaiting);
         onHardReset();
         return false;


@@ 40,6 42,7 @@ namespace cellular::service
         }
 
         procedureInProgress = ProcedureInProgress::Reboot;
+        onAnyReset();
         onCellularStateSet(State::ST::PowerDownWaiting);
         onTurnModemOff();
         return false;


@@ 79,7 82,6 @@ namespace cellular::service
     auto ModemResetHandler::handleSwitchToActive() -> bool
     {
         if (procedureInProgress == ProcedureInProgress::None) {
-
             return false;
         }
 


@@ 90,6 92,8 @@ namespace cellular::service
 
     auto ModemResetHandler::performFunctionalityReset() -> bool
     {
+        onAnyReset();
+
         if (onFunctionalityReset) {
             return onFunctionalityReset();
         }

@@ 54,6 54,7 @@ namespace cellular::service
         std::function<bool()> onSoftReset;
         std::function<void()> onHardReset;
         std::function<bool()> onFunctionalityReset;
+        std::function<void()> onAnyReset;
 
       private:
         enum class ProcedureInProgress

@@ 455,6 455,8 @@ namespace cellular::internal
             }
             return succeed;
         };
+
+        modemResetHandler->onAnyReset = [this]() { owner->callStateTimer.stop(); };
     }
 
     void ServiceCellularPriv::initCSQHandler()

@@ 3,7 3,6 @@
 
 #include "VolteCapabilityHandler.hpp"
 #include <modem/BaseChannel.hpp>
-#include <modem/mux/CellularMux.h>
 #include <log/log.hpp>
 
 namespace cellular::service

@@ 43,6 43,7 @@
 * Fixed looping on the SIM card selection screen
 * Fixed screen lock during onboarding
 * Fixed displayed device name when connected to Windows
+* Fixed redundant modem polling for call states
 
 ### Added
 * Added a popup for changing the SIM card