Overhaul of DiagnosisKey related Download and Caching Mechanisms (EXPOSUREAPP-2469)

Corona-Warn-App/build.gradle

@@ -276,6 +276,8 @@ dependencies {
     testImplementation "io.kotest:kotest-runner-junit5:4.2.0"
     testImplementation "io.kotest:kotest-assertions-core-jvm:4.2.0"
     testImplementation "io.kotest:kotest-property-jvm:4.2.0"
+    androidTestImplementation "io.kotest:kotest-assertions-core-jvm:4.2.0"
+    androidTestImplementation "io.kotest:kotest-property-jvm:4.2.0"
 
     // Testing - Instrumentation
     androidTestImplementation 'androidx.test:runner:1.2.0'

Corona-Warn-App/schemas/de.rki.coronawarnapp.diagnosiskeys.storage.KeyCacheDatabase/1.json

@@ -0,0 +1,76 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 1,
+    "identityHash": "c4ef5f7d4d9672d11c8eb97a63d4a3c5",
+    "entities": [
+      {
+        "tableName": "keyfiles",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `type` TEXT NOT NULL, `location` TEXT NOT NULL, `day` TEXT NOT NULL, `hour` TEXT, `createdAt` TEXT NOT NULL, `checksumMD5` TEXT, `completed` INTEGER NOT NULL, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "location",
+            "columnName": "location",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "day",
+            "columnName": "day",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hour",
+            "columnName": "hour",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "createdAt",
+            "columnName": "createdAt",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "checksumMD5",
+            "columnName": "checksumMD5",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isDownloadComplete",
+            "columnName": "completed",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'c4ef5f7d4d9672d11c8eb97a63d4a3c5')"
+    ]
+  }
+}

Corona-Warn-App/schemas/de.rki.coronawarnapp.storage.keycache.KeyCacheDatabase/1.json

@@ -0,0 +1,82 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 1,
+    "identityHash": "03f6e8cba631c8ef60e506006913a1ad",
+    "entities": [
+      {
+        "tableName": "keyfiles",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `type` TEXT NOT NULL, `location` TEXT NOT NULL, `day` TEXT NOT NULL, `hour` TEXT, `sourceUrl` TEXT NOT NULL, `createdAt` TEXT NOT NULL, `checksumMD5` TEXT, `completed` INTEGER NOT NULL, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "location",
+            "columnName": "location",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "day",
+            "columnName": "day",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hour",
+            "columnName": "hour",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "sourceUrl",
+            "columnName": "sourceUrl",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "createdAt",
+            "columnName": "createdAt",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "checksumMD5",
+            "columnName": "checksumMD5",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isDownloadComplete",
+            "columnName": "completed",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '03f6e8cba631c8ef60e506006913a1ad')"
+    ]
+  }
+}

Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/diagnosiskeys/storage/KeyCacheDatabaseTest.kt

@@ -0,0 +1,79 @@
+package de.rki.coronawarnapp.diagnosiskeys.storage
+
+import android.content.Context
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import de.rki.coronawarnapp.diagnosiskeys.server.LocationCode
+import io.kotest.matchers.shouldBe
+import kotlinx.coroutines.runBlocking
+import org.joda.time.Instant
+import org.joda.time.LocalDate
+import org.joda.time.LocalTime
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class KeyCacheDatabaseTest {
+    private val database = KeyCacheDatabase.Factory(
+        ApplicationProvider.getApplicationContext<Context>()
+    ).create()
+    private val dao = database.cachedKeyFiles()
+
+    @Test
+    fun crud() {
+        val keyDay = CachedKeyInfo(
+            type = CachedKeyInfo.Type.COUNTRY_DAY,
+            location = LocationCode("DE"),
+            day = LocalDate.now(),
+            hour = null,
+            createdAt = Instant.now()
+        )
+        val keyHour = CachedKeyInfo(
+            type = CachedKeyInfo.Type.COUNTRY_HOUR,
+            location = LocationCode("DE"),
+            day = LocalDate.now(),
+            hour = LocalTime.now(),
+            createdAt = Instant.now()
+        )
+        runBlocking {
+            dao.clear()
+
+            dao.insertEntry(keyDay)
+            dao.insertEntry(keyHour)
+            dao.getAllEntries() shouldBe listOf(keyDay, keyHour)
+            dao.getEntriesForType(CachedKeyInfo.Type.COUNTRY_DAY.typeValue) shouldBe listOf(keyDay)
+            dao.getEntriesForType(CachedKeyInfo.Type.COUNTRY_HOUR.typeValue) shouldBe listOf(keyHour)
+
+            dao.updateDownloadState(keyDay.toDownloadUpdate("coffee"))
+            dao.getEntriesForType(CachedKeyInfo.Type.COUNTRY_DAY.typeValue).single().apply {
+                isDownloadComplete shouldBe true
+                checksumMD5 shouldBe "coffee"
+            }
+            dao.getEntriesForType(CachedKeyInfo.Type.COUNTRY_HOUR.typeValue).single().apply {
+                isDownloadComplete shouldBe false
+                checksumMD5 shouldBe null
+            }
+
+            dao.updateDownloadState(keyHour.toDownloadUpdate("with milk"))
+            dao.getEntriesForType(CachedKeyInfo.Type.COUNTRY_DAY.typeValue).single().apply {
+                isDownloadComplete shouldBe true
+                checksumMD5 shouldBe "coffee"
+            }
+            dao.getEntriesForType(CachedKeyInfo.Type.COUNTRY_HOUR.typeValue).single().apply {
+                isDownloadComplete shouldBe true
+                checksumMD5 shouldBe "with milk"
+            }
+
+            dao.deleteEntry(keyDay)
+            dao.getAllEntries() shouldBe listOf(
+                keyHour.copy(
+                    isDownloadComplete = true,
+                    checksumMD5 = "with milk"
+                )
+            )
+
+            dao.clear()
+            dao.getAllEntries() shouldBe emptyList()
+        }
+    }
+}