039ec9b082
[ADDED] Fancy master password input screen. [FIXED] Key size of stored passwords. [FIXED] Several UI fixes. [FIXED] The counter wasn't correctly added to the cipherKey. [IMPROVED] Site style improvements. [UPDATED] Site algorithm explanation update.
483 lines
17 KiB
Objective-C
483 lines
17 KiB
Objective-C
//
|
|
// MPMainViewController.m
|
|
// MasterPassword
|
|
//
|
|
// Created by Maarten Billemont on 24/11/11.
|
|
// Copyright (c) 2011 Lyndir. All rights reserved.
|
|
//
|
|
|
|
#import "MPMainViewController.h"
|
|
#import "MPAppDelegate.h"
|
|
#import "MPElementGeneratedEntity.h"
|
|
#import "MPElementStoredEntity.h"
|
|
#import "IASKAppSettingsViewController.h"
|
|
|
|
#import <MobileCoreServices/MobileCoreServices.h>
|
|
|
|
|
|
@interface MPMainViewController (Private)
|
|
|
|
- (void)updateAnimated:(BOOL)animated;
|
|
- (void)updateWasAnimated:(BOOL)animated;
|
|
- (void)showContentTip:(NSString *)message withIcon:(UIImageView *)icon;
|
|
- (void)showAlertWithTitle:(NSString *)title message:(NSString *)message;
|
|
- (void)updateElement:(void (^)(void))updateElement;
|
|
|
|
@end
|
|
|
|
@implementation MPMainViewController
|
|
@synthesize activeElement = _activeElement;
|
|
@synthesize searchResultsController = _searchResultsController;
|
|
@synthesize typeButton = _typeButton;
|
|
@synthesize helpView = _helpView;
|
|
@synthesize siteName = _siteName;
|
|
@synthesize passwordCounter = _passwordCounter;
|
|
@synthesize passwordIncrementer = _passwordIncrementer;
|
|
@synthesize passwordEdit = _passwordEdit;
|
|
@synthesize contentContainer = _contentContainer;
|
|
@synthesize helpContainer = _helpContainer;
|
|
@synthesize contentTipContainer = _copiedContainer;
|
|
@synthesize alertContainer = _alertContainer;
|
|
@synthesize alertTitle = _alertTitle;
|
|
@synthesize alertBody = _alertBody;
|
|
@synthesize contentTipBody = _contentTipBody;
|
|
@synthesize contentTipEditIcon = _contentTipEditIcon;
|
|
@synthesize searchTipContainer = _searchTip;
|
|
@synthesize contentField = _contentField;
|
|
|
|
#pragma mark - View lifecycle
|
|
|
|
- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation {
|
|
|
|
return [[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPad || interfaceOrientation != UIInterfaceOrientationPortraitUpsideDown;
|
|
}
|
|
|
|
- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
|
|
|
|
if ([[segue identifier] isEqualToString:@"MP_Main_ChooseType"])
|
|
[[segue destinationViewController] setDelegate:self];
|
|
}
|
|
|
|
- (void)viewWillAppear:(BOOL)animated {
|
|
|
|
[super viewWillAppear:animated];
|
|
|
|
self.searchTipContainer.hidden = NO;
|
|
|
|
if (!self.activeElement.name)
|
|
[UIView animateWithDuration:animated? 0.2f: 0 animations:^{
|
|
self.searchTipContainer.alpha = 1;
|
|
}];
|
|
|
|
[self setHelpHidden:[[MPConfig get].helpHidden boolValue] animated:animated];
|
|
[self updateAnimated:animated];
|
|
}
|
|
|
|
- (void)viewWillDisappear:(BOOL)animated {
|
|
|
|
[super viewWillDisappear:animated];
|
|
|
|
self.searchTipContainer.hidden = YES;
|
|
}
|
|
|
|
- (void)viewDidAppear:(BOOL)animated {
|
|
|
|
[super viewDidAppear:animated];
|
|
}
|
|
|
|
- (void)viewDidLoad {
|
|
|
|
self.view.backgroundColor = [UIColor colorWithPatternImage:[UIImage imageNamed:@"ui_background"]];
|
|
|
|
// Put the search tip on the window so it's above the nav bar.
|
|
if (![self.searchTipContainer.superview isEqual:self.navigationController.navigationBar.superview]) {
|
|
CGRect frameInWindow = [self.searchTipContainer.window convertRect:self.searchTipContainer.frame
|
|
fromView:self.searchTipContainer.superview];
|
|
[self.searchTipContainer removeFromSuperview];
|
|
[self.navigationController.navigationBar.superview addSubview:self.searchTipContainer];
|
|
self.searchTipContainer.frame = [self.searchTipContainer.window convertRect:frameInWindow
|
|
toView:self.searchTipContainer.superview];
|
|
}
|
|
|
|
[[NSNotificationCenter defaultCenter] addObserverForName:UIApplicationWillResignActiveNotification object:nil queue:[NSOperationQueue mainQueue]
|
|
usingBlock:^(NSNotification *note) {
|
|
if (![MPAppDelegate get].keyPhrase) {
|
|
self.activeElement = nil;
|
|
[self updateAnimated:NO];
|
|
}
|
|
}];
|
|
[[NSNotificationCenter defaultCenter] addObserverForName:UIApplicationDidBecomeActiveNotification object:nil queue:[NSOperationQueue mainQueue]
|
|
usingBlock:^(NSNotification *note) {
|
|
if (![MPAppDelegate get].keyPhrase) {
|
|
self.activeElement = nil;
|
|
[self updateAnimated:NO];
|
|
}
|
|
}];
|
|
|
|
self.alertBody.text = nil;
|
|
self.contentTipEditIcon.alpha = 0;
|
|
|
|
[super viewDidLoad];
|
|
}
|
|
|
|
- (void)viewDidUnload {
|
|
|
|
[self setContentField:nil];
|
|
[self setTypeButton:nil];
|
|
[self setSearchResultsController:nil];
|
|
[self setHelpView:nil];
|
|
[self setSiteName:nil];
|
|
[self setPasswordCounter:nil];
|
|
[self setPasswordIncrementer:nil];
|
|
[self setPasswordEdit:nil];
|
|
[self setContentContainer:nil];
|
|
[self setHelpContainer:nil];
|
|
[self setContentTipContainer:nil];
|
|
[self setAlertContainer:nil];
|
|
[self setAlertTitle:nil];
|
|
[self setAlertBody:nil];
|
|
[self setContentTipBody:nil];
|
|
[self setContentTipEditIcon:nil];
|
|
[self setSearchTipContainer:nil];
|
|
[super viewDidUnload];
|
|
}
|
|
|
|
- (void)updateAnimated:(BOOL)animated {
|
|
|
|
[[MPAppDelegate get] saveContext];
|
|
|
|
if (animated)
|
|
[UIView animateWithDuration:0.2 animations:^{
|
|
[self updateWasAnimated:YES];
|
|
}];
|
|
else
|
|
[self updateWasAnimated:NO];
|
|
}
|
|
|
|
- (void)updateWasAnimated:(BOOL)animated {
|
|
|
|
[self setHelpChapter:self.activeElement? @"2": @"1"];
|
|
self.siteName.text = self.activeElement.name;
|
|
|
|
self.passwordCounter.alpha = self.activeElement.type & MPElementTypeClassCalculated? 0.5f: 0;
|
|
self.passwordIncrementer.alpha = self.activeElement.type & MPElementTypeClassCalculated? 0.5f: 0;
|
|
self.passwordEdit.alpha = self.activeElement.type & MPElementTypeClassStored? 0.5f: 0;
|
|
|
|
[self.typeButton setTitle:NSStringFromMPElementType(self.activeElement.type)
|
|
forState:UIControlStateNormal];
|
|
self.typeButton.alpha = NSStringFromMPElementType(self.activeElement.type).length? 1: 0;
|
|
|
|
self.contentField.enabled = NO;
|
|
|
|
if ([self.activeElement isKindOfClass:[MPElementGeneratedEntity class]])
|
|
self.passwordCounter.text = [NSString stringWithFormat:@"%u", ((MPElementGeneratedEntity *) self.activeElement).counter];
|
|
|
|
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_BACKGROUND, 0), ^{
|
|
NSString *description = self.activeElement.description;
|
|
|
|
dispatch_async(dispatch_get_main_queue(), ^{
|
|
self.contentField.text = description;
|
|
});
|
|
});
|
|
}
|
|
|
|
- (BOOL)isHelpVisible {
|
|
|
|
return self.helpContainer.frame.origin.y < 400;
|
|
}
|
|
|
|
- (void)toggleHelpAnimated:(BOOL)animated {
|
|
|
|
[self setHelpHidden:[self isHelpVisible] animated:animated];
|
|
}
|
|
|
|
- (void)setHelpHidden:(BOOL)hidden animated:(BOOL)animated {
|
|
|
|
[UIView animateWithDuration:animated? 0.3f: 0 animations:^{
|
|
|
|
if (hidden) {
|
|
self.contentContainer.frame = CGRectSetHeight(self.contentContainer.frame, 373);
|
|
self.helpContainer.frame = CGRectSetY(self.helpContainer.frame, 416);
|
|
[MPConfig get].helpHidden = [NSNumber numberWithBool:YES];
|
|
} else {
|
|
self.contentContainer.frame = CGRectSetHeight(self.contentContainer.frame, 175);
|
|
self.helpContainer.frame = CGRectSetY(self.helpContainer.frame, 216);
|
|
[MPConfig get].helpHidden = [NSNumber numberWithBool:NO];
|
|
}
|
|
}];
|
|
}
|
|
|
|
- (void)setHelpChapter:(NSString *)chapter {
|
|
|
|
#ifndef PRODUCTION
|
|
[TestFlight passCheckpoint:[NSString stringWithFormat:MPTestFlightCheckpointHelpChapter, chapter]];
|
|
#endif
|
|
|
|
[self.helpView loadRequest:
|
|
[NSURLRequest requestWithURL:
|
|
[NSURL URLWithString:[NSString stringWithFormat:@"#%@", chapter] relativeToURL:
|
|
[[NSBundle mainBundle] URLForResource:@"help" withExtension:@"html"]]]];
|
|
|
|
NSString *error = [self.helpView stringByEvaluatingJavaScriptFromString:[NSString stringWithFormat:@"setClass('%@');",
|
|
ClassNameFromMPElementType(self.activeElement.type)]];
|
|
if (error.length)
|
|
err(@"setClass: %@", error);
|
|
}
|
|
|
|
- (void)showContentTip:(NSString *)message withIcon:(UIImageView *)icon {
|
|
|
|
self.contentTipBody.text = message;
|
|
|
|
icon.hidden = NO;
|
|
[UIView animateWithDuration:0.2f animations:^{
|
|
self.contentTipContainer.alpha = 1;
|
|
} completion:^(BOOL finished) {
|
|
dispatch_time_t popTime = dispatch_time(DISPATCH_TIME_NOW, 5.0f * NSEC_PER_SEC);
|
|
dispatch_after(popTime, dispatch_get_main_queue(), ^(void){
|
|
[UIView animateWithDuration:0.2f animations:^{
|
|
self.contentTipContainer.alpha = 0;
|
|
} completion:^(BOOL finished) {
|
|
icon.hidden = YES;
|
|
}];
|
|
});
|
|
}];
|
|
}
|
|
|
|
- (void)showAlertWithTitle:(NSString *)title message:(NSString *)message {
|
|
|
|
self.alertTitle.text = title;
|
|
NSRange scrollRange = NSMakeRange(self.alertBody.text.length, message.length);
|
|
if ([self.alertBody.text length])
|
|
self.alertBody.text = [NSString stringWithFormat:@"%@\n\n---\n\n%@", self.alertBody.text, message];
|
|
else
|
|
self.alertBody.text = message;
|
|
[self.alertBody scrollRangeToVisible:scrollRange];
|
|
|
|
[UIView animateWithDuration:0.2f animations:^{
|
|
self.alertContainer.alpha = 1;
|
|
}];
|
|
}
|
|
|
|
#pragma mark - Protocols
|
|
|
|
- (IBAction)copyContent {
|
|
|
|
if (!self.activeElement)
|
|
return;
|
|
|
|
[[UIPasteboard generalPasteboard] setValue:self.activeElement.content
|
|
forPasteboardType:(id)kUTTypeUTF8PlainText];
|
|
|
|
[self showContentTip:@"Copied!" withIcon:nil];
|
|
|
|
#ifndef PRODUCTION
|
|
[TestFlight passCheckpoint:MPTestFlightCheckpointCopyToPasteboard];
|
|
#endif
|
|
}
|
|
|
|
- (IBAction)incrementPasswordCounter {
|
|
|
|
if (![self.activeElement isKindOfClass:[MPElementGeneratedEntity class]])
|
|
// Not of a type that supports a password counter;
|
|
return;
|
|
|
|
[self updateElement:^{
|
|
++((MPElementGeneratedEntity *) self.activeElement).counter;
|
|
}];
|
|
|
|
#ifndef PRODUCTION
|
|
[TestFlight passCheckpoint:MPTestFlightCheckpointIncrementPasswordCounter];
|
|
#endif
|
|
}
|
|
|
|
- (void)updateElement:(void (^)(void))updateElement {
|
|
|
|
// Update password counter.
|
|
NSString *oldPassword = self.activeElement.description;
|
|
updateElement();
|
|
NSString *newPassword = self.activeElement.description;
|
|
[self updateAnimated:YES];
|
|
|
|
// Show new and old password.
|
|
if ([oldPassword length] && ![oldPassword isEqualToString:newPassword])
|
|
[self showAlertWithTitle:@"Password Changed!" message:l(@"The password for %@ has changed.\n\n"
|
|
@"Don't forget to update the site with your new password! "
|
|
@"Your old password was:\n"
|
|
@"%@", self.activeElement.name, oldPassword)];
|
|
}
|
|
|
|
- (IBAction)editPassword {
|
|
|
|
if (self.activeElement.type & MPElementTypeClassStored) {
|
|
self.contentField.enabled = YES;
|
|
[self.contentField becomeFirstResponder];
|
|
}
|
|
|
|
#ifndef PRODUCTION
|
|
[TestFlight passCheckpoint:MPTestFlightCheckpointEditPassword];
|
|
#endif
|
|
}
|
|
|
|
- (IBAction)closeAlert {
|
|
|
|
[UIView animateWithDuration:0.3f animations:^{
|
|
self.alertContainer.alpha = 0;
|
|
} completion:^(BOOL finished) {
|
|
self.alertBody.text = nil;
|
|
}];
|
|
|
|
#ifndef PRODUCTION
|
|
[TestFlight passCheckpoint:MPTestFlightCheckpointCloseAlert];
|
|
#endif
|
|
}
|
|
|
|
- (IBAction)action:(id)sender {
|
|
|
|
[SheetViewController showSheetWithTitle:nil message:nil viewStyle:UIActionSheetStyleAutomatic
|
|
tappedButtonBlock:^(UIActionSheet *sheet, NSInteger buttonIndex) {
|
|
if (buttonIndex == [sheet cancelButtonIndex])
|
|
return;
|
|
|
|
switch (buttonIndex - [sheet firstOtherButtonIndex]) {
|
|
case 0:
|
|
[self toggleHelpAnimated:YES];
|
|
break;
|
|
case 1:
|
|
[self setHelpChapter:@"faq"];
|
|
[self setHelpHidden:NO animated:YES];
|
|
break;
|
|
case 2:
|
|
[[MPAppDelegate get] showGuide];
|
|
break;
|
|
case 3: {
|
|
IASKAppSettingsViewController *settingsVC = [IASKAppSettingsViewController new];
|
|
settingsVC.delegate = self;
|
|
[self.navigationController pushViewController:settingsVC animated:YES];
|
|
break;
|
|
}
|
|
#ifndef PRODUCTION
|
|
case 4:
|
|
[TestFlight openFeedbackView];
|
|
break;
|
|
#endif
|
|
}
|
|
|
|
#ifndef PRODUCTION
|
|
[TestFlight passCheckpoint:MPTestFlightCheckpointAction];
|
|
#endif
|
|
} cancelTitle:[PearlStrings get].commonButtonCancel destructiveTitle:nil
|
|
otherTitles:
|
|
[self isHelpVisible]? @"Hide Help": @"Show Help", @"FAQ", @"Tutorial", @"Settings",
|
|
#ifndef PRODUCTION
|
|
@"Feedback",
|
|
#endif
|
|
nil];
|
|
}
|
|
|
|
- (MPElementType)selectedType {
|
|
|
|
return self.activeElement.type;
|
|
}
|
|
|
|
- (void)didSelectType:(MPElementType)type {
|
|
|
|
[self updateElement:^{
|
|
// Update password type.
|
|
if (ClassFromMPElementType(type) != ClassFromMPElementType(self.activeElement.type))
|
|
// Type requires a different class of element. Recreate the element.
|
|
[[MPAppDelegate managedObjectContext] performBlockAndWait:^{
|
|
MPElementEntity *newElement = [NSEntityDescription insertNewObjectForEntityForName:ClassNameFromMPElementType(type)
|
|
inManagedObjectContext:[MPAppDelegate managedObjectContext]];
|
|
newElement.name = self.activeElement.name;
|
|
newElement.mpHashHex = self.activeElement.mpHashHex;
|
|
newElement.uses = self.activeElement.uses;
|
|
newElement.lastUsed = self.activeElement.lastUsed;
|
|
|
|
[[MPAppDelegate managedObjectContext] deleteObject:self.activeElement];
|
|
self.activeElement = newElement;
|
|
}];
|
|
|
|
self.activeElement.type = type;
|
|
|
|
#ifndef PRODUCTION
|
|
[TestFlight passCheckpoint:[NSString stringWithFormat:MPTestFlightCheckpointSelectType, NSStringFromMPElementType(type)]];
|
|
#endif
|
|
|
|
if (type & MPElementTypeClassStored && ![self.activeElement.description length])
|
|
[self showContentTip:@"Tap to set a password." withIcon:self.contentTipEditIcon];
|
|
}];
|
|
}
|
|
|
|
- (void)didSelectElement:(MPElementEntity *)element {
|
|
|
|
self.activeElement = element;
|
|
[self.activeElement use];
|
|
|
|
[self.searchDisplayController setActive:NO animated:YES];
|
|
self.searchDisplayController.searchBar.text = self.activeElement.name;
|
|
|
|
#ifndef PRODUCTION
|
|
[TestFlight passCheckpoint:MPTestFlightCheckpointSelectElement];
|
|
#endif
|
|
|
|
[self updateAnimated:YES];
|
|
}
|
|
|
|
- (void)searchBarCancelButtonClicked:(UISearchBar *)searchBar {
|
|
|
|
#ifndef PRODUCTION
|
|
[TestFlight passCheckpoint:MPTestFlightCheckpointCancelSearch];
|
|
#endif
|
|
|
|
[self updateAnimated:YES];
|
|
}
|
|
|
|
- (BOOL)textFieldShouldReturn:(UITextField *)textField {
|
|
|
|
if (textField == self.contentField)
|
|
[self.contentField resignFirstResponder];
|
|
|
|
return YES;
|
|
}
|
|
|
|
- (void)textFieldDidEndEditing:(UITextField *)textField {
|
|
|
|
if (textField == self.contentField) {
|
|
self.contentField.enabled = NO;
|
|
if (![self.activeElement isKindOfClass:[MPElementStoredEntity class]])
|
|
// Not of a type whose content can be edited.
|
|
return;
|
|
|
|
if ([((MPElementStoredEntity *) self.activeElement).content isEqual:self.contentField.text])
|
|
// Content hasn't changed.
|
|
return;
|
|
|
|
[self updateElement:^{
|
|
((MPElementStoredEntity *) self.activeElement).content = self.contentField.text;
|
|
}];
|
|
}
|
|
}
|
|
|
|
- (BOOL)webView:(UIWebView *)webView shouldStartLoadWithRequest:(NSURLRequest *)request
|
|
navigationType:(UIWebViewNavigationType)navigationType {
|
|
|
|
if (navigationType == UIWebViewNavigationTypeLinkClicked) {
|
|
#ifndef PRODUCTION
|
|
[TestFlight passCheckpoint:MPTestFlightCheckpointExternalLink];
|
|
#endif
|
|
|
|
[[UIApplication sharedApplication] openURL:[request URL]];
|
|
return NO;
|
|
}
|
|
|
|
return YES;
|
|
}
|
|
|
|
- (void)settingsViewControllerDidEnd:(IASKAppSettingsViewController *)sender {
|
|
|
|
while ([self.navigationController.viewControllers containsObject:sender])
|
|
[self.navigationController popViewControllerAnimated:YES];
|
|
}
|
|
|
|
@end
|