fix(calendar): Fix inaccessibility to personal calendar on Mac OS X V…

…entura. Fixes #5639
Alinto · Jan 3, 2023 · 8680536 · 8680536
1 parent a7f3daa
commit 8680536
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/SoObjects/Appointments/SOGoAppointmentFolder.m b/SoObjects/Appointments/SOGoAppointmentFolder.m
@@ -2594,8 +2594,15 @@ - (SOGoWebDAVValue *) davCalendarComponentSet
 - (NSException *) setDavDescription: (NSString *) description
 {
   if (description) {
+    // FIXME: Improve MacOSX Ventura support 
+    // Check if the problem will be fixed by Apple or if this fix should be kept in the future
+    // Ticket #5639
+    if ([[context request] isMacOSXVenturaCalendarApp]) {
+      description = [description stringByReplacingOccurrencesOfString:@"/Personal" withString:@"/personal"];
+    }
+
     [self setFolderPropertyValue: description
-                    inCategory: @"DavDescription"];
+                      inCategory: @"DavDescription"];
   }
 
   return nil;

diff --git a/SoObjects/SOGo/SOGoGCSFolder.m b/SoObjects/SOGo/SOGoGCSFolder.m
@@ -460,10 +460,21 @@ - (BOOL) folderIsMandatory
 
 - (NSString *) folderReference
 {
+  NSString *realNameInContainer;
+
+  realNameInContainer = [self realNameInContainer];
+
+  // FIXME: Improve MacOSX Ventura support 
+  // Check if the problem will be fixed by Apple or if this fix should be kept in the future
+  // Ticket #5639
+  if ([[context request] isMacOSXVenturaCalendarApp]) {
+    realNameInContainer = [realNameInContainer stringByReplacingOccurrencesOfString:@"Personal" withString:@"personal"];
+  }
+
   return [NSString stringWithFormat: @"%@:%@/%@",
 		   owner,
 		   [container nameInContainer],
-		   [self realNameInContainer]];
+		   realNameInContainer];
 }
 
 - (NSArray *) pathArrayToFolder