(fix) fixed serialization of PreventInvitationsWhitelist
parent
755efa789b
commit
1e4596ca3a
1
NEWS
1
NEWS
|
@ -14,6 +14,7 @@ Bug fixes
|
||||||
- fixed a potential EAS error with multiple email priority flags
|
- fixed a potential EAS error with multiple email priority flags
|
||||||
- fixed paragraphs margins in HTML messages (#3163)
|
- fixed paragraphs margins in HTML messages (#3163)
|
||||||
- fixed regression when loading the inbox for the first time
|
- fixed regression when loading the inbox for the first time
|
||||||
|
- fixed serialization of the PreventInvitationsWhitelist settings
|
||||||
|
|
||||||
2.2.17a (2015-03-15)
|
2.2.17a (2015-03-15)
|
||||||
--------------------
|
--------------------
|
||||||
|
|
|
@ -640,15 +640,21 @@ static NSArray *reminderValues = nil;
|
||||||
return [userDefaults busyOffHours];
|
return [userDefaults busyOffHours];
|
||||||
}
|
}
|
||||||
|
|
||||||
- (NSArray *) whiteList
|
- (NSString *) whiteList
|
||||||
{
|
{
|
||||||
SOGoUserSettings *us;
|
SOGoUserSettings *us;
|
||||||
NSMutableDictionary *moduleSettings;
|
NSMutableDictionary *moduleSettings;
|
||||||
NSArray *whiteList;
|
id whiteList;
|
||||||
|
|
||||||
us = [user userSettings];
|
us = [user userSettings];
|
||||||
moduleSettings = [us objectForKey: @"Calendar"];
|
moduleSettings = [us objectForKey: @"Calendar"];
|
||||||
whiteList = [moduleSettings objectForKey:@"PreventInvitationsWhitelist"];
|
whiteList = [moduleSettings objectForKey: @"PreventInvitationsWhitelist"];
|
||||||
|
|
||||||
|
if (whiteList && [whiteList isKindOfClass: [NSDictionary class]])
|
||||||
|
{
|
||||||
|
whiteList = [whiteList jsonRepresentation];
|
||||||
|
}
|
||||||
|
|
||||||
return whiteList;
|
return whiteList;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -659,7 +665,7 @@ static NSArray *reminderValues = nil;
|
||||||
|
|
||||||
us = [user userSettings];
|
us = [user userSettings];
|
||||||
moduleSettings = [us objectForKey: @"Calendar"];
|
moduleSettings = [us objectForKey: @"Calendar"];
|
||||||
[moduleSettings setObject: whiteListString forKey: @"PreventInvitationsWhitelist"];
|
[moduleSettings setObject: [whiteListString objectFromJSONString] forKey: @"PreventInvitationsWhitelist"];
|
||||||
[us synchronize];
|
[us synchronize];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue