From 731c1bdfd9da3bcbbf9df6d2e4f5042d96a3de53 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Fri, 8 Apr 2022 08:18:13 -0400 Subject: [PATCH 1/2] fix(mail): don't encode calendar mime part twice SOPE will take care of encoding all text parts in quoted-printable if necessary. Fixes #5391 Fixes #5393 --- SoObjects/Appointments/SOGoCalendarComponent.m | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/SoObjects/Appointments/SOGoCalendarComponent.m b/SoObjects/Appointments/SOGoCalendarComponent.m index 9c63ec46c..35c2832b8 100644 --- a/SoObjects/Appointments/SOGoCalendarComponent.m +++ b/SoObjects/Appointments/SOGoCalendarComponent.m @@ -37,6 +37,7 @@ #import #import #import +#import #import #import #import @@ -142,6 +143,16 @@ return aclManager; } +- (void) setIsNew: (BOOL) newIsNew +{ + [super setIsNew: newIsNew]; +} + +- (BOOL) isNew +{ + return [super isNew]; +} + - (NSException *) changeParticipationStatus: (NSString *) newPartStat withDelegate: (iCalPerson *) delegate alarm: (iCalAlarm *) alarm @@ -755,7 +766,7 @@ [headerMap setObject: @"quoted-printable" forKey: @"content-transfer-encoding"]; bodyPart = [NGMimeBodyPart bodyPartWithHeader: headerMap]; - [bodyPart setBody: [objectData dataByEncodingQuotedPrintable]]; + [bodyPart setBody: objectData]; return bodyPart; } From 7d601fff28ed3ef3d0708f74b3df854dba171861 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Fri, 8 Apr 2022 08:24:33 -0400 Subject: [PATCH 2/2] chore(release): 2.4.3 --- CHANGELOG.md | 6 ++++++ Version | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e56c649e8..a4a083f55 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # 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 diff --git a/Version b/Version index 27469aff1..7f19e7301 100644 --- a/Version +++ b/Version @@ -1,3 +1,3 @@ MAJOR_VERSION=2 MINOR_VERSION=4 -SUBMINOR_VERSION=2 +SUBMINOR_VERSION=3 \ No newline at end of file