nikdoof/MacPass
1
1
Fork 0
mirror of https://github.com/MacPass/MacPass.git synced 2025-12-14 17:32:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Re-enabled password request before saving a database that has no password and key

Browse Source 
Stripped logging code
Fixed issue with save panel not being updated correctly when panel is just reshown
This commit is contained in:
michael starke
2013-09-04 02:15:22 +02:00
parent 06862e7a42
commit 4a8b1207c5
9 changed files with 86 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
MacPass/MPPasswordEditWindowController.m
View File

@@ -29,6 +29,7 @@
- (id)initWithDocument:(MPDocument *)document {
self = [super initWithWindowNibName:@"PasswordEditWindow"];
if(self){
_allowsEmptyPasswordOrKey = YES;
_showPassword = NO;
_hasValidPasswordOrKey = NO;
_document = document;
@@ -84,10 +85,16 @@
_document.password = [self.passwordTextField stringValue];
_document.key = [self.keyfilePathControl URL];
[self dismissSheet:NSRunStoppedResponse];
if(self.delegate && [self.delegate respondsToSelector:@selector(didFinishPasswordEditing:)]) {
[self.delegate didFinishPasswordEditing:YES];
}
}
- (IBAction)cancel:(id)sender {
[self dismissSheet:NSRunAbortedResponse];
if(self.delegate && [self.delegate respondsToSelector:@selector(didFinishPasswordEditing:)]) {
[self.delegate didFinishPasswordEditing:NO];
}
}
- (IBAction)clearKey:(id)sender {
@@ -138,7 +145,7 @@
BOOL hasPasswordOrKey = (hasKey || hasPassword);
keyOk = hasKey ? keyOk : YES;
passwordOk = hasPassword ? passwordOk : YES;
self.hasValidPasswordOrKey = passwordOk && keyOk;
self.hasValidPasswordOrKey = (hasPasswordOrKey || self.allowsEmptyPasswordOrKey ) && passwordOk && keyOk;
if(!hasPasswordOrKey) {
[self.errorTextField setTextColor:[NSColor controlTextColor]];