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

Merge branch 'fix_broken_keyfile_remembering'

Browse Source
This commit is contained in:
michael starke
2016-02-22 10:57:00 +01:00
parent c509dbff99 dee07d1ecd
commit 0aea2629a0
1 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
MacPass/MPSettingsHelper.m
View File

@@ -205,18 +205,30 @@ NSString *const kMPDeprecatedSettingsKeyShowMenuItem = @"Sh
Database file paths was stored as plain text in keyfile mapping. Database file paths was stored as plain text in keyfile mapping.
We only need to store the key file ulr in plain text, thus hashing the path is sufficent We only need to store the key file ulr in plain text, thus hashing the path is sufficent
*/ */
NSDictionary<NSString *, NSString *> *plainTextDict = [[NSUserDefaults standardUserDefaults] dictionaryForKey:kMPSettingsKeyRememeberdKeysForDatabases]; NSDictionary<NSString *, NSString *> *currentMapping = [[NSUserDefaults standardUserDefaults] dictionaryForKey:kMPSettingsKeyRememeberdKeysForDatabases];
if(!plainTextDict) { if(!currentMapping) {
return; return;
} }
NSMutableDictionary *hashedDict = [[NSMutableDictionary alloc] initWithCapacity:plainTextDict.count]; NSMutableDictionary *hashedDict = [[NSMutableDictionary alloc] initWithCapacity:MAX(1,currentMapping.count)];
for(NSString *key in plainTextDict) { BOOL didHash = NO;
for(NSString *key in currentMapping) {
NSURL *fileURL = [NSURL URLWithString:key];
/* Only hash file paths */
if(fileURL.isFileURL) {
NSString *digest = key.sha1HexDigest; NSString *digest = key.sha1HexDigest;
if(digest) { if(digest) {
hashedDict[key.sha1HexDigest] = plainTextDict[key]; hashedDict[key.sha1HexDigest] = currentMapping[key];
didHash = YES;
} }
} }
/* keep all hasehd or unknown data */
else {
hashedDict[key] = currentMapping[key];
}
}
if(didHash) {
[[NSUserDefaults standardUserDefaults] setObject:hashedDict forKey:kMPSettingsKeyRememeberdKeysForDatabases]; [[NSUserDefaults standardUserDefaults] setObject:hashedDict forKey:kMPSettingsKeyRememeberdKeysForDatabases];
}
} }
@end @end