Skip to content
This repository has been archived by the owner on Jun 20, 2023. It is now read-only.

Commit

Permalink
Merge branch 'release/2.1.x' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
d4rken committed May 4, 2021
2 parents e1ec946 + bebc8be commit e7e4dc3
Show file tree
Hide file tree
Showing 696 changed files with 17,807 additions and 7,012 deletions.
4 changes: 2 additions & 2 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ __Thank you for this this PR! Please consider the following:__
* Short step by step instructions help the reviewer test your changes, e.g. how to navigate to a new UI element you added.
* The PR _won't be reviewed_ if CircleCi is failing or if there are merge conflicts. If Circle CI is still failing mark the PR as a draft and write a little comment on your status.
* Provide at least a few unit and/or instrumentation tests.
* Use a meaning full branch name. Use either `fix` or `feature` as prefix for your branch, e.g. `fix/prevent-npe-on-device-rotation-issue_123`
* Test your changes thoroughly. Only open PRs which you think is ready to be merged. If you explicitly need feedback mark the PR as `DRAFT` on Github.
* Use a meaningful branch name. Use either `fix` or `feature` as prefix for your branch, e.g. `fix/prevent-npe-on-device-rotation-issue_123`
* Test your changes thoroughly. Only open PRs which you think is ready to be merged. If you explicitly need feedback mark the PR as `DRAFT` on GitHub.
* Don't introduce unrelated code reformatting (e.g., on-save hooks in your IDE)
* Remove this checklist before creating your pull request.

Expand Down
2 changes: 2 additions & 0 deletions Corona-Warn-App/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@ android {
buildConfigField "int", "VERSION_MAJOR", VERSION_MAJOR
buildConfigField "int", "VERSION_MINOR", VERSION_MINOR
buildConfigField "int", "VERSION_PATCH", VERSION_PATCH

vectorDrawables.useSupportLibrary = true
}

def signingPropFile = file("../keystore.properties")
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,198 @@
{
"formatVersion": 1,
"database": {
"version": 1,
"identityHash": "e23913768d43dc0cb1374df83b2fa78a",
"entities": [
{
"tableName": "checkin",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `traceLocationIdBase64` TEXT NOT NULL, `version` INTEGER NOT NULL, `type` INTEGER NOT NULL, `description` TEXT NOT NULL, `address` TEXT NOT NULL, `traceLocationStart` TEXT, `traceLocationEnd` TEXT, `defaultCheckInLengthInMinutes` INTEGER, `cryptographicSeedBase64` TEXT NOT NULL, `cnPublicKey` TEXT NOT NULL, `checkInStart` TEXT NOT NULL, `checkInEnd` TEXT NOT NULL, `completed` INTEGER NOT NULL, `createJournalEntry` INTEGER NOT NULL, `submitted` INTEGER NOT NULL)",
"fields": [
{
"fieldPath": "id",
"columnName": "id",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "traceLocationIdBase64",
"columnName": "traceLocationIdBase64",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "version",
"columnName": "version",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "type",
"columnName": "type",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "description",
"columnName": "description",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "address",
"columnName": "address",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "traceLocationStart",
"columnName": "traceLocationStart",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "traceLocationEnd",
"columnName": "traceLocationEnd",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "defaultCheckInLengthInMinutes",
"columnName": "defaultCheckInLengthInMinutes",
"affinity": "INTEGER",
"notNull": false
},
{
"fieldPath": "cryptographicSeedBase64",
"columnName": "cryptographicSeedBase64",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "cnPublicKey",
"columnName": "cnPublicKey",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "checkInStart",
"columnName": "checkInStart",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "checkInEnd",
"columnName": "checkInEnd",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "completed",
"columnName": "completed",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "createJournalEntry",
"columnName": "createJournalEntry",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "isSubmitted",
"columnName": "submitted",
"affinity": "INTEGER",
"notNull": true
}
],
"primaryKey": {
"columnNames": [
"id"
],
"autoGenerate": true
},
"indices": [],
"foreignKeys": []
},
{
"tableName": "traceLocations",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `version` INTEGER NOT NULL, `type` INTEGER NOT NULL, `description` TEXT NOT NULL, `address` TEXT NOT NULL, `startDate` TEXT, `endDate` TEXT, `defaultCheckInLengthInMinutes` INTEGER, `cryptographicSeedBase64` TEXT NOT NULL, `cnPublicKey` TEXT NOT NULL)",
"fields": [
{
"fieldPath": "id",
"columnName": "id",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "version",
"columnName": "version",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "type",
"columnName": "type",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "description",
"columnName": "description",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "address",
"columnName": "address",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "startDate",
"columnName": "startDate",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "endDate",
"columnName": "endDate",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "defaultCheckInLengthInMinutes",
"columnName": "defaultCheckInLengthInMinutes",
"affinity": "INTEGER",
"notNull": false
},
{
"fieldPath": "cryptographicSeedBase64",
"columnName": "cryptographicSeedBase64",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "cnPublicKey",
"columnName": "cnPublicKey",
"affinity": "TEXT",
"notNull": true
}
],
"primaryKey": {
"columnNames": [
"id"
],
"autoGenerate": true
},
"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, 'e23913768d43dc0cb1374df83b2fa78a')"
]
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package de.rki.coronawarnapp.eventregistration.checkins.qrcode
package de.rki.coronawarnapp.presencetracing.checkins.qrcode

import android.os.Bundle
import android.os.Parcel
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import androidx.sqlite.db.framework.FrameworkSQLiteOpenHelperFactory
import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4
import androidx.test.platform.app.InstrumentationRegistry
import de.rki.coronawarnapp.eventregistration.storage.TraceLocationDatabase
import de.rki.coronawarnapp.eventregistration.storage.entity.TraceLocationCheckInEntity
import de.rki.coronawarnapp.eventregistration.storage.migration.PresenceTracingDatabaseMigration1To2
import de.rki.coronawarnapp.presencetracing.storage.TraceLocationDatabase
import de.rki.coronawarnapp.presencetracing.storage.entity.TraceLocationCheckInEntity
import de.rki.coronawarnapp.presencetracing.storage.migration.PresenceTracingDatabaseMigration1To2
import io.kotest.matchers.shouldBe
import kotlinx.coroutines.flow.first
import kotlinx.coroutines.runBlocking
Expand Down Expand Up @@ -112,7 +112,7 @@ class PresenceTracingDatabaseMigrationTest : BaseTestInstrumentation() {
isSubmitted = false,
hasSubmissionConsent = false,
)
runBlocking { daoDb.eventCheckInDao().allEntries().first() }.single() shouldBe checkin
runBlocking { daoDb.checkInDao().allEntries().first() }.single() shouldBe checkin
}

@Test
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package de.rki.coronawarnapp.eventregistration.storage
package de.rki.coronawarnapp.presencetracing.storage

import de.rki.coronawarnapp.eventregistration.storage.entity.TraceLocationCheckInEntity
import de.rki.coronawarnapp.presencetracing.storage.entity.TraceLocationCheckInEntity
import de.rki.coronawarnapp.server.protocols.internal.pt.TraceLocationOuterClass
import okio.ByteString.Companion.encode
import org.joda.time.Instant
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package de.rki.coronawarnapp.eventregistration.storage
package de.rki.coronawarnapp.presencetracing.storage

import androidx.room.Room
import androidx.test.core.app.ApplicationProvider
import de.rki.coronawarnapp.eventregistration.storage.CheckInDatabaseData.testCheckIn
import de.rki.coronawarnapp.eventregistration.storage.CheckInDatabaseData.testCheckInWithoutCheckOutTime
import de.rki.coronawarnapp.presencetracing.storage.CheckInDatabaseData.testCheckIn
import de.rki.coronawarnapp.presencetracing.storage.CheckInDatabaseData.testCheckInWithoutCheckOutTime
import io.kotest.assertions.throwables.shouldThrow
import io.kotest.matchers.shouldBe
import io.kotest.matchers.shouldNotBe
Expand All @@ -22,7 +22,7 @@ class TraceLocationCheckInDaoTest : BaseTestInstrumentation() {
TraceLocationDatabase::class.java
).build()

private val checkInDao = traceLocationDatabase.eventCheckInDao()
private val checkInDao = traceLocationDatabase.checkInDao()

@After
fun tearDown() {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package de.rki.coronawarnapp.eventregistration.storage
package de.rki.coronawarnapp.presencetracing.storage

import androidx.room.Room
import androidx.test.core.app.ApplicationProvider
import de.rki.coronawarnapp.eventregistration.storage.TraceLocationDatabaseData.testTraceLocation1
import de.rki.coronawarnapp.eventregistration.storage.TraceLocationDatabaseData.testTraceLocation2
import de.rki.coronawarnapp.presencetracing.storage.TraceLocationDatabaseData.testTraceLocation1
import de.rki.coronawarnapp.presencetracing.storage.TraceLocationDatabaseData.testTraceLocation2
import io.kotest.matchers.shouldBe
import kotlinx.coroutines.flow.first
import kotlinx.coroutines.runBlocking
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package de.rki.coronawarnapp.eventregistration.storage
package de.rki.coronawarnapp.presencetracing.storage

import de.rki.coronawarnapp.eventregistration.storage.entity.TraceLocationEntity
import de.rki.coronawarnapp.presencetracing.storage.entity.TraceLocationEntity
import de.rki.coronawarnapp.server.protocols.internal.pt.TraceLocationOuterClass.TraceLocationType.LOCATION_TYPE_PERMANENT_OTHER
import de.rki.coronawarnapp.server.protocols.internal.pt.TraceLocationOuterClass.TraceLocationType.LOCATION_TYPE_TEMPORARY_OTHER
import okio.ByteString.Companion.encode
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import de.rki.coronawarnapp.contactdiary.ui.overview.adapter.DiaryOverviewItem
import de.rki.coronawarnapp.contactdiary.ui.overview.adapter.day.DayOverviewItem
import de.rki.coronawarnapp.contactdiary.ui.overview.adapter.day.contact.ContactItem
import de.rki.coronawarnapp.contactdiary.ui.overview.adapter.subheader.OverviewSubHeaderItem
import de.rki.coronawarnapp.eventregistration.checkins.CheckInRepository
import de.rki.coronawarnapp.presencetracing.checkins.CheckInRepository
import de.rki.coronawarnapp.risk.storage.RiskLevelStorage
import de.rki.coronawarnapp.task.TaskController
import de.rki.coronawarnapp.util.TimeStamper
Expand Down
Loading

0 comments on commit e7e4dc3

Please sign in to comment.