nikdoof/MacPass
1
1
Fork 0
mirror of https://github.com/MacPass/MacPass.git synced 2025-12-23 10:19:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed #282 Search now gets stored correclty and is respected while performing a search

Browse Source
This commit is contained in:
michael starke
2014-12-08 19:05:58 +01:00
parent 92c1981668
commit bc03d8ef32
13 changed files with 27 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
MacPass/MPDocument+Search.m
View File

@@ -116,7 +116,7 @@ NSString *const kMPDocumentSearchResultsKey = @"kMPDocumentSearchResul
if(MPIsFlagSetInOptions(MPEntrySearchDoublePasswords, self.searchContext.searchFlags)) {
__block NSMutableDictionary *passwordToEntryMap = [[NSMutableDictionary alloc] initWithCapacity:100];
/* Build up a usage map */
[[self.root childEntries] enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) {
[[self.root searchableChildEntries] enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) {
KPKEntry *entry = obj;
/* skip entries without passwords */
if([entry.password length] > 0) {
@@ -144,16 +144,16 @@ NSString *const kMPDocumentSearchResultsKey = @"kMPDocumentSearchResul
KPKNode *node = evaluatedObject;
return node.timeInfo.isExpired;
}];
return [[self.root childEntries] filteredArrayUsingPredicate:expiredPredicate];
return [[self.root searchableChildEntries] filteredArrayUsingPredicate:expiredPredicate];
}
/* Filter using predicates */
NSArray *predicates = [self _filterPredicatesWithString:self.searchContext.searchString];
if(predicates) {
NSPredicate *fullFilter = [NSCompoundPredicate orPredicateWithSubpredicates:predicates];
return [[self.root childEntries] filteredArrayUsingPredicate:fullFilter];
return [[self.root searchableChildEntries] filteredArrayUsingPredicate:fullFilter];
}
/* No filter, just return everything */
return [self.root childEntries];
return [self.root searchableChildEntries];
}
- (NSArray *)_filterPredicatesWithString:(NSString *)string{