From 9076aa2e3559b26349acf59ebeec5d0ffd3aa68f Mon Sep 17 00:00:00 2001
From: Valentin Eudeline <valentin.eudeline@gmail.com>
Date: Thu, 25 Feb 2021 08:55:12 +0000
Subject: [PATCH 1/4] Trying to fix the security pin removal issue

---
 lib/views/settings.dart | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/lib/views/settings.dart b/lib/views/settings.dart
index fcfbd3ab9..f2178d4c3 100644
--- a/lib/views/settings.dart
+++ b/lib/views/settings.dart
@@ -315,13 +315,10 @@ class _SettingsState extends State<Settings> {
       textFields: [
         DialogTextField(
           validator: (text) {
-            if (int.tryParse(text) == null || int.tryParse(text) < 0) {
-              return L10n.of(context).pleaseEnter4Digits;
+            if (text.length == 0 || (text.length == 4 && int.tryparse(text) > 0)) {
+              return null;
             }
-            if (text.length != 4 && text.isNotEmpty) {
-              return L10n.of(context).pleaseEnter4Digits;
-            }
-            return null;
+            return L10n.of(context).pleaseEnter4Digits;
           },
           keyboardType: TextInputType.number,
           obscureText: true,

From 2f9319afea5271cabef859c88ee0ace291ea0a8c Mon Sep 17 00:00:00 2001
From: Valentin Eudeline <valentin.eudeline@gmail.com>
Date: Thu, 25 Feb 2021 09:11:18 +0000
Subject: [PATCH 2/4] typo

---
 lib/views/settings.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/views/settings.dart b/lib/views/settings.dart
index f2178d4c3..fb46fcdfe 100644
--- a/lib/views/settings.dart
+++ b/lib/views/settings.dart
@@ -315,7 +315,7 @@ class _SettingsState extends State<Settings> {
       textFields: [
         DialogTextField(
           validator: (text) {
-            if (text.length == 0 || (text.length == 4 && int.tryparse(text) > 0)) {
+            if (text.length == 0 || (text.length == 4 && int.tryParse(text) > 0)) {
               return null;
             }
             return L10n.of(context).pleaseEnter4Digits;

From bd78bb10411fd970347ee9a57bc1f5eca96b4d1d Mon Sep 17 00:00:00 2001
From: Valentin Eudeline <valentin.eudeline@gmail.com>
Date: Thu, 25 Feb 2021 09:51:50 +0000
Subject: [PATCH 3/4] Typo

---
 lib/views/settings.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/views/settings.dart b/lib/views/settings.dart
index fb46fcdfe..e6d410857 100644
--- a/lib/views/settings.dart
+++ b/lib/views/settings.dart
@@ -315,7 +315,7 @@ class _SettingsState extends State<Settings> {
       textFields: [
         DialogTextField(
           validator: (text) {
-            if (text.length == 0 || (text.length == 4 && int.tryParse(text) > 0)) {
+            if (text.length == 0 || (text.length == 4 && int.tryParse(text) >= 0)) {
               return null;
             }
             return L10n.of(context).pleaseEnter4Digits;

From a46c5a3025877ba191dfcabc7cf45b97ff349900 Mon Sep 17 00:00:00 2001
From: vaelio <a@b.c>
Date: Tue, 2 Mar 2021 01:05:51 +0100
Subject: [PATCH 4/4] Fix format

---
 lib/views/settings.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/views/settings.dart b/lib/views/settings.dart
index e6d410857..f8d69f3e5 100644
--- a/lib/views/settings.dart
+++ b/lib/views/settings.dart
@@ -315,7 +315,7 @@ class _SettingsState extends State<Settings> {
       textFields: [
         DialogTextField(
           validator: (text) {
-            if (text.length == 0 || (text.length == 4 && int.tryParse(text) >= 0)) {
+            if (text.isEmpty || (text.length == 4 && int.tryParse(text) >= 0)) {
               return null;
             }
             return L10n.of(context).pleaseEnter4Digits;