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

Merging KDB files with different options to prevent group duplication

Browse Source
This commit is contained in:
Michael Starke
2018-08-25 08:48:35 +02:00
parent 2276a2b954
commit 6555cc04e5
4 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
MacPass/MPDocument.m
View File

@@ -359,14 +359,23 @@ NSString *const MPDocumentGroupKey = @"MPDocumentGrou
NSError *error;
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) {
otherTree = [[KPKTree alloc] initWithContentsOfUrl:url key:key error:&error];
}
if(otherTree) {
[self.tree synchronizeWithTree:otherTree mode:KPKSynchronizationModeSynchronize options:0];
KPKSynchronizationOptions options = 0;
if(mergeKDB) {
options |= KPKSynchronizationOptionMatchGroupsByTitleOnly;
}
[self.tree synchronizeWithTree:otherTree mode:KPKSynchronizationModeSynchronize options:options];
/* the key might have changed so update ours! */
//self.compositeKey = key;
[self updateChangeCount:NSChangeDone];