fix blocking for exotic categories

Author: kasnder

app/src/main/java/net/kollnig/missioncontrol/data/TrackerBlocklist.java

@@ -99,6 +99,22 @@ public void loadSettings(Context c) {
                     subset.remove("Uncategorised | Adobe Systems");
                     subset.add("Uncategorised | Adobe");
                 }
+                if (subset.contains("FingerprintingGeneral")) {
+                    subset.remove("FingerprintingGeneral");
+                    subset.add("Fingerprinting");
+                }
+                if (subset.contains("FingerprintingInvasive")) {
+                    subset.remove("FingerprintingInvasive");
+                    subset.add("Fingerprinting");
+                }
+                if (subset.contains("EmailStrict")) {
+                    subset.remove("EmailStrict");
+                    subset.add("Email");
+                }
+                if (subset.contains("EmailAggressive")) {
+                    subset.remove("EmailAggressive");
+                    subset.add("Email");
+                }
 
                 // Retrieve uid
                 int uid = -1;

app/src/main/java/net/kollnig/missioncontrol/data/TrackerCategory.java

@@ -76,18 +76,14 @@ public String getDisplayName(Context c) {
             case "Analytics":
                 return c.getString(R.string.tracker_analytics);
             case "Content":
-            case "Anti-fraud":
                 return c.getString(R.string.tracker_content);
             case "Cryptomining":
                 return c.getString(R.string.tracker_cryptomining);
-            case "FingerprintingGeneral":
-            case "FingerprintingInvasive":
+            case "Fingerprinting":
                 return c.getString(R.string.tracker_fingerprinting);
             case "Social":
                 return c.getString(R.string.tracker_social);
             case "Email":
-            case "EmailStrict":
-            case "EmailAggressive":
                 return c.getString(R.string.tracker_email);
             case UNCATEGORISED:
             default:

app/src/main/java/net/kollnig/missioncontrol/data/TrackerList.java

@@ -383,6 +383,21 @@ private void loadDisconnectTrackers(Context c) {
                     // Found tracker, now add to list
                     JSONObject jsonTracker = category.getJSONObject(i);
                     String trackerName = jsonTracker.keys().next();
+
+                    switch (categoryName) {
+                        case "FingerprintingGeneral":
+                        case "FingerprintingInvasive":
+                            categoryName = "Fingerprinting";
+                            break;
+                        case "EmailStrict":
+                        case "EmailAggressive":
+                            categoryName = "Email";
+                            break;
+                        case "Anti-fraud":
+                            categoryName = "Content";
+                            break;
+                    }
+
                     Tracker tracker = new Tracker(trackerName, categoryName);
 
                     // Parse tracker domains