Major tracker networks summary

Author: subsymbolic

app/src/androidTest/java/com/duckduckgo/app/privacydashboard/PrivacyDashboardViewModelTest.kt

@@ -82,17 +82,31 @@ class PrivacyDashboardViewModelTest {
     }
 
     @Test
-    fun whenNoTrackersNetworksThenTrackerNetworkTextShowsZero() {
-        whenever(monitor.trackerNetworkCount).thenReturn(0)
+    fun whenNoTrackersNetworksThenNetworkTextShowsZero() {
+        whenever(monitor.networkCount).thenReturn(0)
         testee.updatePrivacyMonitor(monitor)
-        assertEquals("0 Tracker Networks Blocked", testee.viewState.value?.trackerNetworksText)
+        assertEquals("0 Tracker Networks Blocked", testee.viewState.value?.networksText)
     }
 
     @Test
-    fun whenTenTrackersNetworksThenTrackerNetworkTextShowsTen() {
-        whenever(monitor.trackerNetworkCount).thenReturn(10)
+    fun whenTenTrackersNetworksThenNetworkTextShowsTen() {
+        whenever(monitor.networkCount).thenReturn(10)
         testee.updatePrivacyMonitor(monitor)
-        assertEquals("10 Tracker Networks Blocked", testee.viewState.value?.trackerNetworksText)
+        assertEquals("10 Tracker Networks Blocked", testee.viewState.value?.networksText)
+    }
+
+    @Test
+    fun whenNoMajorTrackersNetworksThenMajorNetworkTextShowsZero() {
+        whenever(monitor.majorNetworkCount).thenReturn(0)
+        testee.updatePrivacyMonitor(monitor)
+        assertEquals("0 Major Tracker Networks Blocked", testee.viewState.value?.majorNetworksText)
+    }
+
+    @Test
+    fun whenTenMajorTrackersNetworksThenMajorNetworkTextShowsTen() {
+        whenever(monitor.majorNetworkCount).thenReturn(10)
+        testee.updatePrivacyMonitor(monitor)
+        assertEquals("10 Major Tracker Networks Blocked", testee.viewState.value?.majorNetworksText)
     }
 
     private fun getStringResource(id: Int): String {

app/src/androidTest/java/com/duckduckgo/app/trackerdetection/model/NetworkTrackersInstrumentationTest.kt

@@ -26,6 +26,7 @@ class NetworkTrackersInstrumentationTest {
     companion object {
         private const val category = "Social"
         private const val network = "Network"
+        private const val majorNetwork = "google"
     }
 
     private val testee = NetworkTrackers()
@@ -79,4 +80,25 @@ class NetworkTrackersInstrumentationTest {
         assertNull(testee.network("http://notsubdomainofnetwork.com/index.html"))
     }
 
+    @Test
+    fun whenUrlMatchesTrackerInMajorNetworkThenMajorNetworkReturnsName() {
+        val data = listOf(DisconnectTracker("tracker.com", category, majorNetwork, "http://www.network.com/"))
+        testee.updateData(data)
+        assertEquals(majorNetwork, testee.majorNetwork("http://tracker.com/script.js"))
+    }
+
+    @Test
+    fun whenUrlMatchesTrackerOutsideMajorNetworkThenMajorNetworkIsNull() {
+        val data = listOf(DisconnectTracker("tracker.com", category, network, "http://www.network.com/"))
+        testee.updateData(data)
+        assertNull(testee.majorNetwork("http://tracker.com/script.js"))
+    }
+
+    @Test
+    fun whenUrlIsNotATrackerThenMajorNetworkIsNull() {
+        val data = listOf(DisconnectTracker("tracker.com", category, network, "http://www.network.com/"))
+        testee.updateData(data)
+        assertNull(testee.majorNetwork("http://example.com/index.html"))
+    }
+
 }

app/src/main/java/com/duckduckgo/app/privacydashboard/PrivacyDashboardActivity.kt

@@ -89,6 +89,9 @@ class PrivacyDashboardActivity : DuckDuckGoActivity() {
         domain.text = viewState.domain
         httpsText.text = viewState.httpsText
         httpsIcon.setImageDrawable(getDrawable(viewState.httpsIcon))
-        trackerNetworksText.text = viewState.trackerNetworksText
+        networksIcon.setImageDrawable(getDrawable(viewState.networksIcon))
+        networksText.text = viewState.networksText
+        majorNetworksIcon.setImageDrawable(getDrawable(viewState.majorNetworksIcon))
+        majorNetworksText.text = viewState.majorNetworksText
     }
 }

app/src/main/java/com/duckduckgo/app/privacydashboard/PrivacyDashboardViewModel.kt

@@ -32,8 +32,10 @@ class PrivacyDashboardViewModel @Inject constructor(@SuppressLint("StaticFieldLe
             val domain: String,
             val httpsIcon: Int,
             val httpsText: String,
-            val trackerNetworksText: String,
-            val trackerNetworksIcon: Int = R.drawable.dashboard_tracker_networks_blocked
+            val networksText: String,
+            val networksIcon: Int = R.drawable.dashboard_networks_blocked,
+            val majorNetworksText: String,
+            val majorNetworksIcon: Int = R.drawable.dashboard_major_networks_blocked
     )
 
     val viewState: MutableLiveData<ViewState> = MutableLiveData()
@@ -43,7 +45,8 @@ class PrivacyDashboardViewModel @Inject constructor(@SuppressLint("StaticFieldLe
                 domain = "",
                 httpsIcon = httpsIcon(HttpsStatus.SECURE),
                 httpsText = httpsText(HttpsStatus.SECURE),
-                trackerNetworksText = trackerNetworksText(0)
+                networksText = networksText(0),
+                majorNetworksText = majorNetworksText(0)
         )
     }
 
@@ -52,7 +55,8 @@ class PrivacyDashboardViewModel @Inject constructor(@SuppressLint("StaticFieldLe
                 domain = monitor.uri?.host ?: "",
                 httpsIcon = httpsIcon(monitor.https),
                 httpsText = httpsText(monitor.https),
-                trackerNetworksText = trackerNetworksText(monitor.trackerNetworkCount)
+                networksText = networksText(monitor.networkCount),
+                majorNetworksText = majorNetworksText(monitor.majorNetworkCount)
         )
     }
 
@@ -68,6 +72,10 @@ class PrivacyDashboardViewModel @Inject constructor(@SuppressLint("StaticFieldLe
         HttpsStatus.SECURE -> R.drawable.dashboard_https_good
     }
 
-    private fun trackerNetworksText(trackerNetworkCount: Int): String =
-            context.getString(R.string.trackerNetworksBlocked, trackerNetworkCount.toString())
+    private fun networksText(trackerNetworkCount: Int): String =
+            context.getString(R.string.networksBlocked, trackerNetworkCount.toString())
+
+
+    private fun majorNetworksText(trackerNetworkCount: Int): String =
+            context.getString(R.string.majorNetworksBlocked, trackerNetworkCount.toString())
 }

app/src/main/java/com/duckduckgo/app/privacymonitor/PrivacyMonitor.kt

@@ -24,6 +24,6 @@ interface PrivacyMonitor {
     val uri: Uri?
     val https: HttpsStatus
     val trackerCount: Int
-    val trackerNetworkCount: Int
-
+    val networkCount: Int
+    val majorNetworkCount: Int
 }

app/src/main/java/com/duckduckgo/app/privacymonitor/SiteMonitor.kt

@@ -49,12 +49,19 @@ class SiteMonitor constructor(override val url: String, private val networkTrack
     override val trackerCount: Int
         get() = trackingEvents.size
 
-    override val trackerNetworkCount: Int
+    override val networkCount: Int
         get() = trackingEvents
                 .mapNotNull { networkTrackers.network(it.trackerUrl) }
                 .distinct()
                 .count()
 
+    override val majorNetworkCount: Int
+        get() = trackingEvents
+                .mapNotNull { networkTrackers.majorNetwork(it.trackerUrl) }
+                .distinct()
+                .count()
+
+
     fun trackerDetected(event: TrackingEvent) {
         trackingEvents.add(event)
     }

app/src/main/java/com/duckduckgo/app/trackerdetection/model/DisconnectTracker.kt

@@ -16,7 +16,9 @@
 
 package com.duckduckgo.app.trackerdetection.model
 
-data class DisconnectTracker(override val url: String,
+import java.io.Serializable
+
+data class DisconnectTracker(val url: String,
                              val category: String,
-                             override val networkName: String,
-                             override val networkUrl: String) : NetworkTracker
+                             val networkName: String,
+                             val networkUrl: String) : Serializable

app/src/main/java/com/duckduckgo/app/trackerdetection/model/NetworkTracker.kt

@@ -18,23 +18,48 @@ package com.duckduckgo.app.trackerdetection.model
 
 import com.duckduckgo.app.global.UriString.Companion.sameOrSubdomain
 import java.io.Serializable
+import java.util.*
 import javax.inject.Inject
 import javax.inject.Singleton
 
 
 @Singleton
 class NetworkTrackers @Inject constructor() : Serializable {
 
-    private var trackers: List<NetworkTracker> = ArrayList()
+    data class MajorNetwork(val name: String,
+                            val domain: String,
+                            val percentageOfPahges: Int)
 
-    fun updateData(trackers: List<NetworkTracker>) {
+    companion object {
+        private var majorNetworks = arrayOf(
+                MajorNetwork("google", "google.com", 84),
+                MajorNetwork("facebook", "facebook.com", 36),
+                MajorNetwork("twitter", "twitter.com", 16),
+                MajorNetwork("amazon.com", "amazon.com", 14),
+                MajorNetwork("appnexus", "appnexus.com", 10),
+                MajorNetwork("oracle", "oracle.com", 10),
+                MajorNetwork("mediamath", "mediamath.com", 9),
+                MajorNetwork("yahoo!", "yahoo.com", 9),
+                MajorNetwork("maxcdn", "maxcdn.com", 7),
+                MajorNetwork("automattic", "automattic.com", 7)
+        )
+    }
+
+    private var trackers: List<DisconnectTracker> = ArrayList()
+
+    fun updateData(trackers: List<DisconnectTracker>) {
         this.trackers = trackers
     }
 
     fun network(url: String): String? {
-        return trackers
-                .filter { sameOrSubdomain(url, it.url) || sameOrSubdomain(url, it.networkUrl) }
-                .map { it.networkName }
-                .firstOrNull()
+        val network = trackers.find { sameOrSubdomain(url, it.url) || sameOrSubdomain(url, it.networkUrl) }
+        return network?.networkName
     }
+
+    fun majorNetwork(url: String): String? {
+        val majorNetwork = majorNetworks.find { network(url).equals(it.name, true) }
+        return majorNetwork?.name
+    }
+
 }
+