From 94676b82bc63464d9110756f61510f3bfb367145 Mon Sep 17 00:00:00 2001 From: michael starke Date: Thu, 4 May 2017 13:25:30 +0200 Subject: [PATCH] using non-leaking KeePassKit --- Cartfile | 2 +- Cartfile.resolved | 2 +- MacPass/MPDatabaseSettingsWindowController.m | 2 +- MacPass/MPDocument.m | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cartfile b/Cartfile index f2003e58..fae0c2e0 100644 --- a/Cartfile +++ b/Cartfile @@ -1,3 +1,3 @@ github "sparkle-project/Sparkle" ~> 1.17.0 -github "mstarke/KeePassKit" "d24bde60a1d73ab2483277f1b424d30d75210150" +github "mstarke/KeePassKit" "19073179a3f4d0dad79d4ac67e39f3dec4f2f6fe" github "mstarke/HNHUi" ~> 1.1 diff --git a/Cartfile.resolved b/Cartfile.resolved index c65b85cf..2b949443 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,3 +1,3 @@ github "mstarke/HNHUi" "1.1" -github "mstarke/KeePassKit" "d24bde60a1d73ab2483277f1b424d30d75210150" +github "mstarke/KeePassKit" "19073179a3f4d0dad79d4ac67e39f3dec4f2f6fe" github "sparkle-project/Sparkle" "1.17.0" diff --git a/MacPass/MPDatabaseSettingsWindowController.m b/MacPass/MPDatabaseSettingsWindowController.m index 4a219a00..f32c8a17 100644 --- a/MacPass/MPDatabaseSettingsWindowController.m +++ b/MacPass/MPDatabaseSettingsWindowController.m @@ -311,7 +311,7 @@ } - (NSMenu *)_buildTemplateTreeMenu:(KPKTree *)tree { - NSMenu *menu = [self _buildTreeMenu:tree preselect:tree.metaData.entryTemplatesGroup]; + NSMenu *menu = [self _buildTreeMenu:tree preselect:tree.metaData.entryTemplatesGroupUuid]; NSMenuItem *selectItem = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"NO_TEMPLATE_GROUP", @"Menu item to reset the template groups") action:NULL diff --git a/MacPass/MPDocument.m b/MacPass/MPDocument.m index 76bb0f75..a8f93272 100644 --- a/MacPass/MPDocument.m +++ b/MacPass/MPDocument.m @@ -424,7 +424,7 @@ NSString *const MPDocumentGroupKey = @"MPDocumentGrou - (KPKGroup *)templates { /* Caching is dangerous as we might have deleted the group */ - return [self findGroup:self.tree.metaData.entryTemplatesGroup]; + return [self findGroup:self.tree.metaData.entryTemplatesGroupUuid]; } - (BOOL)hasSearch {