Improved isSimple handling

Author: rolandleth

Demo/LTHPasscodeViewController Demo/LTHAppDelegate.m

@@ -30,7 +30,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
 //	[navController addChildViewController: demoController];
 	self.window.rootViewController = navController;
 	[self.window makeKeyAndVisible];
-    
+	
 //    [LTHPasscodeViewController sharedUser].delegate = self;
 //    [LTHPasscodeViewController useKeychain:YES];
 	if ([LTHPasscodeViewController doesPasscodeExist] &&

LTHPasscodeViewController/LTHPasscodeViewController.m

@@ -166,6 +166,16 @@ - (void)_useKeychain:(BOOL)useKeychain {
 
 
 - (BOOL)_doesPasscodeExist {
+    if ([LTHKeychainUtils getPasswordForUsername:_keychainPasscodeIsSimpleUsername
+                                  andServiceName:_keychainServiceName
+                                           error:nil]) {
+        _isSimple = [[LTHKeychainUtils getPasswordForUsername:_keychainPasscodeIsSimpleUsername
+                                               andServiceName:_keychainServiceName
+                                                        error:nil] boolValue];
+    } else {
+        _isSimple = YES;
+    }
+    
     return [self _passcode].length != 0;
 }
 
@@ -283,7 +293,6 @@ - (void)_savePasscode:(NSString *)passcode {
                      updateExisting:YES
                               error:nil];
 
-    
     [LTHKeychainUtils storeUsername:_keychainPasscodeIsSimpleUsername
                         andPassword:[NSString stringWithFormat:@"%@", [self isSimple] ? @"YES" : @"NO"]
                      forServiceName:_keychainServiceName
@@ -429,7 +438,7 @@ - (void)setDigitsCount:(NSInteger)digitsCount {
     }
 
     _digitsCount = digitsCount;
-	
+    
     // If we haven't loaded yet, do nothing,
     // _setupDigitFields will be called in viewDidLoad.
     if (!self.isViewLoaded) { return; }
@@ -693,7 +702,7 @@ - (void)_setupDigitFields {
         [_digitTextFieldsArray addObject:digitTextField];
         [_simplePasscodeView addSubview:digitTextField];
     }
-
+    
     [self.view setNeedsUpdateConstraints];
 }
 
@@ -1602,16 +1611,6 @@ - (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
 
 
 - (void)_commonInit {
-    if ([LTHKeychainUtils getPasswordForUsername:_keychainPasscodeIsSimpleUsername
-                                  andServiceName:_keychainServiceName
-                                           error:nil]) {
-        _isSimple = [[LTHKeychainUtils getPasswordForUsername:_keychainPasscodeIsSimpleUsername
-                                               andServiceName:_keychainServiceName
-                                                        error:nil] boolValue];
-    } else {
-        _isSimple = YES;
-    }
-    
     [self _loadDefaults];
 }
 
@@ -1634,6 +1633,7 @@ - (void)_loadMiscDefaults {
     _slideAnimationDuration = 0.15;
     _maxNumberOfAllowedFailedAttempts = 0;
     _usesKeychain = YES;
+    _isSimple = YES;
     _displayedAsModal = YES;
     _hidesBackButton = YES;
     _hidesCancelButton = YES;