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

Use Punycode for multi script email addresses

Browse source
This commit is contained in:
M66B 2020-04-13 15:13:21 +02:00
parent f22cdd6791
commit 1301dcce2a
1 changed files with 38 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -489,27 +489,7 @@ public class MessageHelper {
// https://en.wikipedia.org/wiki/International_email // https://en.wikipedia.org/wiki/International_email
for (Address address : addresses) { for (Address address : addresses) {
String email = ((InternetAddress) address).getAddress(); String email = ((InternetAddress) address).getAddress();
int at = email.indexOf('@'); email = punyCode(email);
if (at > 0) {
String user = email.substring(0, at);
String domain = email.substring(at + 1);
try {
user = IDN.toASCII(user);
} catch (IllegalArgumentException ex) {
Log.e(ex);
}
String[] parts = domain.split("\\.");
for (int p = 0; p < parts.length; p++)
try {
parts[p] = IDN.toASCII(parts[p]);
} catch (IllegalArgumentException ex) {
Log.e(ex);
}
email = user + '@' + TextUtils.join(".", parts);
}
((InternetAddress) address).setAddress(email); ((InternetAddress) address).setAddress(email);
} }
return addresses; return addresses;
@ -1055,8 +1035,15 @@ public class MessageHelper {
for (Address address : addresses) { for (Address address : addresses) {
InternetAddress iaddress = (InternetAddress) address; InternetAddress iaddress = (InternetAddress) address;
iaddress.setAddress(decodeMime(iaddress.getAddress())); String email = iaddress.getAddress();
String personal = iaddress.getPersonal(); String personal = iaddress.getPersonal();
email = decodeMime(email);
if (!Helper.isSingleScript(email))
email = punyCode(email);
iaddress.setAddress(email);
if (personal != null) { if (personal != null) {
try { try {
iaddress.setPersonal(decodeMime(personal)); iaddress.setPersonal(decodeMime(personal));
@ -1270,9 +1257,11 @@ public class MessageHelper {
if (addresses[i] instanceof InternetAddress) { if (addresses[i] instanceof InternetAddress) {
InternetAddress address = (InternetAddress) addresses[i]; InternetAddress address = (InternetAddress) addresses[i];
String email = address.getAddress();
String personal = address.getPersonal(); String personal = address.getPersonal();
if (TextUtils.isEmpty(personal)) if (TextUtils.isEmpty(personal))
formatted.add(address.getAddress()); formatted.add(email);
else { else {
if (compose) { if (compose) {
boolean quote = false; boolean quote = false;
@ -1287,7 +1276,7 @@ public class MessageHelper {
} }
if (full) if (full)
formatted.add(personal + " <" + address.getAddress() + ">"); formatted.add(personal + " <" + email + ">");
else else
formatted.add(personal); formatted.add(personal);
} }
@ -1297,6 +1286,31 @@ public class MessageHelper {
return TextUtils.join(", ", formatted); return TextUtils.join(", ", formatted);
} }
static String punyCode(String email) {
int at = email.indexOf('@');
if (at > 0) {
String user = email.substring(0, at);
String domain = email.substring(at + 1);
try {
user = IDN.toASCII(user);
} catch (IllegalArgumentException ex) {
Log.e(ex);
}
String[] parts = domain.split("\\.");
for (int p = 0; p < parts.length; p++)
try {
parts[p] = IDN.toASCII(parts[p]);
} catch (IllegalArgumentException ex) {
Log.e(ex);
}
email = user + '@' + TextUtils.join(".", parts);
}
return email;
}
static String decodeMime(String text) { static String decodeMime(String text) {
if (text == null) if (text == null)
return null; return null;