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

Fixed #20 Now using [NSDocument fileUrl]

Browse Source
This commit is contained in:
michael starke
2013-06-17 21:05:21 +02:00
parent e76195565c
commit 999c8ce95f
2 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
MacPass/MPDocument.h
View File

@@ -25,7 +25,6 @@ APPKIT_EXTERN NSString *const MPDocumentGroupKey;
@property (assign, readonly) BOOL isProtected; @property (assign, readonly) BOOL isProtected;
@property (assign, readonly) KdbGroup *root; @property (assign, readonly) KdbGroup *root;
@property (nonatomic, retain, readonly) NSURL *file;
@property (nonatomic,retain) NSString *password; @property (nonatomic,retain) NSString *password;
@property (nonatomic, retain) NSURL *key; @property (nonatomic, retain) NSURL *key;
@property (assign, readonly) MPDatabaseVersion version; @property (assign, readonly) MPDatabaseVersion version;

9
MacPass/MPDocument.m
View File

@@ -30,7 +30,6 @@ NSString *const MPDocumentGroupKey = @"MPDocumentGroupKey";
@property (assign, nonatomic) BOOL isProtected; @property (assign, nonatomic) BOOL isProtected;
@property (retain) KdbTree *tree; @property (retain) KdbTree *tree;
@property (retain) NSURL *file;
@property (nonatomic, readonly) KdbPassword *passwordHash; @property (nonatomic, readonly) KdbPassword *passwordHash;
@property (assign) MPDatabaseVersion version; @property (assign) MPDatabaseVersion version;
@property (assign) BOOL isDecrypted; @property (assign) BOOL isDecrypted;
@@ -80,10 +79,8 @@ NSString *const MPDocumentGroupKey = @"MPDocumentGroupKey";
} }
- (BOOL)writeToURL:(NSURL *)url ofType:(NSString *)typeName error:(NSError **)outError { - (BOOL)writeToURL:(NSURL *)url ofType:(NSString *)typeName error:(NSError **)outError {
self.file = url;
@try { @try {
[KdbWriterFactory persist:self.tree file:[self.file path] withPassword:self.passwordHash]; [KdbWriterFactory persist:self.tree file:[url path] withPassword:self.passwordHash];
} }
@catch (NSException *exception) { @catch (NSException *exception) {
NSLog(@"%@", [exception description]); NSLog(@"%@", [exception description]);
@@ -95,7 +92,6 @@ NSString *const MPDocumentGroupKey = @"MPDocumentGroupKey";
} }
- (BOOL)readFromURL:(NSURL *)url ofType:(NSString *)typeName error:(NSError **)outError { - (BOOL)readFromURL:(NSURL *)url ofType:(NSString *)typeName error:(NSError **)outError {
self.file = url;
self.isDecrypted = NO; self.isDecrypted = NO;
return YES; return YES;
} }
@@ -105,10 +101,9 @@ NSString *const MPDocumentGroupKey = @"MPDocumentGroupKey";
} }
- (BOOL)decryptWithPassword:(NSString *)password keyFileURL:(NSURL *)keyFileURL { - (BOOL)decryptWithPassword:(NSString *)password keyFileURL:(NSURL *)keyFileURL {
self.key = keyFileURL;
self.password = password; self.password = password;
@try { @try {
self.tree = [KdbReaderFactory load:[self.file path] withPassword:self.passwordHash]; self.tree = [KdbReaderFactory load:[[self fileURL] path] withPassword:self.passwordHash];
} }
@catch (NSException *exception) { @catch (NSException *exception) {
NSLog(@"%@", [exception description]); NSLog(@"%@", [exception description]);