From 62a62295f54e98826b0cb03a4b9a74c3f1bb9faf Mon Sep 17 00:00:00 2001
From: Lefucjusz <marcin.lyda@mudita.com>
Date: Fri, 9 Sep 2022 16:02:52 +0200
Subject: [PATCH] [MOS-714] Fix passcode lock time discrepancy

Fix of the issue that passcode lock time
wasn't updating on 'Wrong passcode' popup,
what led to discrepancy of the time
between lock screen and the popup.
---
 .../locks/handlers/PhoneLockHandler.cpp       | 36 ++++++++++++-------
 .../locks/handlers/PhoneLockHandler.hpp       |  3 +-
 .../apps-common/locks/widgets/Lock.cpp        |  3 +-
 pure_changelog.md                             |  3 ++
 4 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/module-apps/apps-common/locks/handlers/PhoneLockHandler.cpp b/module-apps/apps-common/locks/handlers/PhoneLockHandler.cpp
index 5e80ca5baa42ba7cc0cfedb3a26260dec1d282cb..107ee3e040bd210e57a9f6cacb64e3945f8287f6 100644
--- a/module-apps/apps-common/locks/handlers/PhoneLockHandler.cpp
+++ b/module-apps/apps-common/locks/handlers/PhoneLockHandler.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2022, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "PhoneLockHandler.hpp"
@@ -11,6 +11,10 @@
 #include <Timers/TimerFactory.hpp>
 #include <time/time_conversion_factory.hpp>
 
+#include <chrono>
+
+using namespace std::chrono_literals;
+
 namespace locks
 {
     PhoneLockHandler::PhoneLockHandler(sys::Service *owner, std::shared_ptr<settings::Settings> settings)
@@ -28,7 +32,8 @@ namespace locks
                 if (lockedFor == nextUnlockAttemptLockTime) {
                     phoneLockTimeUpdateInfoAction(LockTimerState::Start);
                 }
-                else if (lockedFor % utils::secondsInMinute == 0 || lockedFor <= utils::secondsInMinute) {
+                else if (lockedFor % std::chrono::duration_cast<std::chrono::seconds>(1min).count() == 0 ||
+                         lockedFor <= std::chrono::duration_cast<std::chrono::seconds>(1min).count()) {
                     phoneLockTimeUpdateInfoAction(LockTimerState::Counting);
                 }
 
@@ -37,8 +42,6 @@ namespace locks
                 if (lockedFor == 0) {
                     savePhoneLockTime();
                 }
-
-                return;
             });
     }
 
@@ -181,19 +184,22 @@ namespace locks
         auto rebuildRequired = state == LockTimerState::Start;
 
         if (state == LockTimerState::Start || state == LockTimerState::Counting) {
-            if (lockedFor <= utils::secondsInMinute) {
+            if (lockedFor <= std::chrono::duration_cast<std::chrono::seconds>(1min).count()) {
                 using utils::time::Duration;
                 const Duration remainingDuration{static_cast<uint32_t>(std::time_t{lockedFor})};
                 textToPrint = remainingDuration.str(Duration::DisplayedFormat::Fixed0M0S);
 
-                if (lockedFor == utils::secondsInMinute) {
+                if (lockedFor == std::chrono::duration_cast<std::chrono::seconds>(1min).count()) {
                     rebuildRequired = true;
                 }
             }
             else {
-                textToPrint = std::to_string(lockedFor / utils::secondsInMinute) +
-                              utils::translate("phone_lock_blocked_information_minutes");
+                textToPrint =
+                    std::to_string(lockedFor / std::chrono::duration_cast<std::chrono::seconds>(1min).count()) +
+                    utils::translate("phone_lock_blocked_information_minutes");
             }
+
+            setNextUnlockAttemptFormattedTime();
         }
 
         owner->bus.sendMulticast(std::make_shared<locks::PhoneLockTimeUpdate>(textToPrint, rebuildRequired),
@@ -486,16 +492,22 @@ namespace locks
         phoneLockTimer.start();
         phoneLockTimeUpdateInfoAction(LockTimerState::Start);
 
-        if (lockedFor < utils::secondsInMinute) {
+        setNextUnlockAttemptFormattedTime();
+    }
+
+    void PhoneLockHandler::setNextUnlockAttemptFormattedTime() noexcept
+    {
+        if (lockedFor < std::chrono::duration_cast<std::chrono::seconds>(1min).count()) {
             lock.setNextUnlockAttemptFormattedTime(std::to_string(lockedFor) +
                                                    utils::translate("phone_lock_blocked_information_seconds"));
         }
-        else if (lockedFor >= utils::secondsInMinute && lockedFor < 2 * utils::secondsInMinute) {
+        else if (lockedFor < std::chrono::duration_cast<std::chrono::seconds>(2min).count()) {
             lock.setNextUnlockAttemptFormattedTime(utils::translate("phone_lock_blocked_information_minute"));
         }
         else {
-            lock.setNextUnlockAttemptFormattedTime(std::to_string(lockedFor / utils::secondsInMinute) +
-                                                   utils::translate("phone_lock_blocked_information_minutes"));
+            lock.setNextUnlockAttemptFormattedTime(
+                std::to_string(lockedFor / std::chrono::duration_cast<std::chrono::seconds>(1min).count()) +
+                utils::translate("phone_lock_blocked_information_minutes"));
         }
     }
 
diff --git a/module-apps/apps-common/locks/handlers/PhoneLockHandler.hpp b/module-apps/apps-common/locks/handlers/PhoneLockHandler.hpp
index cb16ca51ee3c6e1f193c6c32c93af8cbac5f2342..40a6a5197d909ea2f0730efe837bfd5bae583e73 100644
--- a/module-apps/apps-common/locks/handlers/PhoneLockHandler.hpp
+++ b/module-apps/apps-common/locks/handlers/PhoneLockHandler.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2022, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #pragma once
@@ -101,6 +101,7 @@ namespace locks
         void setNextUnlockAttemptLockTime(time_t time);
         void setNoLockTimeAttemptsLeft(unsigned int attemptsNumber);
         void increaseLockTime() noexcept;
+        void setNextUnlockAttemptFormattedTime() noexcept;
         void resetLockTime() noexcept;
         void broadcastLockTime() noexcept;
     };
diff --git a/module-apps/apps-common/locks/widgets/Lock.cpp b/module-apps/apps-common/locks/widgets/Lock.cpp
index 16987513f61f2917ba32adc5bdfc4cabf0ff7ec8..bf8f9db6cbb57eeb3ec39987b6a1ce177c5b0bf8 100644
--- a/module-apps/apps-common/locks/widgets/Lock.cpp
+++ b/module-apps/apps-common/locks/widgets/Lock.cpp
@@ -1,8 +1,7 @@
-// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2022, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "Lock.hpp"
-#include <log/log.hpp>
 
 namespace locks
 {
diff --git a/pure_changelog.md b/pure_changelog.md
index 3b8d1e87637aa12c5b6193e511fbe766fdddc114..4aae54c81b0255111f11ff9df77bf3b976e1c6dd 100644
--- a/pure_changelog.md
+++ b/pure_changelog.md
@@ -8,6 +8,7 @@
 * Separated system volume from Bluetooth device volume for A2DP
 
 ### Fixed
+* Fixed passcode lock time discrepancy between lock screen and 'Wrong password' popup
 * Fixed cellular DMA errors
 * Fixed order of the services while closing system
 * Fixed crash of the E-ink service while restoring system data
@@ -22,6 +23,8 @@
 * Fixed PLAY label translation in German
 * Fixed USB connection/disconnection detection
 * Fixed memory leaks in APN settings
+
+### Added
 * Added basic MMS handling
 
 ## [1.3.0 2022-08-04]