amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-09-04 21:25:04 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into fix-some-warnings

Browse Source 
Conflicts:
	UI/Scheduler/UIxAppointmentActions.m
This commit is contained in:
Patrice Levesque
2016-02-16 14:32:50 -05:00
parent a5cc2bb5d5 4c01417690
commit 9cb1b899b0
16 changed files with 382 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ActiveSync/SOGoMailObject+ActiveSync.m
+69 -10
View File
@@ -668,13 +668,14 @@ struct GlobalObjectId {
NSMutableString *s;
id value;
int preferredBodyType, mimeSupport, nativeBodyType;
int preferredBodyType, mimeSupport, mimeTruncation, nativeBodyType;
uint32_t v;
subtype = [[[self bodyStructure] valueForKey: @"subtype"] lowercaseString];
preferredBodyType = [[context objectForKey: @"BodyPreferenceType"] intValue];
mimeSupport = [[context objectForKey: @"MIMESupport"] intValue];
mimeTruncation = [[context objectForKey: @"MIMETruncation"] intValue];
s = [NSMutableString string];
@@ -980,9 +981,71 @@ struct GlobalObjectId {
AUTORELEASE(content);
content = [content activeSyncRepresentationInContext: context];
len = [content length];
truncated = 0;
len = [content length];
// We handle MIMETruncation
switch (mimeTruncation)
{
case 0:
{
content = @"";
len = 0;
}
break;
case 1:
if ([content length] > 4096)
{
content = [content substringToIndex: 4096];
len = 4096; truncated = 1;
}
break;
case 2:
if ([content length] > 5120)
{
content = [content substringToIndex: 5120];
len = 5120; truncated = 1;
}
break;
case 3:
if ([content length] > 7168)
{
content = [content substringToIndex: 7168];
len = 7168; truncated = 1;
}
break;
case 4:
if ([content length] > 10240)
{
content = [content substringToIndex: 10240];
len = 10240; truncated = 1;
}
break;
case 5:
if ([content length] > 20480)
{
content = [content substringToIndex: 20480];
len = 20480; truncated = 1;
}
break;
case 6:
if ([content length] > 51200)
{
content = [content substringToIndex: 51200];
len = 51200; truncated = 1;
}
break;
case 7:
if ([content length] > 102400)
{
content = [content substringToIndex: 102400];
len = 102400; truncated = 1;
}
break;
case 8:
default:
truncated = 0;
}
if ([[[context request] headerForKey: @"MS-ASProtocolVersion"] isEqualToString: @"2.5"])
{
@@ -990,7 +1053,7 @@ struct GlobalObjectId {
[s appendFormat: @"<BodyTruncated xmlns=\"Email:\">%d</BodyTruncated>", truncated];
}
else
{
{
[s appendString: @"<Body xmlns=\"AirSyncBase:\">"];
// Set the correct type if client requested text/html but we got text/plain.
@@ -1004,16 +1067,12 @@ struct GlobalObjectId {
[s appendFormat: @"<Truncated>%d</Truncated>", truncated];
[s appendFormat: @"<Preview></Preview>"];
if (!truncated)
{
[s appendFormat: @"<Data>%@</Data>", content];
[s appendFormat: @"<EstimatedDataSize>%d</EstimatedDataSize>", len];
}
[s appendFormat: @"<Data>%@</Data>", content];
[s appendFormat: @"<EstimatedDataSize>%d</EstimatedDataSize>", len];
[s appendString: @"</Body>"];
}
}
// Attachments -namespace 16
attachmentKeys = [self fetchFileAttachmentKeys];