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

Updated KeePassKit for better merge support

Browse Source
This commit is contained in:
michael starke
2017-08-30 17:09:05 +02:00
parent 1d53f0fbee
commit 826644c852
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Cartfile
View File

@@ -1,3 +1,3 @@
github "sparkle-project/Sparkle" ~> 1.17.0 github "sparkle-project/Sparkle" ~> 1.18.1
github "mstarke/KeePassKit" "780c9eb440fc7d5f9bafb9f2d875d4b09cbad3f4" github "mstarke/KeePassKit" "c683892ac02d04d7cbcf4b4a0b684586349df0d3"
github "mstarke/HNHUi" ~> 1.1 github "mstarke/HNHUi" ~> 1.1

4
Cartfile.resolved
View File

@@ -1,3 +1,3 @@
github "mstarke/HNHUi" "1.1" github "mstarke/HNHUi" "1.1"
github "mstarke/KeePassKit" "780c9eb440fc7d5f9bafb9f2d875d4b09cbad3f4" github "mstarke/KeePassKit" "c683892ac02d04d7cbcf4b4a0b684586349df0d3"
github "sparkle-project/Sparkle" "1.17.0" github "sparkle-project/Sparkle" "1.18.1"

3
MacPass/MPDocument.m
View File

@@ -363,6 +363,9 @@ NSString *const MPDocumentGroupKey = @"MPDocumentGrou
KPKTree *otherTree = [[KPKTree alloc] initWithContentsOfUrl:url key:self.compositeKey error:&error]; KPKTree *otherTree = [[KPKTree alloc] initWithContentsOfUrl:url key:self.compositeKey error:&error];
if(!otherTree) { if(!otherTree) {
if(error.code == KPKErrorPasswordAndOrKeyfileWrong) { if(error.code == KPKErrorPasswordAndOrKeyfileWrong) {
NSAlert *alert = [[NSAlert alloc] init];
alert.alertStyle = NSAlertStyleWarning;
alert.informativeText = NSLocalizedString(@"ALERT_MERGE_OTHER_KEY_CHANGED", @"");
[self presentError:error]; [self presentError:error];
} }
else { else {