Merge branch 'hotfix/5.85.1' into main

Author: marcosholgado

app/schemas/com.duckduckgo.app.global.db.AppDatabase/33.json

@@ -355,6 +355,11 @@ class AppDatabaseTest {
         createDatabaseAndMigrate(31, 32, migrationsProvider.MIGRATION_31_TO_32)
     }
 
+    @Test
+    fun whenMigratingFromVersion32o33ThenValidationSucceeds() {
+        createDatabaseAndMigrate(32, 33, migrationsProvider.MIGRATION_32_TO_33)
+    }
+
     private fun givenUserStageIs(database: SupportSQLiteDatabase, appStage: AppStage) {
         database.execSQL("INSERT INTO `userStage` values (1, '${appStage.name}') ")
     }

app/src/androidTest/java/com/duckduckgo/app/global/db/AppDatabaseTest.kt

@@ -38,6 +38,6 @@ class TdsTest {
     }
 
     companion object {
-        private const val DEFAULT_TDS_HASH_VALUE = 2104673228
+        private const val DEFAULT_TDS_HASH_VALUE = -160289387
     }
 }

app/src/androidTest/java/com/duckduckgo/app/trackerdetection/TdsTest.kt

@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2021 DuckDuckGo
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.duckduckgo.app.trackerdetection.api
+
+import okhttp3.Headers
+import org.junit.Assert.*
+import org.junit.Test
+
+class TrackerDataDownloaderKtTest {
+
+    @Test
+    fun whenExtractETagAndContainsPrefixAndQuotesThenReturnETag() {
+        val headers = Headers.headersOf("eTag", "W/\"123456789\"")
+        assertEquals(ETAG, headers.extractETag())
+    }
+
+    @Test
+    fun whenExtractETagAndContainsQuotesThenReturnETag() {
+        val headers = Headers.headersOf("eTag", "\"123456789\"")
+        assertEquals(ETAG, headers.extractETag())
+    }
+
+    @Test
+    fun whenExtractETagAndDoesNotContainsQuotesAndPrefixThenReturnETag() {
+        val headers = Headers.headersOf("eTag", "123456789")
+        assertEquals(ETAG, headers.extractETag())
+    }
+
+    companion object {
+        const val ETAG = "123456789"
+    }
+}

app/src/androidTest/java/com/duckduckgo/app/trackerdetection/api/TrackerDataDownloaderKtTest.kt

@@ -67,7 +67,7 @@ import com.duckduckgo.app.usage.search.SearchCountDao
 import com.duckduckgo.app.usage.search.SearchCountEntity
 
 @Database(
-    exportSchema = true, version = 32,
+    exportSchema = true, version = 33,
     entities = [
         TdsTracker::class,
         TdsEntity::class,
@@ -405,6 +405,15 @@ class MigrationsProvider(
         }
     }
 
+    val MIGRATION_32_TO_33: Migration = object : Migration(32, 33) {
+        override fun migrate(database: SupportSQLiteDatabase) {
+            database.execSQL("DELETE FROM tds_domain_entity")
+            database.execSQL("DELETE FROM tds_entity")
+            database.execSQL("DELETE FROM tds_tracker")
+            database.execSQL("DELETE FROM tdsMetadata")
+        }
+    }
+
     val BOOKMARKS_DB_ON_CREATE = object : RoomDatabase.Callback() {
         override fun onCreate(database: SupportSQLiteDatabase) {
             MIGRATION_29_TO_30.migrate(database)
@@ -449,7 +458,8 @@ class MigrationsProvider(
             MIGRATION_28_TO_29,
             MIGRATION_29_TO_30,
             MIGRATION_30_TO_31,
-            MIGRATION_31_TO_32
+            MIGRATION_31_TO_32,
+            MIGRATION_32_TO_33
         )
 
     @Deprecated(

app/src/main/java/com/duckduckgo/app/global/db/AppDatabase.kt

@@ -86,6 +86,6 @@ class TrackerDataLoader @Inject constructor(
     }
 
     companion object {
-        const val DEFAULT_ETAG = "5c5dda7f1873f3183b141c0739a187ca"
+        const val DEFAULT_ETAG = "961c7d692c985496126cad2d64231243"
     }
 }

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

@@ -22,10 +22,11 @@ import com.duckduckgo.app.global.filterBlankItems
 import com.duckduckgo.app.global.store.BinaryDataStore
 import com.duckduckgo.app.trackerdetection.Client.ClientName.*
 import com.duckduckgo.app.trackerdetection.TrackerDataLoader
-import com.duckduckgo.app.trackerdetection.db.TdsTrackerDao
+import com.duckduckgo.app.trackerdetection.db.TdsMetadataDao
 import com.duckduckgo.app.trackerdetection.db.TemporaryTrackingWhitelistDao
 import com.duckduckgo.app.trackerdetection.model.TemporaryTrackingWhitelistedDomain
 import io.reactivex.Completable
+import okhttp3.Headers
 import timber.log.Timber
 import java.io.IOException
 import javax.inject.Inject
@@ -34,9 +35,9 @@ class TrackerDataDownloader @Inject constructor(
     private val trackerListService: TrackerListService,
     private val binaryDataStore: BinaryDataStore,
     private val trackerDataLoader: TrackerDataLoader,
-    private val tdsTrackerDao: TdsTrackerDao,
     private val temporaryTrackingWhitelistDao: TemporaryTrackingWhitelistDao,
-    private val appDatabase: AppDatabase
+    private val appDatabase: AppDatabase,
+    private val metadataDao: TdsMetadataDao
 ) {
 
     fun downloadTds(): Completable {
@@ -51,17 +52,16 @@ class TrackerDataDownloader @Inject constructor(
             if (!response.isSuccessful) {
                 throw IOException("Status: ${response.code()} - ${response.errorBody()?.string()}")
             }
-            if (response.isCached && tdsTrackerDao.count() != 0) {
-                Timber.d("Tds data already cached and stored")
-                return@fromAction
-            }
 
-            Timber.d("Updating tds data from server")
             val body = response.body()!!
-            val eTag = response.headers()["eTag"]?.removeSurrounding("W/\"", "\"").orEmpty() // removes weak eTag validator
-            appDatabase.runInTransaction {
-                trackerDataLoader.persistTds(eTag, body)
-                trackerDataLoader.loadTrackers()
+            val eTag = response.headers().extractETag()
+            val oldEtag = metadataDao.eTag()
+            if (eTag != oldEtag) {
+                Timber.d("Updating tds data from server")
+                appDatabase.runInTransaction {
+                    trackerDataLoader.persistTds(eTag, body)
+                    trackerDataLoader.loadTrackers()
+                }
             }
         }
     }
@@ -107,3 +107,7 @@ class TrackerDataDownloader @Inject constructor(
         }
     }
 }
+
+fun Headers.extractETag(): String {
+    return this["eTag"]?.removePrefix("W/")?.removeSurrounding("\"", "\"").orEmpty() // removes weak eTag validator
+}