From 7de2bd148e4d8905d9d43263950f17059dc4440d Mon Sep 17 00:00:00 2001
From: Maciej-Mudita <maciej.gibowicz@mudita.com>
Date: Fri, 24 Mar 2023 11:57:52 +0100
Subject: [PATCH] [MOS-942] Fix access to contacts when onboarding in progress

During onboarding, the user could add new contacts
by entering the emergency call screen.
---
 module-apps/application-call/ApplicationCall.cpp | 11 +++++++++++
 pure_changelog.md                                |  1 +
 2 files changed, 12 insertions(+)

diff --git a/module-apps/application-call/ApplicationCall.cpp b/module-apps/application-call/ApplicationCall.cpp
index b6174a0ddd201449f8d0ca42b5f6682a1a6d370c..ee77c39b57c1af24150419b9f3bc70f3a91695dc 100644
--- a/module-apps/application-call/ApplicationCall.cpp
+++ b/module-apps/application-call/ApplicationCall.cpp
@@ -11,6 +11,7 @@
 #include <apps-common/messages/DialogMetadataMessage.hpp>
 #include <apps-common/windows/Dialog.hpp>
 #include <apps-common/windows/DialogMetadata.hpp>
+#include <apps-common/WindowsStack.hpp>
 #include <log/log.hpp>
 #include <module-apps/application-phonebook/data/PhonebookItemData.hpp>
 
@@ -21,6 +22,8 @@
 #include <time/time_conversion.hpp>
 #include <WindowsPopupFilter.hpp>
 #include <service-audio/AudioServiceAPI.hpp>
+#include <service-db/Settings.hpp>
+#include <service-db/agents/settings/SystemSettings.hpp>
 
 #include <cassert>
 #include <memory>
@@ -127,6 +130,14 @@ namespace app
             app::manager::Controller::switchBack(this);
             return true;
         }
+
+        // Onboarding app should not have access to main screen so if onboarding is in progress, we pop the main window
+        // from the stack
+        if (!utils::getNumericValue<bool>(
+                settings->getValue(settings::SystemProperties::onboardingDone, settings::SettingsScope::Global))) {
+            ApplicationCommon::popWindow(gui::name::window::main_window);
+        }
+
         returnToPreviousWindow();
         return true;
     }
diff --git a/pure_changelog.md b/pure_changelog.md
index 1c0bab4b9a64bcd99d5dfbfbd90d8fbd4a654467..7836a67dc77e59c429ab17eba3effc0bfdf5c127 100644
--- a/pure_changelog.md
+++ b/pure_changelog.md
@@ -87,6 +87,7 @@
 * Fixed returning to call screen from message template
 * Fixed displaying wrong information on screen after rejecting call with SMS template
 * Fixed lack of contact search list update when returning to list after contact edition
+* Fixed access to contacts when onboarding is in progress
 
 ## [1.6.0 2023-02-27]