Merge to 2.4.2

Conflicts:
	SoObjects/Appointments/SOGoAppointmentFolder.m

CHANGELOG.md

@@ -1,11 +1,5 @@
 # Changelog
 
-### [2.4.3](https://github.com/inverse-inc/sogo/compare/SOGo-2.4.2...SOGo-2.4.3) (2022-04-08)
-
-### Bug Fixes
-
-* **mail:** don't encode calendar mime part twice ([0757429](https://github.com/inverse-inc/sogo/commit/07574297cd4961223afe0c60e7a639166d907e75)), closes [#5391](https://www.sogo.nu/bugs/view.php?id=5391) [#5393](https://www.sogo.nu/bugs/view.php?id=5393)
-
 ## [2.4.2](https://github.com/inverse-inc/sogo/compare/SOGo-2.4.1...SOGo-2.4.2) (2022-04-04)
 
 ### Bug Fixes

SoObjects/Appointments/SOGoAppointmentFolder.m

@@ -524,7 +524,7 @@ static Class iCalEventK = nil;
 //
 // If the user is the owner of the calendar, by default we include the freebusy information.
 //
-// If the user is NOT the owner of the calendar, by default we exclude the freebusy information.
+// If the user is NOT the owner of the calendar but is subscribed, by default we exclude the freebusy information.
 //
 // We must include the freebusy information of other users if we are actually looking at their freebusy information
 // but we aren't necessarily subscribed to their calendars.
@@ -534,7 +534,7 @@ static Class iCalEventK = nil;
   NSNumber *excludeFromFreeBusy;
   NSString *userLogin, *ownerInContext;
   BOOL is_owner;
-  
+
   userLogin = [[context activeUser] login];
   ownerInContext = [[self container] ownerInContext: context];
   is_owner = [userLogin isEqualToString: ownerInContext];

SoObjects/Appointments/SOGoCalendarComponent.m

@@ -37,7 +37,6 @@
 #import <NGCards/iCalDateTime.h>
 #import <NGCards/iCalEvent.h>
 #import <NGCards/iCalPerson.h>
-#import <NGCards/iCalToDo.h>
 #import <NGCards/iCalRepeatableEntityObject.h>
 #import <NGMime/NGMimeBodyPart.h>
 #import <NGMime/NGMimeMultipartBody.h>
@@ -143,16 +142,6 @@
   return aclManager;
 }
 
-- (void) setIsNew: (BOOL) newIsNew
-{
-  [super setIsNew: newIsNew];
-}
-
-- (BOOL) isNew
-{
-  return [super isNew];
-}
-
 - (NSException *) changeParticipationStatus: (NSString *) newPartStat
                                withDelegate: (iCalPerson *) delegate
                                       alarm: (iCalAlarm *) alarm
@@ -766,7 +755,7 @@
   [headerMap setObject: @"quoted-printable"
                 forKey: @"content-transfer-encoding"];
   bodyPart = [NGMimeBodyPart bodyPartWithHeader: headerMap];
-  [bodyPart setBody: objectData];
+  [bodyPart setBody: [objectData dataByEncodingQuotedPrintable]];
 
   return bodyPart;
 }

Version

@@ -1,3 +1,3 @@
 MAJOR_VERSION=2
 MINOR_VERSION=4
-SUBMINOR_VERSION=3
+SUBMINOR_VERSION=2