LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

(fix) made the code a bit more robust

pull/239/head
Ludovic Marcotte 2017-12-23 06:10:11 -05:00
parent 6294d91180
commit 96d62c432b
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
SoObjects/Mailer/SOGoMailObject.m
View File

@ -1196,17 +1196,24 @@ static BOOL debugSoParts = NO;
if ([self isEncrypted])
{
NSData *certificate;
NGMimeMessage *m;
id part;
certificate = [[self mailAccountFolder] certificate];
m = [[self content] messageFromEncryptedDataAndCertificate: certificate];
part = [[[m body] parts] objectAtIndex: ([_key intValue]-1)];
mimeType = [[part contentType] stringValue];
clazz = [SOGoMailBodyPart bodyPartClassForMimeType: mimeType
inContext: _ctx];
return [clazz objectWithName:_key inContainer: self];
// If we got a user certificate, let's use it. Otherwise we fallback
// to the current parts fetching code.
if (certificate)
{
NGMimeMessage *m;
id part;
m = [[self content] messageFromEncryptedDataAndCertificate: certificate];
part = [[[m body] parts] objectAtIndex: ([_key intValue]-1)];
mimeType = [[part contentType] stringValue];
clazz = [SOGoMailBodyPart bodyPartClassForMimeType: mimeType
inContext: _ctx];
return [clazz objectWithName:_key inContainer: self];
}
}
parts = [[self bodyStructure] objectForKey: @"parts"];