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

Reacting to changes in loaded file outside of MacPass

Browse Source 
Signed-off-by: michael starke <michael.starke@hicknhack-software.com>
This commit is contained in:
michael starke
2015-12-08 18:37:04 +01:00
parent 54b11f9b7b
commit c2472f940d
1 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
MacPass/MPDocument.m
View File

@@ -67,7 +67,6 @@ NSString *const MPDocumentGroupKey = @"MPDocumentGroupKey
@property (nonatomic, strong) KPKCompositeKey *compositeKey; @property (nonatomic, strong) KPKCompositeKey *compositeKey;
@property (nonatomic, strong) NSData *encryptedData; @property (nonatomic, strong) NSData *encryptedData;
@property (nonatomic, strong) MPTreeDelegate *treeDelgate; @property (nonatomic, strong) MPTreeDelegate *treeDelgate;
@property (copy) NSDate *lastLoadedModificationDate;
@property (assign) BOOL readOnly; @property (assign) BOOL readOnly;
@property (strong) NSURL *lockFileURL; @property (strong) NSURL *lockFileURL;
@@ -182,9 +181,6 @@ NSString *const MPDocumentGroupKey = @"MPDocumentGroupKey
if(!sucess) { if(!sucess) {
NSLog(@"%@", [*outError localizedDescription]); NSLog(@"%@", [*outError localizedDescription]);
} }
else {
self.lastLoadedModificationDate = [NSDate date];
}
return sucess; return sucess;
} }
@@ -205,13 +201,11 @@ NSString *const MPDocumentGroupKey = @"MPDocumentGroupKey
*/ */
self.tree = nil; self.tree = nil;
self.encryptedData = [NSData dataWithContentsOfURL:url options:NSDataReadingUncached error:outError]; self.encryptedData = [NSData dataWithContentsOfURL:url options:NSDataReadingUncached error:outError];
self.lastLoadedModificationDate = self.fileModificationDate;
return YES; return YES;
} }
- (BOOL)revertToContentsOfURL:(NSURL *)absoluteURL ofType:(NSString *)typeName error:(NSError **)outError { - (BOOL)revertToContentsOfURL:(NSURL *)absoluteURL ofType:(NSString *)typeName error:(NSError **)outError {
self.tree = nil; if([super revertToContentsOfURL:absoluteURL ofType:typeName error:outError]) {
if([self readFromURL:absoluteURL ofType:typeName error:outError]) {
[[NSNotificationCenter defaultCenter] postNotificationName:MPDocumentDidRevertNotifiation object:self]; [[NSNotificationCenter defaultCenter] postNotificationName:MPDocumentDidRevertNotifiation object:self];
return YES; return YES;
} }
@@ -259,6 +253,27 @@ NSString *const MPDocumentGroupKey = @"MPDocumentGroupKey
return [self fileType]; return [self fileType];
} }
- (void)presentedItemDidChange {
[super presentedItemDidChange];
NSFileManager *fileManager = [NSFileManager defaultManager];
NSDate *creationDate = nil;
NSDictionary *attributes = [fileManager attributesOfItemAtPath:self.fileURL.path error:nil];
creationDate = attributes[NSFileModificationDate];
/* Dispatch the alert to the main queue */
dispatch_async(dispatch_get_main_queue(), ^{
NSAlert *alert = [[NSAlert alloc] init];
alert.alertStyle = NSWarningAlertStyle;
alert.messageText = NSLocalizedString(@"FILE_CHANGED_BY_OTHERS_MESSAGE_TEXT", @"Message displayed when an open file was changed from another application");
alert.informativeText = NSLocalizedString(@"FILE_CHANGED_BY_OTHERS_INFO_TEXT", @"Informative text displayed when the file was change form another application");
[alert addButtonWithTitle:NSLocalizedString(@"IGNORE", @"Ignore the changes to an open file!")];
[alert addButtonWithTitle:NSLocalizedString(@"REOPEN", @"Reopen the file!")];
[alert beginSheetModalForWindow:self.windowForSheet completionHandler:^(NSModalResponse returnCode) {
[self revertDocumentToSaved:nil];
}];
});
}
- (void)writeXMLToURL:(NSURL *)url { - (void)writeXMLToURL:(NSURL *)url {
NSData *xmlData = [self.tree xmlData]; NSData *xmlData = [self.tree xmlData];
[xmlData writeToURL:url atomically:YES]; [xmlData writeToURL:url atomically:YES];
@@ -291,7 +306,7 @@ NSString *const MPDocumentGroupKey = @"MPDocumentGroupKey
self.tree = [[KPKTree alloc] initWithData:self.encryptedData password:self.compositeKey error:error]; self.tree = [[KPKTree alloc] initWithData:self.encryptedData password:self.compositeKey error:error];
BOOL isUnlocked = (nil != self.tree); BOOL isUnlocked = (nil != self.tree);
if(isUnlocked) { if(isUnlocked) {
/* only clear the data if we actually do not need it anymore */ /* only clear the data if we actually do not need it anymore */
self.encryptedData = nil; self.encryptedData = nil;