From 1ce0b74a48175146463961276e12a103829ff60e Mon Sep 17 00:00:00 2001
From: Pawel Olejniczak <pawel.olejniczak@mudita.com>
Date: Thu, 17 Jun 2021 12:28:33 +0200
Subject: [PATCH] [CP-174] Remove limit of maximum attempts of unlocking phone

Limit of 4 attempts of unlocking phone is disabled
due to requirements change. This is a temporary solution until
time intervals between attempts will be intorduced.
Old logic remains untouched on purpose.
It will be reused in final implementation.
---
 image/assets/lang/English.json                            | 2 +-
 image/assets/lang/Svenska.json                            | 2 +-
 .../apps-common/locks/handlers/PhoneLockHandler.cpp       | 8 +++-----
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/image/assets/lang/English.json b/image/assets/lang/English.json
index f6b5ec387f3e5ad850ae589c557d3a1ee5d5bfc4..722c136c1052b81d2c99be062492fb3f7815d2d2 100644
--- a/image/assets/lang/English.json
+++ b/image/assets/lang/English.json
@@ -447,7 +447,7 @@
   "phone_lock_unlock": "<text>Enter the passcode<br></br>to unlock:</text>",
   "phone_lock_unlock_last_attempt": "<text>Wrong passcode.<br></br>You have 1 attempt left.</text>",
   "phone_lock_unlock_last_attempt_warning": "<text>If the passcode is wrong this time,<br></br>you'll have to wait <token>$MINUTES</token> minutes<br></br>before trying again.</text>",
-  "phone_lock_unlock_invalid": "<text>Wrong passcode.<br></br>You have <token>$ATTEMPTS</token> attempts left.</text>",
+  "phone_lock_unlock_invalid": "<text>Wrong passcode.</text>",
   "phone_lock_blocked": "Sorry, phone blocked",
   "phone_lock_current": "Type current passcode",
   "phone_lock_enter_new": "Enter new passcode",
diff --git a/image/assets/lang/Svenska.json b/image/assets/lang/Svenska.json
index 2e95286fd21a54e73105f72b210f58439a6656db..63f2f38210e4fb14c429c4703d908a5b4302fd34 100644
--- a/image/assets/lang/Svenska.json
+++ b/image/assets/lang/Svenska.json
@@ -383,7 +383,7 @@
   "phone_lock_unlock": "<text>Lösenord:</text>",
   "phone_lock_unlock_last_attempt": "<text>Fel lösenord.<br></br>Du har 1 försök kvar.</text>",
   "phone_lock_unlock_last_attempt_warning": "<text>Om lösenordet är fel den här gången,<br></br>måste du vänta <token>$MINUTES</token> minuter<br></br>innan nästa försök.</text>",
-  "phone_lock_unlock_invalid": "<text>Fel lösenord.<br></br>Du har <token>$ATTEMPTS</token> försök kvar.</text>",
+  "phone_lock_unlock_invalid": "<text>Fel lösenord.</text>",
   "phone_lock_blocked": "Tyvärr, telefonen blockerad.",
   "phone_lock_current": "Det förra lösenordet",
   "phone_lock_enter_new": "Det nya lösenordet",
diff --git a/module-apps/apps-common/locks/handlers/PhoneLockHandler.cpp b/module-apps/apps-common/locks/handlers/PhoneLockHandler.cpp
index f14b9e574f334b047bd61c444bd20ef91f7962f0..ed436bdd7156bd158d56b8f7e42e8690cc0c0b1c 100644
--- a/module-apps/apps-common/locks/handlers/PhoneLockHandler.cpp
+++ b/module-apps/apps-common/locks/handlers/PhoneLockHandler.cpp
@@ -13,10 +13,8 @@
 
 namespace locks
 {
-    constexpr unsigned int default_attempts = 4;
-
     PhoneLockHandler::PhoneLockHandler(sys::Service *owner, std::shared_ptr<settings::Settings> settings)
-        : owner(owner), lock(Lock::LockState::InputRequired, default_attempts), settings(std::move(settings))
+        : owner(owner), lock(Lock::LockState::InputRequired), settings(std::move(settings))
     {}
 
     void PhoneLockHandler::enablePhoneLock(bool _phoneLockEnabled)
@@ -38,7 +36,7 @@ namespace locks
     {
         if (phoneLockInputTypeAction != _phoneLockInputTypeAction) {
             phoneLockInputTypeAction = _phoneLockInputTypeAction;
-            lock.attemptsLeft        = default_attempts;
+            lock.attemptsLeft        = Lock::unlimitedNumOfAttempts;
             storedInputData.clear();
         }
     }
@@ -263,7 +261,7 @@ namespace locks
 
         if (phoneLockHash == hash) {
             lock.lockState    = Lock::LockState::Unlocked;
-            lock.attemptsLeft = default_attempts;
+            lock.attemptsLeft = Lock::unlimitedNumOfAttempts;
         }
         else if (lock.attemptsLeft > 0) {
             lock.lockState = Lock::LockState::InputInvalid;