8 files changed, 38 insertions(+), 18 deletions(-)

M module-apps/application-onboarding/windows/ConfigurationSuccessfulDialogWindow.cpp
M module-apps/application-onboarding/windows/OnBoardingDateAndTimeWindow.cpp
M module-apps/application-onboarding/windows/OnBoardingLanguagesWindow.cpp
M module-apps/application-onboarding/windows/OnBoardingSimSelectWindow.cpp
M module-apps/application-onboarding/windows/StartConfigurationWindow.cpp
M module-apps/apps-common/locks/windows/LockInputWindow.cpp
M module-apps/apps-common/popups/lock-popups/PhoneLockInputWindow.cpp
M pure_changelog.md

@@ 1,4 1,4 @@
-// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2023, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "ConfigurationSuccessfulDialogWindow.hpp"


@@ 11,13 11,16 @@
 
 #include <i18n/i18n.hpp>
 #include <Style.hpp>
+#include <EventStore.hpp>
 
 namespace app::onBoarding
 {
     ConfigurationSuccessfulDialogWindow::ConfigurationSuccessfulDialogWindow(app::ApplicationCommon *app)
         : gui::Dialog(app, gui::window::name::onBoarding_configuration_successful)
     {
-        header->navigationIndicatorAdd(new gui::header::IceAction(), gui::header::BoxSelection::Left);
+        if (Store::GSM::get()->simCardInserted()) {
+            header->navigationIndicatorAdd(new gui::header::IceAction(), gui::header::BoxSelection::Left);
+        }
         navBar->setText(gui::nav_bar::Side::Center, utils::translate(style::strings::common::start));
         navBar->setActive(gui::nav_bar::Side::Right, false);
     }


@@ 34,7 37,7 @@ namespace app::onBoarding
                 return true;
             }
 
-            if (inputEvent.is(gui::KeyCode::KEY_LEFT)) {
+            if (inputEvent.is(gui::KeyCode::KEY_LEFT) && Store::GSM::get()->simCardInserted()) {
                 app::manager::Controller::sendAction(application,
                                                      app::manager::actions::EmergencyDial,
                                                      std::make_unique<gui::SwitchData>(),

@@ 1,4 1,4 @@
-// Copyright (c) 2017-2022, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2023, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "OnBoardingDateAndTimeWindow.hpp"


@@ 10,6 10,7 @@
 #include <apps-common/messages/DialogMetadataMessage.hpp>
 #include <header/IceAction.hpp>
 #include <service-appmgr/Controller.hpp>
+#include <EventStore.hpp>
 
 namespace app::onBoarding
 {


@@ 27,7 28,9 @@ namespace app::onBoarding
     void OnBoardingDateAndTimeWindow::onBeforeShow(gui::ShowMode mode, gui::SwitchData *data)
     {
         DateAndTimeMainWindow::onBeforeShow(mode, data);
-        header->navigationIndicatorAdd(new gui::header::IceAction(), gui::header::BoxSelection::Left);
+        if (Store::GSM::get()->simCardInserted()) {
+            header->navigationIndicatorAdd(new gui::header::IceAction(), gui::header::BoxSelection::Left);
+        }
     }
 
     bool OnBoardingDateAndTimeWindow::onInput(const gui::InputEvent &inputEvent)


@@ 47,7 50,7 @@ namespace app::onBoarding
                                       std::move(metaData));
             return true;
         }
-        else if (inputEvent.isShortRelease(gui::KeyCode::KEY_LEFT)) {
+        else if (inputEvent.isShortRelease(gui::KeyCode::KEY_LEFT) && Store::GSM::get()->simCardInserted()) {
             app::manager::Controller::sendAction(application,
                                                  app::manager::actions::EmergencyDial,
                                                  std::make_unique<gui::SwitchData>(),

@@ 1,4 1,4 @@
-// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2023, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "OnBoardingLanguagesWindow.hpp"


@@ 7,6 7,7 @@
 #include <header/IceAction.hpp>
 #include <module-gui/gui/input/InputEvent.hpp>
 #include <service-appmgr/Controller.hpp>
+#include <EventStore.hpp>
 
 namespace app::onBoarding
 {


@@ 21,7 22,9 @@ namespace app::onBoarding
 
     void OnBoardingLanguagesWindow::onBeforeShow(gui::ShowMode mode, gui::SwitchData *data)
     {
-        header->navigationIndicatorAdd(new gui::header::IceAction(), gui::header::BoxSelection::Left);
+        if (Store::GSM::get()->simCardInserted()) {
+            header->navigationIndicatorAdd(new gui::header::IceAction(), gui::header::BoxSelection::Left);
+        }
         navBar->setActive(gui::nav_bar::Side::Right, false);
 
         LanguagesWindow::onBeforeShow(mode, data);


@@ 32,7 35,7 @@ namespace app::onBoarding
         if (inputEvent.isShortRelease(gui::KeyCode::KEY_RF)) {
             return true;
         }
-        else if (inputEvent.isShortRelease(gui::KeyCode::KEY_LEFT)) {
+        else if (inputEvent.isShortRelease(gui::KeyCode::KEY_LEFT) && Store::GSM::get()->simCardInserted()) {
             app::manager::Controller::sendAction(application,
                                                  app::manager::actions::EmergencyDial,
                                                  std::make_unique<gui::SwitchData>(),

@@ 1,4 1,4 @@
-// Copyright (c) 2017-2022, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2023, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "OnBoardingSimSelectWindow.hpp"


@@ 10,6 10,7 @@
 #include <header/IceAction.hpp>
 #include <service-appmgr/Controller.hpp>
 #include <apps-common/messages/DialogMetadataMessage.hpp>
+#include <EventStore.hpp>
 
 namespace app::onBoarding
 {


@@ 22,7 23,9 @@ namespace app::onBoarding
     void OnBoardingSimSelectWindow::buildInterface()
     {
         setTitle(utils::translate("app_onboarding_select_sim"));
-        header->navigationIndicatorAdd(new gui::header::IceAction(), gui::header::BoxSelection::Left);
+        if (Store::GSM::get()->simCardInserted()) {
+            header->navigationIndicatorAdd(new gui::header::IceAction(), gui::header::BoxSelection::Left);
+        }
         navBar->setText(gui::nav_bar::Side::Center, utils::translate(::style::strings::common::select));
         navBar->setText(gui::nav_bar::Side::Right, utils::translate(::style::strings::common::back));
         navBar->setText(gui::nav_bar::Side::Left, utils::translate(::style::strings::common::skip));


@@ 96,7 99,7 @@ namespace app::onBoarding
                 gui::window::name::onBoarding_skip, gui::ShowMode::GUI_SHOW_INIT, std::move(metaData));
             return true;
         }
-        else if (inputEvent.isShortRelease(gui::KeyCode::KEY_LEFT)) {
+        else if (inputEvent.isShortRelease(gui::KeyCode::KEY_LEFT) && Store::GSM::get()->simCardInserted()) {
             app::manager::Controller::sendAction(application,
                                                  app::manager::actions::EmergencyDial,
                                                  std::make_unique<gui::SwitchData>(),

@@ 1,4 1,4 @@
-// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2023, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "StartConfigurationWindow.hpp"


@@ 15,6 15,7 @@
 #include <i18n/i18n.hpp>
 #include <Style.hpp>
 #include <InputEvent.hpp>
+#include <EventStore.hpp>
 
 namespace app::onBoarding
 {


@@ 28,7 29,9 @@ namespace app::onBoarding
     {
         AppWindow::buildInterface();
 
-        header->navigationIndicatorAdd(new gui::header::IceAction(), gui::header::BoxSelection::Left);
+        if (Store::GSM::get()->simCardInserted()) {
+            header->navigationIndicatorAdd(new gui::header::IceAction(), gui::header::BoxSelection::Left);
+        }
         navBar->setText(gui::nav_bar::Side::Center, utils::translate(::style::strings::common::start));
         navBar->setText(gui::nav_bar::Side::Right, utils::translate(::style::strings::common::back));
         navBar->setText(gui::nav_bar::Side::Left, utils::translate(::style::strings::common::skip));


@@ 64,7 67,7 @@ namespace app::onBoarding
                                           gui::ShowMode::GUI_SHOW_INIT,
                                           std::make_unique<OnBoardingSwitchData>());
             }
-            if (inputEvent.is(gui::KeyCode::KEY_LEFT)) {
+            if (inputEvent.is(gui::KeyCode::KEY_LEFT) && Store::GSM::get()->simCardInserted()) {
                 app::manager::Controller::sendAction(application,
                                                      app::manager::actions::EmergencyDial,
                                                      std::make_unique<gui::SwitchData>(),

@@ 10,6 10,7 @@
 #include <header/IceAction.hpp>
 #include <FontManager.hpp>
 #include <i18n/i18n.hpp>
+#include <EventStore.hpp>
 
 namespace lock_style = style::window::lock_input;
 


@@ 73,7 74,9 @@ namespace gui
 
     void LockInputWindow::buildIceBox()
     {
-        header->navigationIndicatorAdd(new gui::header::IceAction(), gui::header::BoxSelection::Left);
+        if (Store::GSM::get()->simCardInserted()) {
+            header->navigationIndicatorAdd(new gui::header::IceAction(), gui::header::BoxSelection::Left);
+        }
     }
 
     void LockInputWindow::buildPinBody()


@@ 166,7 169,7 @@ namespace gui
     {
         header->setTitleVisibility(titleVisible);
 
-        if (iceVisible) {
+        if (iceVisible && Store::GSM::get()->simCardInserted()) {
             header->navigationIndicatorAdd(new gui::header::IceAction(), gui::header::BoxSelection::Left);
         }
         else {

@@ 8,6 8,7 @@
 #include <locks/data/LockData.hpp>
 #include <locks/widgets/PhoneLockBox.hpp>
 #include <popups/data/PopupRequestParams.hpp>
+#include <EventStore.hpp>
 
 namespace gui
 {


@@ 127,7 128,7 @@ namespace gui
             lock->clearAttempt();
             return true;
         }
-        else if (inputEvent.is(KeyCode::KEY_LEFT) && isIceVisible()) {
+        else if (inputEvent.is(KeyCode::KEY_LEFT) && isIceVisible() && Store::GSM::get()->simCardInserted()) {
             app::manager::Controller::sendAction(application,
                                                  app::manager::actions::EmergencyDial,
                                                  std::make_unique<gui::SwitchData>(),

@@ 12,6 12,7 @@
 * Changed UI flow on discharged device window.
 * Changed VoLTE label from 'beta' to 'experimental'.
 * Changed signal strength update mechanism to avoid unnecessary screen refreshes.
+* Hide the SOS label during onboarding when the modem is not ready for an emergency call.
 
 ### Fixed