Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-03-27 19:35:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Refactoring

Browse Source
This commit is contained in:
M66B
2021-11-25 12:44:18 +01:00
parent 4cda3a7f1f
commit aa166b20bd
1 changed files with 32 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -273,35 +273,8 @@ public class MessageHelper {
imessage.addHeader(HEADER_CORRELATION_ID, message.msgid);
// Addresses
if (message.from != null && message.from.length > 0) {
InternetAddress from = ((InternetAddress) message.from[0]);
String email = from.getAddress();
String name = from.getPersonal();
if (identity != null && identity.sender_extra &&
email != null && message.extra != null) {
int at = email.indexOf('@');
String username = UriHelper.getEmailUser(identity.email);
if (at > 0 && !message.extra.equals(username)) {
if (message.extra.length() > 1 && message.extra.startsWith("+"))
email = email.substring(0, at) + message.extra + email.substring(at);
else if (message.extra.length() > 1 && message.extra.startsWith("@"))
email = email.substring(0, at) + message.extra + '.' + email.substring(at + 1);
else
email = message.extra + email.substring(at);
if (!identity.sender_extra_name)
name = null;
Log.i("extra=\"" + name + "\" <" + email + ">");
}
}
if (EntityMessage.DSN_HARD_BOUNCE.equals(message.dsn))
name = null;
imessage.setFrom(new InternetAddress(email, name, StandardCharsets.UTF_8.name()));
}
if (message.from != null && message.from.length > 0)
imessage.setFrom(getFrom(message, identity));
if (message.to != null && message.to.length > 0)
imessage.setRecipients(Message.RecipientType.TO, convertAddress(message.to, identity));
@@ -586,6 +559,36 @@ public class MessageHelper {
return imessage;
}
static Address getFrom(EntityMessage message, EntityIdentity identity) throws UnsupportedEncodingException {
InternetAddress from = ((InternetAddress) message.from[0]);
String email = from.getAddress();
String name = from.getPersonal();
if (identity != null && identity.sender_extra &&
email != null && message.extra != null) {
int at = email.indexOf('@');
String username = UriHelper.getEmailUser(identity.email);
if (at > 0 && !message.extra.equals(username)) {
if (message.extra.length() > 1 && message.extra.startsWith("+"))
email = email.substring(0, at) + message.extra + email.substring(at);
else if (message.extra.length() > 1 && message.extra.startsWith("@"))
email = email.substring(0, at) + message.extra + '.' + email.substring(at + 1);
else
email = message.extra + email.substring(at);
if (!identity.sender_extra_name)
name = null;
Log.i("extra=\"" + name + "\" <" + email + ">");
}
}
if (EntityMessage.DSN_HARD_BOUNCE.equals(message.dsn))
name = null;
return new InternetAddress(email, name, StandardCharsets.UTF_8.name());
}
private static void addAddress(String email, Message.RecipientType type, MimeMessage imessage, EntityIdentity identity) throws MessagingException {
List<Address> result = new ArrayList<>();