(fix) fixed serialization of PreventInvitationsWhitelist

pull/77/merge
Ludovic Marcotte 2015-04-08 14:20:33 -04:00
parent 755efa789b
commit 1e4596ca3a
2 changed files with 11 additions and 4 deletions

1
NEWS
View File

@ -14,6 +14,7 @@ Bug fixes
- fixed a potential EAS error with multiple email priority flags
- fixed paragraphs margins in HTML messages (#3163)
- fixed regression when loading the inbox for the first time
- fixed serialization of the PreventInvitationsWhitelist settings
2.2.17a (2015-03-15)
--------------------

View File

@ -640,15 +640,21 @@ static NSArray *reminderValues = nil;
return [userDefaults busyOffHours];
}
- (NSArray *) whiteList
- (NSString *) whiteList
{
SOGoUserSettings *us;
NSMutableDictionary *moduleSettings;
NSArray *whiteList;
id whiteList;
us = [user userSettings];
moduleSettings = [us objectForKey: @"Calendar"];
whiteList = [moduleSettings objectForKey:@"PreventInvitationsWhitelist"];
whiteList = [moduleSettings objectForKey: @"PreventInvitationsWhitelist"];
if (whiteList && [whiteList isKindOfClass: [NSDictionary class]])
{
whiteList = [whiteList jsonRepresentation];
}
return whiteList;
}
@ -659,7 +665,7 @@ static NSArray *reminderValues = nil;
us = [user userSettings];
moduleSettings = [us objectForKey: @"Calendar"];
[moduleSettings setObject: whiteListString forKey: @"PreventInvitationsWhitelist"];
[moduleSettings setObject: [whiteListString objectFromJSONString] forKey: @"PreventInvitationsWhitelist"];
[us synchronize];
}