From 1e4596ca3a42bc1e3c64d4c0d075fb7ea09336be Mon Sep 17 00:00:00 2001
From: Ludovic Marcotte <lmarcotte@inverse.ca>
Date: Wed, 8 Apr 2015 14:20:33 -0400
Subject: [PATCH] (fix) fixed serialization of PreventInvitationsWhitelist

---
 NEWS                              |  1 +
 UI/PreferencesUI/UIxPreferences.m | 14 ++++++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/NEWS b/NEWS
index 59fe4397a..d888d1a07 100644
--- a/NEWS
+++ b/NEWS
@@ -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)
 --------------------
diff --git a/UI/PreferencesUI/UIxPreferences.m b/UI/PreferencesUI/UIxPreferences.m
index 6e54bc043..9f55e4166 100644
--- a/UI/PreferencesUI/UIxPreferences.m
+++ b/UI/PreferencesUI/UIxPreferences.m
@@ -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];
 }