Fix insights aggregation semantics

Author: kasnder

app/src/main/java/eu/faircode/netguard/DatabaseHelper.java

@@ -841,23 +841,21 @@ public long getHostCount(int uid, boolean usecache) {
     }
 
     /**
-     * Get tracking statistics for the past 7 days for the Insights screen.
-     * Returns aggregated data including blocked/allowed counts per uid and daddr.
-     * 
-     * @return Cursor with columns: uid, daddr, block, connections, time
+     * Get recent tracker access rows for the Insights screen.
+     * The provider deduplicates these rows into the latest app-host contact.
+     *
+     * @return Cursor with columns: uid, daddr, allowed, time, uncertain
      */
     public Cursor getInsightsData7Days() {
         lock.readLock().lock();
         try {
             SQLiteDatabase db = this.getReadableDatabase();
             long sevenDaysAgo = System.currentTimeMillis() - (7L * 24 * 60 * 60 * 1000);
 
-            // Query access table for last 7 days, aggregating connections
-            String query = "SELECT uid, daddr, block, " +
-                    "COALESCE(connections, 1) as connections, time, uncertain " +
+            String query = "SELECT uid, daddr, allowed, time, uncertain " +
                     "FROM access " +
                     "WHERE time >= ? " +
-                    "ORDER BY time DESC";
+                    "ORDER BY time DESC, ID DESC";
 
             return db.rawQuery(query, new String[] { Long.toString(sevenDaysAgo) });
         } finally {

app/src/main/java/net/kollnig/missioncontrol/data/InsightsData.kt

@@ -21,7 +21,7 @@ import android.util.Pair
 
 /**
  * Data model holding aggregated tracking statistics for the Insights screen.
- * Contains 7-day statistics about trackers contacted and blocking effectiveness.
+ * Contains 7-day statistics about observed tracker-host contacts and blocking effectiveness.
  */
 data class InsightsData(
     // Overall 7-day summary
@@ -58,4 +58,3 @@ data class InsightsData(
         return totalTrackingAttempts > 0 || uniqueTrackerCompanies > 0
     }
 }
-

app/src/main/java/net/kollnig/missioncontrol/data/InsightsDataProvider.kt

@@ -24,6 +24,7 @@ import android.util.Pair
 import androidx.preference.PreferenceManager
 import eu.faircode.netguard.DatabaseHelper
 import net.kollnig.missioncontrol.Common
+import java.util.Locale
 
 /**
  * Provider class that computes InsightsData from the database.
@@ -53,10 +54,12 @@ class InsightsDataProvider(context: Context) {
         val showSystem = prefs.getBoolean("show_system", false)
         val applyPrefs = context.getSharedPreferences("apply", Context.MODE_PRIVATE)
         val trackerProtectPrefs = context.getSharedPreferences("tracker_protect", Context.MODE_PRIVATE)
+        val blockingMode = BlockingMode.getMode(context)
 
         // Cache for UID -> package info lookups
         val uidPackageCache = mutableMapOf<Int, String?>()
         val uidSystemCache = mutableMapOf<Int, Boolean>()
+        val seenContacts = mutableSetOf<String>()
 
         // Maps for aggregation
         val appTrackerCounts = mutableMapOf<Int, Int>()  // uid -> unique tracker hosts
@@ -69,15 +72,21 @@ class InsightsDataProvider(context: Context) {
 
         // Top domains: domain -> set of UIDs
         val domainToApps = mutableMapOf<String, MutableSet<Int>>()
+        val uncertainDomains = mutableSetOf<String>()
 
         databaseHelper.getInsightsData7Days().use { cursor ->
             if (cursor != null && cursor.moveToFirst()) {
                 val uidIndex = cursor.getColumnIndexOrThrow("uid")
                 val daddrIndex = cursor.getColumnIndexOrThrow("daddr")
+                val allowedIndex = cursor.getColumnIndex("allowed")
+                val uncertainIndex = cursor.getColumnIndex("uncertain")
 
                 do {
                     val uid = cursor.getInt(uidIndex)
                     val daddr = cursor.getString(daddrIndex)
+                    val contactKey = "$uid|$daddr"
+
+                    if (!seenContacts.add(contactKey)) continue
 
                     // Get package name (cached)
                     val packageName = uidPackageCache.getOrPut(uid) {
@@ -101,16 +110,29 @@ class InsightsDataProvider(context: Context) {
 
                     // Find tracker company for this hostname
                     val tracker = TrackerList.findTracker(daddr) ?: continue
+                    val allowed = if (allowedIndex >= 0 && !cursor.isNull(allowedIndex))
+                        cursor.getInt(allowedIndex)
+                    else
+                        -1
+                    val uncertainty = if (uncertainIndex >= 0 && !cursor.isNull(uncertainIndex))
+                        cursor.getInt(uncertainIndex)
+                    else
+                        DatabaseHelper.ACCESS_UNCERTAIN_NONE
 
                     val companyName = tracker.name ?: daddr
                     uniqueCompanies.add(companyName)
                     appsWithTrackers.add(uid)
 
-                    // Count tracker hosts seen over the last 7 days.
+                    // Count latest unique app-host contacts seen over the last 7 days.
                     data.totalTrackingAttempts += 1
 
-                    // Check if this tracker is currently blocked
-                    val isBlocked = trackerBlocklist.blockedTracker(uid, tracker)
+                    val isBlocked = isTrackerContactBlocked(
+                        uid,
+                        tracker,
+                        allowed,
+                        uncertainty,
+                        blockingMode
+                    )
                     if (isBlocked) {
                         data.blockedTrackingAttempts += 1
                     } else {
@@ -125,9 +147,11 @@ class InsightsDataProvider(context: Context) {
 
                     // Track which apps contact each company
                     companyToApps.getOrPut(companyName) { mutableSetOf() }.add(uid)
-                    
+
                     // Track which apps contact each domain
                     domainToApps.getOrPut(daddr) { mutableSetOf() }.add(uid)
+                    if (uncertainty > DatabaseHelper.ACCESS_UNCERTAIN_NONE)
+                        uncertainDomains.add(daddr)
 
                 } while (cursor.moveToNext())
             }
@@ -164,26 +188,7 @@ class InsightsDataProvider(context: Context) {
         // Group by TLD+1 (e.g., ads.google.com -> google.com) to reduce clutter
         // For uncertain entries, show alternate tracker domains inline
         val tldPlusOneToApps = mutableMapOf<String, MutableSet<Int>>()
-        
-        // Track which domains are uncertain (need to show alternates)
-        val uncertainDomains = mutableSetOf<String>()
-        
-        // First pass: collect all uncertain domains from the cursor data
-        // Re-query to get uncertain info (since we need fresh cursor)
-        databaseHelper.getInsightsData7Days().use { cursor ->
-            if (cursor != null && cursor.moveToFirst()) {
-                val daddrIndex = cursor.getColumnIndexOrThrow("daddr")
-                val uncertainIndex = cursor.getColumnIndex("uncertain")
-                
-                do {
-                    val daddr = cursor.getString(daddrIndex)
-                    if (uncertainIndex >= 0 && cursor.getInt(uncertainIndex) > 0) {
-                        uncertainDomains.add(daddr)
-                    }
-                } while (cursor.moveToNext())
-            }
-        }
-        
+
         for ((daddr, uids) in domainToApps) {
             val tldPlusOne = extractTldPlusOne(daddr)
 
@@ -235,12 +240,16 @@ class InsightsDataProvider(context: Context) {
      * Extract TLD+1 from a domain name (e.g., ads.google.com -> google.com)
      */
     private fun extractTldPlusOne(domain: String): String {
-        val parts = domain.split(".")
-        return if (parts.size >= 2) {
-            "${parts[parts.size - 2]}.${parts[parts.size - 1]}"
-        } else {
-            domain
-        }
+        val normalized = domain.trim('.').lowercase(Locale.ROOT)
+        val parts = normalized.split(".").filter { it.isNotEmpty() }
+        if (parts.size < 2)
+            return normalized
+
+        val suffix = parts.takeLast(2).joinToString(".")
+        return if (parts.size >= 3 && MULTI_LABEL_PUBLIC_SUFFIXES.contains(suffix))
+            "${parts[parts.size - 3]}.$suffix"
+        else
+            suffix
     }
 
     /**
@@ -270,4 +279,44 @@ class InsightsDataProvider(context: Context) {
             tldPlusOne
         }
     }
+
+    private fun isTrackerContactBlocked(
+        uid: Int,
+        tracker: Tracker,
+        allowed: Int,
+        uncertainty: Int,
+        blockingMode: String
+    ): Boolean {
+        if (allowed >= 0)
+            return allowed == 0
+
+        if (!BlockingMode.isStrictMode(context)
+            && uncertainty == DatabaseHelper.ACCESS_UNCERTAIN_MIXED_TRACKER_AND_NON_TRACKER) {
+            return false
+        }
+
+        val blockedByGranularRule = if (BlockingMode.MODE_MINIMAL == blockingMode) {
+            false
+        } else {
+            trackerBlocklist.blockedTracker(uid, tracker)
+        }
+
+        return BlockingModeLogic.shouldBlockKnownTracker(
+            blockingMode,
+            tracker.category,
+            blockedByGranularRule
+        )
+    }
+
+    companion object {
+        private val MULTI_LABEL_PUBLIC_SUFFIXES = setOf(
+            "ac.uk", "co.uk", "gov.uk", "org.uk",
+            "co.jp", "ne.jp", "or.jp",
+            "com.au", "edu.au", "gov.au", "net.au", "org.au",
+            "ac.nz", "co.nz", "govt.nz", "org.nz",
+            "co.in", "firm.in", "gen.in", "ind.in", "net.in", "org.in",
+            "com.br", "com.cn", "com.hk", "com.mx", "com.my", "com.sg",
+            "com.tr", "com.tw", "net.cn", "org.cn"
+        )
+    }
 }

app/src/main/res/layout/layout_insights_share.xml

@@ -132,7 +132,7 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/insights_top_companies"
+            android:text="@string/insights_pervasive_trackers"
             android:textColor="@android:color/white"
             android:textSize="14sp"
             android:textStyle="bold"

app/src/main/res/values/strings.xml

@@ -613,11 +613,11 @@ Sincerely,\n\n]]></string>
     <string name="insights_shocking_fact">Your apps contacted %1$d tracking companies via %2$d tracker hosts this week!</string>
     <string name="insights_shocking_fact_playstore">Your apps contacted %1$d tracking companies this week!</string>
     <string name="insights_share">Share with Friends</string>
-    <string name="insights_share_trackers_blocked">Trackers Blocked</string>
-    <string name="insights_share_trackers_detected">Trackers Detected</string>
+    <string name="insights_share_trackers_blocked">Tracker Hosts Blocked</string>
+    <string name="insights_share_trackers_detected">Tracker Hosts Detected</string>
     <string name="insights_share_url">TrackerControl.org</string>
-    <string name="insights_share_message">I blocked %1$d trackers from %2$d companies this week using TrackerControl! Take back your privacy: https://trackercontrol.org</string>
-    <string name="insights_share_message_playstore">I detected %1$d trackers from %2$d companies this week using TrackerControl! Take back your privacy: https://trackercontrol.org</string>
+    <string name="insights_share_message">I blocked %1$d tracker hosts from %2$d companies this week using TrackerControl! Take back your privacy: https://trackercontrol.org</string>
+    <string name="insights_share_message_playstore">I detected %1$d tracker hosts from %2$d companies this week using TrackerControl! Take back your privacy: https://trackercontrol.org</string>
     <string name="insights_see_more">See More →</string>
 
     <!-- What's New onboarding slide (not translated) -->