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

Simplification

This commit is contained in:
M66B 2021-05-29 19:58:41 +02:00
parent 12076cdffb
commit 340c2ab2ad
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -222,19 +222,18 @@ public class MessageHelper {
String email = ((InternetAddress) message.from[0]).getAddress();
String name = ((InternetAddress) message.from[0]).getPersonal();
if (identity != null && identity.sender_extra &&
identity.email.contains("@") &&
email != null &&
email.contains("@") &&
message.extra != null &&
!message.extra.equals(identity.email.split("@")[0])) {
email != null && message.extra != null) {
int at = email.indexOf('@');
if (message.extra.length() > 1 && message.extra.startsWith("+"))
email = email.substring(0, at) + message.extra + email.substring(at);
else
email = message.extra + email.substring(at);
if (!identity.sender_extra_name)
name = null;
Log.i("extra=" + email);
String username = identity.email.split("@")[0];
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
email = message.extra + email.substring(at);
if (!identity.sender_extra_name)
name = null;
Log.i("extra=" + email);
}
}
imessage.setFrom(new InternetAddress(email, name, StandardCharsets.UTF_8.name()));
}