Merge branch 'master' into develop

Automattic · Sep 24, 2018 · 62ff242 · 62ff242
2 parents ecc42a2 + ce7d1fc
commit 62ff242
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 0 deletions.
diff --git a/External/DTPinLock/DTPinLockController.m b/External/DTPinLock/DTPinLockController.m
@@ -182,6 +182,7 @@ - (void)displayTouchIDIfAppropriate
                                       dispatch_async(dispatch_get_main_queue(), ^{
                                           [self dismissKeyboard];
                                           [self didFinishUnlocking];
+                                          self.biometryUnlockWasSuccessful = YES;
                                       });
                                   }
 

diff --git a/Simplenote/Classes/SPOptionsViewController.m b/Simplenote/Classes/SPOptionsViewController.m
@@ -166,6 +166,28 @@ - (void)viewDidLoad
     self.pinTimeoutTextField.inputAccessoryView = self.doneToolbar;
     [self.view addSubview:self.pinTimeoutTextField];
 
+    self.pinTimeoutPickerView = [UIPickerView new];
+    self.pinTimeoutPickerView.delegate = self;
+    self.pinTimeoutPickerView.dataSource = self;
+    [self.pinTimeoutPickerView selectRow:[[NSUserDefaults standardUserDefaults] integerForKey:kPinTimeoutPreferencesKey] inComponent:0 animated:NO];
+
+    self.doneToolbar = [UIToolbar new];
+    self.doneToolbar.barStyle = UIBarStyleDefault;
+    self.doneToolbar.translucent = NO;
+    [self.doneToolbar sizeToFit];
+
+    UIBarButtonItem *doneButtonItem = [[UIBarButtonItem alloc] initWithTitle: NSLocalizedString(@"Done", @"Done toolbar button")                                                                                    style:UIBarButtonItemStylePlain target:self                                                                 action:@selector(pinTimeoutDoneAction:)];
+    UIBarButtonItem *fixedSpace = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemFixedSpace                                                                                    target:nil action:nil];
+
+    fixedSpace.width = self.doneToolbar.frame.size.width;
+    [self.doneToolbar setItems:[NSArray arrayWithObjects:fixedSpace, doneButtonItem, nil]];
+
+    self.pinTimeoutTextField = [UITextField new];
+    self.pinTimeoutTextField.frame = CGRectMake(0, 0, 0, 0);
+    self.pinTimeoutTextField.inputView = self.pinTimeoutPickerView;
+    self.pinTimeoutTextField.inputAccessoryView = self.doneToolbar;
+    [self.view addSubview:self.pinTimeoutTextField];
+
     // Listen to Theme Notifications
     [[NSNotificationCenter defaultCenter] addObserver:self
                                              selector:@selector(themeDidChange)
@@ -735,6 +757,7 @@ - (BOOL)themePref
 }
 
 
+
 #pragma mark - Picker view delegate
 - (NSInteger)numberOfComponentsInPickerView:(UIPickerView *)pickerView {
     return 1;

diff --git a/Simplenote/SPAppDelegate.m b/Simplenote/SPAppDelegate.m
@@ -352,6 +352,11 @@ - (void)applicationWillResignActive:(UIApplication *)application
 
     // Save any pending changes
     [self.noteEditorViewController save];
+
+    // For the passcode lock, store the current clock time for comparison when returning to the app
+    if ([self passcodeLockIsEnabled]) {
+        [SPPinLockManager storeLastUsedTime];
+    }
 }
 
 - (void)applicationWillTerminate:(UIApplication *)application