feat(calendar): Add CALDAV Mac OS X Sonoma (14) support

Alinto · Jul 31, 2023 · 87bbba0 · 87bbba0
1 parent e0d76fb
commit 87bbba0
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 13 deletions.
diff --git a/SoObjects/Appointments/SOGoAppointmentFolder.m b/SoObjects/Appointments/SOGoAppointmentFolder.m
@@ -2612,7 +2612,7 @@ - (NSException *) setDavDescription: (NSString *) 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]) {
+    if ([[context request] isMacOSXFromVenturaCalendarApp]) {
       description = [description stringByReplacingOccurrencesOfString:@"/PERSONAL" withString:@"/personal"];
     }
 

diff --git a/SoObjects/Appointments/SOGoUserFolder+Appointments.m b/SoObjects/Appointments/SOGoUserFolder+Appointments.m
@@ -190,7 +190,7 @@ - (NSArray *) davCalendarScheduleInboxURL
 
 - (NSArray *) davCalendarScheduleOutboxURL
 {  
-  return [[context request] isMacOSXVenturaCalendarApp] ? [self _davSpecialCalendarURLWithName: @"PERSONAL"] : [self _davSpecialCalendarURLWithName: @"personal"];
+  return [[context request] isMacOSXFromVenturaCalendarApp] ? [self _davSpecialCalendarURLWithName: @"PERSONAL"] : [self _davSpecialCalendarURLWithName: @"personal"];
 }
 
 - (NSArray *) _calendarProxiedUsersWithWriteAccess: (BOOL) write

diff --git a/SoObjects/Mailer/SOGoMailAccount.m b/SoObjects/Mailer/SOGoMailAccount.m
@@ -139,7 +139,7 @@ - (void) _appendNamespaces: (NSMutableArray *) folders
   // 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]) {
+  if ([[context request] isMacOSXFromVenturaCalendarApp]) {
     namespace = [namespaceDict objectForKey: @"PERSONAL"];
   }
   if (namespace)

diff --git a/SoObjects/SOGo/SOGoGCSFolder.m b/SoObjects/SOGo/SOGoGCSFolder.m
@@ -150,7 +150,7 @@ + (id) folderWithSubscriptionReference: (NSString *) reference
   if ([pathElements count] > 1)
     ocsName = [pathElements objectAtIndex: 1];
   else
-    ocsName = [[context request] isMacOSXVenturaCalendarApp] ? @"Personal" : @"personal";
+    ocsName = [[context request] isMacOSXFromVenturaCalendarApp] ? @"Personal" : @"personal";
 
   path = [NSString stringWithFormat: @"/Users/%@/%@/%@",
 		   login, [pathElements objectAtIndex: 0], ocsName];
@@ -404,7 +404,7 @@ - (void) setOCSPath: (NSString *) _path
   // 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]) {
+  if ([[context request] isMacOSXFromVenturaCalendarApp]) {
     _path = [_path stringByReplacingOccurrencesOfString:@"/PERSONAL" withString:@"/personal"];
   }
 
@@ -441,7 +441,7 @@ - (GCSFolder *) ocsFolderForPath: (NSString *) _path
   // 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]) {
+  if ([[context request] isMacOSXFromVenturaCalendarApp]) {
     _path = [_path stringByReplacingOccurrencesOfString:@"PERSONAL" withString:@"personal"];
   }
 
@@ -474,7 +474,7 @@ - (NSString *) folderReference
   // 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]) {
+  if ([[context request] isMacOSXFromVenturaCalendarApp]) {
     realNameInContainer = [realNameInContainer stringByReplacingOccurrencesOfString:@"PERSONAL" withString:@"personal"];
   }
 

diff --git a/SoObjects/SOGo/SOGoParentFolder.m b/SoObjects/SOGo/SOGoParentFolder.m
@@ -144,7 +144,7 @@ - (void) setBaseOCSPath: (NSString *) newOCSPath
 
 - (NSString *) defaultFolderName
 {
-  return [[context request] isMacOSXVenturaCalendarApp] ? @"PERSONAL" : @"Personal";
+  return [[context request] isMacOSXFromVenturaCalendarApp] ? @"PERSONAL" : @"Personal";
 }
 
 - (NSString *) collectedFolderName
@@ -173,7 +173,7 @@ - (void) createSpecialFolder: (SOGoFolderType) folderType
   {
     if (folderType == SOGoPersonalFolder)
     {
-      folderName = [[context request] isMacOSXVenturaCalendarApp] ? @"PERSONAL" : @"personal";
+      folderName = [[context request] isMacOSXFromVenturaCalendarApp] ? @"PERSONAL" : @"personal";
       folder = [subFolderClass objectWithName: folderName inContainer: self];
       [folder setDisplayName: [self defaultFolderName]];
       [folder setOCSPath: [NSString stringWithFormat: @"%@/%@", OCSPath, folderName]];
@@ -224,7 +224,7 @@ - (NSException *) fetchSpecialFolders: (NSString *) sql
       // 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]) {
+      if ([[context request] isMacOSXFromVenturaCalendarApp]) {
         if ([key isEqualToString:@"personal"]) {
           key = @"PERSONAL";
         }

diff --git a/SoObjects/SOGo/SOGoUser.m b/SoObjects/SOGo/SOGoUser.m
@@ -1060,7 +1060,7 @@ - (SOGoAppointmentFolders *) calendarsFolderInContext: (WOContext *) context
 
 - (SOGoAppointmentFolder *) personalCalendarFolderInContext: (WOContext *) context
 {
-  return [[self calendarsFolderInContext: context] lookupPersonalFolder: [[context request] isMacOSXVenturaCalendarApp] ? @"PERSONAL" : @"personal"
+  return [[self calendarsFolderInContext: context] lookupPersonalFolder: [[context request] isMacOSXFromVenturaCalendarApp] ? @"PERSONAL" : @"personal"
                                                          ignoringRights: YES];
 }
 

diff --git a/SoObjects/SOGo/WORequest+SOGo.h b/SoObjects/SOGo/WORequest+SOGo.h
@@ -36,6 +36,7 @@
 - (BOOL)isMacOSXCalendarApp;
 - (BOOL)isIPhoneAddressBookApp;
 - (BOOL) isAndroid;
+- (BOOL)isMacOSXFromVenturaCalendarApp,
 
 @end
 

diff --git a/SoObjects/SOGo/WORequest+SOGo.m b/SoObjects/SOGo/WORequest+SOGo.m
@@ -242,7 +242,7 @@ - (BOOL) isAndroid
   return ([[cc userAgent] rangeOfString: @"Android"].location != NSNotFound);
 }
 
-- (BOOL) isMacOSXVenturaCalendarApp
+- (BOOL) isMacOSXFromVenturaCalendarApp
 {
   WEClientCapabilities *cc;
   BOOL b;
@@ -251,7 +251,8 @@ - (BOOL) isMacOSXVenturaCalendarApp
 
   b = (
         (
-          nil != [cc userAgent] && [[cc userAgent] rangeOfString: @"macOS/13"].location != NSNotFound
+          nil != [cc userAgent] 
+          && ([[cc userAgent] rangeOfString: @"macOS/13"].location != NSNotFound || [[cc userAgent] rangeOfString: @"macOS/14"].location != NSNotFound)
           && [[cc userAgent] rangeOfString: @"dataaccessd"].location != NSNotFound
         )
        );