Clear block list cache on settings changes

app/src/main/java/eu/faircode/email/ApplicationEx.java

@@ -212,6 +212,10 @@ public class ApplicationEx extends Application
             case "schedule_day6":
                 ServiceSynchronize.reschedule(this);
                 break;
+            case "check_blocklist":
+            case "use_blocklist":
+                DnsBlockList.clearCache();
+                break;
             case "watchdog":
                 ServiceSynchronize.scheduleWatchdog(this);
                 break;

app/src/main/java/eu/faircode/email/DnsBlockList.java

@@ -82,16 +82,21 @@ public class DnsBlockList {
     private static final long CACHE_EXPIRY_AFTER = 3600 * 1000L; // milliseconds
     private static final Map<String, CacheEntry> cache = new Hashtable<>();
 
+    static void clearCache() {
+        Log.i("isJunk clear cache");
+        synchronized (cache) {
+            cache.clear();
+        }
+    }
+
     static void setEnabled(Context context, BlockList blocklist, boolean enabled) {
+        Log.i("isJunk " + blocklist.name + "=" + enabled);
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
         if (blocklist.enabled == null || blocklist.enabled == enabled)
             prefs.edit().remove("blocklist." + blocklist.name).apply();
         else
             prefs.edit().putBoolean("blocklist." + blocklist.name, enabled).apply();
-
+        clearCache();
-        synchronized (cache) {
-            cache.clear();
-        }
     }
 
     static boolean isEnabled(Context context, BlockList blocklist) {
@@ -101,15 +106,13 @@ public class DnsBlockList {
     }
 
     static void reset(Context context) {
+        Log.i("isJunk reset");
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
         SharedPreferences.Editor editor = prefs.edit();
         for (BlockList blocklist : BLOCK_LISTS)
             editor.remove("blocklist." + blocklist.name);
         editor.apply();
-
+        clearCache();
-        synchronized (cache) {
-            cache.clear();
-        }
     }
 
     static List<BlockList> getLists() {

app/src/main/java/eu/faircode/email/WorkerCleanup.java

@@ -143,9 +143,8 @@ public class WorkerCleanup extends Worker {
 
                 ServiceSynchronize.reschedule(context);
 
+                DnsBlockList.clearCache();
                 MessageClassifier.cleanup(context);
-
-                // Contact info cache
                 ContactInfo.clearCache(context);
 
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {