Merge branch 'release/5.19.1'

Author: subsymbolic

app/src/main/java/com/duckduckgo/app/privacy/model/Grade.kt

@@ -33,7 +33,6 @@ class Grade {
         D,
         @Json(name = "D-")
         D_MINUS
-
     }
 
 
@@ -56,8 +55,8 @@ class Grade {
 
     val scores: Grade.Scores get() = calculate()
 
-    private var entitiesNotBlocked: MutableMap<String, Double> = mutableMapOf()
-    private var entitiesBlocked: MutableMap<String, Double> = mutableMapOf()
+    private var entitiesNotBlocked: Map<String, Double> = mapOf()
+    private var entitiesBlocked: Map<String, Double> = mapOf()
 
     private fun calculate(): Grade.Scores {
 
@@ -155,19 +154,17 @@ class Grade {
 
     fun addEntityNotBlocked(entity: String, prevalence: Double?) {
         prevalence ?: return
-        entitiesNotBlocked[entity] = prevalence
+        entitiesNotBlocked = entitiesNotBlocked.plus(Pair(entity, prevalence))
     }
 
     fun addEntityBlocked(entity: String, prevalence: Double?) {
         prevalence ?: return
-        entitiesBlocked[entity] = prevalence
+        entitiesBlocked = entitiesBlocked.plus(Pair(entity, prevalence))
     }
 
     companion object {
-
         const val UNKNOWN_PRIVACY_SCORE = 2
         const val MAX_PRIVACY_SCORE = 10
-
     }
 
 }

app/src/main/java/com/duckduckgo/app/trackerdetection/DisconnectClient.kt

@@ -24,10 +24,12 @@ class DisconnectClient(override val name: Client.ClientName, private val tracker
 
     override fun matches(url: String, documentUrl: String, resourceType: ResourceType): Boolean {
         return trackers
-            .filter { bannedCategories().contains(it.category) }
+            .filter { bannedCategories.contains(it.category) }
             .any { sameOrSubdomain(url, it.url) }
     }
 
-    private fun bannedCategories(): List<String> = listOf("Analytics", "Advertising", "Social")
+    companion object {
+        private val bannedCategories = listOf("Analytics", "Advertising", "Social")
+    }
 
 }

app/version/release-notes

@@ -1,5 +1,5 @@
 ## What's new in this release?
-In this release, we added a notification to let new users know that they can automatically clear their data. We also squashed some bugs and cleaned up potential performance issues.
+In this release, we fixed a potential crash when loading a new page and a small performance issue.
 
 ## Have feedback?
 You can always reach us at https://duckduckgo.com/feedback.

app/version/version.properties

@@ -14,4 +14,4 @@
 # limitations under the License.
 #
 
-VERSION=5.19.0
+VERSION=5.19.1