Merge branch 'editing'

Author: mattrubin

Authenticator.xcodeproj/project.pbxproj

@@ -23,6 +23,7 @@
 		C958CC51182A1FDD00DD47D0 /* OTPTokenType.m in Sources */ = {isa = PBXBuildFile; fileRef = C958CC50182A1FDD00DD47D0 /* OTPTokenType.m */; };
 		C958CC54183043A600DD47D0 /* OTPTokenSerializationTests.m in Sources */ = {isa = PBXBuildFile; fileRef = C958CC53183043A600DD47D0 /* OTPTokenSerializationTests.m */; };
 		C9745D0B17DA5861008B6E23 /* UIAlertView+Blocks.m in Sources */ = {isa = PBXBuildFile; fileRef = C9745D0A17DA5861008B6E23 /* UIAlertView+Blocks.m */; };
+		C9777A021908064500B4A7F5 /* OTPTokenEditViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C9777A011908064500B4A7F5 /* OTPTokenEditViewController.m */; };
 		C97B68C717D9226D005D1FE0 /* Settings.bundle in Resources */ = {isa = PBXBuildFile; fileRef = C97B68C617D9226D005D1FE0 /* Settings.bundle */; };
 		C99069D1180CBAC900BAEF53 /* OTPScannerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C99069D0180CBAC900BAEF53 /* OTPScannerViewController.m */; };
 		C99069D4180E07A100BAEF53 /* OTPTokenEntryViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C99069D3180E07A100BAEF53 /* OTPTokenEntryViewController.m */; };
@@ -83,6 +84,8 @@
 		C9745D0917DA5861008B6E23 /* UIAlertView+Blocks.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIAlertView+Blocks.h"; sourceTree = "<group>"; };
 		C9745D0A17DA5861008B6E23 /* UIAlertView+Blocks.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIAlertView+Blocks.m"; sourceTree = "<group>"; };
 		C9776E3318518801003D53CB /* LICENSE.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = LICENSE.txt; sourceTree = "<group>"; };
+		C9777A001908064500B4A7F5 /* OTPTokenEditViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OTPTokenEditViewController.h; sourceTree = "<group>"; };
+		C9777A011908064500B4A7F5 /* OTPTokenEditViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OTPTokenEditViewController.m; sourceTree = "<group>"; };
 		C97B68C617D9226D005D1FE0 /* Settings.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = Settings.bundle; sourceTree = "<group>"; };
 		C99069CF180CBAC900BAEF53 /* OTPScannerViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OTPScannerViewController.h; sourceTree = "<group>"; };
 		C99069D0180CBAC900BAEF53 /* OTPScannerViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OTPScannerViewController.m; sourceTree = "<group>"; };
@@ -227,6 +230,8 @@
 				C99069D5180E09D700BAEF53 /* OTPTokenSourceDelegate.h */,
 				C99069D2180E07A100BAEF53 /* OTPTokenEntryViewController.h */,
 				C99069D3180E07A100BAEF53 /* OTPTokenEntryViewController.m */,
+				C9777A001908064500B4A7F5 /* OTPTokenEditViewController.h */,
+				C9777A011908064500B4A7F5 /* OTPTokenEditViewController.m */,
 				C9D6C8401906BD6F004F0E08 /* Cells */,
 				C99069CF180CBAC900BAEF53 /* OTPScannerViewController.h */,
 				C99069D0180CBAC900BAEF53 /* OTPScannerViewController.m */,
@@ -475,6 +480,7 @@
 				C99069D4180E07A100BAEF53 /* OTPTokenEntryViewController.m in Sources */,
 				C9ABDACF17DD3CF500A86AB5 /* OTPTokenCell.m in Sources */,
 				C9044FCF18224D32002C3C3F /* OTPAlgorithm.m in Sources */,
+				C9777A021908064500B4A7F5 /* OTPTokenEditViewController.m in Sources */,
 				C9044FDC1824E711002C3C3F /* NSDictionary+QueryString.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;

Authenticator/Classes/OTPTokenCell.m

@@ -23,7 +23,6 @@
 //
 
 #import "OTPTokenCell.h"
-@import MobileCoreServices;
 #import "OTPToken+Persistence.h"
 #import "OTPToken+Generation.h"
 
@@ -119,25 +118,6 @@ - (void)layoutSubviews
 }
 
 
-#pragma mark - Copying
-
-- (void)setSelected:(BOOL)selected animated:(BOOL)animated
-{
-    [super setSelected:selected animated:animated];
-
-    if (selected) {
-        [self copyPassword];
-    }
-}
-
-- (void)copyPassword
-{
-    [[UIPasteboard generalPasteboard] setValue:self.token.password forPasteboardType:(__bridge NSString *)kUTTypeUTF8PlainText];
-
-    [SVProgressHUD showSuccessWithStatus:@"Copied"];
-}
-
-
 #pragma mark - KVO
 
 - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context

Authenticator/Classes/OTPTokenEditViewController.h

@@ -0,0 +1,41 @@
+//
+//  OTPTokenEditViewController.h
+//  Authenticator
+//
+//  Copyright (c) 2014 Matt Rubin
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy of
+//  this software and associated documentation files (the "Software"), to deal in
+//  the Software without restriction, including without limitation the rights to
+//  use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+//  the Software, and to permit persons to whom the Software is furnished to do so,
+//  subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in all
+//  copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+//  FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+//  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+//  IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+//  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+#import "OTPTokenEntryViewController.h"
+
+
+@protocol OTPTokenEditorDelegate <OTPTokenSourceDelegate>
+
+- (void)tokenEditor:(id)tokenEditor didEditToken:(OTPToken *)token;
+
+@end
+
+
+@interface OTPTokenEditViewController : OTPTokenEntryViewController
+
+@property (nonatomic, weak) id <OTPTokenEditorDelegate> delegate;
+
+@property (nonatomic, strong) OTPToken *token;
+
+@end

Authenticator/Classes/OTPTokenEditViewController.m

@@ -0,0 +1,134 @@
+//
+//  OTPTokenEditViewController.m
+//  Authenticator
+//
+//  Copyright (c) 2014 Matt Rubin
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy of
+//  this software and associated documentation files (the "Software"), to deal in
+//  the Software without restriction, including without limitation the rights to
+//  use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+//  the Software, and to permit persons to whom the Software is furnished to do so,
+//  subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in all
+//  copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+//  FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+//  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+//  IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+//  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+#import "OTPTokenEditViewController.h"
+#import "OTPTextFieldCell.h"
+#import "OTPToken+Persistence.h"
+
+
+@interface OTPTokenEntryViewController () <UITextFieldDelegate>
+
+@property (nonatomic, strong) UIBarButtonItem *doneButtonItem;
+
+@property (nonatomic, strong) OTPTextFieldCell *issuerCell;
+@property (nonatomic, strong) OTPTextFieldCell *accountNameCell;
+
+@end
+
+
+@implementation OTPTokenEditViewController
+
+- (void)viewDidLoad
+{
+    [super viewDidLoad];
+
+    self.title = @"Edit Token";
+
+    // Override the done button
+    self.doneButtonItem.action = @selector(updateToken);
+
+    self.accountNameCell.textField.returnKeyType = UIReturnKeyDone;
+}
+
+- (void)viewDidAppear:(BOOL)animated
+{
+    [super viewDidAppear:animated];
+    [self.issuerCell.textField becomeFirstResponder];
+}
+
+
+#pragma mark - Token
+
+- (void)setToken:(OTPToken *)token
+{
+    if (_token != token) {
+        _token = token;
+    }
+    self.issuerCell.textField.text = token.issuer;
+    self.accountNameCell.textField.text = token.name;
+}
+
+- (void)updateToken
+{
+    if (!self.formIsValid) return;
+
+    if (![self.token.name isEqualToString:self.accountNameCell.textField.text] ||
+        ![self.token.issuer isEqualToString:self.issuerCell.textField.text]) {
+        self.token.name = self.accountNameCell.textField.text;
+        self.token.issuer = self.issuerCell.textField.text;
+        [self.token saveToKeychain];
+    }
+
+    id <OTPTokenEditorDelegate> delegate = self.delegate;
+    [delegate tokenEditor:self didEditToken:self.token];
+}
+
+
+#pragma mark - UITableViewDataSource
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
+{
+    return 2;
+}
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    switch (indexPath.row) {
+        case 0:
+            return self.issuerCell;
+        case 1:
+            return self.accountNameCell;
+    }
+    return nil;
+}
+
+- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    return 74;
+}
+
+
+#pragma mark - UITextFieldDelegate
+
+- (BOOL)textFieldShouldReturn:(UITextField *)textField
+{
+    if (textField == self.issuerCell.textField) {
+        [self.accountNameCell.textField becomeFirstResponder];
+    } else if (textField == self.accountNameCell.textField) {
+        [textField resignFirstResponder];
+        [self updateToken];
+    }
+    return NO;
+}
+
+
+#pragma mark - Validation
+
+- (BOOL)formIsValid
+{
+    return (self.issuerCell.textField.text.length ||
+            self.accountNameCell.textField.text.length);
+}
+
+@end

Authenticator/Classes/OTPTokenEntryViewController.m

@@ -55,9 +55,13 @@ - (void)viewDidLoad
     self.title = @"Add Token";
     self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemCancel target:self action:@selector(cancel)];
     self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemDone target:self action:@selector(createToken)];
-
     self.doneButtonItem = self.navigationItem.rightBarButtonItem;
-    self.doneButtonItem.enabled = NO;
+}
+
+- (void)viewWillAppear:(BOOL)animated
+{
+    [super viewWillAppear:animated];
+    [self validateForm];
 }
 
 
@@ -70,9 +74,7 @@ - (void)cancel
 
 - (void)createToken
 {
-    if (!self.accountNameCell.textField.text.length || !self.secretKeyCell.textField.text.length) {
-        return;
-    }
+    if (!self.formIsValid) return;
 
     NSData *secret = [NSData dataWithBase32String:self.secretKeyCell.textField.text];
 
@@ -219,15 +221,27 @@ - (BOOL)textFieldShouldReturn:(UITextField *)textField
 
 - (BOOL)textField:(UITextField *)textField shouldChangeCharactersInRange:(NSRange)range replacementString:(NSString *)string
 {
-    // Ensure both fields (will) have text in them
-    NSString *newText = [[textField.text mutableCopy] stringByReplacingCharactersInRange:range withString:string];
-    if (textField == self.accountNameCell.textField) {
-        self.doneButtonItem.enabled = newText.length && self.secretKeyCell.textField.text.length;
-    } else if (textField == self.secretKeyCell.textField) {
-        self.doneButtonItem.enabled = newText.length && self.accountNameCell.textField.text.length;
-    }
+    // Delay validation slightly to allow the text field time to commit the new value
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.01 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        [self validateForm];
+    });
 
     return YES;
 }
 
+
+#pragma mark - Validation
+
+- (void)validateForm
+{
+    self.doneButtonItem.enabled = self.formIsValid;
+}
+
+- (BOOL)formIsValid
+{
+    return ((self.issuerCell.textField.text.length ||
+             self.accountNameCell.textField.text.length) &&
+            self.secretKeyCell.textField.text.length);
+}
+
 @end

Authenticator/Classes/OTPTokenListViewController.m

@@ -26,12 +26,14 @@
 #import "OTPTokenManager.h"
 #import "OTPTokenCell.h"
 #import "OTPProgressRing.h"
-#import "OTPToken.h"
+#import "OTPToken+Generation.h"
 #import "OTPTokenEntryViewController.h"
 #import "OTPScannerViewController.h"
+@import MobileCoreServices;
+#import "OTPTokenEditViewController.h"
 
 
-@interface OTPTokenListViewController ()
+@interface OTPTokenListViewController () <OTPTokenEditorDelegate>
 
 @property (nonatomic, strong) OTPTokenManager *tokenManager;
 @property (nonatomic, strong) OTPProgressRing *ring;
@@ -73,6 +75,8 @@ - (void)viewDidLoad
     self.navigationController.toolbarHidden = NO;
 
     self.tableView.contentInset = UIEdgeInsetsMake(10, 0, 0, 0);
+    self.tableView.allowsSelectionDuringEditing = YES;
+
     [self update];
 }
 
@@ -137,6 +141,26 @@ - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPa
     return 85;
 }
 
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    if (self.isEditing) {
+        self.editing = NO;
+
+        OTPTokenEditViewController *editController = [OTPTokenEditViewController new];
+        editController.token = self.tokenManager.tokens[(NSUInteger)indexPath.row];
+        editController.delegate = self;
+
+        UINavigationController *navController = [[UINavigationController alloc] initWithRootViewController:editController];
+        navController.navigationBar.translucent = NO;
+
+        [self presentViewController:navController animated:YES completion:nil];
+    } else {
+        OTPToken *token = self.tokenManager.tokens[(NSUInteger)indexPath.row];
+        [[UIPasteboard generalPasteboard] setValue:token.password forPasteboardType:(__bridge NSString *)kUTTypeUTF8PlainText];
+        [SVProgressHUD showSuccessWithStatus:@"Copied"];
+    }
+}
+
 
 #pragma mark - Target actions
 
@@ -169,4 +193,13 @@ - (void)tokenSource:(id)tokenSource didCreateToken:(OTPToken *)token
     }
 }
 
+
+#pragma mark - OTPTokenEditorDelegate
+
+- (void)tokenEditor:(id)tokenEditor didEditToken:(OTPToken *)token
+{
+    [self dismissViewControllerAnimated:YES completion:nil];
+    [self.tableView reloadData];
+}
+
 @end