mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-01-01 04:35:57 +00:00
Code Issues Releases Wiki Activity

Unfold all message headers

Browse source
This commit is contained in:
M66B 2019-05-03 09:26:11 +02:00
parent 3d07520d2f
commit 7454645ada
1 changed files with 31 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
app/src/main/java/eu/faircode/email/MessageHelper.java
View file

@ -439,27 +439,27 @@ public class MessageHelper {
String getMessageID() throws MessagingException { String getMessageID() throws MessagingException {
// Outlook outbox -> sent // Outlook outbox -> sent
String[] xID = imessage.getHeader("X-FairEmail-ID"); String header = imessage.getHeader("X-FairEmail-ID", null);
if (xID != null && xID.length > 0) if (header == null)
return xID[0]; header = imessage.getHeader("Message-ID", null);
return (header == null ? null : MimeUtility.unfold(header));
return imessage.getHeader("Message-ID", null);
} }
String[] getReferences() throws MessagingException { String[] getReferences() throws MessagingException {
String refs = imessage.getHeader("References", null); String refs = imessage.getHeader("References", null);
return (refs == null ? new String[0] : refs.split("\\s+")); return (refs == null ? new String[0] : MimeUtility.unfold(refs).split("\\s+"));
} }
String getDeliveredTo() throws MessagingException { String getDeliveredTo() throws MessagingException {
String header = imessage.getHeader("Delivered-To", null); String header = imessage.getHeader("Delivered-To", null);
if (header == null) if (header == null)
header = imessage.getHeader("X-Delivered-To", null); header = imessage.getHeader("X-Delivered-To", null);
return header; return (header == null ? null : MimeUtility.unfold(header));
} }
String getInReplyTo() throws MessagingException { String getInReplyTo() throws MessagingException {
return imessage.getHeader("In-Reply-To", null); String header = imessage.getHeader("In-Reply-To", null);
return (header == null ? null : MimeUtility.unfold(header));
} }
String getThreadId(Context context, long account, long uid) throws MessagingException { String getThreadId(Context context, long account, long uid) throws MessagingException {
@ -497,6 +497,8 @@ public class MessageHelper {
if (to == null) if (to == null)
return null; return null;
to = MimeUtility.unfold(to);
InternetAddress[] address = null; InternetAddress[] address = null;
try { try {
address = InternetAddress.parse(to); address = InternetAddress.parse(to);
@ -513,8 +515,8 @@ public class MessageHelper {
} }
String getAuthentication() throws MessagingException { String getAuthentication() throws MessagingException {
String header = imessage.getHeader("Authentication-Results", ""); String header = imessage.getHeader("Authentication-Results", null);
return (header == null ? null : header.replaceAll("\\r?\\n", "")); return (header == null ? null : MimeUtility.unfold(header));
} }
static Boolean getAuthentication(String type, String header) { static Boolean getAuthentication(String type, String header) {
@ -559,6 +561,7 @@ public class MessageHelper {
} }
Address[] getReply() throws MessagingException { Address[] getReply() throws MessagingException {
// Prevent getting To header
String[] headers = imessage.getHeader("Reply-To"); String[] headers = imessage.getHeader("Reply-To");
if (headers != null && headers.length > 0) if (headers != null && headers.length > 0)
return fix(imessage.getReplyTo()); return fix(imessage.getReplyTo());
@ -572,6 +575,8 @@ public class MessageHelper {
if (list == null || "NO".equals(list)) if (list == null || "NO".equals(list))
return null; return null;
list = MimeUtility.unfold(list);
InternetAddress[] address = null; InternetAddress[] address = null;
try { try {
address = InternetAddress.parse(list); address = InternetAddress.parse(list);
@ -616,22 +621,24 @@ public class MessageHelper {
} }
String getSubject() throws MessagingException { String getSubject() throws MessagingException {
String subject = imessage.getSubject(); String subject = imessage.getHeader("Subject", null);
if (subject == null)
return null;
subject = MimeUtility.unfold(subject);
// Fix UTF-8 // Fix UTF-8
if (subject != null) { char[] kars = subject.toCharArray();
char[] kars = subject.toCharArray(); byte[] bytes = new byte[kars.length];
byte[] bytes = new byte[kars.length]; for (int i = 0; i < kars.length; i++)
for (int i = 0; i < kars.length; i++) bytes[i] = (byte) kars[i];
bytes[i] = (byte) kars[i];
try { try {
CharsetDecoder cs = StandardCharsets.UTF_8.newDecoder(); CharsetDecoder cs = StandardCharsets.UTF_8.newDecoder();
cs.decode(ByteBuffer.wrap(bytes)); cs.decode(ByteBuffer.wrap(bytes));
subject = new String(bytes, StandardCharsets.UTF_8); subject = new String(bytes, StandardCharsets.UTF_8);
} catch (CharacterCodingException ex) { } catch (CharacterCodingException ex) {
Log.w(ex); Log.w(ex);
}
} }
return decodeMime(subject); return decodeMime(subject);
@ -825,7 +832,7 @@ public class MessageHelper {
attachment.type = ct.getBaseType().toLowerCase(); attachment.type = ct.getBaseType().toLowerCase();
attachment.disposition = apart.disposition; attachment.disposition = apart.disposition;
attachment.size = (long) apart.part.getSize(); attachment.size = (long) apart.part.getSize();
attachment.cid = (cid == null || cid.length == 0 ? null : cid[0]); attachment.cid = (cid == null || cid.length == 0 ? null : MimeUtility.unfold(cid[0]));
attachment.encryption = (apart.pgp ? EntityAttachment.PGP_MESSAGE : null); attachment.encryption = (apart.pgp ? EntityAttachment.PGP_MESSAGE : null);
if ("text/calendar".equalsIgnoreCase(attachment.type) && TextUtils.isEmpty(attachment.name)) if ("text/calendar".equalsIgnoreCase(attachment.type) && TextUtils.isEmpty(attachment.name))