From a24fa1723a15bc3831c89f5f57993535533dbd9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcin=20Zieli=C5=84ski?= <marcin.zielinski@mudita.com>
Date: Wed, 14 Sep 2022 16:15:54 +0200
Subject: [PATCH] [MOS-350] Fix some SIM card pop-ups not showing

Also: enhanced a log, improved the English translations.
---
 image/assets/lang/English.json                              | 4 ++--
 module-apps/apps-common/ApplicationCommon.cpp               | 3 ++-
 .../apps-common/ApplicationCommonPopupBlueprints.cpp        | 6 +++++-
 pure_changelog.md                                           | 3 ++-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/image/assets/lang/English.json b/image/assets/lang/English.json
index 2d898b461c8f6da4bfe12157b66141ef03cd5576..5e2e53e8f942399820ae9e65c20c621638b66db6 100644
--- a/image/assets/lang/English.json
+++ b/image/assets/lang/English.json
@@ -238,8 +238,8 @@
   "sim_setup_wrong_puk": "<text>Wrong PUK code.<br></br>You have <token>$ATTEMPTS</token> attempts left</text>",
   "sim_setup_wrong_puk_last_attempt": "<text>Wrong PUK code.<br></br>You have 1 attempt left</text>",
   "sim_setup_wrong_puk_last_attempt_warning": "<text>If the code is wrong this time, the<br></br>SIM card will be blocked and you'll<br></br>have to contact the operator.</text>",
-  "sim_card_pin_disabled": "SIM card pin disabled",
-  "sim_card_pin_enabled": "SIM card pin enabled",
+  "sim_card_pin_disabled": "SIM card PIN disabled",
+  "sim_card_pin_enabled": "SIM card PIN enabled",
   "sim_card_cant_connect": "<text>Cannot connect to <token>$SIM</token> card.<br></br>Please insert card.</text>",
   "sim_card_not_ready": "<text>Waiting for Modem to start.<br></br>This may take a moment.</text>",
   "app_desktop_press_to_unlock": "<text size='27'>Press <b>Unlock</b> and then <b>#</b></text>",
diff --git a/module-apps/apps-common/ApplicationCommon.cpp b/module-apps/apps-common/ApplicationCommon.cpp
index 65ef75d60d122354c39b40256f59e82d8752d3c8..32920c1deb5acab7c731d6bef771709b74c58ffe 100644
--- a/module-apps/apps-common/ApplicationCommon.cpp
+++ b/module-apps/apps-common/ApplicationCommon.cpp
@@ -824,7 +824,8 @@ namespace app
             blueprint = popupBlueprintFallback(id);
         }
         if (data->getDisposition().windowtype != gui::popup::Disposition::WindowType::Popup) {
-            LOG_ERROR("setting popup window type to popup - fallback");
+            LOG_ERROR("setting popup window type from %s to popup - fallback",
+                      magic_enum::enum_name(data->getDisposition().windowtype).data());
             data->setDisposition(gui::popup::Disposition{
                 gui::popup::Disposition::Priority::Normal, gui::popup::Disposition::WindowType::Popup, id});
         }
diff --git a/module-apps/apps-common/ApplicationCommonPopupBlueprints.cpp b/module-apps/apps-common/ApplicationCommonPopupBlueprints.cpp
index 633d6117454da797ca2db150d1e2d68aa324c3d9..e17148411208bbe5b2ca3f17edf57834e26fa35e 100644
--- a/module-apps/apps-common/ApplicationCommonPopupBlueprints.cpp
+++ b/module-apps/apps-common/ApplicationCommonPopupBlueprints.cpp
@@ -106,10 +106,14 @@ namespace app
         popupBlueprint.registerBlueprint(ID::PhoneLockChangeInfo, phoneLockBlueprint);
 
         auto simLockBlueprint = [&](gui::popup::ID id, std::unique_ptr<gui::PopupRequestParams> &params) {
-            auto popupParams = dynamic_cast<const gui::SimUnlockInputRequestParams *>(params.get());
+            auto popupParams = dynamic_cast<gui::SimUnlockInputRequestParams *>(params.get());
             if (popupParams == nullptr) {
                 return false;
             }
+
+            popupParams->setDisposition(gui::popup::Disposition{gui::popup::Disposition::Priority::High,
+                                                                gui::popup::Disposition::WindowType::Popup,
+                                                                params->getPopupId()});
             switchWindowPopup(gui::popup::resolveWindowName(id),
                               popupParams->getDisposition(),
                               std::make_unique<locks::SimLockData>(popupParams->getLock(),
diff --git a/pure_changelog.md b/pure_changelog.md
index b3c6dfce0618d1a746488f137190df1a8337203b..80c9c0e2317f19594a4317610e07f867cffbfe37 100644
--- a/pure_changelog.md
+++ b/pure_changelog.md
@@ -8,6 +8,7 @@
 * Separated system volume from Bluetooth device volume for A2DP
 
 ### Fixed
+* Fixed SIM card pop-ups not showing
 * Fixed lost bytes in logs
 * Fixed passcode lock time discrepancy between lock screen and 'Wrong password' popup
 * Fixed cellular DMA errors
@@ -219,4 +220,4 @@
 
 ### Fixed
 * Fixed problem with contacts disappearing after editing them.
-* Fixed problem with MTP on Windows.
\ No newline at end of file
+* Fixed problem with MTP on Windows.