mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2024-12-29 11:15:51 +00:00
Code Issues Releases Wiki Activity

Fixed parsing non essential addresses

Browse source
This commit is contained in:
M66B 2019-05-10 12:10:23 +02:00
parent ffdeec1e79
commit 6486e306a8
1 changed files with 41 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -20,7 +20,6 @@ package eu.faircode.email;
*/ */
import android.content.Context; import android.content.Context;
import android.text.Html;
import android.text.TextUtils; import android.text.TextUtils;
import android.webkit.MimeTypeMap; import android.webkit.MimeTypeMap;
@ -483,25 +482,30 @@ public class MessageHelper {
} }
Address[] getReceiptTo() throws MessagingException { Address[] getReceiptTo() throws MessagingException {
String to = imessage.getHeader("Disposition-Notification-To", null);
if (to == null)
return null;
to = MimeUtility.unfold(to);
InternetAddress[] address = null;
try { try {
address = InternetAddress.parse(to); String to = imessage.getHeader("Disposition-Notification-To", null);
if (to == null)
return null;
to = MimeUtility.unfold(to);
InternetAddress[] address = null;
try {
address = InternetAddress.parse(to);
} catch (AddressException ex) {
Log.w(ex);
}
if (address == null || address.length == 0)
return null;
fix(address[0]);
return new Address[]{address[0]};
} catch (AddressException ex) { } catch (AddressException ex) {
Log.w(ex); Log.w(ex);
}
if (address == null || address.length == 0)
return null; return null;
}
fix(address[0]);
return new Address[]{address[0]};
} }
String getAuthentication() throws MessagingException { String getAuthentication() throws MessagingException {
@ -560,26 +564,31 @@ public class MessageHelper {
} }
Address[] getListPost() throws MessagingException { Address[] getListPost() throws MessagingException {
// https://www.ietf.org/rfc/rfc2369.txt
String list = imessage.getHeader("List-Post", null);
if (list == null || "NO".equals(list))
return null;
list = MimeUtility.unfold(list);
InternetAddress[] address = null;
try { try {
address = InternetAddress.parse(list); // https://www.ietf.org/rfc/rfc2369.txt
String list = imessage.getHeader("List-Post", null);
if (list == null || "NO".equals(list))
return null;
list = MimeUtility.unfold(list);
InternetAddress[] address = null;
try {
address = InternetAddress.parse(list);
} catch (AddressException ex) {
Log.w(ex);
}
if (address == null || address.length == 0)
return null;
fix(address[0]);
return new Address[]{address[0]};
} catch (AddressException ex) { } catch (AddressException ex) {
Log.w(ex); Log.w(ex);
}
if (address == null || address.length == 0)
return null; return null;
}
fix(address[0]);
return new Address[]{address[0]};
} }
private static Address[] fix(Address[] addresses) { private static Address[] fix(Address[] addresses) {