Monotone-Parent: 54e08d70ed3b12e1a8bb0a68c590698753bb3e02

Monotone-Revision: f240bfe4674e163be4ece6a56adc0840ccdf87e9

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2009-11-19T19:54:08
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2009-11-19 19:54:08 +00:00
parent c94db02a33
commit ee68a98bfd
2 changed files with 21 additions and 21 deletions

View File

@@ -2,6 +2,10 @@
* SoObjects/SOGo/SOGoUser.m (-userDefaults, -userSettings): the
cache handling has now been put in the SOGoUserDefaults class.
(-primaryUserDefaults, -primaryUserSettings): removed useless
methods.
(-userDefaultsClassName): added accessor to allow different
classes.
* SoObjects/SOGo/SOGoUserDefaults.m (-primaryFetchProfile): split
method to separate the cache data and the db data. We know invoke

View File

@@ -65,6 +65,7 @@ static NSURL *SOGoProfileURL = nil;
static int sogoFirstDayOfWeek = -1;
static int defaultDayStartTime = -1;
static int defaultDayEndTime = -1;
static Class SOGoUserDefaultsKlass = Nil;
NSString *SOGoWeekStartJanuary1 = @"January1";
NSString *SOGoWeekStartFirst4DayWeek = @"First4DayWeek";
@@ -463,33 +464,22 @@ _timeValue (NSString *key)
return dateFormatter;
}
- (SOGoUserDefaults *) primaryUserDefaults
- (NSString *) userDefaultsClassName
{
SOGoUserDefaults *o;
o = [[SOGoUserDefaults alloc] initWithTableURL: SOGoProfileURL
uid: login
fieldName: @"c_defaults"];
return o;
}
- (SOGoUserDefaults *) primaryUserSettings
{
SOGoUserDefaults *o;
o = [[SOGoUserDefaults alloc] initWithTableURL: SOGoProfileURL
uid: login
fieldName: @"c_settings"];
return o;
return @"SOGoUserDefaults";
}
- (NSUserDefaults *) userDefaults
{
if (!_defaults)
{
_defaults = [self primaryUserDefaults];
if (!SOGoUserDefaultsKlass)
SOGoUserDefaultsKlass
= NSClassFromString ([self userDefaultsClassName]);
_defaults = [[SOGoUserDefaultsKlass alloc]
initWithTableURL: SOGoProfileURL
uid: login
fieldName: @"c_defaults"];
if (_defaults)
{
[_defaults fetchProfile];
@@ -528,7 +518,13 @@ _timeValue (NSString *key)
{
if (!_settings)
{
_settings = [self primaryUserSettings];
if (!SOGoUserDefaultsKlass)
SOGoUserDefaultsKlass
= NSClassFromString ([self userDefaultsClassName]);
_settings = [[SOGoUserDefaultsKlass alloc]
initWithTableURL: SOGoProfileURL
uid: login
fieldName: @"c_settings"];
if (_settings)
{
[_settings fetchProfile];