improvements for password handling

- do not enforce password policy, only requires password to be existent (i.e. >0)
- added possibility to skip password protection
- automatically unlocks database if no password is set

Author: cbs

TextSecureiOS/ViewControllers/TSSetMasterPasswordViewController.h

@@ -14,6 +14,7 @@
 @property (nonatomic, strong) IBOutlet UITextField *pass;
 
 @property (strong, nonatomic) IBOutlet UIButton *nextButton;
+@property (strong, nonatomic) IBOutlet UIButton *skipButton;
 
 @property (nonatomic, retain) IBOutlet UILabel *instruction;
 

TextSecureiOS/ViewControllers/TSSetMasterPasswordViewController.m

@@ -84,6 +84,13 @@ - (IBAction) nextWasTapped:(id)sender{
     }
 }
 
+- (IBAction)skipWasTapped:(id)sender {
+    // TODO: AlertView(?) to help the user make an informed decision
+    self.pass.text = @"";
+    [self setupDatabase];
+}
+
+
 - (void) setupDatabase {
     NSError *error = nil;
 
@@ -140,6 +147,12 @@ - (BOOL)textField:(UITextField *)textField shouldChangeCharactersInRange:(NSRang
 
     // Update password strenght for the new password
     [self updatePasswordStrength:self forPassword:newPass];
+    
+    if (newPass.length > 0) {
+        self.nextButton.enabled = YES;
+    } else {
+        self.nextButton.enabled = NO;
+    }
 
     return YES;
 }
@@ -153,10 +166,6 @@ - (void)didReceiveMemoryWarning
 #pragma mark - Password strength
 - (void)updatePasswordStrength:(id)sender forPassword:(NSString*)password {
 
-    // disable next button, will be enabled when password strength is reasonable
-    // TODO: define a password policy that should be enforced
-    self.nextButton.enabled = NO;
-    
     if ([password length] == 0) {
         self.passwordStrengthMeterView.progress = 0.0f;
         self.passwordStrengthLabel.text = NSLocalizedString(@"Invalid Password", nil) ;
@@ -178,17 +187,14 @@ - (void)updatePasswordStrength:(id)sender forPassword:(NSString*)password {
                 case NJOReasonablePasswordStrength:
                     self.passwordStrengthMeterView.progress = 0.5f;
                     self.passwordStrengthMeterView.tintColor = [UIColor TSYellowWarningColor];
-                    self.nextButton.enabled = YES;
                     break;
                 case NJOStrongPasswordStrength:
                     self.passwordStrengthMeterView.progress = 0.75f;
                     self.passwordStrengthMeterView.tintColor = [UIColor TSValidColor];
-                    self.nextButton.enabled = YES;
                     break;
                 case NJOVeryStrongPasswordStrength:
                     self.passwordStrengthMeterView.progress = 1.0f;
                     self.passwordStrengthMeterView.tintColor = [UIColor TSValidColor];
-                    self.nextButton.enabled = YES;
                     break;
             }
 

TextSecureiOS/ViewControllers/TextSecureViewController.m

@@ -70,7 +70,15 @@ -(void)viewDidAppear:(BOOL)animated {
     self.navigationController.navigationBarHidden = NO;
 
     if([TSKeyManager hasVerifiedPhoneNumber] && [TSMessagesDatabase databaseWasCreated] && [TSStorageMasterKey isStorageMasterKeyLocked]) {
-        [self performSegueWithIdentifier:@"PasswordUnlockSegue" sender:self];
+        
+        // check if user decided to skip password protection
+        NSError *error = nil;
+        [TSStorageMasterKey unlockStorageMasterKeyUsingPassword:@"" error:&error];
+        BOOL stillLocked = [TSStorageMasterKey isStorageMasterKeyLocked];
+        
+        if (stillLocked) {
+            [self performSegueWithIdentifier:@"PasswordUnlockSegue" sender:self];
+        }
 
     } else if([TSKeyManager hasVerifiedPhoneNumber] == NO) {
         [self performSegueWithIdentifier:@"ObtainVerificationCode" sender:self];

TextSecureiOS/en.lproj/MainStoryboard.storyboard

@@ -84,7 +84,7 @@
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         <prototypes>
                             <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="TSContactCell" editingAccessoryType="checkmark" id="PQB-5D-1De">
-                                <rect key="frame" x="0.0" y="86" width="320" height="44"/>
+                                <rect key="frame" x="0.0" y="22" width="320" height="44"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="PQB-5D-1De" id="tS4-a2-ecF">
                                     <rect key="frame" x="0.0" y="0.0" width="320" height="43"/>
@@ -156,6 +156,21 @@
                                     <action selector="nextWasTapped:" destination="UTA-HQ-Ilx" eventType="touchUpInside" id="8oy-0E-pEe"/>
                                 </connections>
                             </button>
+                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="tHO-bB-EPm">
+                                <rect key="frame" x="0.0" y="308" width="320" height="40"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
+                                <fontDescription key="fontDescription" name="HelveticaNeue-Thin" family="Helvetica Neue" pointSize="23"/>
+                                <state key="normal" title="Skip">
+                                    <color key="titleColor" red="0.39607843139999999" green="0.73333333329999995" blue="0.90588235289999997" alpha="1" colorSpace="calibratedRGB"/>
+                                    <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                </state>
+                                <connections>
+                                    <action selector="doVerifyPhone:" destination="G9I-Gu-J6D" eventType="touchUpInside" id="PbF-zZ-Ega"/>
+                                    <action selector="nextWasTapped:" destination="UTA-HQ-Ilx" eventType="touchUpInside" id="cBp-BG-SSm"/>
+                                    <action selector="skipWasTapped:" destination="UTA-HQ-Ilx" eventType="touchUpInside" id="fFa-i0-xye"/>
+                                </connections>
+                            </button>
                             <progressView opaque="NO" alpha="0.69999999999999996" contentMode="scaleToFill" verticalHuggingPriority="750" fixedFrame="YES" progressViewStyle="bar" translatesAutoresizingMaskIntoConstraints="NO" id="prV-ge-1gh">
                                 <rect key="frame" x="20" y="241" width="280" height="3"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
@@ -190,6 +205,7 @@
                         <outlet property="pass" destination="loe-TW-3kA" id="mlr-Lc-FQa"/>
                         <outlet property="passwordStrengthLabel" destination="h8W-KQ-S8f" id="5pz-PR-kGx"/>
                         <outlet property="passwordStrengthMeterView" destination="prV-ge-1gh" id="eaS-In-3hD"/>
+                        <outlet property="skipButton" destination="tHO-bB-EPm" id="Zpd-AC-GgK"/>
                         <segue destination="KRb-Ro-u27" kind="custom" identifier="BeginUsingApp" customClass="TSStartOverSegue" id="P7Y-NC-M85"/>
                     </connections>
                 </viewController>
@@ -663,7 +679,7 @@
         <simulatedScreenMetrics key="destination" type="retina4"/>
     </simulatedMetricsContainer>
     <inferredMetricsTieBreakers>
+        <segue reference="P7Y-NC-M85"/>
         <segue reference="H42-Az-Klt"/>
-        <segue reference="IPq-is-JQN"/>
     </inferredMetricsTieBreakers>
 </document>