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

Remove name on extra

This commit is contained in:
M66B 2019-12-26 20:17:07 +01:00
parent bf87b4b385
commit f32b70368f
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -157,9 +157,15 @@ public class MessageHelper {
if (message.from != null && message.from.length > 0) {
String email = ((InternetAddress) message.from[0]).getAddress();
String name = ((InternetAddress) message.from[0]).getPersonal();
if (email != null && identity != null && identity.sender_extra && !TextUtils.isEmpty(message.extra)) {
if (identity != null && identity.sender_extra &&
identity.email.contains("@") &&
email != null &&
email.contains("@") &&
message.extra != null &&
!message.extra.equals(identity.email.split("@")[0])) {
int at = email.indexOf('@');
email = message.extra + email.substring(at);
name = null;
Log.i("extra=" + email);
}
imessage.setFrom(new InternetAddress(email, name));