From 37d97a666450c19916e8fe30ea9ac0db9c3c65d7 Mon Sep 17 00:00:00 2001 From: Przemyslaw Brudny Date: Tue, 4 May 2021 12:03:02 +0200 Subject: [PATCH] [EGD-6673] Temporary fix cellular requesting for pin Temporary fix for cellular pin request popup. To be fully integrated with SimLockHandler. --- module-apps/application-desktop/windows/DesktopMainWindow.cpp | 2 ++ module-apps/locks/handlers/PinLockHandler.cpp | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/module-apps/application-desktop/windows/DesktopMainWindow.cpp b/module-apps/application-desktop/windows/DesktopMainWindow.cpp index 10a6c59d24605bcc803c7060e922f4d8511f259f..38a31ef0e7056d381bc0b5909cbc47b51c0dfe0b 100644 --- a/module-apps/application-desktop/windows/DesktopMainWindow.cpp +++ b/module-apps/application-desktop/windows/DesktopMainWindow.cpp @@ -98,6 +98,8 @@ namespace gui { auto app = getAppDesktop(); + app->lockHandler.unlockScreen(); + setActiveState(); if (osUpdateVer == osCurrentVer && osUpdateVer != updateos::initSysVer && diff --git a/module-apps/locks/handlers/PinLockHandler.cpp b/module-apps/locks/handlers/PinLockHandler.cpp index 75f91c454be64eafb9dca4bcba364800be921298..b7d6e349f6379c4fbdcb07d80ecbbcb62c90c63f 100644 --- a/module-apps/locks/handlers/PinLockHandler.cpp +++ b/module-apps/locks/handlers/PinLockHandler.cpp @@ -339,10 +339,9 @@ namespace gui void PinLockHandler::unlockScreen() { - if (getStrongestLock().isType(Lock::LockType::Screen) && !app->isLockScreenPasscodeOn()) { + if (getStrongestLock().isType(Lock::LockType::Screen)) { screenLock.lockState = gui::Lock::LockState::Unlocked; } - unlock(); } void PinLockHandler::setSimLockHandled() noexcept