Check for empty addresses

pull/194/head
M66B 5 years ago
parent d6824bdfcd
commit c08f36f21c

@ -1214,11 +1214,15 @@ public class MessageHelper {
header = header.replaceAll("\\?=[\\r\\n\\t ]+=\\?", "\\?==\\?"); header = header.replaceAll("\\?=[\\r\\n\\t ]+=\\?", "\\?==\\?");
Address[] addresses = InternetAddress.parseHeader(header, false); Address[] addresses = InternetAddress.parseHeader(header, false);
List<Address> result = new ArrayList<>();
for (Address address : addresses) { for (Address address : addresses) {
InternetAddress iaddress = (InternetAddress) address; InternetAddress iaddress = (InternetAddress) address;
String email = iaddress.getAddress(); String email = iaddress.getAddress();
String personal = iaddress.getPersonal(); String personal = iaddress.getPersonal();
if (TextUtils.isEmpty(email) && TextUtils.isEmpty(personal))
continue;
email = decodeMime(email); email = decodeMime(email);
if (!Helper.isSingleScript(email)) if (!Helper.isSingleScript(email))
email = punyCode(email); email = punyCode(email);
@ -1232,9 +1236,11 @@ public class MessageHelper {
Log.w(ex); Log.w(ex);
} }
} }
result.add(address);
} }
return addresses; return (result.size() == 0 ? null : result.toArray(new Address[0]));
} }
Address[] getReturnPath() throws MessagingException { Address[] getReturnPath() throws MessagingException {

Loading…
Cancel
Save