From 18abd4d5a19ec3e398724ec64456a3d338232517 Mon Sep 17 00:00:00 2001 From: Michael Starke Date: Thu, 16 Aug 2018 17:02:54 +0200 Subject: [PATCH] Updated KeePassKit to fix faded Icon display --- Cartfile | 2 +- Cartfile.resolved | 2 +- MacPass/MPDocument.m | 4 +++- MacPass/MPEntryViewController.m | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Cartfile b/Cartfile index 5c6ecc50..1b7b1db1 100644 --- a/Cartfile +++ b/Cartfile @@ -1,3 +1,3 @@ github "sparkle-project/Sparkle" ~> 1.18.1 -github "MacPass/KeePassKit" ~> 1.13.4 +github "MacPass/KeePassKit" ~> 1.13.5 github "mstarke/HNHUi" ~> 1.5 diff --git a/Cartfile.resolved b/Cartfile.resolved index 2756baf2..e0c8231f 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,4 +1,4 @@ -github "MacPass/KeePassKit" "1.13.4" +github "MacPass/KeePassKit" "1.13.5" github "mstarke/HNHUi" "1.5" github "robbiehanson/KissXML" "5.2.3" github "sparkle-project/Sparkle" "1.19.0" diff --git a/MacPass/MPDocument.m b/MacPass/MPDocument.m index c91afc4e..4d894864 100644 --- a/MacPass/MPDocument.m +++ b/MacPass/MPDocument.m @@ -359,12 +359,14 @@ NSString *const MPDocumentGroupKey = @"MPDocumentGrou NSError *error; KPKTree *otherTree; + /* TODO determine KDB file format to set GroupByTitle options */ + if(key) { otherTree = [[KPKTree alloc] initWithContentsOfUrl:url key:key error:&error]; } if(otherTree) { - [self.tree synchronizeWithTree:otherTree options:KPKSynchronizationSynchronizeOption]; + [self.tree synchronizeWithTree:otherTree mode:KPKSynchronizationModeSynchronize options:0]; /* the key might have changed so update ours! */ //self.compositeKey = key; [self updateChangeCount:NSChangeDone]; diff --git a/MacPass/MPEntryViewController.m b/MacPass/MPEntryViewController.m index 2cebbeac..541083d9 100644 --- a/MacPass/MPEntryViewController.m +++ b/MacPass/MPEntryViewController.m @@ -565,7 +565,7 @@ NSString *const _MPTableSecurCellView = @"PasswordCell"; context.allowsImplicitAnimation = YES; [self.view layoutSubtreeIfNeeded]; } completionHandler:^{ - _isDisplayingContextBar = NO; + self->_isDisplayingContextBar = NO; }]; }