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

completed simple merge workflow. Made passwordInputController better reusabel

Browse Source
This commit is contained in:
michael starke
2017-09-01 16:41:33 +02:00
parent 716a822dc0
commit 70650fc20f
7 changed files with 113 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
MacPass/MPDocumentWindowController.m
View File

@@ -305,7 +305,7 @@ typedef void (^MPPasswordChangedBlock)(BOOL didChangePassword);
//openPanel.allowedFileTypes = @[(id)kUTTypeXML];
[openPanel beginSheetModalForWindow:self.window completionHandler:^(NSInteger result) {
if(result == NSFileHandlingPanelOKButton) {
[document mergeWithContentsFromURL:openPanel.URL];
[document mergeWithContentsFromURL:openPanel.URL key:document.compositeKey];
}
}];
}
@@ -324,7 +324,10 @@ typedef void (^MPPasswordChangedBlock)(BOOL didChangePassword);
}
[self _setContentViewController:self.passwordInputController];
__weak MPDocumentWindowController *welf = self;
[self.passwordInputController requestPasswordWithCompletionHandler:^BOOL(NSString *password, NSURL *keyURL, NSError *__autoreleasing *error) {
[self.passwordInputController requestPasswordWithCompletionHandler:^BOOL(NSString *password, NSURL *keyURL, BOOL cancel, NSError *__autoreleasing *error) {
if(cancel) {
return NO;
}
return [((MPDocument *)welf.document) unlockWithPassword:password keyFileURL:keyURL error:error];
}];
}