improved fetching of text parts over EAS
parent
f3325b8b0d
commit
d7c283f751
|
@ -209,6 +209,7 @@ struct GlobalObjectId {
|
||||||
//
|
//
|
||||||
//
|
//
|
||||||
- (NSData *) _preferredBodyDataInMultipartUsingType: (int) theType
|
- (NSData *) _preferredBodyDataInMultipartUsingType: (int) theType
|
||||||
|
nativeTypeFound: (int *) theNativeTypeFound
|
||||||
{
|
{
|
||||||
NSString *encoding, *key, *plainKey, *htmlKey, *type, *subtype;
|
NSString *encoding, *key, *plainKey, *htmlKey, *type, *subtype;
|
||||||
NSDictionary *textParts, *part;
|
NSDictionary *textParts, *part;
|
||||||
|
@ -238,11 +239,22 @@ struct GlobalObjectId {
|
||||||
}
|
}
|
||||||
|
|
||||||
key = nil;
|
key = nil;
|
||||||
|
*theNativeTypeFound = 1;
|
||||||
|
|
||||||
if (theType == 2)
|
if (theType == 2 && htmlKey)
|
||||||
|
{
|
||||||
key = htmlKey;
|
key = htmlKey;
|
||||||
else if (theType == 1)
|
*theNativeTypeFound = 2;
|
||||||
|
}
|
||||||
|
else if (theType == 1 && plainKey)
|
||||||
key = plainKey;
|
key = plainKey;
|
||||||
|
else if (theType == 2 && plainKey)
|
||||||
|
key = plainKey;
|
||||||
|
else if (theType == 1 && htmlKey)
|
||||||
|
{
|
||||||
|
key = htmlKey;
|
||||||
|
*theNativeTypeFound = 2;
|
||||||
|
}
|
||||||
|
|
||||||
if (key)
|
if (key)
|
||||||
{
|
{
|
||||||
|
@ -263,6 +275,10 @@ struct GlobalObjectId {
|
||||||
charset = @"us-ascii";
|
charset = @"us-ascii";
|
||||||
|
|
||||||
s = [NSString stringWithData: d usingEncodingNamed: charset];
|
s = [NSString stringWithData: d usingEncodingNamed: charset];
|
||||||
|
|
||||||
|
if (theType == 1 && *theNativeTypeFound == 2)
|
||||||
|
s = [s htmlToText];
|
||||||
|
|
||||||
d = [s dataUsingEncoding: NSUTF8StringEncoding];
|
d = [s dataUsingEncoding: NSUTF8StringEncoding];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -448,7 +464,7 @@ struct GlobalObjectId {
|
||||||
}
|
}
|
||||||
else if ([type isEqualToString: @"multipart"])
|
else if ([type isEqualToString: @"multipart"])
|
||||||
{
|
{
|
||||||
d = [self _preferredBodyDataInMultipartUsingType: theType];
|
d = [self _preferredBodyDataInMultipartUsingType: theType nativeTypeFound: theNativeType];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (theType == 4)
|
else if (theType == 4)
|
||||||
|
|
1
NEWS
1
NEWS
|
@ -9,6 +9,7 @@ Enhancements
|
||||||
- added support for email categories using EAS (#2995)
|
- added support for email categories using EAS (#2995)
|
||||||
- now possible to always send vacation messages (#2332)
|
- now possible to always send vacation messages (#2332)
|
||||||
- added EAS best practices to the documentation
|
- added EAS best practices to the documentation
|
||||||
|
- improved fetching of text parts over EAS
|
||||||
|
|
||||||
Bug fixes
|
Bug fixes
|
||||||
- (regression) fixed sending a message when mail module is not active (#3088)
|
- (regression) fixed sending a message when mail module is not active (#3088)
|
||||||
|
|
Loading…
Reference in New Issue