Block parent domain

1 year ago · 4eac1f60eb
parent fc1637bc59
commit 4eac1f60eb
2 changed files with 6 additions and 0 deletions
--- a/app/src/main/java/eu/faircode/email/EntityRule.java
+++ b/app/src/main/java/eu/faircode/email/EntityRule.java
@ -1339,6 +1339,9 @@ public class EntityRule {
            if (block_domain) {
                String domain = UriHelper.getEmailDomain(sender);
                if (!TextUtils.isEmpty(domain) && !domains.contains(domain)) {
+                    String parent = UriHelper.getParentDomain(context, domain);
+                    if (parent != null)
+                        domain = parent;
                    domains.add(domain);
                    regex = true;
                    sender = ".*@.*" + Pattern.quote(domain) + ".*";
--- a/app/src/main/java/eu/faircode/email/FragmentDialogJunk.java
+++ b/app/src/main/java/eu/faircode/email/FragmentDialogJunk.java
@ -344,6 +344,9 @@ public class FragmentDialogJunk extends FragmentDialogBase {
                String domain = UriHelper.getEmailDomain(email);
                if (TextUtils.isEmpty(domain) || domains.contains(domain))
                    continue;
+                String parent = UriHelper.getParentDomain(context, domain);
+                if (parent != null)
+                    domain = parent;

                domains.add(domain);