nikdoof/MacPass
1
1
Fork 0
mirror of https://github.com/MacPass/MacPass.git synced 2026-02-02 05:18:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed enforce each of group setting not being correctly stored as defaults (fixes #914)

Browse Source
This commit is contained in:
Michael Starke
2019-03-31 15:52:38 +02:00
parent 1f4966e4c0
commit d26304285f
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
MacPass/MPPasswordCreatorViewController.m
View File

@@ -241,6 +241,7 @@ typedef NS_ENUM(NSUInteger, MPPasswordRating) {
[NSUserDefaults.standardUserDefaults setInteger:self.characterFlags forKey:kMPSettingsKeyPasswordCharacterFlags]; [NSUserDefaults.standardUserDefaults setInteger:self.characterFlags forKey:kMPSettingsKeyPasswordCharacterFlags];
[NSUserDefaults.standardUserDefaults setBool:self.useCustomString forKey:kMPSettingsKeyPasswordUseCustomString]; [NSUserDefaults.standardUserDefaults setBool:self.useCustomString forKey:kMPSettingsKeyPasswordUseCustomString];
[NSUserDefaults.standardUserDefaults setObject:self.customCharactersTextField.stringValue forKey:kMPSettingsKeyPasswordCustomString]; [NSUserDefaults.standardUserDefaults setObject:self.customCharactersTextField.stringValue forKey:kMPSettingsKeyPasswordCustomString];
[NSUserDefaults.standardUserDefaults setBool:self.ensureOccurance forKey:kMPSettingsKeyPasswordEnsureOccurance];
} }
else { else {
NSLog(@"Cannot set password generator defaults. Inconsistent state. Aborting."); NSLog(@"Cannot set password generator defaults. Inconsistent state. Aborting.");
@@ -274,10 +275,8 @@ typedef NS_ENUM(NSUInteger, MPPasswordRating) {
} }
- (void)setRepresentedObject:(id)representedObject { - (void)setRepresentedObject:(id)representedObject {
if(self.representedObject != representedObject) {
self.useEntryDefaults = [self _hasValidDefaultsForCurrentEntry];
}
[super setRepresentedObject:representedObject]; [super setRepresentedObject:representedObject];
self.useEntryDefaults = [self _hasValidDefaultsForCurrentEntry];
} }
- (void)setPassword:(NSString *)password { - (void)setPassword:(NSString *)password {
@@ -307,6 +306,7 @@ typedef NS_ENUM(NSUInteger, MPPasswordRating) {
- (void)setEnsureOccurance:(BOOL)useCharacterFromEachGroup { - (void)setEnsureOccurance:(BOOL)useCharacterFromEachGroup {
if(self.ensureOccurance != useCharacterFromEachGroup) { if(self.ensureOccurance != useCharacterFromEachGroup) {
self.setDefaultButton.enabled = YES;
_ensureOccurance = useCharacterFromEachGroup; _ensureOccurance = useCharacterFromEachGroup;
[self _resetCharacters]; [self _resetCharacters];
[self _generatePassword:nil]; [self _generatePassword:nil];