From 4eac1f60ebebc2638b098ccddc9350ef4ef41f76 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 16 Apr 2023 08:02:47 +0200
Subject: [PATCH] Block parent domain

---
 app/src/main/java/eu/faircode/email/EntityRule.java         | 3 +++
 app/src/main/java/eu/faircode/email/FragmentDialogJunk.java | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/app/src/main/java/eu/faircode/email/EntityRule.java b/app/src/main/java/eu/faircode/email/EntityRule.java
index 4b28916618..e27b378239 100644
--- 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) + ".*";
diff --git a/app/src/main/java/eu/faircode/email/FragmentDialogJunk.java b/app/src/main/java/eu/faircode/email/FragmentDialogJunk.java
index 39c3544632..bd5ce76159 100644
--- 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);