mirror of https://github.com/M66B/FairEmail.git
Mozilla forwards from subdomains now
This commit is contained in:
parent
c778a17ea8
commit
00b68e0b63
|
@ -430,10 +430,12 @@ public class EntityMessage implements Serializable {
|
||||||
return false;
|
return false;
|
||||||
String email = ((InternetAddress) from[0]).getAddress();
|
String email = ((InternetAddress) from[0]).getAddress();
|
||||||
String domain = UriHelper.getEmailDomain(email);
|
String domain = UriHelper.getEmailDomain(email);
|
||||||
|
if (TextUtils.isEmpty(domain))
|
||||||
|
return false;
|
||||||
return "duck.com".equals(domain) ||
|
return "duck.com".equals(domain) ||
|
||||||
"simplelogin.co".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) {
|
String[] checkFromDomain(Context context) {
|
||||||
|
|
|
@ -2691,7 +2691,7 @@ public class MessageHelper {
|
||||||
Address[] from = getAddressHeader("From");
|
Address[] from = getAddressHeader("From");
|
||||||
if (from != null && from.length == 1) {
|
if (from != null && from.length == 1) {
|
||||||
String email = ((InternetAddress) from[0]).getAddress();
|
String email = ((InternetAddress) from[0]).getAddress();
|
||||||
if (email != null && email.endsWith("@mozmail.com"))
|
if (email != null && email.endsWith(".mozmail.com"))
|
||||||
sender = getAddressHeader("Resent-From");
|
sender = getAddressHeader("Resent-From");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue