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

Bugfix & add check for whether to use custom string or not

Browse Source 
Remove local scope variable hiding the one in function scope.
Also did not check for the state of the custom characters button.
This commit is contained in:
Patrik Thunström
2016-04-21 00:27:33 +02:00
parent 1e3e3e141c
commit 2c1eb61682
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
MacPass/NSString+MPPasswordCreation.m
View File

@@ -106,13 +106,13 @@ static NSString *mergeWithoutDuplicates(NSString* baseCharacters, NSString* cust
- (CGFloat)entropyWhithPossibleCharacterSet:(MPPasswordCharacterFlags)allowedCharacters orCustomCharacters:(NSString *)customCharacters { - (CGFloat)entropyWhithPossibleCharacterSet:(MPPasswordCharacterFlags)allowedCharacters orCustomCharacters:(NSString *)customCharacters {
NSString *characters = nil; NSString *characters = nil;
if(nil == customCharacters) { if([[NSUserDefaults standardUserDefaults] boolForKey:kMPSettingsKeyPasswordUseCustomString] && nil != customCharacters) {
characters = allowedCharactersString(allowedCharacters); characters = mergeWithoutDuplicates(
allowedCharactersString(allowedCharacters),
customCharacters);
} }
else { else {
NSString *characters = mergeWithoutDuplicates( characters = allowedCharactersString(allowedCharacters);
allowedCharactersString(allowedCharacters),
customCharacters);
} }
CGFloat alphabetCount = characters.length; CGFloat alphabetCount = characters.length;
CGFloat passwordLength = self.length; CGFloat passwordLength = self.length;