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

Added alert when mergin KDB files

Browse Source
This commit is contained in:
Michael Starke
2018-09-26 16:15:53 +02:00
parent cd34602e28
commit fcaede26bf
1 changed files with 29 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
MacPass/MPDocument.m
View File

@@ -356,25 +356,43 @@ NSString *const MPDocumentGroupKey = @"MPDocumentGrou
} }
- (void)mergeWithContentsFromURL:(NSURL *)url key:(KPKCompositeKey *)key { - (void)mergeWithContentsFromURL:(NSURL *)url key:(KPKCompositeKey *)key {
BOOL mergeKDB;
KPKFileVersion version = [KPKFormat.sharedFormat fileVersionForData:[NSData dataWithContentsOfURL:url]];
mergeKDB = (version.format == KPKDatabaseFormatKdb);
if(mergeKDB) {
NSAlert *alert = [[NSAlert alloc] init];
alert.alertStyle = NSWarningAlertStyle;
alert.messageText = NSLocalizedString(@"ALERT_MERGE_KDB_FILE_MESSAGE", @"Alert message warning user about KDB file merge");
alert.informativeText = NSLocalizedString(@"ALERT_MERGE_KDB_FILE_INFO_TEXT", @"Informative text displayed when merging KDB files");
[alert addButtonWithTitle:NSLocalizedString(@"ALERT_MERGE_CONTINUE", @"Button in dialog to merge KDB changes into file!")];
[alert addButtonWithTitle:NSLocalizedString(@"ALERT_MERGE_CANCEL", @"Button in dialog to cancel merge of KDB file changes!")];
[alert beginSheetModalForWindow:self.windowForSheet completionHandler:^(NSModalResponse returnCode) {
switch(returnCode) {
case NSAlertFirstButtonReturn:
[self _mergeWithContentsFromURL:url key:key options:KPKSynchronizationOptionMatchGroupsByTitleOnly];
break;
case NSAlertSecondButtonReturn:
default:
break;
}
}];
}
else {
[self _mergeWithContentsFromURL:url key:key options:0];
}
}
- (void)_mergeWithContentsFromURL:(NSURL *)url key:(KPKCompositeKey *)key options:(KPKSynchronizationOptions)options {
NSError *error; NSError *error;
KPKTree *otherTree; KPKTree *otherTree;
BOOL mergeKDB;
/* TODO determine KDB file format to set GroupByTitle options */
KPKFileVersion version = [KPKFormat.sharedFormat fileVersionForData:[NSData dataWithContentsOfURL:url]];
mergeKDB = (version.format == KPKDatabaseFormatKdb);
if(key) { if(key) {
otherTree = [[KPKTree alloc] initWithContentsOfUrl:url key:key error:&error]; otherTree = [[KPKTree alloc] initWithContentsOfUrl:url key:key error:&error];
} }
if(otherTree) { if(otherTree) {
KPKSynchronizationOptions options = 0;
if(mergeKDB) {
options |= KPKSynchronizationOptionMatchGroupsByTitleOnly;
}
[self.tree synchronizeWithTree:otherTree mode:KPKSynchronizationModeSynchronize options:options]; [self.tree synchronizeWithTree:otherTree mode:KPKSynchronizationModeSynchronize options:options];
/* the key might have changed so update ours! */ /* the key might have changed so update ours! */
//self.compositeKey = key; //self.compositeKey = key;
@@ -398,7 +416,7 @@ NSString *const MPDocumentGroupKey = @"MPDocumentGrou
[self.windowForSheet endSheet:sheet returnCode:(didCancel ? NSModalResponseCancel : NSModalResponseOK)]; [self.windowForSheet endSheet:sheet returnCode:(didCancel ? NSModalResponseCancel : NSModalResponseOK)];
if(!didCancel) { if(!didCancel) {
KPKCompositeKey *compositeKey = [[KPKCompositeKey alloc] initWithPassword:password key:keyURL]; KPKCompositeKey *compositeKey = [[KPKCompositeKey alloc] initWithPassword:password key:keyURL];
[self mergeWithContentsFromURL:url key:compositeKey]; [self _mergeWithContentsFromURL:url key:compositeKey options:options];
} }
// just return yes regardless since we will display the sheet again if needed! // just return yes regardless since we will display the sheet again if needed!
return YES; return YES;