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

Updated KeePassKit to fix faded Icon display

Browse Source
This commit is contained in:
Michael Starke
2018-08-16 17:02:54 +02:00
parent 99a5d5642e
commit 18abd4d5a1
4 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Cartfile
View File

@@ -1,3 +1,3 @@
github "sparkle-project/Sparkle" ~> 1.18.1 github "sparkle-project/Sparkle" ~> 1.18.1
github "MacPass/KeePassKit" ~> 1.13.4 github "MacPass/KeePassKit" ~> 1.13.5
github "mstarke/HNHUi" ~> 1.5 github "mstarke/HNHUi" ~> 1.5

2
Cartfile.resolved
View File

@@ -1,4 +1,4 @@
github "MacPass/KeePassKit" "1.13.4" github "MacPass/KeePassKit" "1.13.5"
github "mstarke/HNHUi" "1.5" github "mstarke/HNHUi" "1.5"
github "robbiehanson/KissXML" "5.2.3" github "robbiehanson/KissXML" "5.2.3"
github "sparkle-project/Sparkle" "1.19.0" github "sparkle-project/Sparkle" "1.19.0"

4
MacPass/MPDocument.m
View File

@@ -359,12 +359,14 @@ NSString *const MPDocumentGroupKey = @"MPDocumentGrou
NSError *error; NSError *error;
KPKTree *otherTree; KPKTree *otherTree;
/* TODO determine KDB file format to set GroupByTitle options */
if(key) { if(key) {
otherTree = [[KPKTree alloc] initWithContentsOfUrl:url key:key error:&error]; otherTree = [[KPKTree alloc] initWithContentsOfUrl:url key:key error:&error];
} }
if(otherTree) { if(otherTree) {
[self.tree synchronizeWithTree:otherTree options:KPKSynchronizationSynchronizeOption]; [self.tree synchronizeWithTree:otherTree mode:KPKSynchronizationModeSynchronize options:0];
/* the key might have changed so update ours! */ /* the key might have changed so update ours! */
//self.compositeKey = key; //self.compositeKey = key;
[self updateChangeCount:NSChangeDone]; [self updateChangeCount:NSChangeDone];

2
MacPass/MPEntryViewController.m
View File

@@ -565,7 +565,7 @@ NSString *const _MPTableSecurCellView = @"PasswordCell";
context.allowsImplicitAnimation = YES; context.allowsImplicitAnimation = YES;
[self.view layoutSubtreeIfNeeded]; [self.view layoutSubtreeIfNeeded];
} completionHandler:^{ } completionHandler:^{
_isDisplayingContextBar = NO; self->_isDisplayingContextBar = NO;
}]; }];
} }