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

Reanmed flags helper to better reflect return value

Browse Source
This commit is contained in:
michael starke
2014-10-22 20:27:41 +02:00
parent 772a814349
commit 35720cf1a9
6 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
MacPass/MPContextBarViewController.m
View File

@@ -138,12 +138,12 @@ typedef NS_ENUM(NSUInteger, MPContextTab) {
- (void)_updateFilterButtons { - (void)_updateFilterButtons {
MPDocument *document = [[self windowController] document]; MPDocument *document = [[self windowController] document];
MPEntrySearchFlags currentFlags = document.searchContext.searchFlags; MPEntrySearchFlags currentFlags = document.searchContext.searchFlags;
[self.duplicatePasswordsButton setState:HNHStateForBool(MPTestFlagInOptions(MPEntrySearchDoublePasswords, currentFlags))]; [self.duplicatePasswordsButton setState:HNHStateForBool(MPIsFlagSetInOptions(MPEntrySearchDoublePasswords, currentFlags))];
[self.notesButton setState:HNHStateForBool(MPTestFlagInOptions(MPEntrySearchNotes, currentFlags))]; [self.notesButton setState:HNHStateForBool(MPIsFlagSetInOptions(MPEntrySearchNotes, currentFlags))];
[self.passwordButton setState:HNHStateForBool(MPTestFlagInOptions(MPEntrySearchPasswords, currentFlags))]; [self.passwordButton setState:HNHStateForBool(MPIsFlagSetInOptions(MPEntrySearchPasswords, currentFlags))];
[self.titleButton setState:HNHStateForBool(MPTestFlagInOptions(MPEntrySearchTitles, currentFlags))]; [self.titleButton setState:HNHStateForBool(MPIsFlagSetInOptions(MPEntrySearchTitles, currentFlags))];
[self.urlButton setState:HNHStateForBool(MPTestFlagInOptions(MPEntrySearchUrls, currentFlags))]; [self.urlButton setState:HNHStateForBool(MPIsFlagSetInOptions(MPEntrySearchUrls, currentFlags))];
[self.usernameButton setState:HNHStateForBool(MPTestFlagInOptions(MPEntrySearchUsernames, currentFlags))]; [self.usernameButton setState:HNHStateForBool(MPIsFlagSetInOptions(MPEntrySearchUsernames, currentFlags))];
NSInteger selectedTag = MPEntrySearchNone; NSInteger selectedTag = MPEntrySearchNone;
for(NSMenuItem *item in [[self.specialFilterPopUpButton menu] itemArray]) { for(NSMenuItem *item in [[self.specialFilterPopUpButton menu] itemArray]) {
MPEntrySearchFlags flag = [item tag]; MPEntrySearchFlags flag = [item tag];
@@ -152,7 +152,7 @@ typedef NS_ENUM(NSUInteger, MPContextTab) {
[item setEnabled:NO]; [item setEnabled:NO];
} }
else { else {
BOOL isActive = MPTestFlagInOptions(flag, currentFlags); BOOL isActive = MPIsFlagSetInOptions(flag, currentFlags);
if(isActive) { if(isActive) {
selectedTag = flag; selectedTag = flag;
} }

10
MacPass/MPContextMenuHelper.m
View File

@@ -21,11 +21,11 @@ static void MPContextmenuHelperBeginSection(NSMutableArray *items) {
+ (NSArray *)contextMenuItemsWithItems:(MPContextMenuItemsFlags)flags { + (NSArray *)contextMenuItemsWithItems:(MPContextMenuItemsFlags)flags {
BOOL const insertCreate = MPTestFlagInOptions(MPContextMenuCreate, flags); BOOL const insertCreate = MPIsFlagSetInOptions(MPContextMenuCreate, flags);
BOOL const insertDelete = MPTestFlagInOptions(MPContextMenuDelete, flags); BOOL const insertDelete = MPIsFlagSetInOptions(MPContextMenuDelete, flags);
BOOL const insertCopy = MPTestFlagInOptions(MPContextMenuCopy, flags); BOOL const insertCopy = MPIsFlagSetInOptions(MPContextMenuCopy, flags);
BOOL const insertTrash = MPTestFlagInOptions(MPContextMenuTrash, flags); BOOL const insertTrash = MPIsFlagSetInOptions(MPContextMenuTrash, flags);
BOOL const insertClone = MPTestFlagInOptions(MPContextMenuClone, flags); BOOL const insertClone = MPIsFlagSetInOptions(MPContextMenuClone, flags);
NSMutableArray *items = [NSMutableArray arrayWithCapacity:10]; NSMutableArray *items = [NSMutableArray arrayWithCapacity:10];
if(insertCreate) { if(insertCreate) {

14
MacPass/MPDocument+Search.m
View File

@@ -113,7 +113,7 @@ NSString *const kMPDocumentSearchResultsKey = @"kMPDocumentSearchResul
#pragma mark Search #pragma mark Search
- (NSArray *)_findEntriesMatchingCurrentSearch { - (NSArray *)_findEntriesMatchingCurrentSearch {
/* Filter double passwords */ /* Filter double passwords */
if(MPTestFlagInOptions(MPEntrySearchDoublePasswords, self.searchContext.searchFlags)) { if(MPIsFlagSetInOptions(MPEntrySearchDoublePasswords, self.searchContext.searchFlags)) {
__block NSMutableDictionary *passwordToEntryMap = [[NSMutableDictionary alloc] initWithCapacity:100]; __block NSMutableDictionary *passwordToEntryMap = [[NSMutableDictionary alloc] initWithCapacity:100];
/* Build up a usage map */ /* Build up a usage map */
[[self.root childEntries] enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) { [[self.root childEntries] enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) {
@@ -139,7 +139,7 @@ NSString *const kMPDocumentSearchResultsKey = @"kMPDocumentSearchResul
}]; }];
return doublePasswords; return doublePasswords;
} }
if(MPTestFlagInOptions(MPEntrySearchExpiredEntries, self.searchContext.searchFlags)) { if(MPIsFlagSetInOptions(MPEntrySearchExpiredEntries, self.searchContext.searchFlags)) {
NSPredicate *expiredPredicate = [NSPredicate predicateWithBlock:^BOOL(id evaluatedObject, NSDictionary *bindings) { NSPredicate *expiredPredicate = [NSPredicate predicateWithBlock:^BOOL(id evaluatedObject, NSDictionary *bindings) {
KPKNode *node = evaluatedObject; KPKNode *node = evaluatedObject;
return node.timeInfo.isExpired; return node.timeInfo.isExpired;
@@ -159,19 +159,19 @@ NSString *const kMPDocumentSearchResultsKey = @"kMPDocumentSearchResul
- (NSArray *)_filterPredicatesWithString:(NSString *)string{ - (NSArray *)_filterPredicatesWithString:(NSString *)string{
NSMutableArray *prediactes = [[NSMutableArray alloc] initWithCapacity:4]; NSMutableArray *prediactes = [[NSMutableArray alloc] initWithCapacity:4];
if(MPTestFlagInOptions(MPEntrySearchTitles, self.searchContext.searchFlags)) { if(MPIsFlagSetInOptions(MPEntrySearchTitles, self.searchContext.searchFlags)) {
[prediactes addObject:[NSPredicate predicateWithFormat:@"SELF.title CONTAINS[cd] %@", string]]; [prediactes addObject:[NSPredicate predicateWithFormat:@"SELF.title CONTAINS[cd] %@", string]];
} }
if(MPTestFlagInOptions(MPEntrySearchUsernames, self.searchContext.searchFlags)) { if(MPIsFlagSetInOptions(MPEntrySearchUsernames, self.searchContext.searchFlags)) {
[prediactes addObject:[NSPredicate predicateWithFormat:@"SELF.username CONTAINS[cd] %@", string]]; [prediactes addObject:[NSPredicate predicateWithFormat:@"SELF.username CONTAINS[cd] %@", string]];
} }
if(MPTestFlagInOptions(MPEntrySearchUrls, self.searchContext.searchFlags)) { if(MPIsFlagSetInOptions(MPEntrySearchUrls, self.searchContext.searchFlags)) {
[prediactes addObject:[NSPredicate predicateWithFormat:@"SELF.url CONTAINS[cd] %@", string]]; [prediactes addObject:[NSPredicate predicateWithFormat:@"SELF.url CONTAINS[cd] %@", string]];
} }
if(MPTestFlagInOptions(MPEntrySearchPasswords, self.searchContext.searchFlags)) { if(MPIsFlagSetInOptions(MPEntrySearchPasswords, self.searchContext.searchFlags)) {
[prediactes addObject:[NSPredicate predicateWithFormat:@"SELF.password CONTAINS[cd] %@", string]]; [prediactes addObject:[NSPredicate predicateWithFormat:@"SELF.password CONTAINS[cd] %@", string]];
} }
if(MPTestFlagInOptions(MPEntrySearchNotes, self.searchContext.searchFlags)) { if(MPIsFlagSetInOptions(MPEntrySearchNotes, self.searchContext.searchFlags)) {
[prediactes addObject:[NSPredicate predicateWithFormat:@"SELF.notes CONTAINS[cd] %@", string]]; [prediactes addObject:[NSPredicate predicateWithFormat:@"SELF.notes CONTAINS[cd] %@", string]];
} }
return prediactes; return prediactes;

2
MacPass/MPFlagsHelper.h
View File

@@ -20,5 +20,5 @@
* *
* @return YES if any bit of flag is set in mode * @return YES if any bit of flag is set in mode
*/ */
FOUNDATION_EXTERN BOOL MPTestFlagInOptions(const NSUInteger flag, const NSUInteger options ); FOUNDATION_EXTERN BOOL MPIsFlagSetInOptions(const NSUInteger flag, const NSUInteger options );
#endif #endif

2
MacPass/MPFlagsHelper.m
View File

@@ -8,6 +8,6 @@
#import "MPFlagsHelper.h" #import "MPFlagsHelper.h"
BOOL MPTestFlagInOptions(const NSUInteger flag, const NSUInteger options ) { BOOL MPIsFlagSetInOptions(const NSUInteger flag, const NSUInteger options ) {
return (0 != (options & flag)); return (0 != (options & flag));
} }

1
MacPass/MPPasswordCreatorViewController.m
View File

@@ -12,6 +12,7 @@
#import "MPUniqueCharactersFormatter.h" #import "MPUniqueCharactersFormatter.h"
#import "MPSettingsHelper.h" #import "MPSettingsHelper.h"
#import "MPFlagsHelper.h"
#import "KPKEntry.h" #import "KPKEntry.h"
/* /*