msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

Alternative part selection

Browse Source
pull/187/head
M66B 4 years ago
parent dc8726e513
commit 0aa54b9452
1 changed files with 82 additions and 47 deletions
Show Stats Download Patch File Download Diff File

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

@ -844,7 +844,7 @@ public class MessageHelper {
String amsgid = null; String amsgid = null;
MessageParts parts = new MessageParts(); MessageParts parts = new MessageParts();
getMessageParts(imessage, parts, null); getMessageParts(null, imessage, parts, null);
for (AttachmentPart apart : parts.attachments) for (AttachmentPart apart : parts.attachments)
if ("text/rfc822-headers".equalsIgnoreCase(apart.attachment.type)) { if ("text/rfc822-headers".equalsIgnoreCase(apart.attachment.type)) {
InternetHeaders iheaders = new InternetHeaders(apart.part.getInputStream()); InternetHeaders iheaders = new InternetHeaders(apart.part.getInputStream());
@ -1614,27 +1614,70 @@ public class MessageHelper {
return address.getAddress(); return address.getAddress();
} }
class PartHolder {
Multipart parent;
Part part;
String contentType;
PartHolder(Multipart parent, Part part, String contentType) {
this.parent = parent;
this.part = part;
this.contentType = contentType;
}
}
class MessageParts { class MessageParts {
private List<Part> plain = new ArrayList<>(); private List<PartHolder> text = new ArrayList<>();
private List<Part> html = new ArrayList<>(); private List<PartHolder> extra = new ArrayList<>();
private List<Part> extra = new ArrayList<>();
private List<AttachmentPart> attachments = new ArrayList<>(); private List<AttachmentPart> attachments = new ArrayList<>();
private ArrayList<String> warnings = new ArrayList<>(); private ArrayList<String> warnings = new ArrayList<>();
MessageParts select() {
Map<Multipart, List<PartHolder>> map = new HashMap<>();
for (PartHolder h : text)
if (h.parent != null) {
if (!map.containsKey(h.parent))
map.put(h.parent, new ArrayList<>());
map.get(h.parent).add(h);
}
for (Multipart mp : map.keySet())
try {
if (new ContentType(mp.getContentType())
.getBaseType().equalsIgnoreCase("multipart/alternative")) {
boolean plain = true;
for (PartHolder h : map.get(mp))
if (!"text/plain".equalsIgnoreCase(h.contentType)) {
plain = false;
break;
}
for (PartHolder h : map.get(mp))
if (!plain && "text/plain".equalsIgnoreCase(h.contentType))
text.remove(h);
}
} catch (Throwable ex) {
Log.w(ex);
}
return this;
}
Boolean isPlainOnly() { Boolean isPlainOnly() {
if (plain.size() + html.size() + extra.size() == 0) if (text.size() + extra.size() == 0)
return null; return null;
return (html.size() == 0); for (PartHolder h : text)
if (!"text/plain".equalsIgnoreCase(h.contentType))
return false;
return true;
} }
boolean hasBody() throws MessagingException { boolean hasBody() throws MessagingException {
List<Part> all = new ArrayList<>(); List<PartHolder> all = new ArrayList<>();
all.addAll(plain); all.addAll(text);
all.addAll(html);
all.addAll(extra); all.addAll(extra);
for (Part p : all) for (PartHolder h : all)
if (p.getSize() > 0) if (h.part.getSize() > 0)
return true; return true;
return false; return false;
@ -1643,12 +1686,11 @@ public class MessageHelper {
Long getBodySize() throws MessagingException { Long getBodySize() throws MessagingException {
Long size = null; Long size = null;
List<Part> all = new ArrayList<>(); List<PartHolder> all = new ArrayList<>();
all.addAll(plain); all.addAll(text);
all.addAll(html);
all.addAll(extra); all.addAll(extra);
for (Part p : all) { for (PartHolder h : all) {
int s = p.getSize(); int s = h.part.getSize();
if (s >= 0) if (s >= 0)
if (size == null) if (size == null)
size = (long) s; size = (long) s;
@ -1670,21 +1712,18 @@ public class MessageHelper {
} }
String getHtml(Context context) throws MessagingException, IOException { String getHtml(Context context) throws MessagingException, IOException {
if (plain.size() + html.size() == 0) { if (text.size() == 0) {
Log.i("No body part"); Log.i("No body part");
return null; return null;
} }
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
List<Part> parts = new ArrayList<>(); List<PartHolder> parts = new ArrayList<>();
if (html.size() > 0) parts.addAll(text);
parts.addAll(html);
else
parts.addAll(plain);
parts.addAll(extra); parts.addAll(extra);
for (Part part : parts) { for (PartHolder h : parts) {
if (part.getSize() > MAX_MESSAGE_SIZE) { if (h.part.getSize() > MAX_MESSAGE_SIZE) {
warnings.add(context.getString(R.string.title_insufficient_memory)); warnings.add(context.getString(R.string.title_insufficient_memory));
return null; return null;
} }
@ -1692,7 +1731,7 @@ public class MessageHelper {
String result; String result;
try { try {
Object content = part.getContent(); Object content = h.part.getContent();
Log.i("Content class=" + (content == null ? null : content.getClass().getName())); Log.i("Content class=" + (content == null ? null : content.getClass().getName()));
if (content == null) { if (content == null) {
@ -1718,7 +1757,7 @@ public class MessageHelper {
// Get content type // Get content type
ContentType ct; ContentType ct;
try { try {
ct = new ContentType(part.getContentType()); ct = new ContentType(h.part.getContentType());
} catch (ParseException ex) { } catch (ParseException ex) {
Log.e(ex); Log.e(ex);
ct = new ContentType(); ct = new ContentType();
@ -1732,7 +1771,7 @@ public class MessageHelper {
if ((TextUtils.isEmpty(charset) || charset.equalsIgnoreCase(StandardCharsets.US_ASCII.name()))) if ((TextUtils.isEmpty(charset) || charset.equalsIgnoreCase(StandardCharsets.US_ASCII.name())))
charset = null; charset = null;
if (part.isMimeType("text/plain")) { if (h.part.isMimeType("text/plain")) {
if (charset == null) { if (charset == null) {
Charset detected = CharsetHelper.detect(result); Charset detected = CharsetHelper.detect(result);
if (detected == null) { if (detected == null) {
@ -1749,7 +1788,7 @@ public class MessageHelper {
if ("flowed".equalsIgnoreCase(ct.getParameter("format"))) if ("flowed".equalsIgnoreCase(ct.getParameter("format")))
result = HtmlHelper.flow(result); result = HtmlHelper.flow(result);
result = "<div x-plain=\"true\">" + HtmlHelper.formatPre(result) + "</div>"; result = "<div x-plain=\"true\">" + HtmlHelper.formatPre(result) + "</div>";
} else if (part.isMimeType("text/html")) { } else if (h.part.isMimeType("text/html")) {
if (charset == null) { if (charset == null) {
// <meta charset="utf-8" /> // <meta charset="utf-8" />
// <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> // <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
@ -1779,8 +1818,8 @@ public class MessageHelper {
} }
} }
} }
} else if (part.isMimeType("message/delivery-status") || } else if (h.part.isMimeType("message/delivery-status") ||
part.isMimeType("message/disposition-notification")) { h.part.isMimeType("message/disposition-notification")) {
StringBuilder report = new StringBuilder(); StringBuilder report = new StringBuilder();
report.append("<hr><div style=\"font-family: monospace; font-size: small;\">"); report.append("<hr><div style=\"font-family: monospace; font-size: small;\">");
for (String line : result.split("\\r?\\n")) { for (String line : result.split("\\r?\\n")) {
@ -2069,8 +2108,8 @@ public class MessageHelper {
"application/x-pkcs7-signature".equals(protocol)) { "application/x-pkcs7-signature".equals(protocol)) {
Multipart multipart = (Multipart) part.getContent(); Multipart multipart = (Multipart) part.getContent();
if (multipart.getCount() == 2) { if (multipart.getCount() == 2) {
getMessageParts(multipart.getBodyPart(0), parts, null); getMessageParts(null, multipart.getBodyPart(0), parts, null);
getMessageParts(multipart.getBodyPart(1), parts, getMessageParts(null, multipart.getBodyPart(1), parts,
"application/pgp-signature".equals(protocol) "application/pgp-signature".equals(protocol)
? EntityAttachment.PGP_SIGNATURE ? EntityAttachment.PGP_SIGNATURE
: EntityAttachment.SMIME_SIGNATURE); : EntityAttachment.SMIME_SIGNATURE);
@ -2102,7 +2141,7 @@ public class MessageHelper {
Multipart multipart = (Multipart) part.getContent(); Multipart multipart = (Multipart) part.getContent();
if (multipart.getCount() == 2) { if (multipart.getCount() == 2) {
// Ignore header // Ignore header
getMessageParts(multipart.getBodyPart(1), parts, EntityAttachment.PGP_MESSAGE); getMessageParts(null, multipart.getBodyPart(1), parts, EntityAttachment.PGP_MESSAGE);
return parts; return parts;
} }
} }
@ -2111,10 +2150,10 @@ public class MessageHelper {
ContentType ct = new ContentType(part.getContentType()); ContentType ct = new ContentType(part.getContentType());
String smimeType = ct.getParameter("smime-type"); String smimeType = ct.getParameter("smime-type");
if ("enveloped-data".equals(smimeType)) { if ("enveloped-data".equals(smimeType)) {
getMessageParts(part, parts, EntityAttachment.SMIME_MESSAGE); getMessageParts(null, part, parts, EntityAttachment.SMIME_MESSAGE);
return parts; return parts;
} else if ("signed-data".equals(smimeType)) { } else if ("signed-data".equals(smimeType)) {
getMessageParts(part, parts, EntityAttachment.SMIME_SIGNED_DATA); getMessageParts(null, part, parts, EntityAttachment.SMIME_SIGNED_DATA);
return parts; return parts;
} }
} }
@ -2122,11 +2161,11 @@ public class MessageHelper {
Log.w(ex); Log.w(ex);
} }
getMessageParts(imessage, parts, null); getMessageParts(null, imessage, parts, null);
return parts; return parts.select();
} }
private void getMessageParts(Part part, MessageParts parts, Integer encrypt) throws IOException, MessagingException { private void getMessageParts(Multipart parent, Part part, MessageParts parts, Integer encrypt) throws IOException, MessagingException {
try { try {
Log.d("Part class=" + part.getClass() + " type=" + part.getContentType()); Log.d("Part class=" + part.getClass() + " type=" + part.getContentType());
if (part.isMimeType("multipart/*")) { if (part.isMimeType("multipart/*")) {
@ -2143,7 +2182,7 @@ public class MessageHelper {
for (int i = 0; i < multipart.getCount(); i++) for (int i = 0; i < multipart.getCount(); i++)
try { try {
getMessageParts(multipart.getBodyPart(i), parts, encrypt); getMessageParts(multipart, multipart.getBodyPart(i), parts, encrypt);
} catch (ParseException ex) { } catch (ParseException ex) {
// Nested body: try to continue // Nested body: try to continue
// ParseException: In parameter list boundary="...">, expected parameter name, got ";" // ParseException: In parameter list boundary="...">, expected parameter name, got ";"
@ -2185,18 +2224,14 @@ public class MessageHelper {
contentType = new ContentType(Helper.guessMimeType(filename)); contentType = new ContentType(Helper.guessMimeType(filename));
} }
boolean plain = "text/plain".equalsIgnoreCase(contentType.getBaseType()); String ct = contentType.getBaseType();
boolean html = "text/html".equalsIgnoreCase(contentType.getBaseType()); if (("text/plain".equalsIgnoreCase(ct) || "text/html".equalsIgnoreCase(ct)) &&
if ((plain || html) &&
!Part.ATTACHMENT.equalsIgnoreCase(disposition) && TextUtils.isEmpty(filename)) { !Part.ATTACHMENT.equalsIgnoreCase(disposition) && TextUtils.isEmpty(filename)) {
if (plain) parts.text.add(new PartHolder(parent, part, ct));
parts.plain.add(part);
else if (html)
parts.html.add(part);
} else { } else {
if ("message/delivery-status".equalsIgnoreCase(contentType.getBaseType()) || if ("message/delivery-status".equalsIgnoreCase(contentType.getBaseType()) ||
"message/disposition-notification".equalsIgnoreCase(contentType.getBaseType())) "message/disposition-notification".equalsIgnoreCase(contentType.getBaseType()))
parts.extra.add(part); parts.extra.add(new PartHolder(parent, part, ct));
AttachmentPart apart = new AttachmentPart(); AttachmentPart apart = new AttachmentPart();
apart.disposition = disposition; apart.disposition = disposition;

Write Preview
Loading…
Cancel
Save