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

Merge pull request #453 from magebarf/master

Browse Source
This commit is contained in:
Michael Starke
2016-04-21 19:44:32 +02:00
parent d91b56e7b3 cd7dd91a85
commit f73a3db893
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
MacPass/Base.lproj/PasswordCreatorView.xib
View File

@@ -144,6 +144,9 @@
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES" changeBackground="YES" changeGray="YES"/> <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES" changeBackground="YES" changeGray="YES"/>
<font key="font" metaFont="cellTitle"/> <font key="font" metaFont="cellTitle"/>
</buttonCell> </buttonCell>
<connections>
<action selector="_toggleCharacters:" target="-2" id="5CP-8c-RKX"/>
</connections>
</button> </button>
</subviews> </subviews>
<animations/> <animations/>

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;