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

Missing commit for error display

Browse Source
This commit is contained in:
michael starke
2013-09-04 21:27:38 +02:00
parent 7ba43eceec
commit 6bfa2b87ee
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MacPass/MPDocument.h
View File

@@ -57,7 +57,7 @@ APPKIT_EXTERN NSString *const MPDocumnetDidChangeCurrentEntryNotification;
#pragma mark Lock/Decrypt #pragma mark Lock/Decrypt
- (void)lockDatabase:(id)sender; - (void)lockDatabase:(id)sender;
- (BOOL)unlockWithPassword:(NSString *)password keyFileURL:(NSURL *)keyFileURL; - (BOOL)unlockWithPassword:(NSString *)password keyFileURL:(NSURL *)keyFileURL error:(NSError *__autoreleasing*)error;
#pragma mark Data Lookup #pragma mark Data Lookup
/* /*

5
MacPass/MPDocument.m
View File

@@ -212,14 +212,13 @@ typedef NS_ENUM(NSUInteger, MPAlertType) {
#pragma mark Lock/Unlock/Decrypt #pragma mark Lock/Unlock/Decrypt
- (BOOL)unlockWithPassword:(NSString *)password keyFileURL:(NSURL *)keyFileURL { - (BOOL)unlockWithPassword:(NSString *)password keyFileURL:(NSURL *)keyFileURL error:(NSError *__autoreleasing*)error{
KPKPassword *passwordData = [[KPKPassword alloc] initWithPassword:password key:keyFileURL]; KPKPassword *passwordData = [[KPKPassword alloc] initWithPassword:password key:keyFileURL];
self.key = keyFileURL; self.key = keyFileURL;
self.password = [password length] > 0 ? password : nil; self.password = [password length] > 0 ? password : nil;
NSError *error; self.tree = [[KPKTree alloc] initWithData:_encryptedData password:passwordData error:error];
self.tree = [[KPKTree alloc] initWithData:_encryptedData password:passwordData error:&error];
return (self.tree != nil); return (self.tree != nil);
} }