(fix) always force save events creation over EAS (fixes #3958)

Alinto · Dec 21, 2016 · 1da36a3 · 1da36a3
1 parent 7327ec2
commit 1da36a3
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/ActiveSync/SOGoActiveSyncDispatcher+Sync.m b/ActiveSync/SOGoActiveSyncDispatcher+Sync.m
@@ -367,7 +367,12 @@ - (void) processSyncAddCommand: (id <DOMElement>) theDocumentElement
             {
               [o takeActiveSyncValues: allValues  inContext: context];
               [sogoObject setIsNew: is_new];
-              [sogoObject saveComponent: o];
+
+              if (theFolderType == ActiveSyncEventFolder)
+                [sogoObject saveComponent: o force: YES];
+              else
+                [sogoObject saveComponent: o];
+
             }
 
           // Update syncCache
@@ -588,7 +593,11 @@ - (void) processSyncChangeCommand: (id <DOMElement>) theDocumentElement
                     if ([roles containsObject: SOGoCalendarRole_ComponentModifier] || [[sogoObject ownerInContext: context] isEqualToString: [[context activeUser] login]])
 		      {
 			[o takeActiveSyncValues: allChanges  inContext: context];
-			[sogoObject saveComponent: o];
+
+                        if (theFolderType == ActiveSyncEventFolder)
+                          [sogoObject saveComponent: o force: YES];
+                        else
+                          [sogoObject saveComponent: o];
 
 			if ([syncCache objectForKey: serverId])
 			  [syncCache setObject: [NSString stringWithFormat: @"%f", [[sogoObject lastModified] timeIntervalSince1970]]  forKey: serverId];

diff --git a/ActiveSync/SOGoActiveSyncDispatcher.m b/ActiveSync/SOGoActiveSyncDispatcher.m
@@ -1817,7 +1817,10 @@ - (void) processMeetingResponse: (id <DOMElement>) theDocumentElement
             {
               appointmentObject = [[SOGoAppointmentObject alloc] initWithName: [NSString stringWithFormat: @"%@.ics", [event uid]]
                                                                   inContainer: collection];
-              [appointmentObject saveComponent: event];
+              if (folderType == ActiveSyncEventFolder)
+                [appointmentObject saveComponent: event force: YES];
+              else
+                [appointmentObject saveComponent: event];
            }
 
           if (uidCache && [calendarId length] > 64)

diff --git a/NEWS b/NEWS
@@ -28,6 +28,7 @@ Bug fixes
  - [eas] properly skip folders we don't want to synchronize (#3943)
  - [eas] fixed 30 mins freebusy offset with S Planner
  - [eas] now correctly handles reminders on tasks (#3964)
+ - [eas] always force save events creation over EAS (#3958)
 
 3.2.4 (2016-12-01)
 ------------------