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

Parse email address again after double decoding

This commit is contained in:
M66B 2019-04-07 09:37:57 +02:00
parent 4f5b65e7e5
commit 720e10a44d
1 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -470,12 +470,7 @@ public class MessageHelper {
if (address == null || address.length == 0)
return null;
try {
address[0].setPersonal(decodeMime(address[0].getPersonal()));
address[0].setAddress(decodeMime(address[0].getAddress()));
} catch (UnsupportedEncodingException ex) {
Log.w(ex);
}
fix(address[0]);
return address[0];
}
@ -507,17 +502,31 @@ public class MessageHelper {
private static Address[] fix(Address[] addresses) {
if (addresses != null)
for (int i = 0; i < addresses.length; i++)
try {
((InternetAddress) addresses[i]).setPersonal(
decodeMime(((InternetAddress) addresses[i]).getPersonal()));
((InternetAddress) addresses[i]).setAddress(
decodeMime(((InternetAddress) addresses[i]).getAddress()));
} catch (UnsupportedEncodingException ex) {
Log.w(ex);
}
fix((InternetAddress) addresses[i]);
return addresses;
}
private static void fix(InternetAddress address) {
try {
String email = decodeMime(address.getAddress());
String personal = decodeMime(address.getPersonal());
try {
InternetAddress[] a = InternetAddress.parse(email);
if (a.length < 1)
throw new AddressException("empty");
String p = a[0].getPersonal();
address.setAddress(a[0].getAddress());
address.setPersonal(TextUtils.isEmpty(personal) ? p : personal + (p == null ? "" : " " + p));
} catch (AddressException ex) {
Log.w(ex);
address.setAddress(email);
address.setPersonal(personal);
}
} catch (UnsupportedEncodingException ex) {
Log.w(ex);
}
}
String getSubject() throws MessagingException {
String subject = imessage.getSubject();
return decodeMime(subject);