From 31efb7a212fc0a1c731633a78ce86074b3bb5a35 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Mon, 3 Aug 2020 18:11:27 +0200
Subject: [PATCH] Block sender's parent domain

---
 app/src/main/java/eu/faircode/email/EntityRule.java | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/EntityRule.java b/app/src/main/java/eu/faircode/email/EntityRule.java
index c081ec1d01..ea9a02a94a 100644
--- a/app/src/main/java/eu/faircode/email/EntityRule.java
+++ b/app/src/main/java/eu/faircode/email/EntityRule.java
@@ -655,24 +655,27 @@ public class EntityRule {
         if (TextUtils.isEmpty(sender))
             return null;
 
+        boolean regex = false;
         if (block_domain) {
             int at = sender.indexOf('@');
             if (at > 0) {
                 boolean whitelisted = false;
-                String domain = sender.substring(at + 1);
+                String domain = DnsHelper.getParentDomain(sender.substring(at + 1));
                 for (String d : whitelist)
                     if (domain.matches(d)) {
                         whitelisted = true;
                         break;
                     }
-                if (!whitelisted)
-                    sender = '@' + domain;
+                if (!whitelisted) {
+                    regex = true;
+                    sender = ".*@.*" + domain + ".*";
+                }
             }
         }
 
         JSONObject jsender = new JSONObject();
         jsender.put("value", sender);
-        jsender.put("regex", false);
+        jsender.put("regex", regex);
 
         JSONObject jcondition = new JSONObject();
         jcondition.put("sender", jsender);