diff --git a/MacPass/MPEntryViewController.m b/MacPass/MPEntryViewController.m index 86e1e613..456273b1 100644 --- a/MacPass/MPEntryViewController.m +++ b/MacPass/MPEntryViewController.m @@ -206,18 +206,10 @@ NSString *const _MPTableSecurCellView = @"PasswordCell"; // bind NSArrayController sorting so that sort order gets auto-saved // see: http://simx.me/technonova/software_development/sort_descriptors_nstableview_bindings_a.html - if(@available(macOS 10.14, *)) { - [self.entryArrayController bind:NSSortDescriptorsBinding - toObject:[NSUserDefaultsController sharedUserDefaultsController] - withKeyPath:[MPSettingsHelper defaultControllerPathForKey:kMPSettingsKeyEntryTableSortDescriptors] - options:@{ NSValueTransformerNameBindingOption: NSSecureUnarchiveFromDataTransformerName }]; - } - else { - [self.entryArrayController bind:NSSortDescriptorsBinding - toObject:[NSUserDefaultsController sharedUserDefaultsController] - withKeyPath:[MPSettingsHelper defaultControllerPathForKey:kMPDepricatedSettingsKeyEntryTableSortDescriptors] - options:@{ NSValueTransformerNameBindingOption: NSUnarchiveFromDataTransformerName }]; - } + [self.entryArrayController bind:NSSortDescriptorsBinding + toObject:[NSUserDefaultsController sharedUserDefaultsController] + withKeyPath:[MPSettingsHelper defaultControllerPathForKey:kMPSettingsKeyEntryTableSortDescriptors] + options:@{ NSValueTransformerNameBindingOption: NSUnarchiveFromDataTransformerName }]; [self _setupHeaderMenu]; /* Move index and parent column to dedicated places if it was moved by the user before */ diff --git a/MacPass/MPSettingsHelper.h b/MacPass/MPSettingsHelper.h index 1a07ca67..8db6f3ba 100644 --- a/MacPass/MPSettingsHelper.h +++ b/MacPass/MPSettingsHelper.h @@ -47,7 +47,6 @@ APPKIT_EXTERN NSString *const kMPSettingskeyLockOnScreenSleep; /* Autosaving states */ APPKIT_EXTERN NSString *const kMPSettingsKeyShowInspector; APPKIT_EXTERN NSString *const kMPSettingsKeyEntryTableSortDescriptors; -APPKIT_EXTERN NSString *const kMPDepricatedSettingsKeyEntryTableSortDescriptors; /* Kdb Hide/Show settings */ APPKIT_EXTERN NSString *const kMPSettingsKeyLegacyHideTitle; diff --git a/MacPass/MPSettingsHelper.m b/MacPass/MPSettingsHelper.m index 8ba2efc6..9b079a26 100644 --- a/MacPass/MPSettingsHelper.m +++ b/MacPass/MPSettingsHelper.m @@ -40,7 +40,7 @@ NSString *const kMPSettingskeyLockOnLogout = @"Lo NSString *const kMPSettingskeyLockOnScreenSleep = @"LockOnScreenSleep"; NSString *const kMPSettingsKeyIdleLockTimeOut = @"IdleLockTimeOut"; NSString *const kMPSettingsKeyShowInspector = @"ShowInspector"; -NSString *const kMPSettingsKeyEntryTableSortDescriptors = @"EntryTableSortDescriptors2"; +NSString *const kMPSettingsKeyEntryTableSortDescriptors = @"EntryTableSortDescriptors"; NSString *const kMPSettingsKeyLegacyHideTitle = @"LegacyHideTitle"; NSString *const kMPSettingsKeyLegacyHideUsername = @"LegacyHideUsername "; @@ -104,7 +104,6 @@ NSString *const kMPDeprecatedSettingsKeyShowMenuItem = @"Sh NSString *const kMPDeprecatedSettingsKeyDefaultPasswordRounds = @"KeyDefaultPasswordRounds"; NSString *const kMPDepricatedSettingsKeyLoadUnsecurePlugins = @"MPLoadUnsecurePlugins"; NSString *const kMPDepricatedSettingsKeyAutotypeHideAccessibiltyWarning = @"AutotypeHideAccessibiltyWarning"; -NSString *const kMPDepricatedSettingsKeyEntryTableSortDescriptors = @"EntryTableSortDescriptors"; @implementation MPSettingsHelper @@ -197,14 +196,6 @@ NSString *const kMPDepricatedSettingsKeyEntryTableSortDescriptors = @"En kMPDepricatedSettingsKeyLoadUnsecurePlugins, kMPDepricatedSettingsKeyAutotypeHideAccessibiltyWarning ]; - /* - On 10.13 we have to use NSUnarchiveFromDataTransformerName as binding option - NSSecureUnarchiveFromDataTransformerName is only available since 10.14 - Hence remove the depricated settings key since we use a newer on - */ - if (@available(macOS 10.14, *)) { - deprecatedSettings = [deprecatedSettings arrayByAddingObject:kMPDepricatedSettingsKeyEntryTableSortDescriptors]; - } }); return deprecatedSettings; }