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
Alinto · Apr 26, 2023 · 39ab482 · 39ab482
1 parent d9ac1b9
commit 39ab482
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/ActiveSync/SOGoMailObject+ActiveSync.m b/ActiveSync/SOGoMailObject+ActiveSync.m
@@ -410,7 +410,7 @@ - (NSData *) _preferredBodyDataInMultipartUsingType: (int) theType
 
       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 @@ - (NSData *) _preferredBodyDataUsingType: (int) theType
 
           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: @""];