From 02ce9be9b4d8f6fd23b5d51b0bccd847dbcfd372 Mon Sep 17 00:00:00 2001 From: Valentin Eudeline 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 fcfbd3ab..f2178d4c 100644 --- a/lib/views/settings.dart +++ b/lib/views/settings.dart @@ -315,13 +315,10 @@ class _SettingsState extends State { 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 180a35b6863557dc8b9d97f1267fafb77e4e0e30 Mon Sep 17 00:00:00 2001 From: Valentin Eudeline 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 f2178d4c..fb46fcdf 100644 --- a/lib/views/settings.dart +++ b/lib/views/settings.dart @@ -315,7 +315,7 @@ class _SettingsState extends State { 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 239fe44bd3880ea08c20660aa587b3e816157f6e Mon Sep 17 00:00:00 2001 From: Valentin Eudeline 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 fb46fcdf..e6d41085 100644 --- a/lib/views/settings.dart +++ b/lib/views/settings.dart @@ -315,7 +315,7 @@ class _SettingsState extends State { 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 e894820c0c6c903cddf5ee9ec1bafd33da838d98 Mon Sep 17 00:00:00 2001 From: vaelio 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 e6d41085..f8d69f3e 100644 --- a/lib/views/settings.dart +++ b/lib/views/settings.dart @@ -315,7 +315,7 @@ class _SettingsState extends State { 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;