LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Automatically disable alarms for newly subsribed calendars. 

This fixes bug #2074.
pull/7/head
Ludovic Marcotte 2012-11-06 08:05:23 -05:00
parent ca568ec5b5
commit fe09a7969d
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
SoObjects/SOGo/SOGoGCSFolder.m
View File

@ -1,7 +1,7 @@
/* SOGoGCSFolder.m - this file is part of SOGo /* SOGoGCSFolder.m - this file is part of SOGo
* *
* Copyright (C) 2004-2005 SKYRIX Software AG * Copyright (C) 2004-2005 SKYRIX Software AG
* Copyright (C) 2006-2010 Inverse inc. * Copyright (C) 2006-2012 Inverse inc.
* *
* Author: Wolfgang Sourdeau <wsourdeau@inverse.ca> * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
* *
@ -835,7 +835,7 @@ static NSArray *childRecordFields = nil;
- (BOOL) subscribeUserOrGroup: (NSString *) theIdentifier - (BOOL) subscribeUserOrGroup: (NSString *) theIdentifier
reallyDo: (BOOL) reallyDo reallyDo: (BOOL) reallyDo
{ {
NSMutableDictionary *moduleSettings; NSMutableDictionary *moduleSettings, *folderShowAlarms;
NSMutableArray *folderSubscription; NSMutableArray *folderSubscription;
NSString *subscriptionPointer; NSString *subscriptionPointer;
NSMutableArray *allUsers; NSMutableArray *allUsers;
@ -886,6 +886,8 @@ static NSArray *childRecordFields = nil;
folderSubscription folderSubscription
= [moduleSettings objectForKey: @"SubscribedFolders"]; = [moduleSettings objectForKey: @"SubscribedFolders"];
subscriptionPointer = [self folderReference]; subscriptionPointer = [self folderReference];
folderShowAlarms = [moduleSettings objectForKey: @"FolderShowAlarms"];
if (reallyDo) if (reallyDo)
{ {
@ -897,14 +899,26 @@ static NSArray *childRecordFields = nil;
forKey: @"SubscribedFolders"]; forKey: @"SubscribedFolders"];
} }
if (!(folderShowAlarms
&& [folderShowAlarms isKindOfClass: [NSMutableDictionary class]]))
{
folderShowAlarms = [NSMutableDictionary dictionary];
[moduleSettings setObject: folderShowAlarms
forKey: @"FolderShowAlarms"];
}
[folderSubscription addObjectUniquely: subscriptionPointer]; [folderSubscription addObjectUniquely: subscriptionPointer];
// By default, we disable alarms on subscribed calendars
[folderShowAlarms setObject: [NSNumber numberWithBool: NO]
forKey: subscriptionPointer];
} }
else else
{ {
[self removeFolderSettings: moduleSettings [self removeFolderSettings: moduleSettings
withReference: subscriptionPointer]; withReference: subscriptionPointer];
[folderSubscription removeObject: subscriptionPointer]; [folderSubscription removeObject: subscriptionPointer];
[folderShowAlarms removeObjectForKey: subscriptionPointer];
} }
[us synchronize]; [us synchronize];