From fa6ffa5d2e4cec26e491f1cdf2f78c61c8e5e318 Mon Sep 17 00:00:00 2001 From: Adeshchenko Kirill Date: Sun, 22 Mar 2020 23:13:11 +0300 Subject: [PATCH 1/7] fix: support localizedFallbackTitle in IOSAuthMessages --- packages/local_auth/ios/Classes/FLTLocalAuthPlugin.m | 2 +- packages/local_auth/lib/auth_strings.dart | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/local_auth/ios/Classes/FLTLocalAuthPlugin.m b/packages/local_auth/ios/Classes/FLTLocalAuthPlugin.m index b9925e3f425d..da6dab0f4c39 100644 --- a/packages/local_auth/ios/Classes/FLTLocalAuthPlugin.m +++ b/packages/local_auth/ios/Classes/FLTLocalAuthPlugin.m @@ -93,7 +93,7 @@ - (void)authenticateWithBiometrics:(NSDictionary *)arguments NSError *authError = nil; lastCallArgs = nil; lastResult = nil; - context.localizedFallbackTitle = @""; + context.localizedFallbackTitle = arguments[@"localizedFallbackTitle"]; if ([context canEvaluatePolicy:LAPolicyDeviceOwnerAuthenticationWithBiometrics error:&authError]) { diff --git a/packages/local_auth/lib/auth_strings.dart b/packages/local_auth/lib/auth_strings.dart index a8f34f88723c..1453d7db0f57 100644 --- a/packages/local_auth/lib/auth_strings.dart +++ b/packages/local_auth/lib/auth_strings.dart @@ -60,12 +60,14 @@ class IOSAuthMessages { this.goToSettingsButton, this.goToSettingsDescription, this.cancelButton, + this.localizedFallbackTitle, }); final String lockOut; final String goToSettingsButton; final String goToSettingsDescription; final String cancelButton; + final String localizedFallbackTitle; Map get args { return { @@ -74,6 +76,7 @@ class IOSAuthMessages { 'goToSettingDescriptionIOS': goToSettingsDescription ?? iOSGoToSettingsDescription, 'okButton': cancelButton ?? iOSOkButton, + 'localizedFallbackTitle': localizedFallbackTitle, }; } } From a50ca1d1dfc4175108d0379941f058d2f1ad42d9 Mon Sep 17 00:00:00 2001 From: Adeshchenko Kirill Date: Mon, 23 Mar 2020 12:35:42 +0300 Subject: [PATCH 2/7] fix: fix nil localizedFallbackTitle --- packages/local_auth/ios/Classes/FLTLocalAuthPlugin.m | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/local_auth/ios/Classes/FLTLocalAuthPlugin.m b/packages/local_auth/ios/Classes/FLTLocalAuthPlugin.m index da6dab0f4c39..a9260c0c3fce 100644 --- a/packages/local_auth/ios/Classes/FLTLocalAuthPlugin.m +++ b/packages/local_auth/ios/Classes/FLTLocalAuthPlugin.m @@ -93,7 +93,11 @@ - (void)authenticateWithBiometrics:(NSDictionary *)arguments NSError *authError = nil; lastCallArgs = nil; lastResult = nil; - context.localizedFallbackTitle = arguments[@"localizedFallbackTitle"]; + if (arguments[@"localizedFallbackTitle"] != (NSString*) [NSNull null]) { + context.localizedFallbackTitle = arguments[@"localizedFallbackTitle"]; + } else { + context.localizedFallbackTitle = @""; + } if ([context canEvaluatePolicy:LAPolicyDeviceOwnerAuthenticationWithBiometrics error:&authError]) { From e076294d949f498e0ffdb10d5bf6f5abd5d315f5 Mon Sep 17 00:00:00 2001 From: Adeshchenko Kirill Date: Mon, 23 Mar 2020 12:46:52 +0300 Subject: [PATCH 3/7] Update CHANGELOG.md --- packages/local_auth/CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/local_auth/CHANGELOG.md b/packages/local_auth/CHANGELOG.md index b1a00c9b64d7..6a59a483cdb8 100644 --- a/packages/local_auth/CHANGELOG.md +++ b/packages/local_auth/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.6.1+5 + +* Add support `localizedFallbackTitle` in authenticateWithBiometrics on iOS. + ## 0.6.1+4 * Replace deprecated `getFlutterEngine` call on Android. From 037ae85ae5703b0594e00f1c6ea10bb4227a8f46 Mon Sep 17 00:00:00 2001 From: Adeshchenko Kirill Date: Mon, 23 Mar 2020 12:47:23 +0300 Subject: [PATCH 4/7] Update pubspec.yaml --- packages/local_auth/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/local_auth/pubspec.yaml b/packages/local_auth/pubspec.yaml index 581ac63dbb31..6954c9ec7ee6 100644 --- a/packages/local_auth/pubspec.yaml +++ b/packages/local_auth/pubspec.yaml @@ -2,7 +2,7 @@ name: local_auth description: Flutter plugin for Android and iOS device authentication sensors such as Fingerprint Reader and Touch ID. homepage: https://github.com/flutter/plugins/tree/master/packages/local_auth -version: 0.6.1+4 +version: 0.6.1+5 flutter: plugin: From d9478e71df40828c2c0a40c3cd6ec98afedcd190 Mon Sep 17 00:00:00 2001 From: Adeshchenko Kirill Date: Mon, 23 Mar 2020 12:59:34 +0300 Subject: [PATCH 5/7] Fix format --- packages/local_auth/ios/Classes/FLTLocalAuthPlugin.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/local_auth/ios/Classes/FLTLocalAuthPlugin.m b/packages/local_auth/ios/Classes/FLTLocalAuthPlugin.m index a9260c0c3fce..28571af15aa8 100644 --- a/packages/local_auth/ios/Classes/FLTLocalAuthPlugin.m +++ b/packages/local_auth/ios/Classes/FLTLocalAuthPlugin.m @@ -93,7 +93,7 @@ - (void)authenticateWithBiometrics:(NSDictionary *)arguments NSError *authError = nil; lastCallArgs = nil; lastResult = nil; - if (arguments[@"localizedFallbackTitle"] != (NSString*) [NSNull null]) { + if (arguments[@"localizedFallbackTitle"] != (NSString *) [NSNull null]) { context.localizedFallbackTitle = arguments[@"localizedFallbackTitle"]; } else { context.localizedFallbackTitle = @""; From 8c407bbda2aa0886785d03e5ad76511beb5a30ce Mon Sep 17 00:00:00 2001 From: Adeshchenko Kirill Date: Mon, 23 Mar 2020 13:03:02 +0300 Subject: [PATCH 6/7] Fix format --- packages/local_auth/ios/Classes/FLTLocalAuthPlugin.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/local_auth/ios/Classes/FLTLocalAuthPlugin.m b/packages/local_auth/ios/Classes/FLTLocalAuthPlugin.m index 28571af15aa8..57e62d1906e5 100644 --- a/packages/local_auth/ios/Classes/FLTLocalAuthPlugin.m +++ b/packages/local_auth/ios/Classes/FLTLocalAuthPlugin.m @@ -93,7 +93,7 @@ - (void)authenticateWithBiometrics:(NSDictionary *)arguments NSError *authError = nil; lastCallArgs = nil; lastResult = nil; - if (arguments[@"localizedFallbackTitle"] != (NSString *) [NSNull null]) { + if (arguments[@"localizedFallbackTitle"] != (NSString *)[NSNull null]) { context.localizedFallbackTitle = arguments[@"localizedFallbackTitle"]; } else { context.localizedFallbackTitle = @""; From cc793df7c56c4c72528d12b68f89755712e0bf8e Mon Sep 17 00:00:00 2001 From: Kirill Date: Fri, 24 Apr 2020 16:07:31 +0300 Subject: [PATCH 7/7] Fixed formatting --- packages/local_auth/ios/Classes/FLTLocalAuthPlugin.m | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/local_auth/ios/Classes/FLTLocalAuthPlugin.m b/packages/local_auth/ios/Classes/FLTLocalAuthPlugin.m index 8ad751460d96..5d1448db0e27 100644 --- a/packages/local_auth/ios/Classes/FLTLocalAuthPlugin.m +++ b/packages/local_auth/ios/Classes/FLTLocalAuthPlugin.m @@ -103,7 +103,6 @@ - (void)authenticateWithBiometrics:(NSDictionary *)arguments context.localizedFallbackTitle = @""; } - if ([context canEvaluatePolicy:LAPolicyDeviceOwnerAuthenticationWithBiometrics error:&authError]) { [context evaluatePolicy:LAPolicyDeviceOwnerAuthenticationWithBiometrics