From 1322f4a64beb8661ccb0dece503c2d1267d8a6c8 Mon Sep 17 00:00:00 2001 From: M66B Date: Fri, 28 Oct 2022 16:00:39 +0200 Subject: [PATCH] Disabled Spamcop blocklist by default --- app/src/main/java/eu/faircode/email/ApplicationEx.java | 4 ++++ app/src/main/java/eu/faircode/email/DnsBlockList.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/eu/faircode/email/ApplicationEx.java b/app/src/main/java/eu/faircode/email/ApplicationEx.java index 8bc657ef8a..e4aab92bff 100644 --- a/app/src/main/java/eu/faircode/email/ApplicationEx.java +++ b/app/src/main/java/eu/faircode/email/ApplicationEx.java @@ -659,6 +659,10 @@ public class ApplicationEx extends Application editor.putBoolean("photo_picker", true); } else if (version < 1966) editor.remove("hide_timezone"); + else if (version < 1994) { + // 2022-10-28 Spamcop blocks Google's addresses + editor.putBoolean("blocklist.Spamcop", false); + } if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && !BuildConfig.DEBUG) editor.remove("background_service"); diff --git a/app/src/main/java/eu/faircode/email/DnsBlockList.java b/app/src/main/java/eu/faircode/email/DnsBlockList.java index cb816a138a..c81922f32b 100644 --- a/app/src/main/java/eu/faircode/email/DnsBlockList.java +++ b/app/src/main/java/eu/faircode/email/DnsBlockList.java @@ -71,7 +71,7 @@ public class DnsBlockList { "127.0.1.106", // abused legit botnet C&C }), - new BlockList(true, "Spamcop", "bl.spamcop.net", true, new String[]{ + new BlockList(false, "Spamcop", "bl.spamcop.net", true, new String[]{ // https://www.spamcop.net/fom-serve/cache/291.html "127.0.0.2", }),