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

Using newly added isExpired key to display warning icons

Browse Source
This commit is contained in:
michael starke
2014-08-22 11:26:49 +02:00
parent 4ae8350b91
commit 942d66bc25
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
KeePassKit

Submodule KeePassKit updated: 6c63ae1896...8b66768ddb

14
MacPass/KPKNode+IconImage.m
View File

@@ -19,18 +19,24 @@
@implementation KPKNode (IconImage) @implementation KPKNode (IconImage)
+ (NSSet *)keyPathsForValuesAffectingIconImage { + (NSSet *)keyPathsForValuesAffectingIconImage {
static NSString *expireDateKeyPath;
static dispatch_once_t onceToken;
dispatch_once(&onceToken, ^{
expireDateKeyPath = [[NSString alloc] initWithFormat:@"%@.%@", NSStringFromSelector(@selector(timeInfo)), NSStringFromSelector(@selector(isExpired))];
});
return [NSSet setWithArray:@[NSStringFromSelector(@selector(iconUUID)), return [NSSet setWithArray:@[NSStringFromSelector(@selector(iconUUID)),
NSStringFromSelector(@selector(iconId)), NSStringFromSelector(@selector(iconId)),
@"timeInfo.expires"]]; expireDateKeyPath
]];
} }
- (NSImage *)iconImage { - (NSImage *)iconImage {
/*
if(self.timeInfo.expires) { if(self.timeInfo.isExpired) {
const BOOL isGroup = [self isKindOfClass:[KPKGroup class]]; const BOOL isGroup = [self isKindOfClass:[KPKGroup class]];
return [MPIconHelper icon:(isGroup ? MPIconExpiredGroup : MPIconExpiredEntry)]; return [MPIconHelper icon:(isGroup ? MPIconExpiredGroup : MPIconExpiredEntry)];
} }
*/
if(self.iconUUID) { if(self.iconUUID) {
KPKIcon *icon = [self.tree.metaData findIcon:self.iconUUID]; KPKIcon *icon = [self.tree.metaData findIcon:self.iconUUID];
if(icon && icon.image) { if(icon && icon.image) {