Converted to properties where possible. Some missing due to 10.8 deployment

Signed-off-by: michael starke <michael.starke@hicknhack-software.com>
This commit is contained in:
michael starke
2015-10-21 17:29:30 +02:00
parent 50cebc0ef2
commit fa5ca62e9d
7 changed files with 44 additions and 41 deletions

View File

@@ -113,12 +113,11 @@ NSString *const kMPDocumentSearchResultsKey = @"kMPDocumentSearchResul
- (NSArray *)_findEntriesMatchingCurrentSearch {
/* Filter double passwords */
if(MPIsFlagSetInOptions(MPEntrySearchDoublePasswords, self.searchContext.searchFlags)) {
__block NSMutableDictionary *passwordToEntryMap = [[NSMutableDictionary alloc] initWithCapacity:100];
NSMutableDictionary *passwordToEntryMap = [[NSMutableDictionary alloc] initWithCapacity:100];
/* Build up a usage map */
[[self.root searchableChildEntries] enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) {
KPKEntry *entry = obj;
for(KPKEntry *entry in self.root.searchableChildEntries) {
/* skip entries without passwords */
if([entry.password length] > 0) {
if(entry.password.length > 0) {
NSMutableSet *entrySet = passwordToEntryMap[entry.password];
if(entrySet) {
[entrySet addObject:entry];
@@ -127,15 +126,15 @@ NSString *const kMPDocumentSearchResultsKey = @"kMPDocumentSearchResul
passwordToEntryMap[entry.password] = [NSMutableSet setWithObject:entry];
}
}
}];
}
/* check for usage count */
__block NSMutableArray *doublePasswords = [[NSMutableArray alloc] init];
[[passwordToEntryMap allKeys] enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) {
NSSet *entrySet = passwordToEntryMap[obj];
if([entrySet count] > 1) {
[doublePasswords addObjectsFromArray:[entrySet allObjects]];
NSMutableArray *doublePasswords = [[NSMutableArray alloc] init];
for(NSString *password in passwordToEntryMap.allKeys) {
NSSet *entrySet = passwordToEntryMap[password];
if(entrySet.count > 1) {
[doublePasswords addObjectsFromArray:entrySet.allObjects];
}
}];
}
return doublePasswords;
}
if(MPIsFlagSetInOptions(MPEntrySearchExpiredEntries, self.searchContext.searchFlags)) {