fix more bugs

Author: kasnder

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

@@ -41,6 +41,10 @@ public class TrackerBlocklist {
      */
     private final Map<Integer, Set<String>> blockmap = new ConcurrentHashMap<>();
 
+    interface PackageUidResolver {
+        Integer resolve(String packageName);
+    }
+
     private TrackerBlocklist(Context c) {
         // Initialize Concurrent Set using values from shared preferences if possible.
         if (c != null)
@@ -84,6 +88,16 @@ public static String getBlockingKey(Tracker t) {
     public void loadSettings(Context c) {
         SharedPreferences prefs = c.getSharedPreferences(PREF_BLOCKLIST, Context.MODE_PRIVATE);
         Set<String> set = prefs.getStringSet(SHARED_PREFS_BLOCKLIST_APPS_KEY, null);
+        PackageUidResolver resolver = new PackageUidResolver() {
+            @Override
+            public Integer resolve(String packageName) {
+                try {
+                    return c.getPackageManager().getApplicationInfo(packageName, 0).uid;
+                } catch (PackageManager.NameNotFoundException ignored) {
+                    return null;
+                }
+            }
+        };
 
         blockmap.clear();
         if (set != null) {
@@ -123,16 +137,25 @@ public void loadSettings(Context c) {
                 }
 
                 // Retrieve uid
-                int uid = -1;
-                if (StringUtils.isNumeric(appUid))
-                    uid = Integer.parseInt(appUid);
+                int uid = resolveStoredUid(appUid, resolver);
 
                 if (uid >= 0)
                     blockmap.put(uid, subset);
             }
         }
     }
 
+    static int resolveStoredUid(String storedUid, PackageUidResolver resolver) {
+        if (StringUtils.isNumeric(storedUid))
+            return Integer.parseInt(storedUid);
+
+        if (resolver == null)
+            return -1;
+
+        Integer uid = resolver.resolve(storedUid);
+        return uid == null ? -1 : uid;
+    }
+
     public synchronized boolean hasSubset(int uid) {
         return blockmap.containsKey(uid);
     }

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

@@ -38,6 +38,7 @@
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
@@ -56,7 +57,9 @@
  */
 public class TrackerList {
     private static final String TAG = TrackerList.class.getSimpleName();
-    private static final List<String> ignoreDomains = Collections.singletonList("cloudfront.net, fastly.net");
+    private static final Set<String> ignoreDomains = new HashSet<>(Arrays.asList(
+            "cloudfront.net",
+            "fastly.net"));
     private static final Map<String, Tracker> hostnameToTracker = new ConcurrentHashMap<>();
     public static String TRACKER_HOSTLIST = "TRACKER_HOSTLIST";
     private static final Tracker hostlistTracker = new Tracker(TRACKER_HOSTLIST, UNCATEGORISED);
@@ -91,6 +94,10 @@ public static TrackerList getInstance(Context c) {
         return instance;
     }
 
+    static boolean isIgnoredDomain(String domain) {
+        return ignoreDomains.contains(domain);
+    }
+
     /**
      * Identifies tracker hosts
      *
@@ -385,7 +392,7 @@ private void loadXrayTrackers(Context c) {
                 for (int j = 0; j < domains.length(); j++) {
                     String dom = domains.getString(j);
 
-                    if (ignoreDomains.contains(dom))
+                    if (isIgnoredDomain(dom))
                         continue;
 
                     addTrackerDomain(tracker, dom);
@@ -421,7 +428,7 @@ private void loadDuckDuckGoTrackers(Context c) {
                 JSONObject trackerInfo = trackers.getJSONObject(domain);
 
                 // Skip CDN domains that would cause false positives
-                if (ignoreDomains.contains(domain))
+                if (isIgnoredDomain(domain))
                     continue;
 
                 // Check if tracker already exists (e.g., from Disconnect list)
@@ -522,7 +529,7 @@ private void loadDisconnectTrackers(Context c) {
                         for (int j = 0; j < urls.length(); j++) {
                             String dom = urls.getString(j);
 
-                            if (ignoreDomains.contains(dom))
+                            if (isIgnoredDomain(dom))
                                 continue;
 
                             addTrackerDomain(tracker, dom);

app/src/test/java/net/kollnig/missioncontrol/data/TrackerBlocklistTest.java

@@ -93,4 +93,32 @@ public void minimalModeOnlyAllowsContentCategory() {
         assertTrue(TrackerBlocklist.blockedTrackerMinimal(
                 new Tracker("Branch", "Advertising")));
     }
+
+    @Test
+    public void resolveStoredUidParsesNumericIdsWithoutResolver() {
+        assertEquals(UID, TrackerBlocklist.resolveStoredUid(Integer.toString(UID), null));
+    }
+
+    @Test
+    public void resolveStoredUidMigratesLegacyPackageNames() {
+        assertEquals(UID, TrackerBlocklist.resolveStoredUid("com.example.app",
+                new TrackerBlocklist.PackageUidResolver() {
+                    @Override
+                    public Integer resolve(String packageName) {
+                        assertEquals("com.example.app", packageName);
+                        return UID;
+                    }
+                }));
+    }
+
+    @Test
+    public void resolveStoredUidDropsUnknownLegacyPackageNames() {
+        assertEquals(-1, TrackerBlocklist.resolveStoredUid("com.example.missing",
+                new TrackerBlocklist.PackageUidResolver() {
+                    @Override
+                    public Integer resolve(String packageName) {
+                        return null;
+                    }
+                }));
+    }
 }

app/src/test/java/net/kollnig/missioncontrol/data/TrackerListModeTest.java

@@ -65,6 +65,13 @@ public void minimalModeDoesNotSeeRepresentativeXrayOrDisconnectDomains() throws
         assertFalse(duckDuckGo.contains("\"branch.io\""));
     }
 
+    @Test
+    public void ignoredCdnParentDomainsAreMatchedSeparately() {
+        assertTrue(TrackerList.isIgnoredDomain("cloudfront.net"));
+        assertTrue(TrackerList.isIgnoredDomain("fastly.net"));
+        assertFalse(TrackerList.isIgnoredDomain("cloudfront.net, fastly.net"));
+    }
+
     private static String readAsset(String assetName) throws IOException {
         return new String(Files.readAllBytes(assetPath(assetName)), StandardCharsets.UTF_8);
     }