Updated for Face ID

Author: rolandleth

Demo/LTHPasscodeViewController Demo/LTHDemoViewController.m

@@ -21,8 +21,8 @@ @interface LTHDemoViewController () <LTHPasscodeViewControllerDelegate, UITextFi
 @property (nonatomic, strong) UITextField *digitsTextField;
 @property (nonatomic, strong) UILabel  *typeLabel;
 @property (nonatomic, strong) UISwitch *typeSwitch;
-@property (nonatomic, strong) UILabel  *touchIDLabel;
-@property (nonatomic, strong) UISwitch *touchIDSwitch;
+@property (nonatomic, strong) UILabel  *biometricsLabel;
+@property (nonatomic, strong) UISwitch *biometricsSwitch;
 @end
 
 
@@ -55,7 +55,7 @@ - (void)_refreshUI {
 
     _digitsTextField.text = [NSString stringWithFormat:@"%zd", [LTHPasscodeViewController sharedUser].digitsCount];
     _typeSwitch.on = [[LTHPasscodeViewController sharedUser] isSimple];
-    _touchIDSwitch.on = [[LTHPasscodeViewController sharedUser] allowUnlockWithTouchID];
+    _biometricsSwitch.on = [[LTHPasscodeViewController sharedUser] allowUnlockWithBiometrics];
 }
 
 - (BOOL)textFieldShouldReturn:(UITextField *)textField {
@@ -83,15 +83,27 @@ - (void)viewDidLoad {
     _changePasscode.frame = CGRectMake(100, 300, 100, 50);
     _turnOffPasscode.frame = CGRectMake(100, 400, 100, 50);
 
-    if ([self isTouchIDAvailable]) {
+    if ([self areBiometricsAvailable]) {
         _typeLabel = [[UILabel alloc] initWithFrame:(CGRect){230, 190, 60, 30}];
         _typeSwitch = [[UISwitch alloc] initWithFrame:(CGRect){230, 220, 100, 100}];
-        _touchIDLabel = [[UILabel alloc] initWithFrame:(CGRect){230, 290, 90, 30}];
-        _touchIDSwitch = [[UISwitch alloc] initWithFrame:(CGRect){230, 320, 100, 100}];
-        _touchIDLabel.text = @"Touch ID";
-        [_touchIDSwitch addTarget:self action:@selector(_touchIDPasscodeType:) forControlEvents:UIControlEventValueChanged];
-        [self.view addSubview:_touchIDSwitch];
-        [self.view addSubview:_touchIDLabel];
+        _biometricsLabel = [[UILabel alloc] initWithFrame:(CGRect){230, 290, 90, 30}];
+        _biometricsSwitch = [[UISwitch alloc] initWithFrame:(CGRect){230, 320, 100, 100}];
+        
+        _biometricsLabel.text = @"Touch ID";
+        
+        LAContext *context = [[LAContext alloc] init];;
+        
+        if ([context canEvaluatePolicy:LAPolicyDeviceOwnerAuthenticationWithBiometrics error:nil]) {
+            if (@available(iOS 11.0, *)) {
+                if (context.biometryType == LABiometryTypeFaceID) {
+                    self.biometricsLabel.text = @"Face ID";
+                }
+            }
+        }
+        
+        [_biometricsSwitch addTarget:self action:@selector(_touchIDPasscodeType:) forControlEvents:UIControlEventValueChanged];
+        [self.view addSubview:_biometricsSwitch];
+        [self.view addSubview:_biometricsLabel];
     } else {
         _typeLabel = [[UILabel alloc] initWithFrame:(CGRect){230, 230, 60, 30}];
         _typeSwitch = [[UISwitch alloc] initWithFrame:(CGRect){230, 260, 100, 100}];
@@ -186,7 +198,7 @@ - (void)_switchPasscodeType:(UISwitch *)sender {
 }
 
 - (void)_touchIDPasscodeType:(UISwitch *)sender {
-    [[LTHPasscodeViewController sharedUser] setAllowUnlockWithTouchID:sender.isOn];
+    [[LTHPasscodeViewController sharedUser] setAllowUnlockWithBiometrics:sender.isOn];
 }
 
 - (void)showLockViewForEnablingPasscode {
@@ -214,7 +226,7 @@ - (void)showLockViewForTurningPasscodeOff {
                                                                              asModal:NO];
 }
 
-- (BOOL)isTouchIDAvailable {
+- (BOOL)areBiometricsAvailable {
     if ([[[UIDevice currentDevice] systemVersion] compare:@"8.0" options:NSNumericSearch] != NSOrderedAscending) {
         return [[[LAContext alloc] init] canEvaluatePolicy:LAPolicyDeviceOwnerAuthenticationWithBiometrics error:nil];
     }

LTHPasscodeViewController/LTHPasscodeViewController.h

@@ -77,17 +77,17 @@
  */
 - (NSString *)passcode;
 /**
- @brief   Handle here the saving of the preference for allowing the use of TouchID.
+ @brief   Handle here the saving of the preference for allowing the use of Biometrics.
  @details Called if @c +useKeychain:NO was used, but falls back to the Keychain anyway if not implemented.
- @param allowUnlockWithTouchID The boolean for the preference for allowing the use of TouchID.
+ @param allowUnlockWithBiometrics The boolean for the preference for allowing the use of Biometrics.
  */
-- (void)saveAllowUnlockWithTouchID:(BOOL)allowUnlockWithTouchID;
+- (void)saveAllowUnlockWithBiometrics:(BOOL)allowUnlockWithBiometrics;
 /**
- @brief   Retrieve here the saved preference for allowing the use of TouchID.
+ @brief   Retrieve here the saved preference for allowing the use of Biometrics.
  @details Called if @c +useKeychain:NO was used, but falls back to the Keychain anyway if not implemented.
- @return allowUnlockWithTouchID boolean.
+ @return allowUnlockWithBiometrics boolean.
  */
-- (BOOL)allowUnlockWithTouchID;
+- (BOOL)allowUnlockWithBiometrics;
 @end
 
 @interface LTHPasscodeViewController : UIViewController
@@ -209,9 +209,9 @@
  */
 @property (nonatomic, strong) NSString *keychainServiceName;
 /**
- @brief The string to be used as username for allow TouchID unlock in the Keychain.
+ @brief The string to be used as username for allow Biometrics unlock in the Keychain.
  */
-@property (nonatomic, strong) NSString *keychainAllowUnlockWithTouchID;
+@property (nonatomic, strong) NSString *keychainAllowUnlockWithBiometrics;
 /**
  @brief The character for the passcode digit.
  */
@@ -266,9 +266,10 @@
  */
 @property (nonatomic, strong) NSString *reenterNewPasscodeString;
 /**
- @brief The string displayed while user unlocks with TouchID.
+ @brief The string displayed while user unlocks with Biometrics.
+ @details Do not forget to test what kind of Biometrics the device is using, and display the correct string. (Touch ID vs Face ID, for example)
  */
-@property (nonatomic, strong) NSString *touchIDString;
+@property (nonatomic, strong) NSString *biometricsDetailsString;
 /**
  @brief The duration of the lock animation.
  */
@@ -300,9 +301,9 @@
 @property (nonatomic, assign) BOOL hidesCancelButton;
 
 /**
- @brief A Boolean value that indicates whether TouchID can be used (@c YES) or not (@c NO). Default is @c YES.
+ @brief A Boolean value that indicates whether Biometrics can be used (@c YES) or not (@c NO). Default is @c YES.
  */
-@property (nonatomic, assign) BOOL allowUnlockWithTouchID;
+@property (nonatomic, assign) BOOL allowUnlockWithBiometrics;
 
 
 // MARK: - Methods