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

Mozilla forwards from subdomains now

This commit is contained in:
M66B 2024-02-03 11:59:46 +01:00
parent c778a17ea8
commit 00b68e0b63
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/eu/faircode/email/EntityMessage.java
View File

@ -430,10 +430,12 @@ public class EntityMessage implements Serializable {
return false;
String email = ((InternetAddress) from[0]).getAddress();
String domain = UriHelper.getEmailDomain(email);
if (TextUtils.isEmpty(domain))
return false;
return "duck.com".equals(domain) ||
"simplelogin.co".equals(domain) ||
"mozmail.com".equals(domain) ||
"anonaddy.me".equals(domain);
"anonaddy.me".equals(domain) ||
domain.endsWith(".mozmail.com");
}
String[] checkFromDomain(Context context) {

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

@ -2691,7 +2691,7 @@ public class MessageHelper {
Address[] from = getAddressHeader("From");
if (from != null && from.length == 1) {
String email = ((InternetAddress) from[0]).getAddress();
if (email != null && email.endsWith("@mozmail.com"))
if (email != null && email.endsWith(".mozmail.com"))
sender = getAddressHeader("Resent-From");
}
}