From 826644c8521e8004c84d5e31b80f8df278944604 Mon Sep 17 00:00:00 2001 From: michael starke Date: Wed, 30 Aug 2017 17:09:05 +0200 Subject: [PATCH] Updated KeePassKit for better merge support --- Cartfile | 4 ++-- Cartfile.resolved | 4 ++-- MacPass/MPDocument.m | 3 +++ 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Cartfile b/Cartfile index eb1c7a35..3f9a4961 100644 --- a/Cartfile +++ b/Cartfile @@ -1,3 +1,3 @@ -github "sparkle-project/Sparkle" ~> 1.17.0 -github "mstarke/KeePassKit" "780c9eb440fc7d5f9bafb9f2d875d4b09cbad3f4" +github "sparkle-project/Sparkle" ~> 1.18.1 +github "mstarke/KeePassKit" "c683892ac02d04d7cbcf4b4a0b684586349df0d3" github "mstarke/HNHUi" ~> 1.1 diff --git a/Cartfile.resolved b/Cartfile.resolved index 67dd33b7..ff168b6a 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,3 +1,3 @@ github "mstarke/HNHUi" "1.1" -github "mstarke/KeePassKit" "780c9eb440fc7d5f9bafb9f2d875d4b09cbad3f4" -github "sparkle-project/Sparkle" "1.17.0" +github "mstarke/KeePassKit" "c683892ac02d04d7cbcf4b4a0b684586349df0d3" +github "sparkle-project/Sparkle" "1.18.1" diff --git a/MacPass/MPDocument.m b/MacPass/MPDocument.m index dcdaefb1..0b651306 100644 --- a/MacPass/MPDocument.m +++ b/MacPass/MPDocument.m @@ -363,6 +363,9 @@ NSString *const MPDocumentGroupKey = @"MPDocumentGrou KPKTree *otherTree = [[KPKTree alloc] initWithContentsOfUrl:url key:self.compositeKey error:&error]; if(!otherTree) { if(error.code == KPKErrorPasswordAndOrKeyfileWrong) { + NSAlert *alert = [[NSAlert alloc] init]; + alert.alertStyle = NSAlertStyleWarning; + alert.informativeText = NSLocalizedString(@"ALERT_MERGE_OTHER_KEY_CHANGED", @""); [self presentError:error]; } else {