nikdoof/MacPass
1
1
Fork 0
mirror of https://github.com/MacPass/MacPass.git synced 2025-12-13 22:52:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/mstarke/MacPass

Browse Source
This commit is contained in:
michael starke
2016-10-13 14:19:29 +02:00
parent e0a10c3957 58df7fe7c6
commit 3b3df057e1
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MacPass/MPDocument.m
View File

@@ -334,7 +334,7 @@ NSString *const MPDocumentGroupKey = @"MPDocumentGrou
if(self != document) {
return; // wrong parameters
}
if(didSave) {
if(!didSave) {
return; // not saved!
}
/* FIXME: User feedback is ignored */

7
MacPass/MPDocumentWindowController.m
View File

@@ -91,6 +91,7 @@ typedef void (^MPPasswordChangedBlock)(BOOL didChangePassword);
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_didUnlockDatabase:) name:MPDocumentDidUnlockDatabaseNotification object:document];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_didAddEntry:) name:MPDocumentDidAddEntryNotification object:document];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_didAddGroup:) name:MPDocumentDidAddGroupNotification object:document];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_didLockDatabase:) name:MPDocumentDidLockDatabaseNotification object:document];
[self.entryViewController regsiterNotificationsForDocument:document];
[self.inspectorViewController registerNotificationsForDocument:document];
@@ -181,12 +182,17 @@ typedef void (^MPPasswordChangedBlock)(BOOL didChangePassword);
[self showInspector:self];
}
- (void)_didLockDatabase:(NSNotification *)notification {
[self showPasswordInput];
}
- (void)_didUnlockDatabase:(NSNotification *)notification {
[self showEntries];
/* Show password reminders */
[self _presentPasswordIntervalAlerts];
}
#pragma mark Actions
- (void)saveDocument:(id)sender {
MPDocument *document = self.document;
@@ -345,7 +351,6 @@ typedef void (^MPPasswordChangedBlock)(BOOL didChangePassword);
if(document.encrypted) {
return; // Document already locked
}
[self showPasswordInput];
[document lockDatabase:sender];
}