From e24d7c855e3dd7ccbd6583e51fd59f51baf88588 Mon Sep 17 00:00:00 2001
From: Jakub Pyszczak <jakub.pyszczak@mudita.com>
Date: Thu, 11 Feb 2021 16:00:35 +0100
Subject: [PATCH] [EGD-5541] Sim card check refactor

Moved checking for a SIM card logic from
application level to service cellular.
Provided an action in response to application messages.
---
 .../ApplicationMessages.cpp                   | 21 ++++++++++---------
 .../ApplicationMessages.hpp                   |  7 +++++--
 .../windows/NewMessage.cpp                    | 10 ---------
 .../model/ApplicationManager.cpp              |  1 +
 .../service-appmgr/service-appmgr/Actions.hpp |  1 +
 .../service-cellular/ServiceCellular.cpp      | 14 +++++++++++++
 .../service-cellular/CellularMessage.hpp      | 15 ++++++++++++-
 7 files changed, 46 insertions(+), 23 deletions(-)

diff --git a/module-apps/application-messages/ApplicationMessages.cpp b/module-apps/application-messages/ApplicationMessages.cpp
index a27117aea74d29c46587640672695c506a3bd0a5..98a268df2df68d0a16f492b3be70dbb6b463fecc 100644
--- a/module-apps/application-messages/ApplicationMessages.cpp
+++ b/module-apps/application-messages/ApplicationMessages.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "ApplicationMessages.hpp"
@@ -31,6 +31,8 @@
 #include <module-db/queries/messages/threads/QueryThreadRemove.hpp>
 #include <module-db/queries/phonebook/QueryContactGetByID.hpp>
 
+#include <service-cellular/CellularMessage.hpp>
+
 #include <cassert>
 #include <time/time_conversion.hpp>
 #include <messages/OptionsWindow.hpp>
@@ -49,6 +51,14 @@ namespace app
             switchWindow(gui::name::window::sms_templates, std::move(data));
             return msgHandled();
         });
+        addActionReceiver(manager::actions::SmsRejectNoSim, [this](auto &&data) {
+            auto action = [this]() {
+                returnToPreviousWindow();
+                return true;
+            };
+            showNotification(action);
+            return msgHandled();
+        });
     }
 
     // Invoked upon receiving data message
@@ -59,7 +69,6 @@ namespace app
         if (reinterpret_cast<sys::ResponseMessage *>(retMsg.get())->retCode == sys::ReturnCodes::Success) {
             return retMsg;
         }
-
         if (msgl->messageType == MessageType::DBServiceNotification) {
             auto msg = dynamic_cast<db::NotificationMessage *>(msgl);
             if (msg != nullptr) {
@@ -369,14 +378,6 @@ namespace app
             return false;
         }
 
-        if (!Store::GSM::get()->simCardInserted()) {
-            auto action = [=]() -> bool {
-                returnToPreviousWindow();
-                return true;
-            };
-            return showNotification(action);
-        }
-
         return true;
     }
 
diff --git a/module-apps/application-messages/ApplicationMessages.hpp b/module-apps/application-messages/ApplicationMessages.hpp
index e4d49d662f17caef6108b02f64f938429ae63fd6..0606c8e8617c06324dbeae059068f3136c6f19e8 100644
--- a/module-apps/application-messages/ApplicationMessages.hpp
+++ b/module-apps/application-messages/ApplicationMessages.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #pragma once
@@ -81,7 +81,10 @@ namespace app
     {
         static auto GetManifest() -> manager::ApplicationManifest
         {
-            return {{manager::actions::Launch, manager::actions::CreateSms, manager::actions::ShowSmsTemplates}};
+            return {{manager::actions::Launch,
+                     manager::actions::CreateSms,
+                     manager::actions::ShowSmsTemplates,
+                     manager::actions::SmsRejectNoSim}};
         }
     };
 } /* namespace app */
diff --git a/module-apps/application-messages/windows/NewMessage.cpp b/module-apps/application-messages/windows/NewMessage.cpp
index eb1b35a31732e05ffae1e18938b4140d58707eec..28aeefe89ac2ff1b2981598c79aa97b518b5cb33 100644
--- a/module-apps/application-messages/windows/NewMessage.cpp
+++ b/module-apps/application-messages/windows/NewMessage.cpp
@@ -126,16 +126,6 @@ namespace gui
             LOG_ERROR("Failed to send the SMS.");
             return false;
         }
-        if (!Store::GSM::get()->simCardInserted()) {
-            auto action = [this, number]() {
-                if (!switchToThreadWindow(number.getView())) {
-                    LOG_ERROR("switchToThreadWindow failed");
-                }
-                return true;
-            };
-            app->showNotification(action, true);
-            return true;
-        }
         return switchToThreadWindow(number.getView());
     }
 
diff --git a/module-services/service-appmgr/model/ApplicationManager.cpp b/module-services/service-appmgr/model/ApplicationManager.cpp
index 7f7612b85170ab1566744f0b8a5a05a984c29ae3..5ef9b5c0674ec628f68b56b677466ed9a473eca6 100644
--- a/module-services/service-appmgr/model/ApplicationManager.cpp
+++ b/module-services/service-appmgr/model/ApplicationManager.cpp
@@ -299,6 +299,7 @@ namespace app::manager
         connect(typeid(CellularNotAnEmergencyNotification), convertibleToActionHandler);
         connect(typeid(sys::CriticalBatteryLevelNotification), convertibleToActionHandler);
         connect(typeid(sys::SystemBrownoutMesssage), convertibleToActionHandler);
+        connect(typeid(CellularSmsNoSimRequestMessage), convertibleToActionHandler);
     }
 
     sys::ReturnCodes ApplicationManager::SwitchPowerModeHandler(const sys::ServicePowerMode mode)
diff --git a/module-services/service-appmgr/service-appmgr/Actions.hpp b/module-services/service-appmgr/service-appmgr/Actions.hpp
index 1ed17496382a8612c94a39f47e18e2e84b0172e7..063de7154f8e3af5122f33fc79a1e0ce8cfd55b8 100644
--- a/module-services/service-appmgr/service-appmgr/Actions.hpp
+++ b/module-services/service-appmgr/service-appmgr/Actions.hpp
@@ -50,6 +50,7 @@ namespace app::manager
             ShowMMIResult,
             ShowMMIResponse,
             ShowMMIPush,
+            SmsRejectNoSim,
             DisplayCMEError,
             DisplayLowBatteryNotification,
             SystemBrownout,
diff --git a/module-services/service-cellular/ServiceCellular.cpp b/module-services/service-cellular/ServiceCellular.cpp
index ba8dc76d811a270fe65d158e540d6728260ce454..7b2b3713a4809e804ca2756f5aef062265bab24d 100644
--- a/module-services/service-cellular/ServiceCellular.cpp
+++ b/module-services/service-cellular/ServiceCellular.cpp
@@ -730,6 +730,20 @@ auto ServiceCellular::handle(db::query::SMSSearchByTypeResult *response) -> bool
 {
     if (response->getResults().size() > 0) {
         LOG_DEBUG("sending %ud last queued message(s)", static_cast<unsigned int>(response->getResults().size()));
+        if (Store::GSM::get()->simCardInserted() == false) {
+            auto message = std::make_shared<CellularSmsNoSimRequestMessage>();
+            bus.sendUnicast(std::move(message), app::manager::ApplicationManager::ServiceName);
+            auto records = response->getResults();
+
+            for (auto &record : response->getResults()) {
+                if (record.type == SMSType::QUEUED) {
+                    record.type = SMSType::FAILED;
+                    DBServiceAPI::GetQuery(
+                        this, db::Interface::Name::SMS, std::make_unique<db::query::SMSUpdate>(std::move(record)));
+                }
+            }
+            return true;
+        }
         for (auto &rec : response->getResults()) {
             if (rec.type == SMSType::QUEUED) {
                 sendSMS(rec);
diff --git a/module-services/service-cellular/service-cellular/CellularMessage.hpp b/module-services/service-cellular/service-cellular/CellularMessage.hpp
index aa3c85bad797d0446be669e93d87bd8b9d50e653..5829f26cd46fa4c0e6fcad620337a7eb653c7cdc 100644
--- a/module-services/service-cellular/service-cellular/CellularMessage.hpp
+++ b/module-services/service-cellular/service-cellular/CellularMessage.hpp
@@ -27,7 +27,7 @@
 class CellularMessage : public sys::DataMessage
 {
   public:
-    CellularMessage(MessageType messageType) : sys::DataMessage(messageType){};
+    explicit CellularMessage(MessageType messageType) : sys::DataMessage(messageType){};
 };
 
 class CellularCallMessage : public CellularMessage
@@ -300,6 +300,19 @@ class CellularCallRequestMessage : public CellularMessage
     RequestMode requestMode = RequestMode::Normal;
 };
 
+class CellularSmsNoSimRequestMessage : public CellularMessage, public app::manager::actions::ConvertibleToAction
+{
+  public:
+    CellularSmsNoSimRequestMessage() : CellularMessage{MessageType::MessageTypeUninitialized}
+    {}
+
+    [[nodiscard]] auto toAction() const -> std::unique_ptr<app::manager::ActionRequest>
+    {
+        return std::make_unique<app::manager::ActionRequest>(
+            sender, app::manager::actions::SmsRejectNoSim, std::make_unique<app::manager::actions::ActionParams>());
+    }
+};
+
 class CellularSimMessage : public CellularMessage
 {
   public: