amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-02-23 18:36:24 +00:00
Code Issues Projects Releases Wiki Activity

oc: MailMessages return correct codepage

Browse Source
This commit is contained in:
Jesús García Sáez
2014-10-02 17:40:12 +02:00
committed by Julio García
parent c866bce8e8
commit 445a1fb2d6
5 changed files with 263 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
OpenChange/MAPIStoreMailVolatileMessage.m
View File

@@ -50,6 +50,7 @@
#import <Mailer/SOGoMailFolder.h>
#import <Mailer/NSString+Mail.h>
#import "Codepages.h"
#import "MAPIStoreAttachment.h"
#import "MAPIStoreAttachmentTable.h"
#import "MAPIStoreContext.h"
@@ -672,21 +673,9 @@ MakeTextHtmlBody (NSDictionary *mailProperties, NSDictionary *attachmentParts,
{
/* charset */
codePage = [mailProperties objectForKey: MAPIPropertyKey (PR_INTERNET_CPID)];
switch ([codePage intValue])
{
case 20127:
charset = @"us-ascii";
break;
case 28605:
charset = @"iso-8859-15";
break;
case 65001:
charset = @"utf-8";
break;
case 28591:
default:
charset = @"iso-8859-1";
}
charset = [Codepages getNameFromCodepage: codePage];
if (!charset)
charset = @"utf-8";
htmlContentType = [NSString stringWithFormat: @"text/html; charset=%@",
charset];