amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-07-12 11:55:09 +00:00
Code Issues Projects Releases Wiki Activity

fix(calendar): Fix inaccessibility to personal calendar on Mac OS X Ventura. Fixes #5639

Browse Source
This commit is contained in:
smizrahi
2023-01-31 17:39:00 +01:00
parent 7e357f1bc9
commit ba0d4a51c0
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SoObjects/SOGo/SOGoFolder.m
+3 -3
View File
@@ -200,16 +200,16 @@
selfName = [self realNameInContainer];
otherName = [otherFolder realNameInContainer];
if ([selfName isEqualToString: @"personal"] || [selfName isEqualToString: @"Personal"])
if ([[selfName lowercaseString] isEqualToString: @"personal"])
{
if ([otherName isEqualToString: @"personal"] || [otherName isEqualToString: @"Personal"])
if ([[otherName lowercaseString] isEqualToString: @"personal"])
comparison = NSOrderedSame;
else
comparison = NSOrderedAscending;
}
else
{
if ([otherName isEqualToString: @"personal"] || [otherName isEqualToString: @"Personal"])
if ([[otherName lowercaseString] isEqualToString: @"personal"])
comparison = NSOrderedDescending;
else
comparison = NSOrderedSame;
SoObjects/SOGo/SOGoParentFolder.m
+3 -3
View File
@@ -144,7 +144,7 @@ static SoSecurityManager *sm = nil;
- (NSString *) defaultFolderName
{
return @"Personal";
return [[context request] isMacOSXVenturaCalendarApp] ? @"PERSONAL" : @"Personal";
}
- (NSString *) collectedFolderName
@@ -173,7 +173,7 @@ static SoSecurityManager *sm = nil;
{
if (folderType == SOGoPersonalFolder)
{
folderName = [[context request] isMacOSXVenturaCalendarApp] ? @"Personal" : @"personal";
folderName = [[context request] isMacOSXVenturaCalendarApp] ? @"PERSONAL" : @"personal";
folder = [subFolderClass objectWithName: folderName inContainer: self];
[folder setDisplayName: [self defaultFolderName]];
[folder setOCSPath: [NSString stringWithFormat: @"%@/%@", OCSPath, folderName]];
@@ -241,7 +241,7 @@ static SoSecurityManager *sm = nil;
}
if (folderType == SOGoPersonalFolder)
{
if (![subFolders objectForKey: @"personal"] || ![subFolders objectForKey: @"Personal"])
if (![subFolders objectForKey: @"personal"] || ![subFolders objectForKey: @"Personal"] || ![subFolders objectForKey: @"PERSONAL"])
[self createSpecialFolder: SOGoPersonalFolder];
}
else if (folderType == SOGoCollectedFolder)
SoObjects/SOGo/SOGoUser.m
+1 -1
View File
@@ -1059,7 +1059,7 @@
- (SOGoAppointmentFolder *) personalCalendarFolderInContext: (WOContext *) context
{
return [[self calendarsFolderInContext: context] lookupPersonalFolder: [[context request] isMacOSXVenturaCalendarApp] ? @"Personal" : @"personal"
return [[self calendarsFolderInContext: context] lookupPersonalFolder: [[context request] isMacOSXVenturaCalendarApp] ? @"PERSONAL" : @"personal"
ignoringRights: YES];
}