From 39ab482b7f1a9206528a3e9fdb229b3b4e276baf Mon Sep 17 00:00:00 2001 From: smizrahi Date: Wed, 26 Apr 2023 09:49:54 +0200 Subject: [PATCH] fix(activesync): Wrong decoding emails in Outlook via EAS. Force utf-8 when contnet-type is different than html part. Original fix from tfu. Fixes #5664 --- ActiveSync/SOGoMailObject+ActiveSync.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ActiveSync/SOGoMailObject+ActiveSync.m b/ActiveSync/SOGoMailObject+ActiveSync.m index 91e611df5..a975752ef 100644 --- a/ActiveSync/SOGoMailObject+ActiveSync.m +++ b/ActiveSync/SOGoMailObject+ActiveSync.m @@ -410,7 +410,7 @@ struct GlobalObjectId { charset = [[[self lookupInfoForBodyPart: key] objectForKey: @"parameterList"] objectForKey: @"charset"]; - if (![charset length]) + if (![charset length] || [charset caseInsensitiveCompare: @"us-ascii"] == NSOrderedSame) charset = @"utf-8"; s = [NSString stringWithData: d usingEncodingNamed: charset]; @@ -708,7 +708,7 @@ struct GlobalObjectId { charset = [[[self lookupInfoForBodyPart: @""] objectForKey: @"parameterList"] objectForKey: @"charset"]; - if (![charset length]) + if (![charset length] || [charset caseInsensitiveCompare: @"us-ascii"] == NSOrderedSame) charset = @"utf-8"; d = [[self fetchPlainTextParts] objectForKey: @""];