diff --git a/SoObjects/Mailer/SOGoMailAccount.m b/SoObjects/Mailer/SOGoMailAccount.m index be0cea9f4..c5386e951 100644 --- a/SoObjects/Mailer/SOGoMailAccount.m +++ b/SoObjects/Mailer/SOGoMailAccount.m @@ -37,18 +37,10 @@ static NSString *sharedFolderName = @""; // TODO: add English default static NSString *otherUsersFolderName = @""; // TODO: add English default static BOOL useAltNamespace = NO; -+ (int)version { - return [super version] + 0 /* v1 */; -} - + (void)initialize { NSUserDefaults *ud = [NSUserDefaults standardUserDefaults]; NSString *cfgDraftsFolderName; - NSAssert2([super version] == 1, - @"invalid superclass (%@) version %i !", - NSStringFromClass([self superclass]), [super version]); - useAltNamespace = [ud boolForKey:@"SOGoSpecialFoldersInRoot"]; sharedFolderName = [ud stringForKey:@"SOGoSharedFolderName"]; diff --git a/SoObjects/Mailer/SOGoMailBodyPart.m b/SoObjects/Mailer/SOGoMailBodyPart.m index ddad7dffa..ec10200f2 100644 --- a/SoObjects/Mailer/SOGoMailBodyPart.m +++ b/SoObjects/Mailer/SOGoMailBodyPart.m @@ -29,17 +29,10 @@ static NSString *mailETag = nil; static BOOL debugOn = NO; -+ (int)version { - return [super version] + 0 /* v1 */; -} - -+ (void)initialize { ++ (void) initialize +{ NSUserDefaults *ud = [NSUserDefaults standardUserDefaults]; - NSAssert2([super version] == 1, - @"invalid superclass (%@) version %i !", - NSStringFromClass([self superclass]), [super version]); - if (![[ud objectForKey:@"SOGoMailDisableETag"] boolValue]) { mailETag = [[NSString alloc] initWithFormat:@"\"imap4url_%d_%d_%03d\"", UIX_MAILER_MAJOR_VERSION, diff --git a/SoObjects/Mailer/SOGoMailObject.m b/SoObjects/Mailer/SOGoMailObject.m index 29c6a0ea7..e8a72944b 100644 --- a/SoObjects/Mailer/SOGoMailObject.m +++ b/SoObjects/Mailer/SOGoMailObject.m @@ -60,17 +60,10 @@ static BOOL debugOn = NO; static BOOL debugBodyStructure = NO; static BOOL debugSoParts = NO; -+ (int)version { - return [super version] + 0 /* v1 */; -} - -+ (void)initialize { ++ (void) initialize +{ NSUserDefaults *ud = [NSUserDefaults standardUserDefaults]; - NSAssert2([super version] == 1, - @"invalid superclass (%@) version %i !", - NSStringFromClass([self superclass]), [super version]); - if ((fetchHeader = ([ud boolForKey:@"SOGoDoNotFetchMailHeader"] ? NO : YES))) NSLog(@"Note: fetching full mail header."); else diff --git a/SoObjects/Mailer/SOGoSharedMailAccount.m b/SoObjects/Mailer/SOGoSharedMailAccount.m index 27326638d..5b7ba9ec2 100644 --- a/SoObjects/Mailer/SOGoSharedMailAccount.m +++ b/SoObjects/Mailer/SOGoSharedMailAccount.m @@ -35,17 +35,10 @@ static NSString *otherUsersFolderName = @""; // TODO: add English default -+ (int)version { - return [super version] + 0 /* v1 */; -} - -+ (void)initialize { ++ (void) initialize +{ NSUserDefaults *ud = [NSUserDefaults standardUserDefaults]; - NSAssert2([super version] == 1, - @"invalid superclass (%@) version %i !", - NSStringFromClass([self superclass]), [super version]); - otherUsersFolderName = [ud stringForKey:@"SOGoOtherUsersFolderName"]; NSLog(@"Note: using other-users-folders name: '%@'", otherUsersFolderName); }