fixed an issue can activate the faceid switch without a passcode

Automattic · May 15, 2024 · 14904c8 · 14904c8
1 parent 75337a0
commit 14904c8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/Simplenote/Classes/SPSettingsViewController+Extensions.swift b/Simplenote/Classes/SPSettingsViewController+Extensions.swift
@@ -87,6 +87,7 @@ extension SPSettingsViewController: PinLockSetupControllerDelegate {
     func pinLockSetupControllerDidComplete(_ controller: PinLockSetupController) {
         SPTracker.trackSettingsPinlockEnabled(true)
         dismissPresentedViewController()
+        SPPinLockManager.shared.shouldUseBiometry = biometrySwitch.isOn
     }
 
     func pinLockSetupControllerDidCancel(_ controller: PinLockSetupController) {

diff --git a/Simplenote/Classes/SPSettingsViewController.h b/Simplenote/Classes/SPSettingsViewController.h
@@ -2,12 +2,13 @@
 #import "SPTableViewController.h"
 
 @interface SPSettingsViewController : SPTableViewController <UIPickerViewDelegate, UIPickerViewDataSource> {
-
     //Preferences
     NSNumber *sortOrderPref;
     NSNumber *numPreviewLinesPref;
 }
 
+@property (nonatomic, strong) UISwitch      *biometrySwitch;
+
 @end
 
 extern NSString *const SPAlphabeticalTagSortPref;

diff --git a/Simplenote/Classes/SPSettingsViewController.m b/Simplenote/Classes/SPSettingsViewController.m
@@ -14,7 +14,6 @@
 @interface SPSettingsViewController ()
 @property (nonatomic, strong) UISwitch      *condensedNoteListSwitch;
 @property (nonatomic, strong) UISwitch      *alphabeticalTagSortSwitch;
-@property (nonatomic, strong) UISwitch      *biometrySwitch;
 @property (nonatomic, strong) UISwitch      *sustainerIconSwitch;
 @property (nonatomic, strong) UITextField   *pinTimeoutTextField;
 @property (nonatomic, strong) UIPickerView  *pinTimeoutPickerView;
@@ -747,11 +746,11 @@ - (void)tagSortSwitchDidChangeValue:(UISwitch *)sender
 
 - (void)touchIdSwitchDidChangeValue:(UISwitch *)sender
 {
-    SPPinLockManager.shared.shouldUseBiometry = sender.on;
-
     if (![self isPinLockEnabled] && [self.biometrySwitch isOn]) {
         UIAlertController* alert = [self pinLockRequiredAlert];
         [self presentViewController:alert animated:YES completion:nil];
+    } else {
+        SPPinLockManager.shared.shouldUseBiometry = sender.on;
     }
 }