Privacy grade ceiling

* Require tos classification of "a" for an "a" privacy grade
• Remove previous approach of setting a 2 or a 3 to a C as this caused some sites to be mistakenly updated to an A
• There is discussion around the privacy grade algo! More updates coming soon.

Author: subsymbolic

app/src/androidTest/java/com/duckduckgo/app/browser/BrowserViewModelTest.kt

@@ -305,9 +305,11 @@ class BrowserViewModelTest {
     }
 
     @Test
-    fun whenTrackerDetectedThenPrivacyGradeIsUpdated() {
+    fun whenEnoughTrackersDetectedThenPrivacyGradeIsUpdated() {
         testee.urlChanged("https://example.com")
-        testee.trackerDetected(TrackingEvent("https://example.com", "", null, false))
+        for (i in 1..10) {
+            testee.trackerDetected(TrackingEvent("https://example.com", "", null, false))
+        }
         assertEquals(PrivacyGrade.C, testee.privacyGrade.value)
     }
 

app/src/androidTest/java/com/duckduckgo/app/privacymonitor/model/PrivacyGradeTest.kt

@@ -37,18 +37,12 @@ class PrivacyGradeTest {
     }
 
     @Test
-    fun whenScoreIs3ThenGradeIsC() {
-        assertEquals(PrivacyGrade.C, PrivacyGrade.gradeForScore(3))
+    fun whenScoreIs3ThenGradeIsD() {
+        assertEquals(PrivacyGrade.D, PrivacyGrade.gradeForScore(3))
     }
 
     @Test
-    fun whenScoreIs4ThenGradeIsD() {
+    fun whenScoreIsAbove3ThenGradeIsD() {
         assertEquals(PrivacyGrade.D, PrivacyGrade.gradeForScore(4))
     }
-
-    @Test
-    fun whenScoreIsAbove4ThenGradeIsD() {
-        assertEquals(PrivacyGrade.D, PrivacyGrade.gradeForScore(5))
-    }
-
 }

app/src/androidTest/java/com/duckduckgo/app/privacymonitor/model/PrivacyMonitorGradeExtensionTest.kt

@@ -85,9 +85,16 @@ class PrivacyMonitorGradeExtensionTest {
     }
 
     @Test
-    fun whenTermsScoreIsNegativeThenScoreIsDecrementedByOne() {
+    fun whenTermsScoreIsNegativeThenScoreGreaterThanOneIsDecrementedByOne() {
+        // http adds +1 and tos score removes 1 so we expect default score
+        val privacyMonitor = monitor(terms = TermsOfService(score = -5), https = NONE)
+        assertEquals(defaultScore, privacyMonitor.score)
+    }
+
+    @Test
+    fun whenTermsScoreIsNegativeThenScoreOfOneIsUnchanged() {
         val privacyMonitor = monitor(terms = TermsOfService(score = -5))
-        assertEquals(defaultScore - 1, privacyMonitor.score)
+        assertEquals(defaultScore, privacyMonitor.score)
     }
 
     @Test
@@ -103,14 +110,20 @@ class PrivacyMonitorGradeExtensionTest {
     }
 
     @Test
-    fun whenOneTrackerThenScoreIsIncrementedByOne() {
+    fun whenOneTrackerThenScoreNotIncremented() {
         val privacyMonitor = monitor(trackerCount = 1)
+        assertEquals(defaultScore, privacyMonitor.score)
+    }
+
+    @Test
+    fun whenTenTrackersThenScoreIsIncrementedByOne() {
+        val privacyMonitor = monitor(trackerCount = 10)
         assertEquals(defaultScore + 1, privacyMonitor.score)
     }
 
     @Test
-    fun whenElevenTrackersThenScoreIsIncrementedByTwo() {
-        val privacyMonitor = monitor(trackerCount = 11)
+    fun whenTwentyTrackersThenScoreIsIncrementedByTwo() {
+        val privacyMonitor = monitor(trackerCount = 20)
         assertEquals(defaultScore + 2, privacyMonitor.score)
     }
 
@@ -138,7 +151,7 @@ class PrivacyMonitorGradeExtensionTest {
                 TrackerNetwork("", "", "", 5, true),
                 TermsOfService(classification = "D"),
                 NONE,
-                5,
+                11,
                 true,
                 true)
         assertEquals(defaultScore + 6, privacyMonitor.score)

app/src/main/java/com/duckduckgo/app/privacymonitor/model/PrivacyGrade.kt

@@ -30,7 +30,7 @@ enum class PrivacyGrade {
             return when (score) {
                 0 -> PrivacyGrade.A
                 1 -> PrivacyGrade.B
-                2, 3 -> PrivacyGrade.C
+                2 -> PrivacyGrade.C
                 else -> PrivacyGrade.D
             }
         }

app/src/main/java/com/duckduckgo/app/privacymonitor/model/PrivacyMonitorGradeExtension.kt

@@ -17,23 +17,42 @@
 package com.duckduckgo.app.privacymonitor.model
 
 import com.duckduckgo.app.privacymonitor.PrivacyMonitor
+import timber.log.Timber
 
 
 val PrivacyMonitor.score: Int
     get() {
         var score = baseScore
-        score += Math.ceil(trackerCount / 10.0).toInt()
+        score += trackerCount / 10
         if (hasTrackerFromMajorNetwork) {
             score += 1
         }
         if (hasObscureTracker) {
             score += 1
         }
+        if (score == 0 && termsOfService.classification != "A") {
+            score = 1
+        }
+        Timber.v("""Calculating score {
+            memberMajorNetworkPercentage: ${memberNetwork?.percentageOfPages}
+            https: ${https}
+            termsScore: ${termsOfService.gradingScore}
+            trackerCount: $trackerCount
+            hasTrackerFromMajorNetwork: $hasTrackerFromMajorNetwork
+            hasObscureTracker: $hasObscureTracker
+            score: $score
+            """)
         return score
     }
 
 val PrivacyMonitor.potentialScore: Int
-    get() = baseScore
+    get() {
+        var score = baseScore
+        if (score == 0 && termsOfService.classification != "A") {
+            score = 1
+        }
+        return score
+    }
 
 
 private val PrivacyMonitor.baseScore: Int