From d429044f64ff793a4684c4cad2d5cadcd5770881 Mon Sep 17 00:00:00 2001
From: Maarten Billemont <lhunath@lyndir.com>
Date: Sun, 5 Aug 2012 11:40:50 +0200
Subject: [PATCH] Remove debugging "Save" button + fix keybaord appearance.

[FIXED]     Keyboard didn't appear when app is reactivated.
[REMOVED]   "Save" option in user menu on lock screen was for debugging.
---
 MasterPassword/iOS/MPUnlockViewController.m | 44 ++++++++++-----------
 1 file changed, 20 insertions(+), 24 deletions(-)

diff --git a/MasterPassword/iOS/MPUnlockViewController.m b/MasterPassword/iOS/MPUnlockViewController.m
index 0b836c41..c358265c 100644
--- a/MasterPassword/iOS/MPUnlockViewController.m
+++ b/MasterPassword/iOS/MPUnlockViewController.m
@@ -292,9 +292,8 @@
         }
 
     [self updateLayoutAnimated:YES allowScroll:YES completion:^(BOOL finished) {
-        if (finished)
-            if (self.selectedUser)
-                [self.passwordField becomeFirstResponder];
+        if (self.selectedUser)
+            [self.passwordField becomeFirstResponder];
     }];
 }
 
@@ -738,27 +737,24 @@
 
     [PearlSheet showSheetWithTitle:targetedUser.name
                            message:nil viewStyle:UIActionSheetStyleBlackTranslucent
-                         initSheet:nil
-                 tappedButtonBlock:^(UIActionSheet *sheet, NSInteger buttonIndex) {
-                     if (buttonIndex == [sheet cancelButtonIndex])
-                         return;
+                         initSheet:nil tappedButtonBlock:^(UIActionSheet *sheet, NSInteger buttonIndex) {
+        if (buttonIndex == [sheet cancelButtonIndex])
+            return;
 
-                     if (buttonIndex == [sheet destructiveButtonIndex]) {
-                         [[MPAppDelegate get].managedObjectContextIfReady performBlockAndWait:^{
-                             [[MPAppDelegate get].managedObjectContextIfReady deleteObject:targetedUser];
-                         }];
-                         [[MPAppDelegate get] saveContext];
-                         [self updateUsers];
-                     } else
-                         if (buttonIndex == [sheet firstOtherButtonIndex]) {
-                             [[MPAppDelegate get] changeMasterPasswordFor:targetedUser didResetBlock:^{
-                                 [[self avatarForUser:targetedUser] setSelected:YES];
-                             }];
-                         }
-                         else
-                             [[MPAppDelegate get] saveContext];
-                 }     cancelTitle:[PearlStrings get].commonButtonCancel destructiveTitle:@"Delete User" otherTitles:@"Reset Password",
-                                                                                                                     @"Save",
-                                                                                                                     nil];
+        if (buttonIndex == [sheet destructiveButtonIndex]) {
+            [[MPAppDelegate get].managedObjectContextIfReady performBlockAndWait:^{
+                [[MPAppDelegate get].managedObjectContextIfReady deleteObject:targetedUser];
+            }];
+            [[MPAppDelegate get] saveContext];
+            [self updateUsers];
+            return;
+        }
+
+        if (buttonIndex == [sheet firstOtherButtonIndex])
+            [[MPAppDelegate get] changeMasterPasswordFor:targetedUser didResetBlock:^{
+                [[self avatarForUser:targetedUser] setSelected:YES];
+            }];
+    }                  cancelTitle:[PearlStrings get].commonButtonCancel
+                  destructiveTitle:@"Delete User" otherTitles:@"Reset Password", nil];
 }
 @end