mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Improved content type handling

This commit is contained in:
M66B 2019-11-20 14:22:21 +01:00
parent e3aa66d844
commit 19ad6e88b0
1 changed files with 13 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
app/src/main/java/eu/faircode/email/MessageHelper.java
View File

@ -1260,19 +1260,18 @@ public class MessageHelper {
filename = null;
}
String pct = part.getContentType();
if (TextUtils.isEmpty(pct))
pct = "text/plain";
ContentType contentType = new ContentType(pct);
if (part instanceof MimeMessage) {
String header = ((MimeMessage) part).getHeader("Content-Type", null);
if (!TextUtils.isEmpty(header)) {
ContentType messageContentType = new ContentType(header);
if (!messageContentType.getBaseType().equalsIgnoreCase(contentType.getBaseType())) {
Log.w("Content type message=" + messageContentType + " part=" + contentType);
contentType = messageContentType;
}
}
ContentType contentType;
try {
String c = part.getContentType();
contentType = new ContentType(c == null ? "" : c);
} catch (ParseException ex) {
Log.w(ex);
parts.warnings.add(Helper.formatThrowable(ex, false));
if (part instanceof MimeMessage)
contentType = new ContentType("text/html");
else
contentType = new ContentType(Helper.guessMimeType(filename));
}
if (!Part.ATTACHMENT.equalsIgnoreCase(disposition) &&
@ -1290,15 +1289,6 @@ public class MessageHelper {
apart.pgp = pgp;
apart.part = part;
ContentType ct;
try {
ct = new ContentType(apart.part.getContentType());
} catch (ParseException ex) {
Log.w(ex);
parts.warnings.add(Helper.formatThrowable(ex, false));
ct = new ContentType("application/octet-stream");
}
String[] cid = null;
try {
cid = apart.part.getHeader("Content-ID");
@ -1310,7 +1300,7 @@ public class MessageHelper {
apart.attachment = new EntityAttachment();
apart.attachment.name = apart.filename;
apart.attachment.type = ct.getBaseType().toLowerCase(Locale.ROOT);
apart.attachment.type = contentType.getBaseType().toLowerCase(Locale.ROOT);
apart.attachment.disposition = apart.disposition;
apart.attachment.size = (long) apart.part.getSize();
apart.attachment.cid = (cid == null || cid.length == 0 ? null : MimeUtility.unfold(cid[0]));