diff --git a/Corona-Warn-App/schemas/de.rki.coronawarnapp.presencetracing.storage.TraceLocationDatabase/1.json b/Corona-Warn-App/schemas/de.rki.coronawarnapp.presencetracing.storage.TraceLocationDatabase/1.json
new file mode 100644
index 0000000000000000000000000000000000000000..856916f58dfa37e09331ebb2dbe0f6297e126d3e
--- /dev/null
+++ b/Corona-Warn-App/schemas/de.rki.coronawarnapp.presencetracing.storage.TraceLocationDatabase/1.json
@@ -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')"
+ ]
+ }
+}
\ No newline at end of file
diff --git a/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/eventregistration/checkins/qrcode/VerifiedTraceLocationTest.kt b/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/presencetracing/checkins/qrcode/VerifiedTraceLocationTest.kt
similarity index 97%
rename from Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/eventregistration/checkins/qrcode/VerifiedTraceLocationTest.kt
rename to Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/presencetracing/checkins/qrcode/VerifiedTraceLocationTest.kt
index 2e78d0912c047be24b4ab9c53a46da693f0deaf7..1dc2bc18f4a54030fa5d92c0f5fb399fd209c846 100644
--- a/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/eventregistration/checkins/qrcode/VerifiedTraceLocationTest.kt
+++ b/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/presencetracing/checkins/qrcode/VerifiedTraceLocationTest.kt
@@ -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
diff --git a/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/eventregistration/storage/CheckInDatabaseData.kt b/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/presencetracing/storage/CheckInDatabaseData.kt
similarity index 92%
rename from Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/eventregistration/storage/CheckInDatabaseData.kt
rename to Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/presencetracing/storage/CheckInDatabaseData.kt
index 1ab9a7725c591841be423ccaad882b5d9481a744..1be7e8f1a81516ffdbd331e55ae209a6a4bb71c4 100644
--- a/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/eventregistration/storage/CheckInDatabaseData.kt
+++ b/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/presencetracing/storage/CheckInDatabaseData.kt
@@ -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
diff --git a/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/eventregistration/storage/TraceLocationCheckInDaoTest.kt b/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/presencetracing/storage/TraceLocationCheckInDaoTest.kt
similarity index 92%
rename from Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/eventregistration/storage/TraceLocationCheckInDaoTest.kt
rename to Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/presencetracing/storage/TraceLocationCheckInDaoTest.kt
index b98dafcd84700ec2df653da9586fc160b72b78da..5c4e7c77bcac9ecfb37dd7f3b21d2c727c15380b 100644
--- a/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/eventregistration/storage/TraceLocationCheckInDaoTest.kt
+++ b/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/presencetracing/storage/TraceLocationCheckInDaoTest.kt
@@ -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
@@ -22,7 +22,7 @@ class TraceLocationCheckInDaoTest : BaseTestInstrumentation() {
TraceLocationDatabase::class.java
).build()
- private val checkInDao = traceLocationDatabase.eventCheckInDao()
+ private val checkInDao = traceLocationDatabase.checkInDao()
@After
fun tearDown() {
diff --git a/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/eventregistration/storage/TraceLocationDaoTest.kt b/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/presencetracing/storage/TraceLocationDaoTest.kt
similarity index 91%
rename from Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/eventregistration/storage/TraceLocationDaoTest.kt
rename to Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/presencetracing/storage/TraceLocationDaoTest.kt
index 4e14980c61a70fb4a790c7bb064bcb79a779637d..8f7202d1047c532483899a1d9cdfc50f9e2b3ddb 100644
--- a/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/eventregistration/storage/TraceLocationDaoTest.kt
+++ b/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/presencetracing/storage/TraceLocationDaoTest.kt
@@ -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
diff --git a/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/eventregistration/storage/TraceLocationDatabaseData.kt b/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/presencetracing/storage/TraceLocationDatabaseData.kt
similarity index 90%
rename from Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/eventregistration/storage/TraceLocationDatabaseData.kt
rename to Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/presencetracing/storage/TraceLocationDatabaseData.kt
index 21465140084b792d2c6933c9bcfd724416c5b9b8..89b84e39bab1478a0920ea2a9b45912cc9ac9ce5 100644
--- a/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/eventregistration/storage/TraceLocationDatabaseData.kt
+++ b/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/presencetracing/storage/TraceLocationDatabaseData.kt
@@ -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
diff --git a/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/contactdiary/ContactDiaryOverviewFragmentTest.kt b/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/contactdiary/ContactDiaryOverviewFragmentTest.kt
index 4038ad7448406bca7ff8339defe6b6089175da6f..210b1574af3219dbb8e6ee0738bfb50a5d3e1c0d 100644
--- a/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/contactdiary/ContactDiaryOverviewFragmentTest.kt
+++ b/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/contactdiary/ContactDiaryOverviewFragmentTest.kt
@@ -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
diff --git a/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/main/home/HomeFragmentTest.kt b/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/main/home/HomeFragmentTest.kt
index 873fd9bf58116e8028edaafa67891506c24a381f..b2c8c041d1d768c817a92586dc4abf3440a38fc8 100644
--- a/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/main/home/HomeFragmentTest.kt
+++ b/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/main/home/HomeFragmentTest.kt
@@ -27,7 +27,7 @@ import de.rki.coronawarnapp.tracing.GeneralTracingStatus
import de.rki.coronawarnapp.tracing.states.TracingStateProvider
import de.rki.coronawarnapp.tracing.ui.homecards.TracingStateItem
import de.rki.coronawarnapp.tracing.ui.statusbar.TracingHeaderState
-import de.rki.coronawarnapp.ui.eventregistration.organizer.TraceLocationOrganizerSettings
+import de.rki.coronawarnapp.ui.presencetracing.organizer.TraceLocationOrganizerSettings
import de.rki.coronawarnapp.ui.main.home.items.FAQCard
import de.rki.coronawarnapp.ui.main.home.items.HomeItem
import de.rki.coronawarnapp.ui.statistics.Statistics
diff --git a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/deltaonboarding/ui/DeltaOnboardingFragmentViewModel.kt b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/deltaonboarding/ui/DeltaOnboardingFragmentViewModel.kt
index 9152f953ae3a51042e5a7e816e5a0f5998b3dc6b..ee6dd0085f2953971e9d69e6db99ea8120b27bc9 100644
--- a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/deltaonboarding/ui/DeltaOnboardingFragmentViewModel.kt
+++ b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/deltaonboarding/ui/DeltaOnboardingFragmentViewModel.kt
@@ -6,7 +6,7 @@ import dagger.assisted.AssistedFactory
import dagger.assisted.AssistedInject
import de.rki.coronawarnapp.contactdiary.ui.ContactDiarySettings
import de.rki.coronawarnapp.environment.BuildConfigWrap
-import de.rki.coronawarnapp.eventregistration.TraceLocationSettings
+import de.rki.coronawarnapp.presencetracing.TraceLocationSettings
import de.rki.coronawarnapp.main.CWASettings
import de.rki.coronawarnapp.util.coroutine.DispatcherProvider
import de.rki.coronawarnapp.util.viewmodel.CWAViewModel
diff --git a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/presencetracing/ui/PresenceTracingTestFragment.kt b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/presencetracing/ui/PresenceTracingTestFragment.kt
index 8e54311d1f424a8bb319fe076fc00ba731524871..0fc0a95a98eceef10b89513943d36696945192cd 100644
--- a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/presencetracing/ui/PresenceTracingTestFragment.kt
+++ b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/presencetracing/ui/PresenceTracingTestFragment.kt
@@ -12,7 +12,7 @@ import androidx.core.view.isVisible
import androidx.fragment.app.Fragment
import de.rki.coronawarnapp.R
import de.rki.coronawarnapp.databinding.FragmentTestPresenceTracingBinding
-import de.rki.coronawarnapp.eventregistration.checkins.qrcode.TraceLocation
+import de.rki.coronawarnapp.presencetracing.checkins.qrcode.TraceLocation
import de.rki.coronawarnapp.test.menu.ui.TestMenuItem
import de.rki.coronawarnapp.util.ContextExtensions.getColorCompat
import de.rki.coronawarnapp.util.di.AutoInject
diff --git a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/presencetracing/ui/PresenceTracingTestViewModel.kt b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/presencetracing/ui/PresenceTracingTestViewModel.kt
index dfb0d221f958bb44cadceaff6600824147254b68..f879e8b9fdc977fffbbe5b7bac23ded44d198009 100644
--- a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/presencetracing/ui/PresenceTracingTestViewModel.kt
+++ b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/presencetracing/ui/PresenceTracingTestViewModel.kt
@@ -5,10 +5,10 @@ import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.asLiveData
import dagger.assisted.AssistedFactory
import dagger.assisted.AssistedInject
-import de.rki.coronawarnapp.eventregistration.checkins.CheckIn
-import de.rki.coronawarnapp.eventregistration.checkins.CheckInRepository
-import de.rki.coronawarnapp.eventregistration.checkins.qrcode.TraceLocation
-import de.rki.coronawarnapp.eventregistration.storage.repo.TraceLocationRepository
+import de.rki.coronawarnapp.presencetracing.checkins.CheckIn
+import de.rki.coronawarnapp.presencetracing.checkins.CheckInRepository
+import de.rki.coronawarnapp.presencetracing.checkins.qrcode.TraceLocation
+import de.rki.coronawarnapp.presencetracing.storage.repo.TraceLocationRepository
import de.rki.coronawarnapp.presencetracing.risk.calculation.PresenceTracingRiskCalculator
import de.rki.coronawarnapp.presencetracing.risk.execution.PresenceTracingWarningTask
import de.rki.coronawarnapp.presencetracing.risk.storage.PresenceTracingRiskRepository
@@ -61,7 +61,7 @@ class PresenceTracingTestViewModel @AssistedInject constructor(
taskController.submitBlocking(
DefaultTaskRequest(
PresenceTracingWarningTask::class,
- originTag = "EventRegistrationTestFragmentViewModel"
+ originTag = "PresenceTracingTestViewModel"
)
)
}
diff --git a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/presencetracing/ui/poster/QrCodePosterTestViewModel.kt b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/presencetracing/ui/poster/QrCodePosterTestViewModel.kt
index f4cf799fa56161f0b5171622d89d8cca564f7e66..05bfd33c01dc2301b9fa3523e4e790b8ef72341f 100644
--- a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/presencetracing/ui/poster/QrCodePosterTestViewModel.kt
+++ b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/presencetracing/ui/poster/QrCodePosterTestViewModel.kt
@@ -8,10 +8,10 @@ import androidx.lifecycle.MutableLiveData
import dagger.assisted.Assisted
import dagger.assisted.AssistedFactory
import dagger.assisted.AssistedInject
-import de.rki.coronawarnapp.eventregistration.checkins.qrcode.PosterTemplateProvider
-import de.rki.coronawarnapp.eventregistration.checkins.qrcode.QrCodeGenerator
-import de.rki.coronawarnapp.eventregistration.checkins.qrcode.Template
-import de.rki.coronawarnapp.eventregistration.storage.repo.TraceLocationRepository
+import de.rki.coronawarnapp.presencetracing.checkins.qrcode.PosterTemplateProvider
+import de.rki.coronawarnapp.presencetracing.checkins.qrcode.QrCodeGenerator
+import de.rki.coronawarnapp.presencetracing.checkins.qrcode.Template
+import de.rki.coronawarnapp.presencetracing.storage.repo.TraceLocationRepository
import de.rki.coronawarnapp.exception.ExceptionCategory
import de.rki.coronawarnapp.exception.reporting.report
import de.rki.coronawarnapp.util.coroutine.DispatcherProvider
diff --git a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/ui/main/MainActivityTestModule.kt b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/ui/main/MainActivityTestModule.kt
index e4a3ea0afa6b77501ace2c87fe364335253996e6..1ed880647cd7385d13cc4b49a23f18850d05d1bd 100644
--- a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/ui/main/MainActivityTestModule.kt
+++ b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/ui/main/MainActivityTestModule.kt
@@ -71,8 +71,8 @@ abstract class MainActivityTestModule {
abstract fun deltaOnboarding(): DeltaonboardingFragment
@ContributesAndroidInjector(modules = [PresenceTracingTestFragmentModule::class])
- abstract fun eventRegistration(): PresenceTracingTestFragment
+ abstract fun presenceTracingTestFragment(): PresenceTracingTestFragment
@ContributesAndroidInjector(modules = [QrCodePosterTestFragmentModule::class])
- abstract fun showEventDetail(): QrCodePosterTestFragment
+ abstract fun qrCodePosterTestFragment(): QrCodePosterTestFragment
}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/CoronaWarnApplication.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/CoronaWarnApplication.kt
index cee7752cbc1bf088f981eabd22a6d506d28c62b2..0e1a49d5cee914765e1b923d7504324298e03b09 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/CoronaWarnApplication.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/CoronaWarnApplication.kt
@@ -17,7 +17,7 @@ import de.rki.coronawarnapp.bugreporting.loghistory.LogHistoryTree
import de.rki.coronawarnapp.contactdiary.retention.ContactDiaryWorkScheduler
import de.rki.coronawarnapp.datadonation.analytics.worker.DataDonationAnalyticsScheduler
import de.rki.coronawarnapp.deadman.DeadmanNotificationScheduler
-import de.rki.coronawarnapp.eventregistration.storage.retention.TraceLocationDbCleanUpScheduler
+import de.rki.coronawarnapp.presencetracing.storage.retention.TraceLocationDbCleanUpScheduler
import de.rki.coronawarnapp.exception.reporting.ErrorReportReceiver
import de.rki.coronawarnapp.exception.reporting.ReportingConstants.ERROR_REPORT_LOCAL_BROADCAST_CHANNEL
import de.rki.coronawarnapp.notification.GeneralNotifications
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/ContactDiaryLocation.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/ContactDiaryLocation.kt
index 020bb3f955ec83abfa6992437d69db66c1f4a7bf..a281d10ea0900290363ba9d398c6561f348ba553 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/ContactDiaryLocation.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/ContactDiaryLocation.kt
@@ -1,6 +1,6 @@
package de.rki.coronawarnapp.contactdiary.model
-import de.rki.coronawarnapp.eventregistration.checkins.qrcode.TraceLocationId
+import de.rki.coronawarnapp.presencetracing.checkins.qrcode.TraceLocationId
import de.rki.coronawarnapp.util.lists.HasStableId
import java.util.Locale
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/DefaultContactDiaryLocation.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/DefaultContactDiaryLocation.kt
index 9ebd6f415d6f0ac8a6d5045215f9d776dc763445..44ecd3c686d2cea9ca2899e3dab64286f5026289 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/DefaultContactDiaryLocation.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/DefaultContactDiaryLocation.kt
@@ -1,6 +1,6 @@
package de.rki.coronawarnapp.contactdiary.model
-import de.rki.coronawarnapp.eventregistration.checkins.qrcode.TraceLocationId
+import de.rki.coronawarnapp.presencetracing.checkins.qrcode.TraceLocationId
data class DefaultContactDiaryLocation(
override val locationId: Long = 0L,
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/storage/entity/ContactDiaryLocationEntity.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/storage/entity/ContactDiaryLocationEntity.kt
index ba4f25464b0caf198370cd9ad539d02f6e25e840..d52f4b35c3e9cd19b0996a4041e73efe00ce20ed 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/storage/entity/ContactDiaryLocationEntity.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/storage/entity/ContactDiaryLocationEntity.kt
@@ -5,7 +5,7 @@ import androidx.room.ColumnInfo
import androidx.room.Entity
import androidx.room.PrimaryKey
import de.rki.coronawarnapp.contactdiary.model.ContactDiaryLocation
-import de.rki.coronawarnapp.eventregistration.checkins.qrcode.TraceLocationId
+import de.rki.coronawarnapp.presencetracing.checkins.qrcode.TraceLocationId
import de.rki.coronawarnapp.util.trimToLength
import kotlinx.parcelize.Parcelize
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/overview/ContactDiaryOverviewViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/overview/ContactDiaryOverviewViewModel.kt
index 09ca3ef2e455fa1e4ed4e540ad7feea2773f5f08..b5d208955534aa06fac622a0eea94ddc05a8ead4 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/overview/ContactDiaryOverviewViewModel.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/overview/ContactDiaryOverviewViewModel.kt
@@ -19,8 +19,8 @@ import de.rki.coronawarnapp.contactdiary.ui.overview.adapter.day.contact.Contact
import de.rki.coronawarnapp.contactdiary.ui.overview.adapter.day.riskenf.RiskEnfItem
import de.rki.coronawarnapp.contactdiary.ui.overview.adapter.day.riskevent.RiskEventItem
import de.rki.coronawarnapp.contactdiary.ui.overview.adapter.subheader.OverviewSubHeaderItem
-import de.rki.coronawarnapp.eventregistration.checkins.CheckIn
-import de.rki.coronawarnapp.eventregistration.checkins.CheckInRepository
+import de.rki.coronawarnapp.presencetracing.checkins.CheckIn
+import de.rki.coronawarnapp.presencetracing.checkins.CheckInRepository
import de.rki.coronawarnapp.presencetracing.risk.TraceLocationCheckInRisk
import de.rki.coronawarnapp.risk.RiskState
import de.rki.coronawarnapp.risk.result.ExposureWindowDayRisk
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/environment/eventregistration/qrcodeposter/QrCodePosterTemplateModule.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/environment/presencetracing/qrcodeposter/QrCodePosterTemplateModule.kt
similarity index 89%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/environment/eventregistration/qrcodeposter/QrCodePosterTemplateModule.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/environment/presencetracing/qrcodeposter/QrCodePosterTemplateModule.kt
index 9e987ba5e53ecf55760e01d47c1d155d467dffab..47535f7fd260524b425fdea095bb406fab76130d 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/environment/eventregistration/qrcodeposter/QrCodePosterTemplateModule.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/environment/presencetracing/qrcodeposter/QrCodePosterTemplateModule.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.environment.eventregistration.qrcodeposter
+package de.rki.coronawarnapp.environment.presencetracing.qrcodeposter
import android.content.Context
import dagger.Module
@@ -6,7 +6,7 @@ import dagger.Provides
import de.rki.coronawarnapp.environment.BaseEnvironmentModule
import de.rki.coronawarnapp.environment.download.DownloadCDNHttpClient
import de.rki.coronawarnapp.environment.download.DownloadCDNServerUrl
-import de.rki.coronawarnapp.eventregistration.events.server.qrcodepostertemplate.QrCodePosterTemplateApiV1
+import de.rki.coronawarnapp.presencetracing.locations.server.qrcodepostertemplate.QrCodePosterTemplateApiV1
import de.rki.coronawarnapp.util.di.AppContext
import okhttp3.Cache
import okhttp3.OkHttpClient
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/EventRegistrationModule.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/PresenceTracingModule.kt
similarity index 52%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/EventRegistrationModule.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/PresenceTracingModule.kt
index 2704dfe269b033a3425aa37e3d44df5738ce3a0c..87b00ad19e4dbe1768d9c6b5174aa2d124bb51d2 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/EventRegistrationModule.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/PresenceTracingModule.kt
@@ -1,10 +1,10 @@
-package de.rki.coronawarnapp.eventregistration
+package de.rki.coronawarnapp.presencetracing
import dagger.Binds
import dagger.Module
-import de.rki.coronawarnapp.environment.eventregistration.qrcodeposter.QrCodePosterTemplateModule
-import de.rki.coronawarnapp.eventregistration.storage.repo.DefaultTraceLocationRepository
-import de.rki.coronawarnapp.eventregistration.storage.repo.TraceLocationRepository
+import de.rki.coronawarnapp.environment.presencetracing.qrcodeposter.QrCodePosterTemplateModule
+import de.rki.coronawarnapp.presencetracing.storage.repo.DefaultTraceLocationRepository
+import de.rki.coronawarnapp.presencetracing.storage.repo.TraceLocationRepository
import de.rki.coronawarnapp.presencetracing.warning.PresenceTracingWarningModule
@Module(
@@ -13,7 +13,7 @@ import de.rki.coronawarnapp.presencetracing.warning.PresenceTracingWarningModule
PresenceTracingWarningModule::class,
]
)
-abstract class EventRegistrationModule {
+abstract class PresenceTracingModule {
@Binds
abstract fun traceLocationRepository(
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/TraceLocationSettings.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/TraceLocationSettings.kt
similarity index 96%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/TraceLocationSettings.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/TraceLocationSettings.kt
index f9feb6dd532f77f1405721326748f63c033a8327..11b0c580fb3ffa147e5a0e882e56dfdb903bc382 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/TraceLocationSettings.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/TraceLocationSettings.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.eventregistration
+package de.rki.coronawarnapp.presencetracing
import android.content.Context
import de.rki.coronawarnapp.util.di.AppContext
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/checkins/CheckIn.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/checkins/CheckIn.kt
similarity index 79%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/checkins/CheckIn.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/checkins/CheckIn.kt
index 8fea0b27af22d976d99d8a73a5c379cedd6759ea..6330d8dd0d464fb13c05cd81ba5bb7fdc7c8fb52 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/checkins/CheckIn.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/checkins/CheckIn.kt
@@ -1,8 +1,8 @@
-package de.rki.coronawarnapp.eventregistration.checkins
+package de.rki.coronawarnapp.presencetracing.checkins
-import de.rki.coronawarnapp.eventregistration.checkins.qrcode.TraceLocationId
-import de.rki.coronawarnapp.eventregistration.checkins.qrcode.toTraceLocationIdHash
-import de.rki.coronawarnapp.eventregistration.storage.entity.TraceLocationCheckInEntity
+import de.rki.coronawarnapp.presencetracing.checkins.qrcode.TraceLocationId
+import de.rki.coronawarnapp.presencetracing.checkins.qrcode.toTraceLocationIdHash
+import de.rki.coronawarnapp.presencetracing.storage.entity.TraceLocationCheckInEntity
import okio.ByteString
import org.joda.time.Instant
@@ -29,7 +29,7 @@ data class CheckIn(
* Returns SHA-256 hash of [traceLocationId] which itself may also be SHA-256 hash.
* For privacy reasons TraceTimeIntervalWarnings only offer a hash of the actual locationId.
*
- * @see [de.rki.coronawarnapp.eventregistration.checkins.qrcode.TraceLocation]
+ * @see [de.rki.coronawarnapp.presencetracing.checkins.qrcode.TraceLocation]
*/
val traceLocationIdHash by lazy { traceLocationId.toTraceLocationIdHash() }
}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/checkins/CheckInRepository.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/checkins/CheckInRepository.kt
similarity index 88%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/checkins/CheckInRepository.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/checkins/CheckInRepository.kt
index ea9d8b74b00d24032a7f341d41e7d0eee5f9df84..4528fc1138c0c111aae3e822d569e730f472e046 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/checkins/CheckInRepository.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/checkins/CheckInRepository.kt
@@ -1,9 +1,9 @@
-package de.rki.coronawarnapp.eventregistration.checkins
+package de.rki.coronawarnapp.presencetracing.checkins
-import de.rki.coronawarnapp.eventregistration.storage.TraceLocationDatabase
-import de.rki.coronawarnapp.eventregistration.storage.dao.CheckInDao
-import de.rki.coronawarnapp.eventregistration.storage.entity.TraceLocationCheckInEntity
-import de.rki.coronawarnapp.eventregistration.storage.entity.toCheckIn
+import de.rki.coronawarnapp.presencetracing.storage.TraceLocationDatabase
+import de.rki.coronawarnapp.presencetracing.storage.dao.CheckInDao
+import de.rki.coronawarnapp.presencetracing.storage.entity.TraceLocationCheckInEntity
+import de.rki.coronawarnapp.presencetracing.storage.entity.toCheckIn
import de.rki.coronawarnapp.util.TimeStamper
import kotlinx.coroutines.NonCancellable
import kotlinx.coroutines.flow.Flow
@@ -24,7 +24,7 @@ class CheckInRepository @Inject constructor(
}
private val checkInDao: CheckInDao by lazy {
- traceLocationDatabase.eventCheckInDao()
+ traceLocationDatabase.checkInDao()
}
/**
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/checkins/CheckInRetention.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/checkins/CheckInRetention.kt
similarity index 92%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/checkins/CheckInRetention.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/checkins/CheckInRetention.kt
index 875612a2a0b00a6512964fb347a1d956b245e997..bfdff994699377502d272bf1e78a358b403eaaae 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/checkins/CheckInRetention.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/checkins/CheckInRetention.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.eventregistration.checkins
+package de.rki.coronawarnapp.presencetracing.checkins
import de.rki.coronawarnapp.util.TimeAndDateExtensions.seconds
import org.joda.time.Instant
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/checkins/CheckInsTransformer.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/checkins/CheckInsTransformer.kt
similarity index 95%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/checkins/CheckInsTransformer.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/checkins/CheckInsTransformer.kt
index 723ea4bd4761c9c5a550293d6f5bd79291590038..64d5d97322a4cec72e5a61ac1d5364ab53e44a1c 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/checkins/CheckInsTransformer.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/checkins/CheckInsTransformer.kt
@@ -1,8 +1,8 @@
-package de.rki.coronawarnapp.eventregistration.checkins
+package de.rki.coronawarnapp.presencetracing.checkins
import de.rki.coronawarnapp.appconfig.AppConfigProvider
-import de.rki.coronawarnapp.eventregistration.checkins.derivetime.deriveTime
-import de.rki.coronawarnapp.eventregistration.checkins.split.splitByMidnightUTC
+import de.rki.coronawarnapp.presencetracing.checkins.derivetime.deriveTime
+import de.rki.coronawarnapp.presencetracing.checkins.split.splitByMidnightUTC
import de.rki.coronawarnapp.server.protocols.internal.pt.CheckInOuterClass
import de.rki.coronawarnapp.server.protocols.internal.v2.RiskCalculationParametersOuterClass.TransmissionRiskValueMapping
import de.rki.coronawarnapp.submission.Symptoms
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/checkins/checkout/CheckOutHandler.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/checkins/checkout/CheckOutHandler.kt
index 4852be4a722be3c850ad18fbe2bc0784f1e9e668..1308578f0e34464d3e85c6e886de26f6292a2898 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/checkins/checkout/CheckOutHandler.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/checkins/checkout/CheckOutHandler.kt
@@ -1,8 +1,8 @@
package de.rki.coronawarnapp.presencetracing.checkins.checkout
import dagger.Reusable
-import de.rki.coronawarnapp.eventregistration.checkins.CheckIn
-import de.rki.coronawarnapp.eventregistration.checkins.CheckInRepository
+import de.rki.coronawarnapp.presencetracing.checkins.CheckIn
+import de.rki.coronawarnapp.presencetracing.checkins.CheckInRepository
import de.rki.coronawarnapp.util.TimeStamper
import org.joda.time.Instant
import timber.log.Timber
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/checkins/checkout/ContactJournalCheckInEntryCreator.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/checkins/checkout/ContactJournalCheckInEntryCreator.kt
index ed1f0b0c0eb042105bb16987f3e1f907a6b68528..e770f6db91734c0c3e171d327ca43563f082681b 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/checkins/checkout/ContactJournalCheckInEntryCreator.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/checkins/checkout/ContactJournalCheckInEntryCreator.kt
@@ -7,8 +7,8 @@ import de.rki.coronawarnapp.contactdiary.model.ContactDiaryLocationVisit
import de.rki.coronawarnapp.contactdiary.model.DefaultContactDiaryLocation
import de.rki.coronawarnapp.contactdiary.model.DefaultContactDiaryLocationVisit
import de.rki.coronawarnapp.contactdiary.storage.repo.ContactDiaryRepository
-import de.rki.coronawarnapp.eventregistration.checkins.CheckIn
-import de.rki.coronawarnapp.eventregistration.checkins.split.splitByMidnightUTC
+import de.rki.coronawarnapp.presencetracing.checkins.CheckIn
+import de.rki.coronawarnapp.presencetracing.checkins.split.splitByMidnightUTC
import de.rki.coronawarnapp.util.TimeAndDateExtensions.toLocalDateUtc
import de.rki.coronawarnapp.util.TimeAndDateExtensions.toUserTimeZone
import kotlinx.coroutines.flow.first
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/checkins/checkout/auto/AutoCheckOut.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/checkins/checkout/auto/AutoCheckOut.kt
index b0b8d2190fda0913ad902bdba9c00576c2d55c4f..b28dcc137dbb62191396c30b49bee6375fa37f25 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/checkins/checkout/auto/AutoCheckOut.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/checkins/checkout/auto/AutoCheckOut.kt
@@ -1,8 +1,8 @@
package de.rki.coronawarnapp.presencetracing.checkins.checkout.auto
import android.app.AlarmManager
-import de.rki.coronawarnapp.eventregistration.checkins.CheckIn
-import de.rki.coronawarnapp.eventregistration.checkins.CheckInRepository
+import de.rki.coronawarnapp.presencetracing.checkins.CheckIn
+import de.rki.coronawarnapp.presencetracing.checkins.CheckInRepository
import de.rki.coronawarnapp.presencetracing.checkins.checkout.CheckOutHandler
import de.rki.coronawarnapp.util.TimeStamper
import de.rki.coronawarnapp.util.coroutine.AppScope
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/checkins/derivetime/TimeIntervalDeriver.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/checkins/derivetime/TimeIntervalDeriver.kt
similarity index 98%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/checkins/derivetime/TimeIntervalDeriver.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/checkins/derivetime/TimeIntervalDeriver.kt
index 9e125f866c19bdf8a515e7d201ab52b470982830..73febeac89bb50a2175c85175b05f2e3659734e9 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/checkins/derivetime/TimeIntervalDeriver.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/checkins/derivetime/TimeIntervalDeriver.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.eventregistration.checkins.derivetime
+package de.rki.coronawarnapp.presencetracing.checkins.derivetime
import de.rki.coronawarnapp.appconfig.PresenceTracingSubmissionParamContainer
import de.rki.coronawarnapp.risk.DefaultRiskLevels.Companion.inRange
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/checkins/qrcode/DefaultAutoCheckoutLength.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/checkins/qrcode/DefaultAutoCheckoutLength.kt
similarity index 97%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/checkins/qrcode/DefaultAutoCheckoutLength.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/checkins/qrcode/DefaultAutoCheckoutLength.kt
index 0f5c0d6dfa510bfbc46a452678702c0947a39304..15ccbe7dde4ae971963aee28c7455a4e71eb91f7 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/checkins/qrcode/DefaultAutoCheckoutLength.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/checkins/qrcode/DefaultAutoCheckoutLength.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.eventregistration.checkins.qrcode
+package de.rki.coronawarnapp.presencetracing.checkins.qrcode
import androidx.annotation.VisibleForTesting
import org.joda.time.Duration
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/checkins/qrcode/PosterTemplateProvider.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/checkins/qrcode/PosterTemplateProvider.kt
similarity index 93%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/checkins/qrcode/PosterTemplateProvider.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/checkins/qrcode/PosterTemplateProvider.kt
index f00a0c22f14152f4909eabf4c93667c76e4a8a8a..bc35b1aaf64bcd96ff506f76944677c7c00f3d4d 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/checkins/qrcode/PosterTemplateProvider.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/checkins/qrcode/PosterTemplateProvider.kt
@@ -1,10 +1,10 @@
-package de.rki.coronawarnapp.eventregistration.checkins.qrcode
+package de.rki.coronawarnapp.presencetracing.checkins.qrcode
import android.content.Context
import android.graphics.Bitmap
import android.graphics.pdf.PdfRenderer
import android.os.ParcelFileDescriptor
-import de.rki.coronawarnapp.eventregistration.events.server.qrcodepostertemplate.QrCodePosterTemplateServer
+import de.rki.coronawarnapp.presencetracing.locations.server.qrcodepostertemplate.QrCodePosterTemplateServer
import de.rki.coronawarnapp.server.protocols.internal.pt.QrCodePosterTemplate.QRCodePosterTemplateAndroid.QRCodeTextBoxAndroid
import de.rki.coronawarnapp.util.coroutine.DispatcherProvider
import de.rki.coronawarnapp.util.di.AppContext
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/checkins/qrcode/QRCodeException.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/checkins/qrcode/QRCodeException.kt
similarity index 89%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/checkins/qrcode/QRCodeException.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/checkins/qrcode/QRCodeException.kt
index 3df60ea22ecbc0d8683f5d5987475eb287373e7a..85e6e8ee5c0762ec28a54bb1f540a8e20105cd03 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/checkins/qrcode/QRCodeException.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/checkins/qrcode/QRCodeException.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.eventregistration.checkins.qrcode
+package de.rki.coronawarnapp.presencetracing.checkins.qrcode
sealed class QRCodeException constructor(
message: String? = null,
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/checkins/qrcode/QRCodeUriParser.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/checkins/qrcode/QRCodeUriParser.kt
similarity index 98%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/checkins/qrcode/QRCodeUriParser.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/checkins/qrcode/QRCodeUriParser.kt
index 493d2bdb667c846e7189099574c2018b63fd5a57..75e77f4281cd5fd60c40c62d5d3a848c2e8fa2d2 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/checkins/qrcode/QRCodeUriParser.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/checkins/qrcode/QRCodeUriParser.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.eventregistration.checkins.qrcode
+package de.rki.coronawarnapp.presencetracing.checkins.qrcode
import com.google.common.io.BaseEncoding
import dagger.Reusable
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/checkins/qrcode/QrCodeGenerator.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/checkins/qrcode/QrCodeGenerator.kt
similarity index 97%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/checkins/qrcode/QrCodeGenerator.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/checkins/qrcode/QrCodeGenerator.kt
index 96a244814db3cb17550f44466aa76668e58d0294..38d00f815ad46162e5adc6150bbf0e3c1d3d7dfb 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/checkins/qrcode/QrCodeGenerator.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/checkins/qrcode/QrCodeGenerator.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.eventregistration.checkins.qrcode
+package de.rki.coronawarnapp.presencetracing.checkins.qrcode
import android.content.Context
import android.graphics.Bitmap
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/checkins/qrcode/QrCodePayload.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/checkins/qrcode/QrCodePayload.kt
similarity index 97%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/checkins/qrcode/QrCodePayload.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/checkins/qrcode/QrCodePayload.kt
index 7ac7412993b6bea0ea8e9c666d013bb41dac2dbe..990fcab9158b9fa724c36d992800514c1f506856 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/checkins/qrcode/QrCodePayload.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/checkins/qrcode/QrCodePayload.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.eventregistration.checkins.qrcode
+package de.rki.coronawarnapp.presencetracing.checkins.qrcode
import de.rki.coronawarnapp.server.protocols.internal.pt.TraceLocationOuterClass
import de.rki.coronawarnapp.server.protocols.internal.pt.TraceLocationOuterClass.CWALocationData
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/checkins/qrcode/TraceLocation.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/checkins/qrcode/TraceLocation.kt
similarity index 93%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/checkins/qrcode/TraceLocation.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/checkins/qrcode/TraceLocation.kt
index bccfcf4b1dcf3768f8bfab1e48bf267cc71f4e4c..6cfbb1be48c27c4bea87f11a4a273d98a3da0b12 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/checkins/qrcode/TraceLocation.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/checkins/qrcode/TraceLocation.kt
@@ -1,8 +1,8 @@
-package de.rki.coronawarnapp.eventregistration.checkins.qrcode
+package de.rki.coronawarnapp.presencetracing.checkins.qrcode
import android.os.Parcelable
import com.google.common.io.BaseEncoding
-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
import kotlinx.parcelize.IgnoredOnParcel
import kotlinx.parcelize.Parcelize
@@ -52,7 +52,7 @@ data class TraceLocation(
* Returns SHA-256 hash of [locationId] which itself may also be SHA-256 hash.
* For privacy reasons TraceTimeIntervalWarnings only offer a hash of the actual locationId.
*
- * @see [de.rki.coronawarnapp.eventregistration.checkins.CheckIn]
+ * @see [de.rki.coronawarnapp.presencetracing.checkins.CheckIn]
*/
@IgnoredOnParcel
val locationIdHash: ByteString by lazy { locationId.toTraceLocationIdHash() }
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/checkins/qrcode/TraceLocationVerifier.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/checkins/qrcode/TraceLocationVerifier.kt
similarity index 97%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/checkins/qrcode/TraceLocationVerifier.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/checkins/qrcode/TraceLocationVerifier.kt
index abd313609ebdd09320116af2a9a86fdeafb125c9..399d3324bf8306fd8e5039001762b698e2e35a35 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/checkins/qrcode/TraceLocationVerifier.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/checkins/qrcode/TraceLocationVerifier.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.eventregistration.checkins.qrcode
+package de.rki.coronawarnapp.presencetracing.checkins.qrcode
import androidx.annotation.StringRes
import dagger.Reusable
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/checkins/qrcode/VerifiedTraceLocation.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/checkins/qrcode/VerifiedTraceLocation.kt
similarity index 96%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/checkins/qrcode/VerifiedTraceLocation.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/checkins/qrcode/VerifiedTraceLocation.kt
index b524577b5626e51801189188cb5a4db447ff6f69..e0bf914566b01bc402562d5f59176971c8f5dcb5 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/checkins/qrcode/VerifiedTraceLocation.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/checkins/qrcode/VerifiedTraceLocation.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.eventregistration.checkins.qrcode
+package de.rki.coronawarnapp.presencetracing.checkins.qrcode
import android.os.Parcel
import android.os.Parcelable
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/checkins/split/CheckInSplitter.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/checkins/split/CheckInSplitter.kt
similarity index 95%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/checkins/split/CheckInSplitter.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/checkins/split/CheckInSplitter.kt
index df60537d2f417ddc1396cca12bc03a93a3b4b864..b5687689ee930ceb9859e480fafc6a364c31afcb 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/checkins/split/CheckInSplitter.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/checkins/split/CheckInSplitter.kt
@@ -1,6 +1,6 @@
-package de.rki.coronawarnapp.eventregistration.checkins.split
+package de.rki.coronawarnapp.presencetracing.checkins.split
-import de.rki.coronawarnapp.eventregistration.checkins.CheckIn
+import de.rki.coronawarnapp.presencetracing.checkins.CheckIn
import de.rki.coronawarnapp.util.TimeAndDateExtensions.seconds
import de.rki.coronawarnapp.util.TimeAndDateExtensions.toLocalDateUtc
import org.joda.time.Instant
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/events/TraceLocationCreator.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/locations/TraceLocationCreator.kt
similarity index 85%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/events/TraceLocationCreator.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/locations/TraceLocationCreator.kt
index 3373755f51b2cef5412134eb6716c05cdc94268b..dbd2208e8972b68ea2857f089fda301c6e69a6db 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/events/TraceLocationCreator.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/locations/TraceLocationCreator.kt
@@ -1,8 +1,8 @@
-package de.rki.coronawarnapp.eventregistration.events
+package de.rki.coronawarnapp.presencetracing.locations
import de.rki.coronawarnapp.environment.EnvironmentSetup
-import de.rki.coronawarnapp.eventregistration.checkins.qrcode.TraceLocation
-import de.rki.coronawarnapp.eventregistration.storage.repo.TraceLocationRepository
+import de.rki.coronawarnapp.presencetracing.checkins.qrcode.TraceLocation
+import de.rki.coronawarnapp.presencetracing.storage.repo.TraceLocationRepository
import okio.ByteString
import okio.ByteString.Companion.toByteString
import java.security.SecureRandom
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/events/TraceLocationUserInput.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/locations/TraceLocationUserInput.kt
similarity index 86%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/events/TraceLocationUserInput.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/locations/TraceLocationUserInput.kt
index 139fe361c96a6c1c3aaaafbc6128c2026dc5a09e..da5e6aa6371b44281274edad9a426ea3338215f9 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/events/TraceLocationUserInput.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/locations/TraceLocationUserInput.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.eventregistration.events
+package de.rki.coronawarnapp.presencetracing.locations
import de.rki.coronawarnapp.server.protocols.internal.pt.TraceLocationOuterClass
import org.joda.time.Instant
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/events/server/qrcodepostertemplate/DefaultQrCodePosterTemplateSource.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/locations/server/qrcodepostertemplate/DefaultQrCodePosterTemplateSource.kt
similarity index 81%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/events/server/qrcodepostertemplate/DefaultQrCodePosterTemplateSource.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/locations/server/qrcodepostertemplate/DefaultQrCodePosterTemplateSource.kt
index eac888cca0185974c5ba86be10fccb7b96b0f742..d02260492a1720d57a7393799b9a1b4a03fa4733 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/events/server/qrcodepostertemplate/DefaultQrCodePosterTemplateSource.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/locations/server/qrcodepostertemplate/DefaultQrCodePosterTemplateSource.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.eventregistration.events.server.qrcodepostertemplate
+package de.rki.coronawarnapp.presencetracing.locations.server.qrcodepostertemplate
import android.content.Context
import dagger.Reusable
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/events/server/qrcodepostertemplate/QrCodePosterTemplateApiV1.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/locations/server/qrcodepostertemplate/QrCodePosterTemplateApiV1.kt
similarity index 74%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/events/server/qrcodepostertemplate/QrCodePosterTemplateApiV1.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/locations/server/qrcodepostertemplate/QrCodePosterTemplateApiV1.kt
index 32b9d12cbeef24397a3f8c4a66987c6fc8eaec77..c0c29e443083fd56ccfd41e4183ee12f465cf70e 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/events/server/qrcodepostertemplate/QrCodePosterTemplateApiV1.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/locations/server/qrcodepostertemplate/QrCodePosterTemplateApiV1.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.eventregistration.events.server.qrcodepostertemplate
+package de.rki.coronawarnapp.presencetracing.locations.server.qrcodepostertemplate
import okhttp3.ResponseBody
import retrofit2.Response
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/events/server/qrcodepostertemplate/QrCodePosterTemplateInvalidResponseException.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/locations/server/qrcodepostertemplate/QrCodePosterTemplateInvalidResponseException.kt
similarity index 61%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/events/server/qrcodepostertemplate/QrCodePosterTemplateInvalidResponseException.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/locations/server/qrcodepostertemplate/QrCodePosterTemplateInvalidResponseException.kt
index 12e67da2278110ed089cbf53106f66c9861eb9c9..eff70391e28f66ae45da028c9888dfa155c9cda1 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/events/server/qrcodepostertemplate/QrCodePosterTemplateInvalidResponseException.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/locations/server/qrcodepostertemplate/QrCodePosterTemplateInvalidResponseException.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.eventregistration.events.server.qrcodepostertemplate
+package de.rki.coronawarnapp.presencetracing.locations.server.qrcodepostertemplate
class QrCodePosterTemplateInvalidResponseException(
message: String,
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/events/server/qrcodepostertemplate/QrCodePosterTemplateServer.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/locations/server/qrcodepostertemplate/QrCodePosterTemplateServer.kt
similarity index 97%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/events/server/qrcodepostertemplate/QrCodePosterTemplateServer.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/locations/server/qrcodepostertemplate/QrCodePosterTemplateServer.kt
index 9e24711b07252248f5d4fe9b932168efe87db3cd..59426a0ab87288cfa8ddf8d44c87cd146472b693 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/events/server/qrcodepostertemplate/QrCodePosterTemplateServer.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/locations/server/qrcodepostertemplate/QrCodePosterTemplateServer.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.eventregistration.events.server.qrcodepostertemplate
+package de.rki.coronawarnapp.presencetracing.locations.server.qrcodepostertemplate
import androidx.annotation.VisibleForTesting
import com.google.protobuf.InvalidProtocolBufferException
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/risk/calculation/CheckInWarningMatcher.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/risk/calculation/CheckInWarningMatcher.kt
index 530ebc138071c5f2d9dead90fb658c773a659339..a1028997270316ed0920d52d7215d88feddb4b62 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/risk/calculation/CheckInWarningMatcher.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/risk/calculation/CheckInWarningMatcher.kt
@@ -1,8 +1,8 @@
package de.rki.coronawarnapp.presencetracing.risk.calculation
import androidx.annotation.VisibleForTesting
-import de.rki.coronawarnapp.eventregistration.checkins.CheckIn
-import de.rki.coronawarnapp.eventregistration.checkins.split.splitByMidnightUTC
+import de.rki.coronawarnapp.presencetracing.checkins.CheckIn
+import de.rki.coronawarnapp.presencetracing.checkins.split.splitByMidnightUTC
import de.rki.coronawarnapp.presencetracing.warning.storage.TraceWarningPackage
import de.rki.coronawarnapp.server.protocols.internal.pt.TraceWarning
import de.rki.coronawarnapp.util.coroutine.DispatcherProvider
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/risk/execution/PresenceTracingWarningTask.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/risk/execution/PresenceTracingWarningTask.kt
index 8000745d6440e0e416ca6b65233d6e31106c01fe..3cf08b5ca2ff59ea8492fe04e1d1dfbcc77ec718 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/risk/execution/PresenceTracingWarningTask.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/risk/execution/PresenceTracingWarningTask.kt
@@ -2,7 +2,7 @@ package de.rki.coronawarnapp.presencetracing.risk.execution
import de.rki.coronawarnapp.appconfig.AppConfigProvider
import de.rki.coronawarnapp.bugreporting.reportProblem
-import de.rki.coronawarnapp.eventregistration.checkins.CheckInRepository
+import de.rki.coronawarnapp.presencetracing.checkins.CheckInRepository
import de.rki.coronawarnapp.exception.ExceptionCategory
import de.rki.coronawarnapp.exception.reporting.report
import de.rki.coronawarnapp.presencetracing.risk.calculation.CheckInWarningMatcher
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/risk/storage/PresenceTracingRiskRepository.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/risk/storage/PresenceTracingRiskRepository.kt
index 1b356f35b51531d19136a1098fd3706e5b1193d8..98fcb83d2fbdc5c01473f1fff3250c5cb28d9341 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/risk/storage/PresenceTracingRiskRepository.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/risk/storage/PresenceTracingRiskRepository.kt
@@ -9,7 +9,7 @@ import androidx.room.OnConflictStrategy.REPLACE
import androidx.room.PrimaryKey
import androidx.room.Query
import androidx.room.TypeConverter
-import de.rki.coronawarnapp.eventregistration.storage.entity.TraceLocationCheckInEntity
+import de.rki.coronawarnapp.presencetracing.storage.entity.TraceLocationCheckInEntity
import de.rki.coronawarnapp.presencetracing.risk.PtRiskLevelResult
import de.rki.coronawarnapp.presencetracing.risk.TraceLocationCheckInRisk
import de.rki.coronawarnapp.presencetracing.risk.calculation.CheckInWarningOverlap
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/TraceLocationDatabase.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/storage/TraceLocationDatabase.kt
similarity index 65%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/TraceLocationDatabase.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/storage/TraceLocationDatabase.kt
index 30e508cf4c45d0a9145c9551e64523c457f20a99..7e6facc03e154d5eeb5505ec3743cc8f6b51c61c 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/TraceLocationDatabase.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/storage/TraceLocationDatabase.kt
@@ -1,15 +1,15 @@
-package de.rki.coronawarnapp.eventregistration.storage
+package de.rki.coronawarnapp.presencetracing.storage
import android.content.Context
import androidx.room.Database
import androidx.room.Room
import androidx.room.RoomDatabase
import androidx.room.TypeConverters
-import de.rki.coronawarnapp.eventregistration.storage.dao.CheckInDao
-import de.rki.coronawarnapp.eventregistration.storage.dao.TraceLocationDao
-import de.rki.coronawarnapp.eventregistration.storage.entity.TraceLocationCheckInEntity
-import de.rki.coronawarnapp.eventregistration.storage.entity.TraceLocationConverters
-import de.rki.coronawarnapp.eventregistration.storage.entity.TraceLocationEntity
+import de.rki.coronawarnapp.presencetracing.storage.dao.CheckInDao
+import de.rki.coronawarnapp.presencetracing.storage.dao.TraceLocationDao
+import de.rki.coronawarnapp.presencetracing.storage.entity.TraceLocationCheckInEntity
+import de.rki.coronawarnapp.presencetracing.storage.entity.TraceLocationConverters
+import de.rki.coronawarnapp.presencetracing.storage.entity.TraceLocationEntity
import de.rki.coronawarnapp.util.database.CommonConverters
import de.rki.coronawarnapp.util.di.AppContext
import javax.inject.Inject
@@ -25,7 +25,7 @@ import javax.inject.Inject
@TypeConverters(CommonConverters::class, TraceLocationConverters::class)
abstract class TraceLocationDatabase : RoomDatabase() {
- abstract fun eventCheckInDao(): CheckInDao
+ abstract fun checkInDao(): CheckInDao
abstract fun traceLocationDao(): TraceLocationDao
class Factory @Inject constructor(@AppContext private val context: Context) {
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/dao/CheckInDao.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/storage/dao/CheckInDao.kt
similarity index 79%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/dao/CheckInDao.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/storage/dao/CheckInDao.kt
index 56ed45b2abe1f75be100a40cb3f8160b840571cf..1d56e9455d19f8e7c9336692f0b6b588dea121f3 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/dao/CheckInDao.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/storage/dao/CheckInDao.kt
@@ -1,14 +1,14 @@
-package de.rki.coronawarnapp.eventregistration.storage.dao
+package de.rki.coronawarnapp.presencetracing.storage.dao
import androidx.room.Dao
import androidx.room.Insert
import androidx.room.Query
import androidx.room.Transaction
import androidx.room.Update
-import de.rki.coronawarnapp.eventregistration.checkins.CheckIn
-import de.rki.coronawarnapp.eventregistration.checkins.toEntity
-import de.rki.coronawarnapp.eventregistration.storage.entity.TraceLocationCheckInEntity
-import de.rki.coronawarnapp.eventregistration.storage.entity.toCheckIn
+import de.rki.coronawarnapp.presencetracing.checkins.CheckIn
+import de.rki.coronawarnapp.presencetracing.checkins.toEntity
+import de.rki.coronawarnapp.presencetracing.storage.entity.TraceLocationCheckInEntity
+import de.rki.coronawarnapp.presencetracing.storage.entity.toCheckIn
import kotlinx.coroutines.flow.Flow
@Dao
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/dao/TraceLocationDao.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/storage/dao/TraceLocationDao.kt
similarity index 85%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/dao/TraceLocationDao.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/storage/dao/TraceLocationDao.kt
index 550b45a84e0f813a64b1bfd6999b6135f198e60c..4bbf8a3a1758439830e8b53ed38aa20e84472be5 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/dao/TraceLocationDao.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/storage/dao/TraceLocationDao.kt
@@ -1,10 +1,10 @@
-package de.rki.coronawarnapp.eventregistration.storage.dao
+package de.rki.coronawarnapp.presencetracing.storage.dao
import androidx.room.Dao
import androidx.room.Delete
import androidx.room.Insert
import androidx.room.Query
-import de.rki.coronawarnapp.eventregistration.storage.entity.TraceLocationEntity
+import de.rki.coronawarnapp.presencetracing.storage.entity.TraceLocationEntity
import kotlinx.coroutines.flow.Flow
@Dao
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/entity/TraceLocationCheckInEntity.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/storage/entity/TraceLocationCheckInEntity.kt
similarity index 94%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/entity/TraceLocationCheckInEntity.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/storage/entity/TraceLocationCheckInEntity.kt
index 8ddcadd2a8b811cfae2b987771a001582c2c8bb0..0d9fda64de57a889e6ca43212f32df7194a2a5ab 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/entity/TraceLocationCheckInEntity.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/storage/entity/TraceLocationCheckInEntity.kt
@@ -1,9 +1,9 @@
-package de.rki.coronawarnapp.eventregistration.storage.entity
+package de.rki.coronawarnapp.presencetracing.storage.entity
import androidx.room.ColumnInfo
import androidx.room.Entity
import androidx.room.PrimaryKey
-import de.rki.coronawarnapp.eventregistration.checkins.CheckIn
+import de.rki.coronawarnapp.presencetracing.checkins.CheckIn
import okio.ByteString.Companion.decodeBase64
import org.joda.time.Instant
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/entity/TraceLocationConverters.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/storage/entity/TraceLocationConverters.kt
similarity index 87%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/entity/TraceLocationConverters.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/storage/entity/TraceLocationConverters.kt
index 2f547dd177d8e3988401930858dd01c073ac11f1..444307b1396786138c72c10231db7812d199deae 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/entity/TraceLocationConverters.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/storage/entity/TraceLocationConverters.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.eventregistration.storage.entity
+package de.rki.coronawarnapp.presencetracing.storage.entity
import androidx.room.TypeConverter
import de.rki.coronawarnapp.server.protocols.internal.pt.TraceLocationOuterClass
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/entity/TraceLocationEntity.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/storage/entity/TraceLocationEntity.kt
similarity index 91%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/entity/TraceLocationEntity.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/storage/entity/TraceLocationEntity.kt
index abfdc5698e9775b2680546b11fb837261d653812..1a4b76dd35640cae99e3ed6fa893f5534da1a172 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/entity/TraceLocationEntity.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/storage/entity/TraceLocationEntity.kt
@@ -1,9 +1,9 @@
-package de.rki.coronawarnapp.eventregistration.storage.entity
+package de.rki.coronawarnapp.presencetracing.storage.entity
import androidx.room.ColumnInfo
import androidx.room.Entity
import androidx.room.PrimaryKey
-import de.rki.coronawarnapp.eventregistration.checkins.qrcode.TraceLocation
+import de.rki.coronawarnapp.presencetracing.checkins.qrcode.TraceLocation
import de.rki.coronawarnapp.server.protocols.internal.pt.TraceLocationOuterClass
import org.joda.time.Instant
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/repo/DefaultTraceLocationRepository.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/storage/repo/DefaultTraceLocationRepository.kt
similarity index 77%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/repo/DefaultTraceLocationRepository.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/storage/repo/DefaultTraceLocationRepository.kt
index b0c5f879dcdd3c5af499bdcce2593283cddef3db..5fdc708f4d26d805972faf8c80e09e272122a405 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/repo/DefaultTraceLocationRepository.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/storage/repo/DefaultTraceLocationRepository.kt
@@ -1,12 +1,12 @@
-package de.rki.coronawarnapp.eventregistration.storage.repo
+package de.rki.coronawarnapp.presencetracing.storage.repo
-import de.rki.coronawarnapp.eventregistration.checkins.qrcode.TraceLocation
-import de.rki.coronawarnapp.eventregistration.checkins.qrcode.toTraceLocation
-import de.rki.coronawarnapp.eventregistration.checkins.qrcode.toTraceLocations
-import de.rki.coronawarnapp.eventregistration.storage.TraceLocationDatabase
-import de.rki.coronawarnapp.eventregistration.storage.dao.TraceLocationDao
-import de.rki.coronawarnapp.eventregistration.storage.entity.toTraceLocationEntity
-import de.rki.coronawarnapp.eventregistration.storage.retention.isWithinRetention
+import de.rki.coronawarnapp.presencetracing.checkins.qrcode.TraceLocation
+import de.rki.coronawarnapp.presencetracing.checkins.qrcode.toTraceLocation
+import de.rki.coronawarnapp.presencetracing.checkins.qrcode.toTraceLocations
+import de.rki.coronawarnapp.presencetracing.storage.TraceLocationDatabase
+import de.rki.coronawarnapp.presencetracing.storage.dao.TraceLocationDao
+import de.rki.coronawarnapp.presencetracing.storage.entity.toTraceLocationEntity
+import de.rki.coronawarnapp.presencetracing.storage.retention.isWithinRetention
import de.rki.coronawarnapp.util.TimeStamper
import de.rki.coronawarnapp.util.coroutine.AppScope
import kotlinx.coroutines.CoroutineScope
@@ -74,15 +74,15 @@ class DefaultTraceLocationRepository @Inject constructor(
override fun deleteTraceLocation(traceLocation: TraceLocation) {
appScope.launch {
- Timber.d("Delete hosted event: $traceLocation")
- val eventEntity = traceLocation.toTraceLocationEntity()
- traceLocationDao.delete(eventEntity)
+ Timber.d("Delete trace location: $traceLocation")
+ val traceLocationEntity = traceLocation.toTraceLocationEntity()
+ traceLocationDao.delete(traceLocationEntity)
}
}
override fun deleteAllTraceLocations() {
appScope.launch {
- Timber.d("Delete all hosted events.")
+ Timber.d("Delete all trace locations.")
traceLocationDao.deleteAll()
}
}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/repo/TraceLocationRepository.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/storage/repo/TraceLocationRepository.kt
similarity index 87%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/repo/TraceLocationRepository.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/storage/repo/TraceLocationRepository.kt
index df566a3cc3b8c982984871cfb3c2451fad3dc63d..ceb8d907e766a3a86b4765d3c24225d381071624 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/repo/TraceLocationRepository.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/storage/repo/TraceLocationRepository.kt
@@ -1,6 +1,6 @@
-package de.rki.coronawarnapp.eventregistration.storage.repo
+package de.rki.coronawarnapp.presencetracing.storage.repo
-import de.rki.coronawarnapp.eventregistration.checkins.qrcode.TraceLocation
+import de.rki.coronawarnapp.presencetracing.checkins.qrcode.TraceLocation
import kotlinx.coroutines.flow.Flow
interface TraceLocationRepository {
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/retention/CheckInCleaner.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/storage/retention/CheckInCleaner.kt
similarity index 78%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/retention/CheckInCleaner.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/storage/retention/CheckInCleaner.kt
index af5e3f80a39252d0c07ccce930c0d8f968a3e092..5256e94708d570f61e77d6fe79fa28ac33f278e6 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/retention/CheckInCleaner.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/storage/retention/CheckInCleaner.kt
@@ -1,8 +1,8 @@
-package de.rki.coronawarnapp.eventregistration.storage.retention
+package de.rki.coronawarnapp.presencetracing.storage.retention
import dagger.Reusable
-import de.rki.coronawarnapp.eventregistration.checkins.CheckInRepository
-import de.rki.coronawarnapp.eventregistration.checkins.isOutOfRetention
+import de.rki.coronawarnapp.presencetracing.checkins.CheckInRepository
+import de.rki.coronawarnapp.presencetracing.checkins.isOutOfRetention
import de.rki.coronawarnapp.util.TimeStamper
import kotlinx.coroutines.flow.first
import timber.log.Timber
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/retention/TraceLocationCleaner.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/storage/retention/TraceLocationCleaner.kt
similarity index 85%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/retention/TraceLocationCleaner.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/storage/retention/TraceLocationCleaner.kt
index 69fac1678fb37a4bce0e309561003d1b68d44c36..01b2d206b276d3202afc1a9ce41fb349c24228de 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/retention/TraceLocationCleaner.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/storage/retention/TraceLocationCleaner.kt
@@ -1,7 +1,7 @@
-package de.rki.coronawarnapp.eventregistration.storage.retention
+package de.rki.coronawarnapp.presencetracing.storage.retention
import dagger.Reusable
-import de.rki.coronawarnapp.eventregistration.storage.repo.TraceLocationRepository
+import de.rki.coronawarnapp.presencetracing.storage.repo.TraceLocationRepository
import de.rki.coronawarnapp.util.TimeStamper
import kotlinx.coroutines.flow.first
import timber.log.Timber
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/retention/TraceLocationDbCleanUpPeriodicWorker.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/storage/retention/TraceLocationDbCleanUpPeriodicWorker.kt
similarity index 95%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/retention/TraceLocationDbCleanUpPeriodicWorker.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/storage/retention/TraceLocationDbCleanUpPeriodicWorker.kt
index 9f6a2607975b24f9ff41803de3bb32b2cbe3c796..15c759d3731d51859eb31882c1851599da0f5fdc 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/retention/TraceLocationDbCleanUpPeriodicWorker.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/storage/retention/TraceLocationDbCleanUpPeriodicWorker.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.eventregistration.storage.retention
+package de.rki.coronawarnapp.presencetracing.storage.retention
import android.content.Context
import androidx.work.CoroutineWorker
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/retention/TraceLocationDbCleanUpScheduler.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/storage/retention/TraceLocationDbCleanUpScheduler.kt
similarity index 93%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/retention/TraceLocationDbCleanUpScheduler.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/storage/retention/TraceLocationDbCleanUpScheduler.kt
index 86c4ad31e7f057fecde430b6c9d8a43699973c64..00b740e1bb53cd36956fef0ea997549e6e19569b 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/retention/TraceLocationDbCleanUpScheduler.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/storage/retention/TraceLocationDbCleanUpScheduler.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.eventregistration.storage.retention
+package de.rki.coronawarnapp.presencetracing.storage.retention
import androidx.work.ExistingPeriodicWorkPolicy
import androidx.work.PeriodicWorkRequestBuilder
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/retention/TraceLocationRetention.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/storage/retention/TraceLocationRetention.kt
similarity index 86%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/retention/TraceLocationRetention.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/storage/retention/TraceLocationRetention.kt
index b1c854e7f974551e34505eb05c1757e7c1cabdf8..064047da190f9983459fbe7c7d80d5765f1bd5d4 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/retention/TraceLocationRetention.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/storage/retention/TraceLocationRetention.kt
@@ -1,6 +1,6 @@
-package de.rki.coronawarnapp.eventregistration.storage.retention
+package de.rki.coronawarnapp.presencetracing.storage.retention
-import de.rki.coronawarnapp.eventregistration.checkins.qrcode.TraceLocation
+import de.rki.coronawarnapp.presencetracing.checkins.qrcode.TraceLocation
import de.rki.coronawarnapp.util.TimeAndDateExtensions.seconds
import org.joda.time.Instant
import java.util.concurrent.TimeUnit
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/warning/download/TraceWarningPackageSyncTool.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/warning/download/TraceWarningPackageSyncTool.kt
index 4e2f9e118ae1fb0842a1783269d69ed6d0175381..bcfcf69dfe552f95bee9da7225fae5b3ae4eea5d 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/warning/download/TraceWarningPackageSyncTool.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/warning/download/TraceWarningPackageSyncTool.kt
@@ -5,7 +5,7 @@ import dagger.Reusable
import de.rki.coronawarnapp.appconfig.AppConfigProvider
import de.rki.coronawarnapp.appconfig.KeyDownloadConfig
import de.rki.coronawarnapp.diagnosiskeys.server.LocationCode
-import de.rki.coronawarnapp.eventregistration.checkins.CheckInRepository
+import de.rki.coronawarnapp.presencetracing.checkins.CheckInRepository
import de.rki.coronawarnapp.presencetracing.warning.download.server.TraceWarningApiV1
import de.rki.coronawarnapp.presencetracing.warning.download.server.TraceWarningServer
import de.rki.coronawarnapp.presencetracing.warning.storage.TraceWarningPackageMetadata
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/submission/task/SubmissionTask.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/submission/task/SubmissionTask.kt
index 5f801d507b6da853a6d4ec7602f0766e263bd0da..db59a8c793d0cfcc7fa320e2f7ba56387628d8fd 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/submission/task/SubmissionTask.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/submission/task/SubmissionTask.kt
@@ -4,8 +4,8 @@ import com.google.android.gms.nearby.exposurenotification.TemporaryExposureKey
import de.rki.coronawarnapp.appconfig.AppConfigProvider
import de.rki.coronawarnapp.bugreporting.reportProblem
import de.rki.coronawarnapp.datadonation.analytics.modules.keysubmission.AnalyticsKeySubmissionCollector
-import de.rki.coronawarnapp.eventregistration.checkins.CheckInRepository
-import de.rki.coronawarnapp.eventregistration.checkins.CheckInsTransformer
+import de.rki.coronawarnapp.presencetracing.checkins.CheckInRepository
+import de.rki.coronawarnapp.presencetracing.checkins.CheckInsTransformer
import de.rki.coronawarnapp.exception.NoRegistrationTokenSetException
import de.rki.coronawarnapp.notification.ShareTestResultNotificationService
import de.rki.coronawarnapp.notification.TestResultAvailableNotificationService
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/EventRegistrationUIModule.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/EventRegistrationUIModule.kt
deleted file mode 100644
index 07b90907c3e3a2d6e3e9141c29603f5e9ba9f4fb..0000000000000000000000000000000000000000
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/EventRegistrationUIModule.kt
+++ /dev/null
@@ -1,63 +0,0 @@
-package de.rki.coronawarnapp.ui.eventregistration
-
-import dagger.Module
-import dagger.android.ContributesAndroidInjector
-import de.rki.coronawarnapp.ui.eventregistration.attendee.checkins.CheckInsFragment
-import de.rki.coronawarnapp.ui.eventregistration.attendee.checkins.CheckInsModule
-import de.rki.coronawarnapp.ui.eventregistration.attendee.confirm.ConfirmCheckInFragment
-import de.rki.coronawarnapp.ui.eventregistration.attendee.confirm.ConfirmCheckInModule
-import de.rki.coronawarnapp.ui.eventregistration.attendee.edit.EditCheckInFragment
-import de.rki.coronawarnapp.ui.eventregistration.attendee.edit.EditCheckInModule
-import de.rki.coronawarnapp.ui.eventregistration.attendee.onboarding.CheckInOnboardingFragment
-import de.rki.coronawarnapp.ui.eventregistration.attendee.onboarding.CheckInOnboardingModule
-import de.rki.coronawarnapp.ui.eventregistration.attendee.scan.ScanCheckInQrCodeFragment
-import de.rki.coronawarnapp.ui.eventregistration.attendee.scan.ScanCheckInQrCodeModule
-import de.rki.coronawarnapp.ui.eventregistration.organizer.category.TraceLocationCategoryFragment
-import de.rki.coronawarnapp.ui.eventregistration.organizer.category.TraceLocationCategoryFragmentModule
-import de.rki.coronawarnapp.ui.eventregistration.organizer.create.TraceLocationCreateFragment
-import de.rki.coronawarnapp.ui.eventregistration.organizer.create.TraceLocationCreateFragmentModule
-import de.rki.coronawarnapp.ui.eventregistration.organizer.details.QrCodeDetailFragment
-import de.rki.coronawarnapp.ui.eventregistration.organizer.details.QrCodeDetailFragmentModule
-import de.rki.coronawarnapp.ui.eventregistration.organizer.list.TraceLocationsFragment
-import de.rki.coronawarnapp.ui.eventregistration.organizer.list.TraceLocationsFragmentModule
-import de.rki.coronawarnapp.ui.eventregistration.organizer.poster.QrCodePosterFragment
-import de.rki.coronawarnapp.ui.eventregistration.organizer.poster.QrCodePosterFragmentModule
-import de.rki.coronawarnapp.ui.eventregistration.organizer.qrinfo.TraceLocationQRInfoFragment
-import de.rki.coronawarnapp.ui.eventregistration.organizer.qrinfo.TraceLocationQRInfoFragmentModule
-
-@Module
-internal abstract class EventRegistrationUIModule {
-
- @ContributesAndroidInjector(modules = [ScanCheckInQrCodeModule::class])
- abstract fun scanCheckInQrCodeFragment(): ScanCheckInQrCodeFragment
-
- @ContributesAndroidInjector(modules = [ConfirmCheckInModule::class])
- abstract fun confirmCheckInFragment(): ConfirmCheckInFragment
-
- @ContributesAndroidInjector(modules = [EditCheckInModule::class])
- abstract fun editCheckInFragment(): EditCheckInFragment
-
- @ContributesAndroidInjector(modules = [CheckInsModule::class])
- abstract fun checkInsFragment(): CheckInsFragment
-
- @ContributesAndroidInjector(modules = [CheckInOnboardingModule::class])
- abstract fun checkInOnboardingFragment(): CheckInOnboardingFragment
-
- @ContributesAndroidInjector(modules = [TraceLocationCategoryFragmentModule::class])
- abstract fun traceLocationCategoryFragment(): TraceLocationCategoryFragment
-
- @ContributesAndroidInjector(modules = [TraceLocationCreateFragmentModule::class])
- abstract fun traceLocationCreateFragment(): TraceLocationCreateFragment
-
- @ContributesAndroidInjector(modules = [TraceLocationQRInfoFragmentModule::class])
- abstract fun traceLocationQRInfoFragment(): TraceLocationQRInfoFragment
-
- @ContributesAndroidInjector(modules = [TraceLocationsFragmentModule::class])
- abstract fun traceLocationsFragment(): TraceLocationsFragment
-
- @ContributesAndroidInjector(modules = [QrCodePosterFragmentModule::class])
- abstract fun qrCodePosterFragment(): QrCodePosterFragment
-
- @ContributesAndroidInjector(modules = [QrCodeDetailFragmentModule::class])
- abstract fun showEventDetail(): QrCodeDetailFragment
-}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/category/adapter/separator/TraceLocationSeparatorItem.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/category/adapter/separator/TraceLocationSeparatorItem.kt
deleted file mode 100644
index 8486a55f6f27834579a64d6707567050260ee415..0000000000000000000000000000000000000000
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/category/adapter/separator/TraceLocationSeparatorItem.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package de.rki.coronawarnapp.ui.eventregistration.organizer.category.adapter.separator
-
-import de.rki.coronawarnapp.ui.eventregistration.organizer.category.adapter.CategoryItem
-
-object TraceLocationSeparatorItem : CategoryItem {
- override val stableId = this.hashCode().toLong()
-}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/MainActivity.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/MainActivity.kt
index 798abdfcc35bce36c4b9e698e84572ffdb6191d3..177f1ce6f84d42e7f51bd02b98b229ec13cabe05 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/MainActivity.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/MainActivity.kt
@@ -24,7 +24,7 @@ import de.rki.coronawarnapp.datadonation.analytics.worker.DataDonationAnalyticsS
import de.rki.coronawarnapp.deadman.DeadmanNotificationScheduler
import de.rki.coronawarnapp.submission.SubmissionSettings
import de.rki.coronawarnapp.ui.base.startActivitySafely
-import de.rki.coronawarnapp.ui.eventregistration.attendee.checkins.CheckInsFragment
+import de.rki.coronawarnapp.ui.presencetracing.attendee.checkins.CheckInsFragment
import de.rki.coronawarnapp.ui.setupWithNavController2
import de.rki.coronawarnapp.util.AppShortcuts
import de.rki.coronawarnapp.util.CWADebug
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/MainActivityModule.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/MainActivityModule.kt
index dc98543bbc48644fdbebc937c055cb39c33d74aa..67297c38309b7a9ab97425d9f93f80926293f8e0 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/MainActivityModule.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/MainActivityModule.kt
@@ -8,7 +8,7 @@ import de.rki.coronawarnapp.datadonation.analytics.ui.AnalyticsUIModule
import de.rki.coronawarnapp.release.NewReleaseInfoFragment
import de.rki.coronawarnapp.release.NewReleaseInfoFragmentModule
import de.rki.coronawarnapp.tracing.ui.details.TracingDetailsFragmentModule
-import de.rki.coronawarnapp.ui.eventregistration.EventRegistrationUIModule
+import de.rki.coronawarnapp.ui.presencetracing.PresenceTracingUIModule
import de.rki.coronawarnapp.ui.information.InformationFragmentModule
import de.rki.coronawarnapp.ui.interoperability.InteroperabilityConfigurationFragment
import de.rki.coronawarnapp.ui.interoperability.InteroperabilityConfigurationFragmentModule
@@ -34,7 +34,7 @@ import de.rki.coronawarnapp.util.viewmodel.CWAViewModelKey
InformationFragmentModule::class,
NewReleaseInfoFragmentModule::class,
AnalyticsUIModule::class,
- EventRegistrationUIModule::class,
+ PresenceTracingUIModule::class,
]
)
abstract class MainActivityModule {
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/MainActivityViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/MainActivityViewModel.kt
index 7b8d11a2af4cee4a59ee4afdb404fc07d4302109..08d5f165d9a5e5dd6ec550b1b49f10f84b04818f 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/MainActivityViewModel.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/MainActivityViewModel.kt
@@ -7,8 +7,8 @@ import dagger.assisted.AssistedFactory
import dagger.assisted.AssistedInject
import de.rki.coronawarnapp.contactdiary.ui.ContactDiarySettings
import de.rki.coronawarnapp.environment.EnvironmentSetup
-import de.rki.coronawarnapp.eventregistration.TraceLocationSettings
-import de.rki.coronawarnapp.eventregistration.checkins.CheckInRepository
+import de.rki.coronawarnapp.presencetracing.TraceLocationSettings
+import de.rki.coronawarnapp.presencetracing.checkins.CheckInRepository
import de.rki.coronawarnapp.playbook.BackgroundNoise
import de.rki.coronawarnapp.storage.OnboardingSettings
import de.rki.coronawarnapp.util.CWADebug
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/home/HomeFragmentViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/home/HomeFragmentViewModel.kt
index 3e0d93c81d701e3875a42efb2e13c0ad5e4990c5..f171d8a2fc0703a8eb0662ad300b8af3fb48f01e 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/home/HomeFragmentViewModel.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/home/HomeFragmentViewModel.kt
@@ -47,7 +47,7 @@ import de.rki.coronawarnapp.tracing.ui.homecards.TracingFailedCard
import de.rki.coronawarnapp.tracing.ui.homecards.TracingProgressCard
import de.rki.coronawarnapp.tracing.ui.statusbar.TracingHeaderState
import de.rki.coronawarnapp.tracing.ui.statusbar.toHeaderState
-import de.rki.coronawarnapp.ui.eventregistration.organizer.TraceLocationOrganizerSettings
+import de.rki.coronawarnapp.ui.presencetracing.organizer.TraceLocationOrganizerSettings
import de.rki.coronawarnapp.ui.main.home.HomeFragmentEvents.ShowErrorResetDialog
import de.rki.coronawarnapp.ui.main.home.HomeFragmentEvents.ShowTracingExplanation
import de.rki.coronawarnapp.ui.main.home.items.CreateTraceLocationCard
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/PresenceTracingUIModule.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/PresenceTracingUIModule.kt
new file mode 100644
index 0000000000000000000000000000000000000000..b741e3d8820158a311a449f7a889fe0a0e7a35d7
--- /dev/null
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/PresenceTracingUIModule.kt
@@ -0,0 +1,63 @@
+package de.rki.coronawarnapp.ui.presencetracing
+
+import dagger.Module
+import dagger.android.ContributesAndroidInjector
+import de.rki.coronawarnapp.ui.presencetracing.attendee.checkins.CheckInsFragment
+import de.rki.coronawarnapp.ui.presencetracing.attendee.checkins.CheckInsModule
+import de.rki.coronawarnapp.ui.presencetracing.attendee.confirm.ConfirmCheckInFragment
+import de.rki.coronawarnapp.ui.presencetracing.attendee.confirm.ConfirmCheckInModule
+import de.rki.coronawarnapp.ui.presencetracing.attendee.edit.EditCheckInFragment
+import de.rki.coronawarnapp.ui.presencetracing.attendee.edit.EditCheckInModule
+import de.rki.coronawarnapp.ui.presencetracing.attendee.onboarding.CheckInOnboardingFragment
+import de.rki.coronawarnapp.ui.presencetracing.attendee.onboarding.CheckInOnboardingModule
+import de.rki.coronawarnapp.ui.presencetracing.attendee.scan.ScanCheckInQrCodeFragment
+import de.rki.coronawarnapp.ui.presencetracing.attendee.scan.ScanCheckInQrCodeModule
+import de.rki.coronawarnapp.ui.presencetracing.organizer.category.TraceLocationCategoryFragment
+import de.rki.coronawarnapp.ui.presencetracing.organizer.category.TraceLocationCategoryFragmentModule
+import de.rki.coronawarnapp.ui.presencetracing.organizer.create.TraceLocationCreateFragment
+import de.rki.coronawarnapp.ui.presencetracing.organizer.create.TraceLocationCreateFragmentModule
+import de.rki.coronawarnapp.ui.presencetracing.organizer.details.QrCodeDetailFragment
+import de.rki.coronawarnapp.ui.presencetracing.organizer.details.QrCodeDetailFragmentModule
+import de.rki.coronawarnapp.ui.presencetracing.organizer.list.TraceLocationsFragment
+import de.rki.coronawarnapp.ui.presencetracing.organizer.list.TraceLocationsFragmentModule
+import de.rki.coronawarnapp.ui.presencetracing.organizer.poster.QrCodePosterFragment
+import de.rki.coronawarnapp.ui.presencetracing.organizer.poster.QrCodePosterFragmentModule
+import de.rki.coronawarnapp.ui.presencetracing.organizer.qrinfo.TraceLocationQRInfoFragment
+import de.rki.coronawarnapp.ui.presencetracing.organizer.qrinfo.TraceLocationQRInfoFragmentModule
+
+@Module
+internal abstract class PresenceTracingUIModule {
+
+ @ContributesAndroidInjector(modules = [ScanCheckInQrCodeModule::class])
+ abstract fun scanCheckInQrCodeFragment(): ScanCheckInQrCodeFragment
+
+ @ContributesAndroidInjector(modules = [ConfirmCheckInModule::class])
+ abstract fun confirmCheckInFragment(): ConfirmCheckInFragment
+
+ @ContributesAndroidInjector(modules = [EditCheckInModule::class])
+ abstract fun editCheckInFragment(): EditCheckInFragment
+
+ @ContributesAndroidInjector(modules = [CheckInsModule::class])
+ abstract fun checkInsFragment(): CheckInsFragment
+
+ @ContributesAndroidInjector(modules = [CheckInOnboardingModule::class])
+ abstract fun checkInOnboardingFragment(): CheckInOnboardingFragment
+
+ @ContributesAndroidInjector(modules = [TraceLocationCategoryFragmentModule::class])
+ abstract fun traceLocationCategoryFragment(): TraceLocationCategoryFragment
+
+ @ContributesAndroidInjector(modules = [TraceLocationCreateFragmentModule::class])
+ abstract fun traceLocationCreateFragment(): TraceLocationCreateFragment
+
+ @ContributesAndroidInjector(modules = [TraceLocationQRInfoFragmentModule::class])
+ abstract fun traceLocationQRInfoFragment(): TraceLocationQRInfoFragment
+
+ @ContributesAndroidInjector(modules = [TraceLocationsFragmentModule::class])
+ abstract fun traceLocationsFragment(): TraceLocationsFragment
+
+ @ContributesAndroidInjector(modules = [QrCodePosterFragmentModule::class])
+ abstract fun qrCodePosterFragment(): QrCodePosterFragment
+
+ @ContributesAndroidInjector(modules = [QrCodeDetailFragmentModule::class])
+ abstract fun qrCodeDetailFragment(): QrCodeDetailFragment
+}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/TraceLocationPreferences.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/TraceLocationPreferences.kt
similarity index 93%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/TraceLocationPreferences.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/TraceLocationPreferences.kt
index 1f0b4fca0e568bc0d976295a46c7dab1bd3761e9..d6451170caa4bf68d3085e92620787b042c21903 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/TraceLocationPreferences.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/TraceLocationPreferences.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.ui.eventregistration
+package de.rki.coronawarnapp.ui.presencetracing
import android.content.Context
import de.rki.coronawarnapp.util.di.AppContext
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/checkins/CheckInEvent.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/checkins/CheckInEvent.kt
similarity index 77%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/checkins/CheckInEvent.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/checkins/CheckInEvent.kt
index a8c0aba5198cd1c7f7bfa98a90e34dea8566ce5c..d4b369658455b93d3de1b5e525077780ff054d5b 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/checkins/CheckInEvent.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/checkins/CheckInEvent.kt
@@ -1,8 +1,8 @@
-package de.rki.coronawarnapp.ui.eventregistration.attendee.checkins
+package de.rki.coronawarnapp.ui.presencetracing.attendee.checkins
import androidx.annotation.StringRes
-import de.rki.coronawarnapp.eventregistration.checkins.CheckIn
-import de.rki.coronawarnapp.eventregistration.checkins.qrcode.VerifiedTraceLocation
+import de.rki.coronawarnapp.presencetracing.checkins.CheckIn
+import de.rki.coronawarnapp.presencetracing.checkins.qrcode.VerifiedTraceLocation
sealed class CheckInEvent {
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/checkins/CheckInsAdapter.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/checkins/CheckInsAdapter.kt
similarity index 78%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/checkins/CheckInsAdapter.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/checkins/CheckInsAdapter.kt
index 6c4256087c9d40605436b2eb27649b402d3a97a2..f48f1bd582aae51df42e4250143afe56e1e69243 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/checkins/CheckInsAdapter.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/checkins/CheckInsAdapter.kt
@@ -1,12 +1,12 @@
-package de.rki.coronawarnapp.ui.eventregistration.attendee.checkins
+package de.rki.coronawarnapp.ui.presencetracing.attendee.checkins
import android.view.ViewGroup
import androidx.annotation.LayoutRes
import androidx.viewbinding.ViewBinding
-import de.rki.coronawarnapp.ui.eventregistration.attendee.checkins.items.ActiveCheckInVH
-import de.rki.coronawarnapp.ui.eventregistration.attendee.checkins.items.CameraPermissionVH
-import de.rki.coronawarnapp.ui.eventregistration.attendee.checkins.items.CheckInsItem
-import de.rki.coronawarnapp.ui.eventregistration.attendee.checkins.items.PastCheckInVH
+import de.rki.coronawarnapp.ui.presencetracing.attendee.checkins.items.ActiveCheckInVH
+import de.rki.coronawarnapp.ui.presencetracing.attendee.checkins.items.CameraPermissionVH
+import de.rki.coronawarnapp.ui.presencetracing.attendee.checkins.items.CheckInsItem
+import de.rki.coronawarnapp.ui.presencetracing.attendee.checkins.items.PastCheckInVH
import de.rki.coronawarnapp.util.lists.BindableVH
import de.rki.coronawarnapp.util.lists.diffutil.AsyncDiffUtilAdapter
import de.rki.coronawarnapp.util.lists.diffutil.AsyncDiffer
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/checkins/CheckInsFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/checkins/CheckInsFragment.kt
similarity index 96%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/checkins/CheckInsFragment.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/checkins/CheckInsFragment.kt
index d198e93cc2b4ac82228cc1215d73cec574e7fa7f..d99a60911455f397e16efbf55ea8bc99b1209297 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/checkins/CheckInsFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/checkins/CheckInsFragment.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.ui.eventregistration.attendee.checkins
+package de.rki.coronawarnapp.ui.presencetracing.attendee.checkins
import android.content.ActivityNotFoundException
import android.content.Intent
@@ -23,10 +23,10 @@ import com.google.android.material.transition.MaterialSharedAxis
import de.rki.coronawarnapp.BuildConfig
import de.rki.coronawarnapp.R
import de.rki.coronawarnapp.databinding.TraceLocationAttendeeCheckinsFragmentBinding
-import de.rki.coronawarnapp.eventregistration.checkins.CheckIn
-import de.rki.coronawarnapp.ui.eventregistration.attendee.checkins.items.CameraPermissionVH
-import de.rki.coronawarnapp.ui.eventregistration.attendee.checkins.items.CheckInsItem
-import de.rki.coronawarnapp.ui.eventregistration.attendee.edit.EditCheckInFragmentArgs
+import de.rki.coronawarnapp.presencetracing.checkins.CheckIn
+import de.rki.coronawarnapp.ui.presencetracing.attendee.checkins.items.CameraPermissionVH
+import de.rki.coronawarnapp.ui.presencetracing.attendee.checkins.items.CheckInsItem
+import de.rki.coronawarnapp.ui.presencetracing.attendee.edit.EditCheckInFragmentArgs
import de.rki.coronawarnapp.util.di.AutoInject
import de.rki.coronawarnapp.util.list.isSwipeable
import de.rki.coronawarnapp.util.list.onSwipeItem
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/checkins/CheckInsModule.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/checkins/CheckInsModule.kt
similarity index 87%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/checkins/CheckInsModule.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/checkins/CheckInsModule.kt
index 3777ed0daf59ed0c16f474f0843692827e4fbf19..1a75aa7aadb5748032e325f3fde3687980b51ae5 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/checkins/CheckInsModule.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/checkins/CheckInsModule.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.ui.eventregistration.attendee.checkins
+package de.rki.coronawarnapp.ui.presencetracing.attendee.checkins
import dagger.Binds
import dagger.Module
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/checkins/CheckInsViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/checkins/CheckInsViewModel.kt
similarity index 88%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/checkins/CheckInsViewModel.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/checkins/CheckInsViewModel.kt
index 94c98114e6d18bbff7bd7932ba116ef723bb7684..4ac8e10467832829d23c4d5abab617069f6b4d50 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/checkins/CheckInsViewModel.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/checkins/CheckInsViewModel.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.ui.eventregistration.attendee.checkins
+package de.rki.coronawarnapp.ui.presencetracing.attendee.checkins
import androidx.lifecycle.LiveData
import androidx.lifecycle.SavedStateHandle
@@ -6,18 +6,18 @@ import androidx.lifecycle.asLiveData
import dagger.assisted.Assisted
import dagger.assisted.AssistedFactory
import dagger.assisted.AssistedInject
-import de.rki.coronawarnapp.eventregistration.checkins.CheckIn
-import de.rki.coronawarnapp.eventregistration.checkins.CheckInRepository
-import de.rki.coronawarnapp.eventregistration.checkins.qrcode.QRCodeUriParser
-import de.rki.coronawarnapp.eventregistration.checkins.qrcode.TraceLocationVerifier
+import de.rki.coronawarnapp.presencetracing.checkins.CheckIn
+import de.rki.coronawarnapp.presencetracing.checkins.CheckInRepository
+import de.rki.coronawarnapp.presencetracing.checkins.qrcode.QRCodeUriParser
+import de.rki.coronawarnapp.presencetracing.checkins.qrcode.TraceLocationVerifier
import de.rki.coronawarnapp.exception.ExceptionCategory
import de.rki.coronawarnapp.exception.reporting.report
import de.rki.coronawarnapp.presencetracing.checkins.checkout.CheckOutHandler
-import de.rki.coronawarnapp.ui.eventregistration.attendee.checkins.items.ActiveCheckInVH
-import de.rki.coronawarnapp.ui.eventregistration.attendee.checkins.items.CameraPermissionVH
-import de.rki.coronawarnapp.ui.eventregistration.attendee.checkins.items.CheckInsItem
-import de.rki.coronawarnapp.ui.eventregistration.attendee.checkins.items.PastCheckInVH
-import de.rki.coronawarnapp.ui.eventregistration.attendee.checkins.permission.CameraPermissionProvider
+import de.rki.coronawarnapp.ui.presencetracing.attendee.checkins.items.ActiveCheckInVH
+import de.rki.coronawarnapp.ui.presencetracing.attendee.checkins.items.CameraPermissionVH
+import de.rki.coronawarnapp.ui.presencetracing.attendee.checkins.items.CheckInsItem
+import de.rki.coronawarnapp.ui.presencetracing.attendee.checkins.items.PastCheckInVH
+import de.rki.coronawarnapp.ui.presencetracing.attendee.checkins.permission.CameraPermissionProvider
import de.rki.coronawarnapp.util.coroutine.AppScope
import de.rki.coronawarnapp.util.coroutine.DispatcherProvider
import de.rki.coronawarnapp.util.flow.intervalFlow
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/checkins/items/ActiveCheckInVH.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/checkins/items/ActiveCheckInVH.kt
similarity index 96%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/checkins/items/ActiveCheckInVH.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/checkins/items/ActiveCheckInVH.kt
index 619de76483d144439940fa7665fc86d1959f31fa..e92ded3d3ee2100def36887cbc6a3a8c1f3abd90 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/checkins/items/ActiveCheckInVH.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/checkins/items/ActiveCheckInVH.kt
@@ -1,10 +1,10 @@
-package de.rki.coronawarnapp.ui.eventregistration.attendee.checkins.items
+package de.rki.coronawarnapp.ui.presencetracing.attendee.checkins.items
import android.view.ViewGroup
import de.rki.coronawarnapp.R
import de.rki.coronawarnapp.contactdiary.util.getLocale
import de.rki.coronawarnapp.databinding.TraceLocationAttendeeCheckinsItemActiveBinding
-import de.rki.coronawarnapp.eventregistration.checkins.CheckIn
+import de.rki.coronawarnapp.presencetracing.checkins.CheckIn
import de.rki.coronawarnapp.util.TimeAndDateExtensions.toUserTimeZone
import de.rki.coronawarnapp.util.list.SwipeConsumer
import de.rki.coronawarnapp.util.lists.diffutil.HasPayloadDiffer
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/checkins/items/BaseCheckInVH.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/checkins/items/BaseCheckInVH.kt
similarity index 84%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/checkins/items/BaseCheckInVH.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/checkins/items/BaseCheckInVH.kt
index 763bf101d94fbcfcb3443c827b7c6a0130a1f972..9b14f4779eda885a8bc6f00fda9f18b54150fda3 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/checkins/items/BaseCheckInVH.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/checkins/items/BaseCheckInVH.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.ui.eventregistration.attendee.checkins.items
+package de.rki.coronawarnapp.ui.presencetracing.attendee.checkins.items
import android.view.Gravity
import android.view.MenuItem
@@ -8,7 +8,7 @@ import androidx.annotation.LayoutRes
import androidx.annotation.MenuRes
import androidx.appcompat.widget.PopupMenu
import androidx.viewbinding.ViewBinding
-import de.rki.coronawarnapp.ui.eventregistration.attendee.checkins.CheckInsAdapter
+import de.rki.coronawarnapp.ui.presencetracing.attendee.checkins.CheckInsAdapter
abstract class BaseCheckInVH<ItemT : CheckInsItem, BindingT : ViewBinding>(
parent: ViewGroup,
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/checkins/items/CameraPermissionVH.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/checkins/items/CameraPermissionVH.kt
similarity index 93%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/checkins/items/CameraPermissionVH.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/checkins/items/CameraPermissionVH.kt
index c000a927e2f0b561d37ac692a4571af13f497382..43d63e51f42d128ae92b3c135c45692a2dfde6ac 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/checkins/items/CameraPermissionVH.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/checkins/items/CameraPermissionVH.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.ui.eventregistration.attendee.checkins.items
+package de.rki.coronawarnapp.ui.presencetracing.attendee.checkins.items
import android.view.ViewGroup
import de.rki.coronawarnapp.R
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/checkins/items/CheckInsItem.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/checkins/items/CheckInsItem.kt
similarity index 54%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/checkins/items/CheckInsItem.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/checkins/items/CheckInsItem.kt
index ef4c711b971239f4755220f8e42367ca73ba9350..bcd06035388b9544800ca4cea610c2781eb8dc04 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/checkins/items/CheckInsItem.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/checkins/items/CheckInsItem.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.ui.eventregistration.attendee.checkins.items
+package de.rki.coronawarnapp.ui.presencetracing.attendee.checkins.items
import de.rki.coronawarnapp.util.lists.HasStableId
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/checkins/items/PastCheckInVH.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/checkins/items/PastCheckInVH.kt
similarity index 95%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/checkins/items/PastCheckInVH.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/checkins/items/PastCheckInVH.kt
index 4ae061dcb109ee351fb2f8d3560018981e1386b8..392de2548ba9c038e928fa23ce336ca1c5a138b1 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/checkins/items/PastCheckInVH.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/checkins/items/PastCheckInVH.kt
@@ -1,9 +1,9 @@
-package de.rki.coronawarnapp.ui.eventregistration.attendee.checkins.items
+package de.rki.coronawarnapp.ui.presencetracing.attendee.checkins.items
import android.view.ViewGroup
import de.rki.coronawarnapp.R
import de.rki.coronawarnapp.databinding.TraceLocationAttendeeCheckinsItemPastBinding
-import de.rki.coronawarnapp.eventregistration.checkins.CheckIn
+import de.rki.coronawarnapp.presencetracing.checkins.CheckIn
import de.rki.coronawarnapp.util.TimeAndDateExtensions.toUserTimeZone
import de.rki.coronawarnapp.util.list.SwipeConsumer
import de.rki.coronawarnapp.util.lists.diffutil.HasPayloadDiffer
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/checkins/permission/CameraPermissionProvider.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/checkins/permission/CameraPermissionProvider.kt
similarity index 91%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/checkins/permission/CameraPermissionProvider.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/checkins/permission/CameraPermissionProvider.kt
index 7f5e7e4a07f362998b82732a45de5559621fc20d..7c7925ca5c1c22742bfd52323f5065c5b6bdc163 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/checkins/permission/CameraPermissionProvider.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/checkins/permission/CameraPermissionProvider.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.ui.eventregistration.attendee.checkins.permission
+package de.rki.coronawarnapp.ui.presencetracing.attendee.checkins.permission
import android.content.Context
import de.rki.coronawarnapp.util.di.AppContext
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/confirm/ConfirmCheckInFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/confirm/ConfirmCheckInFragment.kt
similarity index 98%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/confirm/ConfirmCheckInFragment.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/confirm/ConfirmCheckInFragment.kt
index 5b9767a72dcf21e160b669bcbaea5cad6c0ceab3..5b234f97b41a933084d8494264450eb9bf9dfda3 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/confirm/ConfirmCheckInFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/confirm/ConfirmCheckInFragment.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.ui.eventregistration.attendee.confirm
+package de.rki.coronawarnapp.ui.presencetracing.attendee.confirm
import android.os.Bundle
import android.view.View
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/confirm/ConfirmCheckInModule.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/confirm/ConfirmCheckInModule.kt
similarity index 88%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/confirm/ConfirmCheckInModule.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/confirm/ConfirmCheckInModule.kt
index fa18d2e2e0caabeeac574cfb141687db6f4dfe75..6a3dde55821e7cf7d15439ed99d65b40d0ed7520 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/confirm/ConfirmCheckInModule.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/confirm/ConfirmCheckInModule.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.ui.eventregistration.attendee.confirm
+package de.rki.coronawarnapp.ui.presencetracing.attendee.confirm
import dagger.Binds
import dagger.Module
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/confirm/ConfirmCheckInNavigation.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/confirm/ConfirmCheckInNavigation.kt
similarity index 69%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/confirm/ConfirmCheckInNavigation.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/confirm/ConfirmCheckInNavigation.kt
index 0620735ed73a68cd34c6842eb3f909de36091ac0..4afbfaa853518e9549801f9d80afdba062211a8f 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/confirm/ConfirmCheckInNavigation.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/confirm/ConfirmCheckInNavigation.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.ui.eventregistration.attendee.confirm
+package de.rki.coronawarnapp.ui.presencetracing.attendee.confirm
sealed class ConfirmCheckInNavigation {
object BackNavigation : ConfirmCheckInNavigation()
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/confirm/ConfirmCheckInViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/confirm/ConfirmCheckInViewModel.kt
similarity index 89%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/confirm/ConfirmCheckInViewModel.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/confirm/ConfirmCheckInViewModel.kt
index a8654db5b89c460c92f3ac006d3f383fa238bce6..ae6338f35bae7c8dea56f31b8466f1e2a54381aa 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/confirm/ConfirmCheckInViewModel.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/confirm/ConfirmCheckInViewModel.kt
@@ -1,17 +1,17 @@
-package de.rki.coronawarnapp.ui.eventregistration.attendee.confirm
+package de.rki.coronawarnapp.ui.presencetracing.attendee.confirm
import androidx.lifecycle.asLiveData
import dagger.assisted.Assisted
import dagger.assisted.AssistedFactory
import dagger.assisted.AssistedInject
-import de.rki.coronawarnapp.eventregistration.checkins.CheckIn
-import de.rki.coronawarnapp.eventregistration.checkins.CheckInRepository
-import de.rki.coronawarnapp.eventregistration.checkins.qrcode.TraceLocation
-import de.rki.coronawarnapp.eventregistration.checkins.qrcode.VerifiedTraceLocation
-import de.rki.coronawarnapp.eventregistration.checkins.qrcode.getDefaultAutoCheckoutLengthInMinutes
+import de.rki.coronawarnapp.presencetracing.checkins.CheckIn
+import de.rki.coronawarnapp.presencetracing.checkins.CheckInRepository
+import de.rki.coronawarnapp.presencetracing.checkins.qrcode.TraceLocation
+import de.rki.coronawarnapp.presencetracing.checkins.qrcode.VerifiedTraceLocation
+import de.rki.coronawarnapp.presencetracing.checkins.qrcode.getDefaultAutoCheckoutLengthInMinutes
import de.rki.coronawarnapp.ui.durationpicker.toContactDiaryFormat
import de.rki.coronawarnapp.ui.durationpicker.toReadableDuration
-import de.rki.coronawarnapp.ui.eventregistration.organizer.category.adapter.category.mapTraceLocationToTitleRes
+import de.rki.coronawarnapp.ui.presencetracing.organizer.category.adapter.category.mapTraceLocationToTitleRes
import de.rki.coronawarnapp.util.TimeStamper
import de.rki.coronawarnapp.util.ui.SingleLiveEvent
import de.rki.coronawarnapp.util.viewmodel.CWAViewModel
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/edit/EditCheckInFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/edit/EditCheckInFragment.kt
similarity index 99%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/edit/EditCheckInFragment.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/edit/EditCheckInFragment.kt
index 4f5471d1952764b0b9c54cf3487a93316e08c6f4..af5a38c45f1298fd91d06ad4d4319e509eb331eb 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/edit/EditCheckInFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/edit/EditCheckInFragment.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.ui.eventregistration.attendee.edit
+package de.rki.coronawarnapp.ui.presencetracing.attendee.edit
import android.os.Bundle
import android.text.format.DateFormat
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/edit/EditCheckInModule.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/edit/EditCheckInModule.kt
similarity index 88%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/edit/EditCheckInModule.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/edit/EditCheckInModule.kt
index 6a7862e259435a50b7624c3dc28decd6003f4644..c0e8869901aa01946b725a2487a1b6872c09653b 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/edit/EditCheckInModule.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/edit/EditCheckInModule.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.ui.eventregistration.attendee.edit
+package de.rki.coronawarnapp.ui.presencetracing.attendee.edit
import dagger.Binds
import dagger.Module
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/edit/EditCheckInNavigation.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/edit/EditCheckInNavigation.kt
similarity index 69%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/edit/EditCheckInNavigation.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/edit/EditCheckInNavigation.kt
index 05b11d1ad1c7509567aa471835f684734c526fa5..f06905d03cd3e336da96f7d48c9a6cc1c3967d2c 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/edit/EditCheckInNavigation.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/edit/EditCheckInNavigation.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.ui.eventregistration.attendee.edit
+package de.rki.coronawarnapp.ui.presencetracing.attendee.edit
sealed class EditCheckInNavigation {
object BackNavigation : EditCheckInNavigation()
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/edit/EditCheckInViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/edit/EditCheckInViewModel.kt
similarity index 95%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/edit/EditCheckInViewModel.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/edit/EditCheckInViewModel.kt
index 7cfc15b894c9aeb71ae03e455d3deed3ebb896f6..fd7e270a167493fd14ea72a0a47058dfe69a12b4 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/edit/EditCheckInViewModel.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/edit/EditCheckInViewModel.kt
@@ -1,13 +1,13 @@
-package de.rki.coronawarnapp.ui.eventregistration.attendee.edit
+package de.rki.coronawarnapp.ui.presencetracing.attendee.edit
import androidx.annotation.StringRes
import androidx.lifecycle.asLiveData
import dagger.assisted.Assisted
import dagger.assisted.AssistedFactory
import dagger.assisted.AssistedInject
-import de.rki.coronawarnapp.eventregistration.checkins.CheckIn
-import de.rki.coronawarnapp.eventregistration.checkins.CheckInRepository
-import de.rki.coronawarnapp.ui.eventregistration.organizer.category.adapter.category.mapTraceLocationToTitleRes
+import de.rki.coronawarnapp.presencetracing.checkins.CheckIn
+import de.rki.coronawarnapp.presencetracing.checkins.CheckInRepository
+import de.rki.coronawarnapp.ui.presencetracing.organizer.category.adapter.category.mapTraceLocationToTitleRes
import de.rki.coronawarnapp.util.ui.SingleLiveEvent
import de.rki.coronawarnapp.util.viewmodel.CWAViewModel
import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactory
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/onboarding/CheckInOnboardingFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/onboarding/CheckInOnboardingFragment.kt
similarity index 97%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/onboarding/CheckInOnboardingFragment.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/onboarding/CheckInOnboardingFragment.kt
index 3c3cd2f0c9b6a16b76f0cdd46feb621e293573e1..f7c9de003bf4ca062fb86dbb642040e63026da14 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/onboarding/CheckInOnboardingFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/onboarding/CheckInOnboardingFragment.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.ui.eventregistration.attendee.onboarding
+package de.rki.coronawarnapp.ui.presencetracing.attendee.onboarding
import android.os.Bundle
import android.view.View
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/onboarding/CheckInOnboardingModule.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/onboarding/CheckInOnboardingModule.kt
similarity index 88%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/onboarding/CheckInOnboardingModule.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/onboarding/CheckInOnboardingModule.kt
index d052ff794e039fd398e301e3e83856ddbea2cd4c..cbf6da8e5cddcfe753cbd495cc0b4b08fce6a578 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/onboarding/CheckInOnboardingModule.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/onboarding/CheckInOnboardingModule.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.ui.eventregistration.attendee.onboarding
+package de.rki.coronawarnapp.ui.presencetracing.attendee.onboarding
import dagger.Binds
import dagger.Module
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/onboarding/CheckInOnboardingNavigation.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/onboarding/CheckInOnboardingNavigation.kt
similarity index 72%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/onboarding/CheckInOnboardingNavigation.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/onboarding/CheckInOnboardingNavigation.kt
index 80abbc78a846607e135fa48c5ae91afc63cdda29..3031d8efa62d51f6a37b1c92e2a263c761beb8d7 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/onboarding/CheckInOnboardingNavigation.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/onboarding/CheckInOnboardingNavigation.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.ui.eventregistration.attendee.onboarding
+package de.rki.coronawarnapp.ui.presencetracing.attendee.onboarding
sealed class CheckInOnboardingNavigation {
object AcknowledgedNavigation : CheckInOnboardingNavigation()
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/onboarding/CheckInOnboardingViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/onboarding/CheckInOnboardingViewModel.kt
similarity index 88%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/onboarding/CheckInOnboardingViewModel.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/onboarding/CheckInOnboardingViewModel.kt
index c48273409646b2e96e4c4afb9dda38d2dd0f3862..afbffab4c3d2a4f1abdb5c56ed078adbe699ab48 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/onboarding/CheckInOnboardingViewModel.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/onboarding/CheckInOnboardingViewModel.kt
@@ -1,8 +1,8 @@
-package de.rki.coronawarnapp.ui.eventregistration.attendee.onboarding
+package de.rki.coronawarnapp.ui.presencetracing.attendee.onboarding
import dagger.assisted.AssistedFactory
import dagger.assisted.AssistedInject
-import de.rki.coronawarnapp.eventregistration.TraceLocationSettings
+import de.rki.coronawarnapp.presencetracing.TraceLocationSettings
import de.rki.coronawarnapp.util.ui.SingleLiveEvent
import de.rki.coronawarnapp.util.viewmodel.CWAViewModel
import de.rki.coronawarnapp.util.viewmodel.SimpleCWAViewModelFactory
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/scan/ScanCheckInQrCodeFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/scan/ScanCheckInQrCodeFragment.kt
similarity index 97%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/scan/ScanCheckInQrCodeFragment.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/scan/ScanCheckInQrCodeFragment.kt
index 4da62b575f1b31ecbfedb0d9626177d92cb0fadf..1849244156e93dabc5ed4dde2481f71aa2b365b8 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/scan/ScanCheckInQrCodeFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/scan/ScanCheckInQrCodeFragment.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.ui.eventregistration.attendee.scan
+package de.rki.coronawarnapp.ui.presencetracing.attendee.scan
import android.Manifest
import android.content.pm.PackageManager
@@ -13,7 +13,7 @@ import com.google.zxing.BarcodeFormat
import com.journeyapps.barcodescanner.DefaultDecoderFactory
import de.rki.coronawarnapp.R
import de.rki.coronawarnapp.databinding.FragmentScanCheckInQrCodeBinding
-import de.rki.coronawarnapp.ui.eventregistration.attendee.checkins.CheckInsFragment
+import de.rki.coronawarnapp.ui.presencetracing.attendee.checkins.CheckInsFragment
import de.rki.coronawarnapp.util.DialogHelper
import de.rki.coronawarnapp.util.di.AutoInject
import de.rki.coronawarnapp.util.permission.CameraPermissionHelper
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/scan/ScanCheckInQrCodeModule.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/scan/ScanCheckInQrCodeModule.kt
similarity index 89%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/scan/ScanCheckInQrCodeModule.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/scan/ScanCheckInQrCodeModule.kt
index 37349adb9a52a9b8f936f64993e9395d8f43da8a..1d47473be5da6171f4356318d70cfe8d82fd5041 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/scan/ScanCheckInQrCodeModule.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/scan/ScanCheckInQrCodeModule.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.ui.eventregistration.attendee.scan
+package de.rki.coronawarnapp.ui.presencetracing.attendee.scan
import dagger.Binds
import dagger.Module
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/scan/ScanCheckInQrCodeNavigation.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/scan/ScanCheckInQrCodeNavigation.kt
similarity index 74%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/scan/ScanCheckInQrCodeNavigation.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/scan/ScanCheckInQrCodeNavigation.kt
index db3c562d8276579ab79d50043d0b347b67895760..688adc324d9c5747fea6216fad480c5f1ba6eb77 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/scan/ScanCheckInQrCodeNavigation.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/scan/ScanCheckInQrCodeNavigation.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.ui.eventregistration.attendee.scan
+package de.rki.coronawarnapp.ui.presencetracing.attendee.scan
sealed class ScanCheckInQrCodeNavigation {
object BackNavigation : ScanCheckInQrCodeNavigation()
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/scan/ScanCheckInQrCodeViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/scan/ScanCheckInQrCodeViewModel.kt
similarity index 94%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/scan/ScanCheckInQrCodeViewModel.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/scan/ScanCheckInQrCodeViewModel.kt
index 9c20d8702f635fb31719a5161483e4cfc4ffaa81..c9227d4a526c385bb47403fa1e8a01c8b934c5b9 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/scan/ScanCheckInQrCodeViewModel.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/scan/ScanCheckInQrCodeViewModel.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.ui.eventregistration.attendee.scan
+package de.rki.coronawarnapp.ui.presencetracing.attendee.scan
import com.journeyapps.barcodescanner.BarcodeResult
import dagger.assisted.AssistedFactory
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/common/TraceLocationCardHighlightView.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/common/TraceLocationCardHighlightView.kt
similarity index 97%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/common/TraceLocationCardHighlightView.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/common/TraceLocationCardHighlightView.kt
index d61e3ea638c3fc389470b985299cb711035c42cc..9db690c9c246b6562782953810ff91f623127f4a 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/common/TraceLocationCardHighlightView.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/common/TraceLocationCardHighlightView.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.ui.eventregistration.common
+package de.rki.coronawarnapp.ui.presencetracing.common
import android.content.Context
import android.util.AttributeSet
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/TraceLocationOrganizerSettings.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/TraceLocationOrganizerSettings.kt
similarity index 72%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/TraceLocationOrganizerSettings.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/TraceLocationOrganizerSettings.kt
index 8752beda3bb3e2e4c81911629cd35250d12de32e..70e8a10ce7583fdb354aeb1c9a0f3f8aafa46abd 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/TraceLocationOrganizerSettings.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/TraceLocationOrganizerSettings.kt
@@ -1,6 +1,6 @@
-package de.rki.coronawarnapp.ui.eventregistration.organizer
+package de.rki.coronawarnapp.ui.presencetracing.organizer
-import de.rki.coronawarnapp.ui.eventregistration.TraceLocationPreferences
+import de.rki.coronawarnapp.ui.presencetracing.TraceLocationPreferences
import javax.inject.Inject
import javax.inject.Singleton
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/category/TraceLocationCategoryFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/category/TraceLocationCategoryFragment.kt
similarity index 92%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/category/TraceLocationCategoryFragment.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/category/TraceLocationCategoryFragment.kt
index 51f1ef93946acbb0ee18e61476c9d133f26175f8..99a29a46715e75433ab4a00e2dabcaf0d9ef1b87 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/category/TraceLocationCategoryFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/category/TraceLocationCategoryFragment.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.ui.eventregistration.organizer.category
+package de.rki.coronawarnapp.ui.presencetracing.organizer.category
import android.os.Bundle
import android.view.View
@@ -7,7 +7,7 @@ import androidx.fragment.app.Fragment
import com.google.android.material.transition.MaterialContainerTransform
import de.rki.coronawarnapp.R
import de.rki.coronawarnapp.databinding.TraceLocationOrganizerCategoryFragmentBinding
-import de.rki.coronawarnapp.ui.eventregistration.organizer.category.adapter.TraceLocationCategoryAdapter
+import de.rki.coronawarnapp.ui.presencetracing.organizer.category.adapter.TraceLocationCategoryAdapter
import de.rki.coronawarnapp.util.di.AutoInject
import de.rki.coronawarnapp.util.ui.doNavigate
import de.rki.coronawarnapp.util.ui.observe2
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/category/TraceLocationCategoryFragmentModule.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/category/TraceLocationCategoryFragmentModule.kt
similarity index 88%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/category/TraceLocationCategoryFragmentModule.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/category/TraceLocationCategoryFragmentModule.kt
index e2151c9274563b0fa69066f4f9e8188189b5ab7b..d9b112e00330322684558dfab1e104b0e832515e 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/category/TraceLocationCategoryFragmentModule.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/category/TraceLocationCategoryFragmentModule.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.ui.eventregistration.organizer.category
+package de.rki.coronawarnapp.ui.presencetracing.organizer.category
import dagger.Binds
import dagger.Module
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/category/TraceLocationCategoryViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/category/TraceLocationCategoryViewModel.kt
similarity index 65%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/category/TraceLocationCategoryViewModel.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/category/TraceLocationCategoryViewModel.kt
index e57a4be08b5372ff3399456a2ff9889690dea497..8f092fb8189dbc3d55b10a0a5d5c977ce61a136a 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/category/TraceLocationCategoryViewModel.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/category/TraceLocationCategoryViewModel.kt
@@ -1,15 +1,15 @@
-package de.rki.coronawarnapp.ui.eventregistration.organizer.category
+package de.rki.coronawarnapp.ui.presencetracing.organizer.category
import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData
import dagger.assisted.AssistedFactory
import dagger.assisted.AssistedInject
import de.rki.coronawarnapp.R
-import de.rki.coronawarnapp.ui.eventregistration.organizer.category.adapter.CategoryItem
-import de.rki.coronawarnapp.ui.eventregistration.organizer.category.adapter.category.TraceLocationUIType
-import de.rki.coronawarnapp.ui.eventregistration.organizer.category.adapter.category.traceLocationCategories
-import de.rki.coronawarnapp.ui.eventregistration.organizer.category.adapter.header.TraceLocationHeaderItem
-import de.rki.coronawarnapp.ui.eventregistration.organizer.category.adapter.separator.TraceLocationSeparatorItem
+import de.rki.coronawarnapp.ui.presencetracing.organizer.category.adapter.CategoryItem
+import de.rki.coronawarnapp.ui.presencetracing.organizer.category.adapter.category.TraceLocationUIType
+import de.rki.coronawarnapp.ui.presencetracing.organizer.category.adapter.category.traceLocationCategories
+import de.rki.coronawarnapp.ui.presencetracing.organizer.category.adapter.header.TraceLocationHeaderItem
+import de.rki.coronawarnapp.ui.presencetracing.organizer.category.adapter.separator.TraceLocationSeparatorItem
import de.rki.coronawarnapp.util.viewmodel.CWAViewModel
import de.rki.coronawarnapp.util.viewmodel.SimpleCWAViewModelFactory
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/category/adapter/CategoryItem.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/category/adapter/CategoryItem.kt
similarity index 53%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/category/adapter/CategoryItem.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/category/adapter/CategoryItem.kt
index 9907dd6c4387dd423cebbe1beed71cb9853c31f7..e1cf20199f6401952c66295f08224cbbb0757c4c 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/category/adapter/CategoryItem.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/category/adapter/CategoryItem.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.ui.eventregistration.organizer.category.adapter
+package de.rki.coronawarnapp.ui.presencetracing.organizer.category.adapter
import de.rki.coronawarnapp.util.lists.HasStableId
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/category/adapter/TraceLocationCategoryAdapter.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/category/adapter/TraceLocationCategoryAdapter.kt
similarity index 72%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/category/adapter/TraceLocationCategoryAdapter.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/category/adapter/TraceLocationCategoryAdapter.kt
index 2899ca946644d2da758001e76365ee7a4e814571..9cdcd7d5376ca5064eda148f476b2ff0eda70378 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/category/adapter/TraceLocationCategoryAdapter.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/category/adapter/TraceLocationCategoryAdapter.kt
@@ -1,14 +1,14 @@
-package de.rki.coronawarnapp.ui.eventregistration.organizer.category.adapter
+package de.rki.coronawarnapp.ui.presencetracing.organizer.category.adapter
import android.view.ViewGroup
import androidx.annotation.LayoutRes
import androidx.viewbinding.ViewBinding
-import de.rki.coronawarnapp.ui.eventregistration.organizer.category.adapter.category.TraceLocationCategory
-import de.rki.coronawarnapp.ui.eventregistration.organizer.category.adapter.category.TraceLocationCategoryVH
-import de.rki.coronawarnapp.ui.eventregistration.organizer.category.adapter.header.TraceLocationHeaderItem
-import de.rki.coronawarnapp.ui.eventregistration.organizer.category.adapter.header.TraceLocationHeaderVH
-import de.rki.coronawarnapp.ui.eventregistration.organizer.category.adapter.separator.TraceLocationSeparatorItem
-import de.rki.coronawarnapp.ui.eventregistration.organizer.category.adapter.separator.TraceLocationSeparatorVH
+import de.rki.coronawarnapp.ui.presencetracing.organizer.category.adapter.category.TraceLocationCategory
+import de.rki.coronawarnapp.ui.presencetracing.organizer.category.adapter.category.TraceLocationCategoryVH
+import de.rki.coronawarnapp.ui.presencetracing.organizer.category.adapter.header.TraceLocationHeaderItem
+import de.rki.coronawarnapp.ui.presencetracing.organizer.category.adapter.header.TraceLocationHeaderVH
+import de.rki.coronawarnapp.ui.presencetracing.organizer.category.adapter.separator.TraceLocationSeparatorItem
+import de.rki.coronawarnapp.ui.presencetracing.organizer.category.adapter.separator.TraceLocationSeparatorVH
import de.rki.coronawarnapp.util.lists.BindableVH
import de.rki.coronawarnapp.util.lists.diffutil.AsyncDiffUtilAdapter
import de.rki.coronawarnapp.util.lists.diffutil.AsyncDiffer
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/category/adapter/category/TraceLocationCategory.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/category/adapter/category/TraceLocationCategory.kt
similarity index 92%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/category/adapter/category/TraceLocationCategory.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/category/adapter/category/TraceLocationCategory.kt
index ffcb22118b5d722e610c063325d14e7dd7b5120f..20711ab2baf81fd3516ff7db3ab3e4edcc9284c3 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/category/adapter/category/TraceLocationCategory.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/category/adapter/category/TraceLocationCategory.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.ui.eventregistration.organizer.category.adapter.category
+package de.rki.coronawarnapp.ui.presencetracing.organizer.category.adapter.category
import android.os.Parcelable
import androidx.annotation.StringRes
@@ -16,9 +16,9 @@ import de.rki.coronawarnapp.server.protocols.internal.pt.TraceLocationOuterClass
import de.rki.coronawarnapp.server.protocols.internal.pt.TraceLocationOuterClass.TraceLocationType.LOCATION_TYPE_TEMPORARY_OTHER
import de.rki.coronawarnapp.server.protocols.internal.pt.TraceLocationOuterClass.TraceLocationType.LOCATION_TYPE_TEMPORARY_PRIVATE_EVENT
import de.rki.coronawarnapp.server.protocols.internal.pt.TraceLocationOuterClass.TraceLocationType.LOCATION_TYPE_TEMPORARY_WORSHIP_SERVICE
-import de.rki.coronawarnapp.ui.eventregistration.organizer.category.adapter.CategoryItem
-import de.rki.coronawarnapp.ui.eventregistration.organizer.category.adapter.category.TraceLocationUIType.EVENT
-import de.rki.coronawarnapp.ui.eventregistration.organizer.category.adapter.category.TraceLocationUIType.LOCATION
+import de.rki.coronawarnapp.ui.presencetracing.organizer.category.adapter.CategoryItem
+import de.rki.coronawarnapp.ui.presencetracing.organizer.category.adapter.category.TraceLocationUIType.EVENT
+import de.rki.coronawarnapp.ui.presencetracing.organizer.category.adapter.category.TraceLocationUIType.LOCATION
import kotlinx.parcelize.IgnoredOnParcel
import kotlinx.parcelize.Parcelize
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/category/adapter/category/TraceLocationCategoryVH.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/category/adapter/category/TraceLocationCategoryVH.kt
similarity index 84%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/category/adapter/category/TraceLocationCategoryVH.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/category/adapter/category/TraceLocationCategoryVH.kt
index bb7318797e7ff65d6e26a63d0e62c35672e35f30..b84717e724ef85b42c19539b8224e3bc4dce7481 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/category/adapter/category/TraceLocationCategoryVH.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/category/adapter/category/TraceLocationCategoryVH.kt
@@ -1,9 +1,9 @@
-package de.rki.coronawarnapp.ui.eventregistration.organizer.category.adapter.category
+package de.rki.coronawarnapp.ui.presencetracing.organizer.category.adapter.category
import android.view.ViewGroup
import de.rki.coronawarnapp.R
import de.rki.coronawarnapp.databinding.TraceLocationOrganizerCategoryItemBinding
-import de.rki.coronawarnapp.ui.eventregistration.organizer.category.adapter.TraceLocationCategoryAdapter
+import de.rki.coronawarnapp.ui.presencetracing.organizer.category.adapter.TraceLocationCategoryAdapter
class TraceLocationCategoryVH(parent: ViewGroup, onItemClickListener: (category: TraceLocationCategory) -> Unit) :
TraceLocationCategoryAdapter.ItemVH<TraceLocationCategory, TraceLocationOrganizerCategoryItemBinding>(
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/category/adapter/header/TraceLocationHeaderItem.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/category/adapter/header/TraceLocationHeaderItem.kt
similarity index 50%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/category/adapter/header/TraceLocationHeaderItem.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/category/adapter/header/TraceLocationHeaderItem.kt
index d860e32713e025baaf8ca09b962095b2cf13c826..2b0765d701d86a7afddfa44f64e43f1b8122fe30 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/category/adapter/header/TraceLocationHeaderItem.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/category/adapter/header/TraceLocationHeaderItem.kt
@@ -1,7 +1,7 @@
-package de.rki.coronawarnapp.ui.eventregistration.organizer.category.adapter.header
+package de.rki.coronawarnapp.ui.presencetracing.organizer.category.adapter.header
import androidx.annotation.StringRes
-import de.rki.coronawarnapp.ui.eventregistration.organizer.category.adapter.CategoryItem
+import de.rki.coronawarnapp.ui.presencetracing.organizer.category.adapter.CategoryItem
data class TraceLocationHeaderItem(@StringRes val headerText: Int) : CategoryItem {
override val stableId = this.hashCode().toLong()
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/category/adapter/header/TraceLocationHeaderVH.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/category/adapter/header/TraceLocationHeaderVH.kt
similarity index 81%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/category/adapter/header/TraceLocationHeaderVH.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/category/adapter/header/TraceLocationHeaderVH.kt
index 890569170a09f52e98a32792f4ebd0e129f9b2a8..2d2ee89b3b2ad29d06ac319a29e5025c2131968a 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/category/adapter/header/TraceLocationHeaderVH.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/category/adapter/header/TraceLocationHeaderVH.kt
@@ -1,9 +1,9 @@
-package de.rki.coronawarnapp.ui.eventregistration.organizer.category.adapter.header
+package de.rki.coronawarnapp.ui.presencetracing.organizer.category.adapter.header
import android.view.ViewGroup
import de.rki.coronawarnapp.R
import de.rki.coronawarnapp.databinding.TraceLocationOrganizerCategoryHeaderBinding
-import de.rki.coronawarnapp.ui.eventregistration.organizer.category.adapter.TraceLocationCategoryAdapter
+import de.rki.coronawarnapp.ui.presencetracing.organizer.category.adapter.TraceLocationCategoryAdapter
class TraceLocationHeaderVH(parent: ViewGroup) :
TraceLocationCategoryAdapter.ItemVH<TraceLocationHeaderItem, TraceLocationOrganizerCategoryHeaderBinding>(
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/category/adapter/separator/TraceLocationSeparatorItem.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/category/adapter/separator/TraceLocationSeparatorItem.kt
new file mode 100644
index 0000000000000000000000000000000000000000..dfac5b8e187ef8b9e66261d172f80b4cb2e75f8d
--- /dev/null
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/category/adapter/separator/TraceLocationSeparatorItem.kt
@@ -0,0 +1,7 @@
+package de.rki.coronawarnapp.ui.presencetracing.organizer.category.adapter.separator
+
+import de.rki.coronawarnapp.ui.presencetracing.organizer.category.adapter.CategoryItem
+
+object TraceLocationSeparatorItem : CategoryItem {
+ override val stableId = this.hashCode().toLong()
+}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/category/adapter/separator/TraceLocationSeparatorVH.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/category/adapter/separator/TraceLocationSeparatorVH.kt
similarity index 80%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/category/adapter/separator/TraceLocationSeparatorVH.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/category/adapter/separator/TraceLocationSeparatorVH.kt
index d458a720b898dce40010d408850beb1e35034d68..1c52d22101c4a79c5f8f9caf34644ef6ac0aea15 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/category/adapter/separator/TraceLocationSeparatorVH.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/category/adapter/separator/TraceLocationSeparatorVH.kt
@@ -1,9 +1,9 @@
-package de.rki.coronawarnapp.ui.eventregistration.organizer.category.adapter.separator
+package de.rki.coronawarnapp.ui.presencetracing.organizer.category.adapter.separator
import android.view.ViewGroup
import de.rki.coronawarnapp.R
import de.rki.coronawarnapp.databinding.TraceLocationOrganizerCategorySeparatorBinding
-import de.rki.coronawarnapp.ui.eventregistration.organizer.category.adapter.TraceLocationCategoryAdapter
+import de.rki.coronawarnapp.ui.presencetracing.organizer.category.adapter.TraceLocationCategoryAdapter
class TraceLocationSeparatorVH(parent: ViewGroup) :
TraceLocationCategoryAdapter.ItemVH<TraceLocationSeparatorItem, TraceLocationOrganizerCategorySeparatorBinding>(
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/create/TraceLocationCreateFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/create/TraceLocationCreateFragment.kt
similarity index 99%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/create/TraceLocationCreateFragment.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/create/TraceLocationCreateFragment.kt
index 385d826151839cd32662301c8d045d8eef15e153..4843c35ccac9c53e05cce240cd9357bdc2e5e88d 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/create/TraceLocationCreateFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/create/TraceLocationCreateFragment.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.ui.eventregistration.organizer.create
+package de.rki.coronawarnapp.ui.presencetracing.organizer.create
import android.os.Bundle
import android.text.format.DateFormat.is24HourFormat
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/create/TraceLocationCreateFragmentModule.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/create/TraceLocationCreateFragmentModule.kt
similarity index 88%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/create/TraceLocationCreateFragmentModule.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/create/TraceLocationCreateFragmentModule.kt
index b32ebf2fb923fb143c13849415915bfca475feb0..2694fa7f288c68e3d4cda4fb41c6566512032971 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/create/TraceLocationCreateFragmentModule.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/create/TraceLocationCreateFragmentModule.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.ui.eventregistration.organizer.create
+package de.rki.coronawarnapp.ui.presencetracing.organizer.create
import dagger.Binds
import dagger.Module
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/create/TraceLocationCreateViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/create/TraceLocationCreateViewModel.kt
similarity index 92%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/create/TraceLocationCreateViewModel.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/create/TraceLocationCreateViewModel.kt
index da0c661715bac8e462d43a71c31ca012a5012c24..4e862e265e57d3cb0d9cd7c41bb3a8f8405fa179 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/create/TraceLocationCreateViewModel.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/create/TraceLocationCreateViewModel.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.ui.eventregistration.organizer.create
+package de.rki.coronawarnapp.ui.presencetracing.organizer.create
import android.content.res.Resources
import androidx.annotation.StringRes
@@ -9,12 +9,12 @@ import dagger.assisted.AssistedFactory
import dagger.assisted.AssistedInject
import de.rki.coronawarnapp.R
import de.rki.coronawarnapp.contactdiary.util.CWADateTimeFormatPatternFactory.shortDatePattern
-import de.rki.coronawarnapp.eventregistration.checkins.qrcode.TraceLocation
-import de.rki.coronawarnapp.eventregistration.events.TraceLocationCreator
-import de.rki.coronawarnapp.eventregistration.events.TraceLocationUserInput
+import de.rki.coronawarnapp.presencetracing.checkins.qrcode.TraceLocation
+import de.rki.coronawarnapp.presencetracing.locations.TraceLocationCreator
+import de.rki.coronawarnapp.presencetracing.locations.TraceLocationUserInput
import de.rki.coronawarnapp.ui.durationpicker.toReadableDuration
-import de.rki.coronawarnapp.ui.eventregistration.organizer.category.adapter.category.TraceLocationCategory
-import de.rki.coronawarnapp.ui.eventregistration.organizer.category.adapter.category.TraceLocationUIType
+import de.rki.coronawarnapp.ui.presencetracing.organizer.category.adapter.category.TraceLocationCategory
+import de.rki.coronawarnapp.ui.presencetracing.organizer.category.adapter.category.TraceLocationUIType
import de.rki.coronawarnapp.util.coroutine.DispatcherProvider
import de.rki.coronawarnapp.util.ui.SingleLiveEvent
import de.rki.coronawarnapp.util.viewmodel.CWAViewModel
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/details/QrCodeDetailFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/details/QrCodeDetailFragment.kt
similarity index 99%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/details/QrCodeDetailFragment.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/details/QrCodeDetailFragment.kt
index 82521d81b8aa135937772bd9b30e7343f5632cdd..b85dea9f8730792b52d0ad473b44e0a6e14d0203 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/details/QrCodeDetailFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/details/QrCodeDetailFragment.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.ui.eventregistration.organizer.details
+package de.rki.coronawarnapp.ui.presencetracing.organizer.details
import android.os.Bundle
import android.view.View
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/details/QrCodeDetailFragmentModule.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/details/QrCodeDetailFragmentModule.kt
similarity index 88%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/details/QrCodeDetailFragmentModule.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/details/QrCodeDetailFragmentModule.kt
index 23c2a52b2a016149b294c60014e1725cb103a24f..582dbc19fa1207fc60d85e2e3a8eff7dc3d06647 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/details/QrCodeDetailFragmentModule.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/details/QrCodeDetailFragmentModule.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.ui.eventregistration.organizer.details
+package de.rki.coronawarnapp.ui.presencetracing.organizer.details
import dagger.Binds
import dagger.Module
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/details/QrCodeDetailNavigationEvents.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/details/QrCodeDetailNavigationEvents.kt
similarity index 58%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/details/QrCodeDetailNavigationEvents.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/details/QrCodeDetailNavigationEvents.kt
index 1939ed098a96a614fb192fb6771ee661c6cbb9de..90ff86c06a669a0c204a308c3416e110026188bf 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/details/QrCodeDetailNavigationEvents.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/details/QrCodeDetailNavigationEvents.kt
@@ -1,7 +1,7 @@
-package de.rki.coronawarnapp.ui.eventregistration.organizer.details
+package de.rki.coronawarnapp.ui.presencetracing.organizer.details
-import de.rki.coronawarnapp.eventregistration.checkins.qrcode.TraceLocation
-import de.rki.coronawarnapp.ui.eventregistration.organizer.category.adapter.category.TraceLocationCategory
+import de.rki.coronawarnapp.presencetracing.checkins.qrcode.TraceLocation
+import de.rki.coronawarnapp.ui.presencetracing.organizer.category.adapter.category.TraceLocationCategory
sealed class QrCodeDetailNavigationEvents {
object NavigateBack : QrCodeDetailNavigationEvents()
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/details/QrCodeDetailViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/details/QrCodeDetailViewModel.kt
similarity index 89%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/details/QrCodeDetailViewModel.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/details/QrCodeDetailViewModel.kt
index 30f3363daca6adda72f5a868f791d1e571166590..0a33ec89e6e88a184b0da4018dc37af1e500f67e 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/details/QrCodeDetailViewModel.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/details/QrCodeDetailViewModel.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.ui.eventregistration.organizer.details
+package de.rki.coronawarnapp.ui.presencetracing.organizer.details
import android.graphics.Bitmap
import androidx.lifecycle.LiveData
@@ -6,12 +6,12 @@ import androidx.lifecycle.MutableLiveData
import dagger.assisted.Assisted
import dagger.assisted.AssistedFactory
import dagger.assisted.AssistedInject
-import de.rki.coronawarnapp.eventregistration.checkins.qrcode.QrCodeGenerator
-import de.rki.coronawarnapp.eventregistration.checkins.qrcode.TraceLocation
-import de.rki.coronawarnapp.eventregistration.storage.repo.DefaultTraceLocationRepository
+import de.rki.coronawarnapp.presencetracing.checkins.qrcode.QrCodeGenerator
+import de.rki.coronawarnapp.presencetracing.checkins.qrcode.TraceLocation
+import de.rki.coronawarnapp.presencetracing.storage.repo.DefaultTraceLocationRepository
import de.rki.coronawarnapp.exception.ExceptionCategory
import de.rki.coronawarnapp.exception.reporting.report
-import de.rki.coronawarnapp.ui.eventregistration.organizer.category.adapter.category.traceLocationCategories
+import de.rki.coronawarnapp.ui.presencetracing.organizer.category.adapter.category.traceLocationCategories
import de.rki.coronawarnapp.util.coroutine.DispatcherProvider
import de.rki.coronawarnapp.util.ui.SingleLiveEvent
import de.rki.coronawarnapp.util.viewmodel.CWAViewModel
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/list/TraceLocationEvent.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/list/TraceLocationEvent.kt
similarity index 81%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/list/TraceLocationEvent.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/list/TraceLocationEvent.kt
index a4576f0ae318ae641605d530e667d128c0bae926..ebf415e656b9674a09c2057a6d3702b1014c62be 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/list/TraceLocationEvent.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/list/TraceLocationEvent.kt
@@ -1,6 +1,6 @@
-package de.rki.coronawarnapp.ui.eventregistration.organizer.list
+package de.rki.coronawarnapp.ui.presencetracing.organizer.list
-import de.rki.coronawarnapp.eventregistration.checkins.qrcode.TraceLocation
+import de.rki.coronawarnapp.presencetracing.checkins.qrcode.TraceLocation
sealed class TraceLocationEvent {
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/list/TraceLocationsAdapter.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/list/TraceLocationsAdapter.kt
similarity index 85%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/list/TraceLocationsAdapter.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/list/TraceLocationsAdapter.kt
index 42005de704080b9ba218a6685e9abb2b782f4b0a..6b3fe922f364c191d002af210b984a25687a8fec 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/list/TraceLocationsAdapter.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/list/TraceLocationsAdapter.kt
@@ -1,10 +1,10 @@
-package de.rki.coronawarnapp.ui.eventregistration.organizer.list
+package de.rki.coronawarnapp.ui.presencetracing.organizer.list
import android.view.ViewGroup
import androidx.annotation.LayoutRes
import androidx.viewbinding.ViewBinding
-import de.rki.coronawarnapp.ui.eventregistration.organizer.list.items.TraceLocationItem
-import de.rki.coronawarnapp.ui.eventregistration.organizer.list.items.TraceLocationVH
+import de.rki.coronawarnapp.ui.presencetracing.organizer.list.items.TraceLocationItem
+import de.rki.coronawarnapp.ui.presencetracing.organizer.list.items.TraceLocationVH
import de.rki.coronawarnapp.util.lists.BindableVH
import de.rki.coronawarnapp.util.lists.diffutil.AsyncDiffUtilAdapter
import de.rki.coronawarnapp.util.lists.diffutil.AsyncDiffer
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/list/TraceLocationsFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/list/TraceLocationsFragment.kt
similarity index 95%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/list/TraceLocationsFragment.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/list/TraceLocationsFragment.kt
index 6cf9139837b6ba6c194dcd9128985c4652de5de4..98f9779fa6f8157b56a146b3497531f12940f6af 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/list/TraceLocationsFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/list/TraceLocationsFragment.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.ui.eventregistration.organizer.list
+package de.rki.coronawarnapp.ui.presencetracing.organizer.list
import android.os.Bundle
import android.view.View
@@ -14,10 +14,10 @@ import com.google.android.material.transition.Hold
import com.google.android.material.transition.MaterialSharedAxis
import de.rki.coronawarnapp.R
import de.rki.coronawarnapp.databinding.TraceLocationOrganizerTraceLocationsListFragmentBinding
-import de.rki.coronawarnapp.eventregistration.checkins.qrcode.TraceLocation
-import de.rki.coronawarnapp.ui.eventregistration.attendee.checkins.CheckInsFragment
-import de.rki.coronawarnapp.ui.eventregistration.organizer.category.adapter.category.traceLocationCategories
-import de.rki.coronawarnapp.ui.eventregistration.organizer.details.QrCodeDetailFragmentArgs
+import de.rki.coronawarnapp.presencetracing.checkins.qrcode.TraceLocation
+import de.rki.coronawarnapp.ui.presencetracing.attendee.checkins.CheckInsFragment
+import de.rki.coronawarnapp.ui.presencetracing.organizer.category.adapter.category.traceLocationCategories
+import de.rki.coronawarnapp.ui.presencetracing.organizer.details.QrCodeDetailFragmentArgs
import de.rki.coronawarnapp.util.DialogHelper
import de.rki.coronawarnapp.util.di.AutoInject
import de.rki.coronawarnapp.util.list.isSwipeable
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/list/TraceLocationsFragmentModule.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/list/TraceLocationsFragmentModule.kt
similarity index 89%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/list/TraceLocationsFragmentModule.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/list/TraceLocationsFragmentModule.kt
index 4a9d04a90ffc9b158ecd05ad9d752948038758c9..3364c89f5a053efe58c0ef8f1684f0818eaf5fc8 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/list/TraceLocationsFragmentModule.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/list/TraceLocationsFragmentModule.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.ui.eventregistration.organizer.list
+package de.rki.coronawarnapp.ui.presencetracing.organizer.list
import dagger.Binds
import dagger.Module
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/list/TraceLocationsViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/list/TraceLocationsViewModel.kt
similarity index 85%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/list/TraceLocationsViewModel.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/list/TraceLocationsViewModel.kt
index e00d80c9b5d4e9293c70382f3fda8a941c0de911..eee8533aef0800f7209c8d5111705f634d0806cd 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/list/TraceLocationsViewModel.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/list/TraceLocationsViewModel.kt
@@ -1,14 +1,14 @@
-package de.rki.coronawarnapp.ui.eventregistration.organizer.list
+package de.rki.coronawarnapp.ui.presencetracing.organizer.list
import androidx.lifecycle.LiveData
import androidx.lifecycle.asLiveData
import dagger.assisted.AssistedFactory
import dagger.assisted.AssistedInject
-import de.rki.coronawarnapp.eventregistration.checkins.CheckInRepository
-import de.rki.coronawarnapp.eventregistration.checkins.qrcode.TraceLocation
-import de.rki.coronawarnapp.eventregistration.storage.repo.TraceLocationRepository
-import de.rki.coronawarnapp.ui.eventregistration.organizer.list.items.TraceLocationItem
-import de.rki.coronawarnapp.ui.eventregistration.organizer.list.items.TraceLocationVH
+import de.rki.coronawarnapp.presencetracing.checkins.CheckInRepository
+import de.rki.coronawarnapp.presencetracing.checkins.qrcode.TraceLocation
+import de.rki.coronawarnapp.presencetracing.storage.repo.TraceLocationRepository
+import de.rki.coronawarnapp.ui.presencetracing.organizer.list.items.TraceLocationItem
+import de.rki.coronawarnapp.ui.presencetracing.organizer.list.items.TraceLocationVH
import de.rki.coronawarnapp.util.coroutine.DispatcherProvider
import de.rki.coronawarnapp.util.ui.SingleLiveEvent
import de.rki.coronawarnapp.util.viewmodel.CWAViewModel
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/list/items/TraceLocationItem.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/list/items/TraceLocationItem.kt
similarity index 57%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/list/items/TraceLocationItem.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/list/items/TraceLocationItem.kt
index bd4d36554d82780a8dc2cdbcecfd676a3dafe8d8..068ef2cf5a81a2315c36c64595765c314c74c9e4 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/list/items/TraceLocationItem.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/list/items/TraceLocationItem.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.ui.eventregistration.organizer.list.items
+package de.rki.coronawarnapp.ui.presencetracing.organizer.list.items
import de.rki.coronawarnapp.util.lists.HasStableId
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/list/items/TraceLocationVH.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/list/items/TraceLocationVH.kt
similarity index 90%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/list/items/TraceLocationVH.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/list/items/TraceLocationVH.kt
index 7a1f9a80aa342f55f77f772262c52328be1c6564..a38860b1d7cb2fb27699f08e09ac4eb461726c87 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/list/items/TraceLocationVH.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/list/items/TraceLocationVH.kt
@@ -1,13 +1,13 @@
-package de.rki.coronawarnapp.ui.eventregistration.organizer.list.items
+package de.rki.coronawarnapp.ui.presencetracing.organizer.list.items
import android.view.ViewGroup
import androidx.core.view.isGone
import androidx.core.view.isVisible
import de.rki.coronawarnapp.R
import de.rki.coronawarnapp.databinding.TraceLocationOrganizerTraceLocationsItemBinding
-import de.rki.coronawarnapp.eventregistration.checkins.qrcode.TraceLocation
-import de.rki.coronawarnapp.ui.eventregistration.attendee.checkins.items.BaseCheckInVH.Companion.setupMenu
-import de.rki.coronawarnapp.ui.eventregistration.organizer.list.TraceLocationsAdapter
+import de.rki.coronawarnapp.presencetracing.checkins.qrcode.TraceLocation
+import de.rki.coronawarnapp.ui.presencetracing.attendee.checkins.items.BaseCheckInVH.Companion.setupMenu
+import de.rki.coronawarnapp.ui.presencetracing.organizer.list.TraceLocationsAdapter
import de.rki.coronawarnapp.util.list.SwipeConsumer
class TraceLocationVH(parent: ViewGroup) :
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/poster/QrCodePosterFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/poster/QrCodePosterFragment.kt
similarity index 98%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/poster/QrCodePosterFragment.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/poster/QrCodePosterFragment.kt
index 1a526d2770b001a4af2011ce29b83b7476a7eb17..a38a3c447d166eadeba49cda769ed2c204a4e0f1 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/poster/QrCodePosterFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/poster/QrCodePosterFragment.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.ui.eventregistration.organizer.poster
+package de.rki.coronawarnapp.ui.presencetracing.organizer.poster
import android.os.Bundle
import android.print.PrintAttributes
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/poster/QrCodePosterFragmentModule.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/poster/QrCodePosterFragmentModule.kt
similarity index 88%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/poster/QrCodePosterFragmentModule.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/poster/QrCodePosterFragmentModule.kt
index a64e78afba4fc2e0735838b97974b6c494306f97..e53c49094d0f18e53bfc9f76ae33dca11134566e 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/poster/QrCodePosterFragmentModule.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/poster/QrCodePosterFragmentModule.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.ui.eventregistration.organizer.poster
+package de.rki.coronawarnapp.ui.presencetracing.organizer.poster
import dagger.Binds
import dagger.Module
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/poster/QrCodePosterViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/poster/QrCodePosterViewModel.kt
similarity index 91%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/poster/QrCodePosterViewModel.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/poster/QrCodePosterViewModel.kt
index 3a5a36a36e0e9ad166cd5b192aecaf9117572998..4e7facefc6fdff6626a1fece1e42fee551241d37 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/poster/QrCodePosterViewModel.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/poster/QrCodePosterViewModel.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.ui.eventregistration.organizer.poster
+package de.rki.coronawarnapp.ui.presencetracing.organizer.poster
import android.graphics.Bitmap
import android.graphics.pdf.PdfDocument
@@ -8,10 +8,10 @@ import androidx.lifecycle.MutableLiveData
import dagger.assisted.Assisted
import dagger.assisted.AssistedFactory
import dagger.assisted.AssistedInject
-import de.rki.coronawarnapp.eventregistration.checkins.qrcode.PosterTemplateProvider
-import de.rki.coronawarnapp.eventregistration.checkins.qrcode.QrCodeGenerator
-import de.rki.coronawarnapp.eventregistration.checkins.qrcode.Template
-import de.rki.coronawarnapp.eventregistration.storage.repo.TraceLocationRepository
+import de.rki.coronawarnapp.presencetracing.checkins.qrcode.PosterTemplateProvider
+import de.rki.coronawarnapp.presencetracing.checkins.qrcode.QrCodeGenerator
+import de.rki.coronawarnapp.presencetracing.checkins.qrcode.Template
+import de.rki.coronawarnapp.presencetracing.storage.repo.TraceLocationRepository
import de.rki.coronawarnapp.exception.ExceptionCategory
import de.rki.coronawarnapp.exception.reporting.report
import de.rki.coronawarnapp.util.coroutine.DispatcherProvider
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/qrinfo/TraceLocationQRInfoFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/qrinfo/TraceLocationQRInfoFragment.kt
similarity index 94%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/qrinfo/TraceLocationQRInfoFragment.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/qrinfo/TraceLocationQRInfoFragment.kt
index f454e6d41507365359bd1cb60c002d432e01e4c1..d69518a4d34a09bf371b7294266817ef224ef4e5 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/qrinfo/TraceLocationQRInfoFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/qrinfo/TraceLocationQRInfoFragment.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.ui.eventregistration.organizer.qrinfo
+package de.rki.coronawarnapp.ui.presencetracing.organizer.qrinfo
import android.os.Bundle
import android.view.View
@@ -8,7 +8,7 @@ import androidx.navigation.fragment.findNavController
import com.google.android.material.transition.MaterialSharedAxis
import de.rki.coronawarnapp.R
import de.rki.coronawarnapp.databinding.TraceLocationOrganizerQrCodeInfoFragmentBinding
-import de.rki.coronawarnapp.ui.eventregistration.organizer.TraceLocationOrganizerSettings
+import de.rki.coronawarnapp.ui.presencetracing.organizer.TraceLocationOrganizerSettings
import de.rki.coronawarnapp.util.di.AutoInject
import de.rki.coronawarnapp.util.ui.doNavigate
import de.rki.coronawarnapp.util.ui.observe2
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/qrinfo/TraceLocationQRInfoFragmentModule.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/qrinfo/TraceLocationQRInfoFragmentModule.kt
similarity index 88%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/qrinfo/TraceLocationQRInfoFragmentModule.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/qrinfo/TraceLocationQRInfoFragmentModule.kt
index 830c5f14db0465c837d8e244fcbc8b2e0ba9c349..518e4be8dddecb83bb8ea9ea5f7689f56060190e 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/qrinfo/TraceLocationQRInfoFragmentModule.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/qrinfo/TraceLocationQRInfoFragmentModule.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.ui.eventregistration.organizer.qrinfo
+package de.rki.coronawarnapp.ui.presencetracing.organizer.qrinfo
import dagger.Binds
import dagger.Module
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/qrinfo/TraceLocationQRInfoNavigationEvents.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/qrinfo/TraceLocationQRInfoNavigationEvents.kt
similarity index 74%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/qrinfo/TraceLocationQRInfoNavigationEvents.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/qrinfo/TraceLocationQRInfoNavigationEvents.kt
index cb197c473037df56d18987b4adb518e2c7d2a584..cd2d5dfe3400d324e4967feeaa36b1725f232566 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/qrinfo/TraceLocationQRInfoNavigationEvents.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/qrinfo/TraceLocationQRInfoNavigationEvents.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.ui.eventregistration.organizer.qrinfo
+package de.rki.coronawarnapp.ui.presencetracing.organizer.qrinfo
sealed class TraceLocationQRInfoNavigationEvents {
object NavigateToDataPrivacy : TraceLocationQRInfoNavigationEvents()
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/qrinfo/TraceLocationQRInfoViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/qrinfo/TraceLocationQRInfoViewModel.kt
similarity index 92%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/qrinfo/TraceLocationQRInfoViewModel.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/qrinfo/TraceLocationQRInfoViewModel.kt
index 5f9da66ec59cae472c8e81a35cf3caeefb395b9c..03ad959146cc3c04a305790587cd401569070242 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/qrinfo/TraceLocationQRInfoViewModel.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/qrinfo/TraceLocationQRInfoViewModel.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.ui.eventregistration.organizer.qrinfo
+package de.rki.coronawarnapp.ui.presencetracing.organizer.qrinfo
import dagger.assisted.AssistedFactory
import dagger.assisted.AssistedInject
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/DataReset.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/DataReset.kt
index efbc89f6af264e192cf7cf28b39f953de9e2da43..9f43056902f79eba4ee9652a49d09fcf2a7fc151 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/DataReset.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/DataReset.kt
@@ -11,9 +11,9 @@ import de.rki.coronawarnapp.datadonation.analytics.storage.AnalyticsSettings
import de.rki.coronawarnapp.datadonation.survey.SurveySettings
import de.rki.coronawarnapp.diagnosiskeys.download.DownloadDiagnosisKeysSettings
import de.rki.coronawarnapp.diagnosiskeys.storage.KeyCacheRepository
-import de.rki.coronawarnapp.eventregistration.TraceLocationSettings
-import de.rki.coronawarnapp.eventregistration.checkins.CheckInRepository
-import de.rki.coronawarnapp.eventregistration.storage.repo.TraceLocationRepository
+import de.rki.coronawarnapp.presencetracing.TraceLocationSettings
+import de.rki.coronawarnapp.presencetracing.checkins.CheckInRepository
+import de.rki.coronawarnapp.presencetracing.storage.repo.TraceLocationRepository
import de.rki.coronawarnapp.main.CWASettings
import de.rki.coronawarnapp.nearby.modules.detectiontracker.ExposureDetectionTracker
import de.rki.coronawarnapp.presencetracing.warning.storage.TraceWarningRepository
@@ -23,7 +23,7 @@ import de.rki.coronawarnapp.storage.OnboardingSettings
import de.rki.coronawarnapp.storage.TracingSettings
import de.rki.coronawarnapp.submission.SubmissionRepository
import de.rki.coronawarnapp.submission.SubmissionSettings
-import de.rki.coronawarnapp.ui.eventregistration.TraceLocationPreferences
+import de.rki.coronawarnapp.ui.presencetracing.TraceLocationPreferences
import de.rki.coronawarnapp.util.di.AppContext
import kotlinx.coroutines.sync.Mutex
import kotlinx.coroutines.sync.withLock
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/database/CommonConverters.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/database/CommonConverters.kt
index 4c30c5eb0baa94bba40db9ee9e4061f6b0237b17..16318cc82ef55215102058d8492a011743748f02 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/database/CommonConverters.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/database/CommonConverters.kt
@@ -4,7 +4,7 @@ import androidx.room.TypeConverter
import com.google.gson.Gson
import com.google.gson.reflect.TypeToken
import de.rki.coronawarnapp.diagnosiskeys.server.LocationCode
-import de.rki.coronawarnapp.eventregistration.checkins.qrcode.TraceLocationId
+import de.rki.coronawarnapp.presencetracing.checkins.qrcode.TraceLocationId
import de.rki.coronawarnapp.util.serialization.fromJson
import okio.ByteString.Companion.decodeBase64
import org.joda.time.Instant
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/di/ApplicationComponent.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/di/ApplicationComponent.kt
index 98551b2125158d86076118ad18f2c089a9fe56c5..9ddda9b3ec68c4068a7577798d6b3dfeb7d6377d 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/di/ApplicationComponent.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/di/ApplicationComponent.kt
@@ -17,7 +17,7 @@ import de.rki.coronawarnapp.diagnosiskeys.DiagnosisKeysModule
import de.rki.coronawarnapp.diagnosiskeys.DownloadDiagnosisKeysTaskModule
import de.rki.coronawarnapp.diagnosiskeys.storage.KeyCacheRepository
import de.rki.coronawarnapp.environment.EnvironmentModule
-import de.rki.coronawarnapp.eventregistration.EventRegistrationModule
+import de.rki.coronawarnapp.presencetracing.PresenceTracingModule
import de.rki.coronawarnapp.http.HttpModule
import de.rki.coronawarnapp.nearby.ENFClient
import de.rki.coronawarnapp.nearby.ENFModule
@@ -77,7 +77,7 @@ import javax.inject.Singleton
StatisticsModule::class,
DataDonationModule::class,
SecurityModule::class,
- EventRegistrationModule::class,
+ PresenceTracingModule::class,
CoronaTestModule::class,
]
)
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/worker/WorkerBinder.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/worker/WorkerBinder.kt
index f93c59b45ba5d0cbd6c0501bb84be8e5c6ccb16d..400286b19a31baefe0423f273f64fc5d4b8bd839 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/worker/WorkerBinder.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/worker/WorkerBinder.kt
@@ -9,7 +9,7 @@ import de.rki.coronawarnapp.datadonation.analytics.worker.DataDonationAnalyticsP
import de.rki.coronawarnapp.deadman.DeadmanNotificationOneTimeWorker
import de.rki.coronawarnapp.deadman.DeadmanNotificationPeriodicWorker
import de.rki.coronawarnapp.diagnosiskeys.execution.DiagnosisKeyRetrievalWorker
-import de.rki.coronawarnapp.eventregistration.storage.retention.TraceLocationDbCleanUpPeriodicWorker
+import de.rki.coronawarnapp.presencetracing.storage.retention.TraceLocationDbCleanUpPeriodicWorker
import de.rki.coronawarnapp.nearby.ExposureStateUpdateWorker
import de.rki.coronawarnapp.presencetracing.checkins.checkout.auto.AutoCheckOutWorker
import de.rki.coronawarnapp.presencetracing.risk.execution.PresenceTracingWarningWorker
diff --git a/Corona-Warn-App/src/main/res/layout/qr_code_poster_fragment.xml b/Corona-Warn-App/src/main/res/layout/qr_code_poster_fragment.xml
index 903ac942915ebfe2fdb1d7142222ef0b8db30926..ce922477ef366b564c988ae69f23160ae4a94ee6 100644
--- a/Corona-Warn-App/src/main/res/layout/qr_code_poster_fragment.xml
+++ b/Corona-Warn-App/src/main/res/layout/qr_code_poster_fragment.xml
@@ -5,7 +5,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@android:color/white"
- tools:context=".ui.eventregistration.organizer.poster.QrCodePosterFragment">
+ tools:context=".ui.presencetracing.organizer.poster.QrCodePosterFragment">
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
diff --git a/Corona-Warn-App/src/main/res/layout/trace_location_attendee_checkins_item_active.xml b/Corona-Warn-App/src/main/res/layout/trace_location_attendee_checkins_item_active.xml
index af99c65414025eef1cc19e0c7a24f7952a6df4ce..4fe7a317f3555a55ac93a0967857294f2129fd2f 100644
--- a/Corona-Warn-App/src/main/res/layout/trace_location_attendee_checkins_item_active.xml
+++ b/Corona-Warn-App/src/main/res/layout/trace_location_attendee_checkins_item_active.xml
@@ -9,7 +9,7 @@
android:layout_marginVertical="8dp"
android:focusable="true">
- <de.rki.coronawarnapp.ui.eventregistration.common.TraceLocationCardHighlightView
+ <de.rki.coronawarnapp.ui.presencetracing.common.TraceLocationCardHighlightView
android:id="@+id/traceLocationCardHighlightView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -49,7 +49,7 @@
app:layout_constraintTop_toBottomOf="@id/highlight_duration_label"
tools:text="00:25" />
- </de.rki.coronawarnapp.ui.eventregistration.common.TraceLocationCardHighlightView>
+ </de.rki.coronawarnapp.ui.presencetracing.common.TraceLocationCardHighlightView>
<TextView
android:id="@+id/description"
diff --git a/Corona-Warn-App/src/main/res/layout/trace_location_create_fragment.xml b/Corona-Warn-App/src/main/res/layout/trace_location_create_fragment.xml
index 3a19e3c3b4f64b8066c9f51219504968a1929175..2cd6a15dfe3c635c017cb1d6d3ede275c89fe840 100644
--- a/Corona-Warn-App/src/main/res/layout/trace_location_create_fragment.xml
+++ b/Corona-Warn-App/src/main/res/layout/trace_location_create_fragment.xml
@@ -5,7 +5,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:contentDescription="@string/tracelocation_organizer_category_title"
- tools:context=".ui.eventregistration.organizer.create.TraceLocationCreateFragment">
+ tools:context=".ui.presencetracing.organizer.create.TraceLocationCreateFragment">
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
diff --git a/Corona-Warn-App/src/main/res/layout/trace_location_organizer_qr_code_info_fragment.xml b/Corona-Warn-App/src/main/res/layout/trace_location_organizer_qr_code_info_fragment.xml
index 594d4846fbd20bf048ddf06d8c1f6a14c415bad9..c106bb4ddcea1a87288b686c7b5d3415f985b7df 100644
--- a/Corona-Warn-App/src/main/res/layout/trace_location_organizer_qr_code_info_fragment.xml
+++ b/Corona-Warn-App/src/main/res/layout/trace_location_organizer_qr_code_info_fragment.xml
@@ -6,7 +6,7 @@
android:layout_height="match_parent"
android:contentDescription="@string/tracelocation_organizer_category_title"
android:background="@color/colorBackground"
- tools:context=".ui.eventregistration.organizer.qrinfo.TraceLocationQRInfoFragment">
+ tools:context=".ui.presencetracing.organizer.qrinfo.TraceLocationQRInfoFragment">
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
diff --git a/Corona-Warn-App/src/main/res/layout/trace_location_organizer_trace_locations_item.xml b/Corona-Warn-App/src/main/res/layout/trace_location_organizer_trace_locations_item.xml
index 41503487bbafe2aa59352e6ad1e2056e3615f754..3b0d989a634d8d026167b26298a3e64c6c9bb7f7 100644
--- a/Corona-Warn-App/src/main/res/layout/trace_location_organizer_trace_locations_item.xml
+++ b/Corona-Warn-App/src/main/res/layout/trace_location_organizer_trace_locations_item.xml
@@ -9,7 +9,7 @@
android:layout_marginVertical="8dp"
android:focusable="true">
- <de.rki.coronawarnapp.ui.eventregistration.common.TraceLocationCardHighlightView
+ <de.rki.coronawarnapp.ui.presencetracing.common.TraceLocationCardHighlightView
android:id="@+id/icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -29,7 +29,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
- </de.rki.coronawarnapp.ui.eventregistration.common.TraceLocationCardHighlightView>
+ </de.rki.coronawarnapp.ui.presencetracing.common.TraceLocationCardHighlightView>
<TextView
android:id="@+id/description"
diff --git a/Corona-Warn-App/src/main/res/navigation/nav_graph.xml b/Corona-Warn-App/src/main/res/navigation/nav_graph.xml
index 6a025e8397fc03d2239e57a6cfd02a906f346b41..f8b5895d66971e5a7352055e161eaad7677f69c1 100644
--- a/Corona-Warn-App/src/main/res/navigation/nav_graph.xml
+++ b/Corona-Warn-App/src/main/res/navigation/nav_graph.xml
@@ -9,7 +9,7 @@
<include app:graph="@navigation/test_nav_graph" />
<!-- Contact Diary graph-->
<include app:graph="@navigation/contact_diary_nav_graph" />
- <!-- Event registration graphs-->
+ <!-- Presence Tracing graphs-->
<include app:graph="@navigation/trace_location_organizer_nav_graph" />
<include app:graph="@navigation/trace_location_attendee_nav_graph" />
diff --git a/Corona-Warn-App/src/main/res/navigation/trace_location_attendee_nav_graph.xml b/Corona-Warn-App/src/main/res/navigation/trace_location_attendee_nav_graph.xml
index bf5f0ba98e89a4ec1d90780dbb2337213e3bb056..b202c89c6ed2888b5fa2ea166927fa59979fbca3 100644
--- a/Corona-Warn-App/src/main/res/navigation/trace_location_attendee_nav_graph.xml
+++ b/Corona-Warn-App/src/main/res/navigation/trace_location_attendee_nav_graph.xml
@@ -6,7 +6,7 @@
app:startDestination="@id/checkInOnboardingFragment">
<fragment
android:id="@+id/checkInOnboardingFragment"
- android:name="de.rki.coronawarnapp.ui.eventregistration.attendee.onboarding.CheckInOnboardingFragment"
+ android:name="de.rki.coronawarnapp.ui.presencetracing.attendee.onboarding.CheckInOnboardingFragment"
android:label="CheckInOnboardingFragment"
tools:layout="@layout/fragment_trace_location_onboarding">
<deepLink app:uri="coronawarnapp://check-ins/{uri}/?cleanHistory={cleanHistory}" />
@@ -39,16 +39,16 @@
tools:layout="@layout/fragment_information_privacy" />
<fragment
android:id="@+id/confirmCheckInFragment"
- android:name="de.rki.coronawarnapp.ui.eventregistration.attendee.confirm.ConfirmCheckInFragment"
+ android:name="de.rki.coronawarnapp.ui.presencetracing.attendee.confirm.ConfirmCheckInFragment"
android:label="fragment_confirm_check_in"
tools:layout="@layout/fragment_confirm_check_in">
<argument
android:name="verifiedTraceLocation"
- app:argType="de.rki.coronawarnapp.eventregistration.checkins.qrcode.VerifiedTraceLocation" />
+ app:argType="de.rki.coronawarnapp.presencetracing.checkins.qrcode.VerifiedTraceLocation" />
</fragment>
<fragment
android:id="@+id/editCheckInFragment"
- android:name="de.rki.coronawarnapp.ui.eventregistration.attendee.edit.EditCheckInFragment"
+ android:name="de.rki.coronawarnapp.ui.presencetracing.attendee.edit.EditCheckInFragment"
android:label="EditCheckInFragment"
tools:layout="@layout/fragment_edit_check_in">
<argument
@@ -57,13 +57,13 @@
</fragment>
<fragment
android:id="@+id/scanCheckInQrCodeFragment"
- android:name="de.rki.coronawarnapp.ui.eventregistration.attendee.scan.ScanCheckInQrCodeFragment"
+ android:name="de.rki.coronawarnapp.ui.presencetracing.attendee.scan.ScanCheckInQrCodeFragment"
android:label="ScanCheckInQrCodeFragment"
tools:layout="@layout/fragment_scan_check_in_qr_code" />
<fragment
android:id="@+id/checkInsFragment"
- android:name="de.rki.coronawarnapp.ui.eventregistration.attendee.checkins.CheckInsFragment"
+ android:name="de.rki.coronawarnapp.ui.presencetracing.attendee.checkins.CheckInsFragment"
android:label="CheckInsFragment"
tools:layout="@layout/trace_location_attendee_checkins_fragment">
<action
diff --git a/Corona-Warn-App/src/main/res/navigation/trace_location_organizer_nav_graph.xml b/Corona-Warn-App/src/main/res/navigation/trace_location_organizer_nav_graph.xml
index ae96af2c68e982128fd1f41093a65f7e5f34bbfa..d68cb45864c6de40de421fe0da988925d3af0be4 100644
--- a/Corona-Warn-App/src/main/res/navigation/trace_location_organizer_nav_graph.xml
+++ b/Corona-Warn-App/src/main/res/navigation/trace_location_organizer_nav_graph.xml
@@ -7,7 +7,7 @@
<fragment
android:id="@+id/traceLocationInfoFragment"
- android:name="de.rki.coronawarnapp.ui.eventregistration.organizer.qrinfo.TraceLocationQRInfoFragment"
+ android:name="de.rki.coronawarnapp.ui.presencetracing.organizer.qrinfo.TraceLocationQRInfoFragment"
android:label="TraceLocationQRInfoFragment"
tools:layout="@layout/trace_location_organizer_qr_code_info_fragment">
@@ -21,7 +21,7 @@
<fragment
android:id="@+id/traceLocationCategoryFragment"
- android:name="de.rki.coronawarnapp.ui.eventregistration.organizer.category.TraceLocationCategoryFragment"
+ android:name="de.rki.coronawarnapp.ui.presencetracing.organizer.category.TraceLocationCategoryFragment"
android:label="TraceLocationCategoryFragment"
tools:layout="@layout/trace_location_organizer_category_fragment">
<action
@@ -30,16 +30,16 @@
</fragment>
<fragment
android:id="@+id/traceLocationCreateFragment"
- android:name="de.rki.coronawarnapp.ui.eventregistration.organizer.create.TraceLocationCreateFragment"
+ android:name="de.rki.coronawarnapp.ui.presencetracing.organizer.create.TraceLocationCreateFragment"
android:label="trace_location_create_fragment"
tools:layout="@layout/trace_location_create_fragment">
<argument
android:name="category"
- app:argType="de.rki.coronawarnapp.ui.eventregistration.organizer.category.adapter.category.TraceLocationCategory" />
+ app:argType="de.rki.coronawarnapp.ui.presencetracing.organizer.category.adapter.category.TraceLocationCategory" />
<argument
android:name="originalItem"
android:defaultValue="@null"
- app:argType="de.rki.coronawarnapp.eventregistration.checkins.qrcode.TraceLocation"
+ app:argType="de.rki.coronawarnapp.presencetracing.checkins.qrcode.TraceLocation"
app:nullable="true" />
<action
android:id="@+id/action_traceLocationCreateFragment_to_traceLocationOrganizerListFragment"
@@ -49,7 +49,7 @@
</fragment>
<fragment
android:id="@+id/traceLocationsFragment"
- android:name="de.rki.coronawarnapp.ui.eventregistration.organizer.list.TraceLocationsFragment"
+ android:name="de.rki.coronawarnapp.ui.presencetracing.organizer.list.TraceLocationsFragment"
android:label="TraceLocationsFragment"
tools:layout="@layout/trace_location_organizer_trace_locations_list_fragment">
<action
@@ -73,7 +73,7 @@
</fragment>
<fragment
android:id="@+id/qrCodeDetailFragment"
- android:name="de.rki.coronawarnapp.ui.eventregistration.organizer.details.QrCodeDetailFragment"
+ android:name="de.rki.coronawarnapp.ui.presencetracing.organizer.details.QrCodeDetailFragment"
android:label="QrCodeDetailFragment"
tools:layout="@layout/trace_location_organizer_qr_code_detail_fragment">
<argument
@@ -89,7 +89,7 @@
<fragment
android:id="@+id/qrCodePosterFragment"
- android:name="de.rki.coronawarnapp.ui.eventregistration.organizer.poster.QrCodePosterFragment"
+ android:name="de.rki.coronawarnapp.ui.presencetracing.organizer.poster.QrCodePosterFragment"
android:label="qr_code_poster_fragment"
tools:layout="@layout/qr_code_poster_fragment">
<argument
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/contactdiary/ui/edit/ContactDiaryEditLocationsViewModelTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/contactdiary/ui/edit/ContactDiaryEditLocationsViewModelTest.kt
index 6706173c4975ad8508aa49a7fe7f77c3c0aadc6d..e3c6768ae4f33fdc3cec8df266f4b09a1e96c17d 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/contactdiary/ui/edit/ContactDiaryEditLocationsViewModelTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/contactdiary/ui/edit/ContactDiaryEditLocationsViewModelTest.kt
@@ -3,7 +3,7 @@ package de.rki.coronawarnapp.contactdiary.ui.edit
import de.rki.coronawarnapp.contactdiary.model.ContactDiaryLocation
import de.rki.coronawarnapp.contactdiary.storage.entity.toContactDiaryLocationEntity
import de.rki.coronawarnapp.contactdiary.storage.repo.ContactDiaryRepository
-import de.rki.coronawarnapp.eventregistration.checkins.qrcode.TraceLocationId
+import de.rki.coronawarnapp.presencetracing.checkins.qrcode.TraceLocationId
import io.kotest.matchers.shouldBe
import io.mockk.MockKAnnotations
import io.mockk.Runs
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/contactdiary/ui/overview/ContactDiaryOverviewViewModelTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/contactdiary/ui/overview/ContactDiaryOverviewViewModelTest.kt
index b50da8d26d837814fd363f8957e9e362ff9cb0e9..f17d6c08cf076ebf3b5bd7e82a80c89a1d9ba8b9 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/contactdiary/ui/overview/ContactDiaryOverviewViewModelTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/contactdiary/ui/overview/ContactDiaryOverviewViewModelTest.kt
@@ -15,8 +15,8 @@ import de.rki.coronawarnapp.contactdiary.ui.overview.adapter.day.riskevent.RiskE
import de.rki.coronawarnapp.contactdiary.ui.overview.adapter.subheader.OverviewSubHeaderItem
import de.rki.coronawarnapp.contactdiary.util.ContactDiaryData
import de.rki.coronawarnapp.contactdiary.util.mockStringsForContactDiaryExporterTests
-import de.rki.coronawarnapp.eventregistration.checkins.CheckIn
-import de.rki.coronawarnapp.eventregistration.checkins.CheckInRepository
+import de.rki.coronawarnapp.presencetracing.checkins.CheckIn
+import de.rki.coronawarnapp.presencetracing.checkins.CheckInRepository
import de.rki.coronawarnapp.presencetracing.risk.TraceLocationCheckInRisk
import de.rki.coronawarnapp.risk.RiskState
import de.rki.coronawarnapp.risk.result.ExposureWindowDayRisk
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/main/MainActivityViewModelTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/main/MainActivityViewModelTest.kt
index e456fa43ae2757a5bfa043e2ff923cc1cbb8b57f..21548c0e148c7051f00e1e8987d3627fd0f19b5b 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/main/MainActivityViewModelTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/main/MainActivityViewModelTest.kt
@@ -2,8 +2,8 @@ package de.rki.coronawarnapp.main
import de.rki.coronawarnapp.contactdiary.ui.ContactDiarySettings
import de.rki.coronawarnapp.environment.EnvironmentSetup
-import de.rki.coronawarnapp.eventregistration.TraceLocationSettings
-import de.rki.coronawarnapp.eventregistration.checkins.CheckInRepository
+import de.rki.coronawarnapp.presencetracing.TraceLocationSettings
+import de.rki.coronawarnapp.presencetracing.checkins.CheckInRepository
import de.rki.coronawarnapp.playbook.BackgroundNoise
import de.rki.coronawarnapp.storage.OnboardingSettings
import de.rki.coronawarnapp.ui.main.MainActivityViewModel
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/main/home/HomeFragmentViewModelTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/main/home/HomeFragmentViewModelTest.kt
index 962b580018c203e7ff42ef01038de9653720e32f..045f24aed0ab8ef9334aa47abe206b4b0a8ea703 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/main/home/HomeFragmentViewModelTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/main/home/HomeFragmentViewModelTest.kt
@@ -17,7 +17,7 @@ import de.rki.coronawarnapp.tracing.GeneralTracingStatus.Status
import de.rki.coronawarnapp.tracing.states.LowRisk
import de.rki.coronawarnapp.tracing.states.TracingStateProvider
import de.rki.coronawarnapp.tracing.ui.statusbar.TracingHeaderState
-import de.rki.coronawarnapp.ui.eventregistration.organizer.TraceLocationOrganizerSettings
+import de.rki.coronawarnapp.ui.presencetracing.organizer.TraceLocationOrganizerSettings
import de.rki.coronawarnapp.ui.main.home.HomeFragmentEvents
import de.rki.coronawarnapp.ui.main.home.HomeFragmentViewModel
import de.rki.coronawarnapp.util.DeviceUIState.PAIRED_POSITIVE
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/attendee/confirm/ConfirmCheckInViewModelTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/attendee/confirm/ConfirmCheckInViewModelTest.kt
similarity index 85%
rename from Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/attendee/confirm/ConfirmCheckInViewModelTest.kt
rename to Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/attendee/confirm/ConfirmCheckInViewModelTest.kt
index f5b58f654c33d15067a76e6d8740474edce34cd7..51a12fe4489dfa0671daf297a37a49e60ab2751b 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/attendee/confirm/ConfirmCheckInViewModelTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/attendee/confirm/ConfirmCheckInViewModelTest.kt
@@ -1,11 +1,11 @@
-package de.rki.coronawarnapp.eventregistration.attendee.confirm
+package de.rki.coronawarnapp.presencetracing.attendee.confirm
-import de.rki.coronawarnapp.eventregistration.checkins.CheckInRepository
-import de.rki.coronawarnapp.eventregistration.checkins.qrcode.TraceLocation
-import de.rki.coronawarnapp.eventregistration.checkins.qrcode.VerifiedTraceLocation
+import de.rki.coronawarnapp.presencetracing.checkins.CheckInRepository
+import de.rki.coronawarnapp.presencetracing.checkins.qrcode.TraceLocation
+import de.rki.coronawarnapp.presencetracing.checkins.qrcode.VerifiedTraceLocation
import de.rki.coronawarnapp.server.protocols.internal.pt.TraceLocationOuterClass
-import de.rki.coronawarnapp.ui.eventregistration.attendee.confirm.ConfirmCheckInNavigation
-import de.rki.coronawarnapp.ui.eventregistration.attendee.confirm.ConfirmCheckInViewModel
+import de.rki.coronawarnapp.ui.presencetracing.attendee.confirm.ConfirmCheckInNavigation
+import de.rki.coronawarnapp.ui.presencetracing.attendee.confirm.ConfirmCheckInViewModel
import de.rki.coronawarnapp.util.TimeAndDateExtensions.secondsToInstant
import de.rki.coronawarnapp.util.TimeStamper
import io.kotest.matchers.shouldBe
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/checkins/CheckInRepositoryTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/checkins/CheckInRepositoryTest.kt
similarity index 95%
rename from Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/checkins/CheckInRepositoryTest.kt
rename to Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/checkins/CheckInRepositoryTest.kt
index 23ea1802a9cfc3827af343301079606c0e160f46..f5e3d4202e2587dad2ba7589ec22999e4529d99b 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/checkins/CheckInRepositoryTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/checkins/CheckInRepositoryTest.kt
@@ -1,8 +1,8 @@
-package de.rki.coronawarnapp.eventregistration.checkins
+package de.rki.coronawarnapp.presencetracing.checkins
-import de.rki.coronawarnapp.eventregistration.storage.TraceLocationDatabase
-import de.rki.coronawarnapp.eventregistration.storage.dao.CheckInDao
-import de.rki.coronawarnapp.eventregistration.storage.entity.TraceLocationCheckInEntity
+import de.rki.coronawarnapp.presencetracing.storage.TraceLocationDatabase
+import de.rki.coronawarnapp.presencetracing.storage.dao.CheckInDao
+import de.rki.coronawarnapp.presencetracing.storage.entity.TraceLocationCheckInEntity
import de.rki.coronawarnapp.util.TimeStamper
import io.kotest.assertions.throwables.shouldThrow
import io.kotest.matchers.shouldBe
@@ -37,7 +37,7 @@ class CheckInRepositoryTest : BaseTest() {
fun setup() {
MockKAnnotations.init(this)
every { factory.create() } returns database
- every { database.eventCheckInDao() } returns checkInDao
+ every { database.checkInDao() } returns checkInDao
every { checkInDao.allEntries() } returns allEntriesFlow
coEvery { checkInDao.entryForId(any()) } coAnswers {
allEntriesFlow.first().singleOrNull { it.id == arg(0) }
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/checkins/CheckInRetentionTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/checkins/CheckInRetentionTest.kt
similarity index 96%
rename from Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/checkins/CheckInRetentionTest.kt
rename to Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/checkins/CheckInRetentionTest.kt
index c95a3d181f9774bf3f772bd239d6122dce82635b..c65ecb914c98c373bd2f3d283bdabed9b0486f08 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/checkins/CheckInRetentionTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/checkins/CheckInRetentionTest.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.eventregistration.checkins
+package de.rki.coronawarnapp.presencetracing.checkins
import io.kotest.matchers.shouldBe
import okio.ByteString.Companion.encode
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/checkins/CheckInTransmissionRiskLevelTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/checkins/CheckInTransmissionRiskLevelTest.kt
similarity index 97%
rename from Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/checkins/CheckInTransmissionRiskLevelTest.kt
rename to Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/checkins/CheckInTransmissionRiskLevelTest.kt
index 6439da3b9157a29a38ea87c89127bfdd2f6496f3..e2d27b385639fb6669538a78d63f8a546329ef58 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/checkins/CheckInTransmissionRiskLevelTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/checkins/CheckInTransmissionRiskLevelTest.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.eventregistration.checkins
+package de.rki.coronawarnapp.presencetracing.checkins
import de.rki.coronawarnapp.submission.task.TransmissionRiskVector
import io.kotest.matchers.shouldBe
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/checkins/CheckInsTransformerTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/checkins/CheckInsTransformerTest.kt
similarity index 99%
rename from Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/checkins/CheckInsTransformerTest.kt
rename to Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/checkins/CheckInsTransformerTest.kt
index 1f188c3ec580271c013d8d0e963e9533accecc8e..780568fe5b8590e1e579ffe0c390dfba297acedd 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/checkins/CheckInsTransformerTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/checkins/CheckInsTransformerTest.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.eventregistration.checkins
+package de.rki.coronawarnapp.presencetracing.checkins
import de.rki.coronawarnapp.appconfig.AppConfigProvider
import de.rki.coronawarnapp.appconfig.ConfigData
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/checkins/checkout/CheckOutHandlerTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/checkins/checkout/CheckOutHandlerTest.kt
index 2c593184e9dc277b021427063294662dbe1a2a51..120efecf735b93a9f602cbe41363cba77705d0b6 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/checkins/checkout/CheckOutHandlerTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/checkins/checkout/CheckOutHandlerTest.kt
@@ -1,7 +1,7 @@
package de.rki.coronawarnapp.presencetracing.checkins.checkout
-import de.rki.coronawarnapp.eventregistration.checkins.CheckIn
-import de.rki.coronawarnapp.eventregistration.checkins.CheckInRepository
+import de.rki.coronawarnapp.presencetracing.checkins.CheckIn
+import de.rki.coronawarnapp.presencetracing.checkins.CheckInRepository
import de.rki.coronawarnapp.util.TimeStamper
import io.kotest.matchers.shouldBe
import io.mockk.MockKAnnotations
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/checkins/checkout/ContactJournalCheckInEntryCreatorTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/checkins/checkout/ContactJournalCheckInEntryCreatorTest.kt
index 0726f259a2e346abaf851c492c5ccc0e4fe2d9fd..d66bb45ec8852bed62d248b9d19a77d3ee5c4c09 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/checkins/checkout/ContactJournalCheckInEntryCreatorTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/checkins/checkout/ContactJournalCheckInEntryCreatorTest.kt
@@ -3,7 +3,7 @@ package de.rki.coronawarnapp.presencetracing.checkins.checkout
import de.rki.coronawarnapp.contactdiary.model.DefaultContactDiaryLocation
import de.rki.coronawarnapp.contactdiary.model.DefaultContactDiaryLocationVisit
import de.rki.coronawarnapp.contactdiary.storage.repo.ContactDiaryRepository
-import de.rki.coronawarnapp.eventregistration.checkins.CheckIn
+import de.rki.coronawarnapp.presencetracing.checkins.CheckIn
import de.rki.coronawarnapp.util.TimeAndDateExtensions.toLocalDateUtc
import de.rki.coronawarnapp.util.TimeAndDateExtensions.toUserTimeZone
import io.kotest.matchers.shouldBe
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/checkins/checkout/auto/AutoCheckOutTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/checkins/checkout/auto/AutoCheckOutTest.kt
index 4958a8cb294eb4916e23de2f9ca1fe5d385ccd3f..9298a80aa2df936857d55e7c06a8ef7587087336 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/checkins/checkout/auto/AutoCheckOutTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/checkins/checkout/auto/AutoCheckOutTest.kt
@@ -2,8 +2,8 @@ package de.rki.coronawarnapp.presencetracing.checkins.checkout.auto
import android.app.AlarmManager
import android.app.PendingIntent
-import de.rki.coronawarnapp.eventregistration.checkins.CheckIn
-import de.rki.coronawarnapp.eventregistration.checkins.CheckInRepository
+import de.rki.coronawarnapp.presencetracing.checkins.CheckIn
+import de.rki.coronawarnapp.presencetracing.checkins.CheckInRepository
import de.rki.coronawarnapp.presencetracing.checkins.checkout.CheckOutHandler
import de.rki.coronawarnapp.util.TimeStamper
import io.kotest.matchers.shouldBe
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/checkins/derivetime/TimeIntervalDeriverTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/checkins/derivetime/TimeIntervalDeriverTest.kt
similarity index 99%
rename from Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/checkins/derivetime/TimeIntervalDeriverTest.kt
rename to Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/checkins/derivetime/TimeIntervalDeriverTest.kt
index eed36da372cf26fa9bd3e83fcdc3efe225e5df97..444856c9c3afbf91f4e4213872214c216c133d77 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/checkins/derivetime/TimeIntervalDeriverTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/checkins/derivetime/TimeIntervalDeriverTest.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.eventregistration.checkins.derivetime
+package de.rki.coronawarnapp.presencetracing.checkins.derivetime
import de.rki.coronawarnapp.appconfig.PresenceTracingSubmissionParamContainer
import de.rki.coronawarnapp.server.protocols.internal.v2
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/checkins/qrcode/AutoCheckoutHelperTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/checkins/qrcode/AutoCheckoutHelperTest.kt
similarity index 95%
rename from Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/checkins/qrcode/AutoCheckoutHelperTest.kt
rename to Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/checkins/qrcode/AutoCheckoutHelperTest.kt
index c0690025cf2d7d8acc53403175cfef1b61f830c3..ba378f67bd152490141ab32fa2454d2a042e46c5 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/checkins/qrcode/AutoCheckoutHelperTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/checkins/qrcode/AutoCheckoutHelperTest.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.eventregistration.checkins.qrcode
+package de.rki.coronawarnapp.presencetracing.checkins.qrcode
import io.kotest.matchers.shouldBe
import org.junit.jupiter.params.ParameterizedTest
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/checkins/qrcode/Base32UrlProvider.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/checkins/qrcode/Base32UrlProvider.kt
similarity index 98%
rename from Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/checkins/qrcode/Base32UrlProvider.kt
rename to Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/checkins/qrcode/Base32UrlProvider.kt
index 036343e6dcf6c681a7f35f89809b365b11da401e..eb565268772c17a1da9876838064fffa33d1c1f9 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/checkins/qrcode/Base32UrlProvider.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/checkins/qrcode/Base32UrlProvider.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.eventregistration.checkins.qrcode
+package de.rki.coronawarnapp.presencetracing.checkins.qrcode
import de.rki.coronawarnapp.server.protocols.internal.pt.TraceLocationOuterClass
import de.rki.coronawarnapp.server.protocols.internal.pt.TraceLocationOuterClass.CWALocationData
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/checkins/qrcode/Base64UrlProvider.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/checkins/qrcode/Base64UrlProvider.kt
similarity index 98%
rename from Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/checkins/qrcode/Base64UrlProvider.kt
rename to Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/checkins/qrcode/Base64UrlProvider.kt
index 2d92ae6bc967dc070b483590991c231b79295626..b45bd725f0d1a0153b20ec78b60d3d6450460028 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/checkins/qrcode/Base64UrlProvider.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/checkins/qrcode/Base64UrlProvider.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.eventregistration.checkins.qrcode
+package de.rki.coronawarnapp.presencetracing.checkins.qrcode
import de.rki.coronawarnapp.server.protocols.internal.pt.TraceLocationOuterClass
import de.rki.coronawarnapp.server.protocols.internal.pt.TraceLocationOuterClass.CWALocationData
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/checkins/qrcode/InvalidQRCodeProvider.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/checkins/qrcode/InvalidQRCodeProvider.kt
similarity index 98%
rename from Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/checkins/qrcode/InvalidQRCodeProvider.kt
rename to Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/checkins/qrcode/InvalidQRCodeProvider.kt
index 6d8df6b978065dd082d5a9d2825af00e11df9a88..216319a2672704c2cbee1593dbb527544cd1d813 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/checkins/qrcode/InvalidQRCodeProvider.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/checkins/qrcode/InvalidQRCodeProvider.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.eventregistration.checkins.qrcode
+package de.rki.coronawarnapp.presencetracing.checkins.qrcode
import de.rki.coronawarnapp.server.protocols.internal.pt.TraceLocationOuterClass
import de.rki.coronawarnapp.util.toProtoByteString
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/checkins/qrcode/InvalidUrlProvider.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/checkins/qrcode/InvalidUrlProvider.kt
similarity index 96%
rename from Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/checkins/qrcode/InvalidUrlProvider.kt
rename to Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/checkins/qrcode/InvalidUrlProvider.kt
index d7e3d30e51b86fa877323ef4f79746009624d4f9..41cf0bd8e4c3723b9326b67d34eead045dd954ae 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/checkins/qrcode/InvalidUrlProvider.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/checkins/qrcode/InvalidUrlProvider.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.eventregistration.checkins.qrcode
+package de.rki.coronawarnapp.presencetracing.checkins.qrcode
import org.junit.jupiter.api.extension.ExtensionContext
import org.junit.jupiter.params.provider.Arguments
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/checkins/qrcode/QRCodeUriParserTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/checkins/qrcode/QRCodeUriParserTest.kt
similarity index 98%
rename from Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/checkins/qrcode/QRCodeUriParserTest.kt
rename to Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/checkins/qrcode/QRCodeUriParserTest.kt
index c01a15b2b532b8da63ff40271b1c22e9ed49910f..2e3403a035d2704f0adde8d61de70d9c3742bec8 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/checkins/qrcode/QRCodeUriParserTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/checkins/qrcode/QRCodeUriParserTest.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.eventregistration.checkins.qrcode
+package de.rki.coronawarnapp.presencetracing.checkins.qrcode
import de.rki.coronawarnapp.appconfig.AppConfigProvider
import de.rki.coronawarnapp.appconfig.ConfigData
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/checkins/qrcode/TraceLocationUserInputToTraceLocationMapperTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/checkins/qrcode/TraceLocationUserInputToTraceLocationMapperTest.kt
similarity index 87%
rename from Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/checkins/qrcode/TraceLocationUserInputToTraceLocationMapperTest.kt
rename to Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/checkins/qrcode/TraceLocationUserInputToTraceLocationMapperTest.kt
index fe1c63234c45a344cce934be82ee479f4b98e0b7..1034b1fbe575ceafc7a858297a8d78517efc0e85 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/checkins/qrcode/TraceLocationUserInputToTraceLocationMapperTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/checkins/qrcode/TraceLocationUserInputToTraceLocationMapperTest.kt
@@ -1,7 +1,7 @@
-package de.rki.coronawarnapp.eventregistration.checkins.qrcode
+package de.rki.coronawarnapp.presencetracing.checkins.qrcode
-import de.rki.coronawarnapp.eventregistration.events.TraceLocationUserInput
-import de.rki.coronawarnapp.eventregistration.events.toTraceLocation
+import de.rki.coronawarnapp.presencetracing.locations.TraceLocationUserInput
+import de.rki.coronawarnapp.presencetracing.locations.toTraceLocation
import de.rki.coronawarnapp.server.protocols.internal.pt.TraceLocationOuterClass
import io.kotest.matchers.shouldBe
import io.mockk.MockKAnnotations
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/checkins/qrcode/TraceLocationVerifierTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/checkins/qrcode/TraceLocationVerifierTest.kt
similarity index 94%
rename from Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/checkins/qrcode/TraceLocationVerifierTest.kt
rename to Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/checkins/qrcode/TraceLocationVerifierTest.kt
index 1bc7865431213f233211fd4eecaa641f8cc16586..af85700776f73f4953c411603d665853f07f3ae8 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/checkins/qrcode/TraceLocationVerifierTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/checkins/qrcode/TraceLocationVerifierTest.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.eventregistration.checkins.qrcode
+package de.rki.coronawarnapp.presencetracing.checkins.qrcode
import de.rki.coronawarnapp.server.protocols.internal.pt.TraceLocationOuterClass
import io.kotest.matchers.shouldBe
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/checkins/qrcode/ValidQRCodeProvider.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/checkins/qrcode/ValidQRCodeProvider.kt
similarity index 98%
rename from Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/checkins/qrcode/ValidQRCodeProvider.kt
rename to Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/checkins/qrcode/ValidQRCodeProvider.kt
index bd08d284659adf109ec01c0b29834815631f01d1..f08e84471e4b032780473c1f03606d4428ffce63 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/checkins/qrcode/ValidQRCodeProvider.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/checkins/qrcode/ValidQRCodeProvider.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.eventregistration.checkins.qrcode
+package de.rki.coronawarnapp.presencetracing.checkins.qrcode
import de.rki.coronawarnapp.server.protocols.internal.pt.TraceLocationOuterClass
import de.rki.coronawarnapp.util.toProtoByteString
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/checkins/split/CheckInSplitterTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/checkins/split/CheckInSplitterTest.kt
similarity index 99%
rename from Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/checkins/split/CheckInSplitterTest.kt
rename to Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/checkins/split/CheckInSplitterTest.kt
index 8c76d64b9b633b1c8fcde91572d7ce43c9f1a47f..dbac556a9ff5547c522ef5c2b91ccfc3aff50711 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/checkins/split/CheckInSplitterTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/checkins/split/CheckInSplitterTest.kt
@@ -1,6 +1,6 @@
-package de.rki.coronawarnapp.eventregistration.checkins.split
+package de.rki.coronawarnapp.presencetracing.checkins.split
-import de.rki.coronawarnapp.eventregistration.checkins.CheckIn
+import de.rki.coronawarnapp.presencetracing.checkins.CheckIn
import io.kotest.matchers.shouldBe
import okio.ByteString.Companion.encode
import org.joda.time.Instant
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/events/DefaultAutoCheckoutLengthTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/locations/DefaultAutoCheckoutLengthTest.kt
similarity index 97%
rename from Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/events/DefaultAutoCheckoutLengthTest.kt
rename to Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/locations/DefaultAutoCheckoutLengthTest.kt
index f5d72d1ae03d53902b8a71df0964a07857b97aae..3663b16e0a6b2e2c1367a969ab5aa06c214e562f 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/events/DefaultAutoCheckoutLengthTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/locations/DefaultAutoCheckoutLengthTest.kt
@@ -1,7 +1,7 @@
-package de.rki.coronawarnapp.eventregistration.events
+package de.rki.coronawarnapp.presencetracing.locations
-import de.rki.coronawarnapp.eventregistration.checkins.qrcode.TraceLocation
-import de.rki.coronawarnapp.eventregistration.checkins.qrcode.getDefaultAutoCheckoutLengthInMinutes
+import de.rki.coronawarnapp.presencetracing.checkins.qrcode.TraceLocation
+import de.rki.coronawarnapp.presencetracing.checkins.qrcode.getDefaultAutoCheckoutLengthInMinutes
import de.rki.coronawarnapp.server.protocols.internal.pt.TraceLocationOuterClass
import io.kotest.matchers.shouldBe
import okio.ByteString.Companion.encode
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/events/QrCodePayloadTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/locations/QrCodePayloadTest.kt
similarity index 92%
rename from Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/events/QrCodePayloadTest.kt
rename to Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/locations/QrCodePayloadTest.kt
index 683a645639868de09b9607ee724e21801bfac02c..113f29fc180575db80406445711f0a34d1e91052 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/events/QrCodePayloadTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/locations/QrCodePayloadTest.kt
@@ -1,7 +1,7 @@
-package de.rki.coronawarnapp.eventregistration.events
+package de.rki.coronawarnapp.presencetracing.locations
-import de.rki.coronawarnapp.eventregistration.checkins.qrcode.TraceLocation
-import de.rki.coronawarnapp.eventregistration.checkins.qrcode.qrCodePayload
+import de.rki.coronawarnapp.presencetracing.checkins.qrcode.TraceLocation
+import de.rki.coronawarnapp.presencetracing.checkins.qrcode.qrCodePayload
import de.rki.coronawarnapp.server.protocols.internal.pt.TraceLocationOuterClass
import de.rki.coronawarnapp.util.TimeAndDateExtensions.secondsToInstant
import io.kotest.matchers.shouldBe
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/events/TraceLocationCreatorTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/locations/TraceLocationCreatorTest.kt
similarity index 94%
rename from Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/events/TraceLocationCreatorTest.kt
rename to Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/locations/TraceLocationCreatorTest.kt
index 45ecec1e50c19032ff28c81bb9ab953717baa929..2ebd6392a6ee0c96c02c68d8c64ba6ebff6521fa 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/events/TraceLocationCreatorTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/locations/TraceLocationCreatorTest.kt
@@ -1,7 +1,7 @@
-package de.rki.coronawarnapp.eventregistration.events
+package de.rki.coronawarnapp.presencetracing.locations
import de.rki.coronawarnapp.environment.EnvironmentSetup
-import de.rki.coronawarnapp.eventregistration.storage.repo.TraceLocationRepository
+import de.rki.coronawarnapp.presencetracing.storage.repo.TraceLocationRepository
import de.rki.coronawarnapp.server.protocols.internal.pt.TraceLocationOuterClass
import io.kotest.matchers.shouldBe
import io.mockk.MockKAnnotations
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/events/TraceLocationIdTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/locations/TraceLocationIdTest.kt
similarity index 96%
rename from Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/events/TraceLocationIdTest.kt
rename to Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/locations/TraceLocationIdTest.kt
index f92345e30e279cf4183212ddf5f99bbf93a72007..e9f60fd8b05cfb48f6655252f770f9156a19482a 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/events/TraceLocationIdTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/locations/TraceLocationIdTest.kt
@@ -1,10 +1,10 @@
-package de.rki.coronawarnapp.eventregistration.events
+package de.rki.coronawarnapp.presencetracing.locations
-import de.rki.coronawarnapp.eventregistration.checkins.qrcode.TraceLocation
-import de.rki.coronawarnapp.eventregistration.checkins.qrcode.TraceLocationId
-import de.rki.coronawarnapp.eventregistration.checkins.qrcode.qrCodePayload
-import de.rki.coronawarnapp.eventregistration.checkins.qrcode.toTraceLocationIdHash
-import de.rki.coronawarnapp.eventregistration.checkins.qrcode.traceLocation
+import de.rki.coronawarnapp.presencetracing.checkins.qrcode.TraceLocation
+import de.rki.coronawarnapp.presencetracing.checkins.qrcode.TraceLocationId
+import de.rki.coronawarnapp.presencetracing.checkins.qrcode.qrCodePayload
+import de.rki.coronawarnapp.presencetracing.checkins.qrcode.toTraceLocationIdHash
+import de.rki.coronawarnapp.presencetracing.checkins.qrcode.traceLocation
import de.rki.coronawarnapp.server.protocols.internal.pt.TraceLocationOuterClass
import de.rki.coronawarnapp.util.TimeAndDateExtensions.secondsToInstant
import io.kotest.matchers.shouldBe
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/events/TraceLocationMapperTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/locations/TraceLocationMapperTest.kt
similarity index 93%
rename from Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/events/TraceLocationMapperTest.kt
rename to Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/locations/TraceLocationMapperTest.kt
index dddee2778678f1c516335bd52705b4202d92b3ff..8dc3d7d4a7cfc505d95f2487c245ec9211d683e4 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/events/TraceLocationMapperTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/locations/TraceLocationMapperTest.kt
@@ -1,9 +1,9 @@
-package de.rki.coronawarnapp.eventregistration.events
+package de.rki.coronawarnapp.presencetracing.locations
-import de.rki.coronawarnapp.eventregistration.checkins.qrcode.TraceLocation
-import de.rki.coronawarnapp.eventregistration.checkins.qrcode.toTraceLocation
-import de.rki.coronawarnapp.eventregistration.checkins.qrcode.toTraceLocations
-import de.rki.coronawarnapp.eventregistration.storage.entity.TraceLocationEntity
+import de.rki.coronawarnapp.presencetracing.checkins.qrcode.TraceLocation
+import de.rki.coronawarnapp.presencetracing.checkins.qrcode.toTraceLocation
+import de.rki.coronawarnapp.presencetracing.checkins.qrcode.toTraceLocations
+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 io.kotest.matchers.shouldBe
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/events/TraceLocationUrlTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/locations/TraceLocationUrlTest.kt
similarity index 95%
rename from Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/events/TraceLocationUrlTest.kt
rename to Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/locations/TraceLocationUrlTest.kt
index aee6965e78df1ed7e771ec7b6bb041c3fbaa6ec6..364258f245fc07c1c33712a60f991185a16652f1 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/events/TraceLocationUrlTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/locations/TraceLocationUrlTest.kt
@@ -1,6 +1,6 @@
-package de.rki.coronawarnapp.eventregistration.events
+package de.rki.coronawarnapp.presencetracing.locations
-import de.rki.coronawarnapp.eventregistration.checkins.qrcode.TraceLocation
+import de.rki.coronawarnapp.presencetracing.checkins.qrcode.TraceLocation
import de.rki.coronawarnapp.server.protocols.internal.pt.TraceLocationOuterClass
import de.rki.coronawarnapp.util.TimeAndDateExtensions.secondsToInstant
import io.kotest.matchers.shouldBe
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/events/server/qrcodepostertemplate/DefaultQrCodePosterTemplateTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/locations/server/DefaultQrCodePosterTemplateTest.kt
similarity index 94%
rename from Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/events/server/qrcodepostertemplate/DefaultQrCodePosterTemplateTest.kt
rename to Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/locations/server/DefaultQrCodePosterTemplateTest.kt
index bac5aeb8f0611dc7c43bab07185fb0d492ea00df..a63fec06f9c47f568c862a1b1cd2153df35706f2 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/events/server/qrcodepostertemplate/DefaultQrCodePosterTemplateTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/locations/server/DefaultQrCodePosterTemplateTest.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.eventregistration.events.server.qrcodepostertemplate
+package de.rki.coronawarnapp.presencetracing.locations.server
import android.content.Context
import android.os.Build
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/events/server/qrcodepostertemplate/QrCodePosterTemplateApiV1Test.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/locations/server/QrCodePosterTemplateApiV1Test.kt
similarity index 95%
rename from Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/events/server/qrcodepostertemplate/QrCodePosterTemplateApiV1Test.kt
rename to Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/locations/server/QrCodePosterTemplateApiV1Test.kt
index 0aea9cdf1e398308995bde72f087fa3b094386ba..24d5a0ad14f915a8b53ef66a4e6b02fe1ca8dd09 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/events/server/qrcodepostertemplate/QrCodePosterTemplateApiV1Test.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/locations/server/QrCodePosterTemplateApiV1Test.kt
@@ -1,7 +1,8 @@
-package de.rki.coronawarnapp.eventregistration.events.server.qrcodepostertemplate
+package de.rki.coronawarnapp.presencetracing.locations.server
-import de.rki.coronawarnapp.environment.eventregistration.qrcodeposter.QrCodePosterTemplateModule
+import de.rki.coronawarnapp.environment.presencetracing.qrcodeposter.QrCodePosterTemplateModule
import de.rki.coronawarnapp.http.HttpModule
+import de.rki.coronawarnapp.presencetracing.locations.server.qrcodepostertemplate.QrCodePosterTemplateApiV1
import io.kotest.matchers.shouldBe
import io.kotest.matchers.shouldNotBe
import io.mockk.MockKAnnotations
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/events/server/qrcodepostertemplate/QrCodePosterTemplateServerTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/locations/server/QrCodePosterTemplateServerTest.kt
similarity index 92%
rename from Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/events/server/qrcodepostertemplate/QrCodePosterTemplateServerTest.kt
rename to Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/locations/server/QrCodePosterTemplateServerTest.kt
index 68c3ee124e630adce7004a40f3f0454ce65a128d..a23b791c1cd03be21cd465e15d508870e5b155e1 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/events/server/qrcodepostertemplate/QrCodePosterTemplateServerTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/locations/server/QrCodePosterTemplateServerTest.kt
@@ -1,5 +1,9 @@
-package de.rki.coronawarnapp.eventregistration.events.server.qrcodepostertemplate
+package de.rki.coronawarnapp.presencetracing.locations.server
+import de.rki.coronawarnapp.presencetracing.locations.server.qrcodepostertemplate.DefaultQrCodePosterTemplateSource
+import de.rki.coronawarnapp.presencetracing.locations.server.qrcodepostertemplate.QrCodePosterTemplateApiV1
+import de.rki.coronawarnapp.presencetracing.locations.server.qrcodepostertemplate.QrCodePosterTemplateInvalidResponseException
+import de.rki.coronawarnapp.presencetracing.locations.server.qrcodepostertemplate.QrCodePosterTemplateServer
import de.rki.coronawarnapp.util.security.SignatureValidation
import io.kotest.assertions.throwables.shouldThrow
import io.kotest.matchers.shouldBe
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/risk/calculation/OverlapTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/risk/calculation/OverlapTest.kt
index bff78e2cc5b30c5fc13a732d15456d48d6f4f3f6..88b428894b7f3af6f2bf326c46c099f1d66932c4 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/risk/calculation/OverlapTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/risk/calculation/OverlapTest.kt
@@ -1,6 +1,6 @@
package de.rki.coronawarnapp.presencetracing.risk.calculation
-import de.rki.coronawarnapp.eventregistration.checkins.CheckIn
+import de.rki.coronawarnapp.presencetracing.checkins.CheckIn
import de.rki.coronawarnapp.server.protocols.internal.pt.TraceWarning
import de.rki.coronawarnapp.util.toOkioByteString
import de.rki.coronawarnapp.util.toProtoByteString
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/risk/execution/PresenceTracingWarningTaskTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/risk/execution/PresenceTracingWarningTaskTest.kt
index 918257658101455d756ffaa64ddcf11ac0885cb4..f9722d08a76a6568cd5d3b4782661a5b98b17637 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/risk/execution/PresenceTracingWarningTaskTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/risk/execution/PresenceTracingWarningTaskTest.kt
@@ -1,6 +1,6 @@
package de.rki.coronawarnapp.presencetracing.risk.execution
-import de.rki.coronawarnapp.eventregistration.checkins.CheckInRepository
+import de.rki.coronawarnapp.presencetracing.checkins.CheckInRepository
import de.rki.coronawarnapp.presencetracing.risk.calculation.CheckInWarningMatcher
import de.rki.coronawarnapp.presencetracing.risk.calculation.createCheckIn
import de.rki.coronawarnapp.presencetracing.risk.calculation.createWarning
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/storage/entity/TraceLocationConvertersTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/storage/entity/TraceLocationConvertersTest.kt
similarity index 95%
rename from Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/storage/entity/TraceLocationConvertersTest.kt
rename to Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/storage/entity/TraceLocationConvertersTest.kt
index 203b7762c3423f2564a5e5c32bdb8046cc95d622..20b326c92802e3911a2a581aee126066f4a34088 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/storage/entity/TraceLocationConvertersTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/storage/entity/TraceLocationConvertersTest.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.eventregistration.storage.entity
+package de.rki.coronawarnapp.presencetracing.storage.entity
import de.rki.coronawarnapp.server.protocols.internal.pt.TraceLocationOuterClass
import io.kotest.matchers.shouldBe
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/storage/entity/TraceLocationEntityTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/storage/entity/TraceLocationEntityTest.kt
similarity index 95%
rename from Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/storage/entity/TraceLocationEntityTest.kt
rename to Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/storage/entity/TraceLocationEntityTest.kt
index 8084790f1635517bc0bcba11dfb08b64cf5c3e39..cd6eb5aaa5a49b16474c2278c8f806cc2cc7ee3a 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/storage/entity/TraceLocationEntityTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/storage/entity/TraceLocationEntityTest.kt
@@ -1,6 +1,6 @@
-package de.rki.coronawarnapp.eventregistration.storage.entity
+package de.rki.coronawarnapp.presencetracing.storage.entity
-import de.rki.coronawarnapp.eventregistration.checkins.qrcode.TraceLocation
+import de.rki.coronawarnapp.presencetracing.checkins.qrcode.TraceLocation
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 io.kotest.matchers.shouldBe
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/storage/repo/DefaultTraceLocationRepositoryTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/storage/repo/DefaultTraceLocationRepositoryTest.kt
similarity index 87%
rename from Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/storage/repo/DefaultTraceLocationRepositoryTest.kt
rename to Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/storage/repo/DefaultTraceLocationRepositoryTest.kt
index 89c9e4da754a01c06001e2e7e9fe2a4976054553..1fbd0a143b5bf48d754303b802b69ec760867dfd 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/storage/repo/DefaultTraceLocationRepositoryTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/storage/repo/DefaultTraceLocationRepositoryTest.kt
@@ -1,9 +1,9 @@
-package de.rki.coronawarnapp.eventregistration.storage.repo
+package de.rki.coronawarnapp.presencetracing.storage.repo
-import de.rki.coronawarnapp.eventregistration.checkins.qrcode.TraceLocation
-import de.rki.coronawarnapp.eventregistration.storage.TraceLocationDatabase
-import de.rki.coronawarnapp.eventregistration.storage.dao.TraceLocationDao
-import de.rki.coronawarnapp.eventregistration.storage.entity.toTraceLocationEntity
+import de.rki.coronawarnapp.presencetracing.checkins.qrcode.TraceLocation
+import de.rki.coronawarnapp.presencetracing.storage.TraceLocationDatabase
+import de.rki.coronawarnapp.presencetracing.storage.dao.TraceLocationDao
+import de.rki.coronawarnapp.presencetracing.storage.entity.toTraceLocationEntity
import de.rki.coronawarnapp.server.protocols.internal.pt.TraceLocationOuterClass
import de.rki.coronawarnapp.util.TimeStamper
import io.kotest.matchers.shouldBe
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/storage/retention/CheckInCleanerTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/storage/retention/CheckInCleanerTest.kt
similarity index 93%
rename from Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/storage/retention/CheckInCleanerTest.kt
rename to Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/storage/retention/CheckInCleanerTest.kt
index c7661962153098c69e209b30e0ed0f02563f3cb5..d1d501fa781875adfb5042795696b346e23b0007 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/storage/retention/CheckInCleanerTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/storage/retention/CheckInCleanerTest.kt
@@ -1,7 +1,7 @@
-package de.rki.coronawarnapp.eventregistration.storage.retention
+package de.rki.coronawarnapp.presencetracing.storage.retention
-import de.rki.coronawarnapp.eventregistration.checkins.CheckIn
-import de.rki.coronawarnapp.eventregistration.checkins.CheckInRepository
+import de.rki.coronawarnapp.presencetracing.checkins.CheckIn
+import de.rki.coronawarnapp.presencetracing.checkins.CheckInRepository
import de.rki.coronawarnapp.util.TimeStamper
import io.mockk.MockKAnnotations
import io.mockk.Runs
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/storage/retention/TraceLocationCleanerTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/storage/retention/TraceLocationCleanerTest.kt
similarity index 93%
rename from Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/storage/retention/TraceLocationCleanerTest.kt
rename to Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/storage/retention/TraceLocationCleanerTest.kt
index 5a6f1398e01fddb8b36b559cd1daa7ded0f135ef..eac2777beba9472f74d86fc061f83b5d86883024 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/storage/retention/TraceLocationCleanerTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/storage/retention/TraceLocationCleanerTest.kt
@@ -1,7 +1,7 @@
-package de.rki.coronawarnapp.eventregistration.storage.retention
+package de.rki.coronawarnapp.presencetracing.storage.retention
-import de.rki.coronawarnapp.eventregistration.checkins.qrcode.TraceLocation
-import de.rki.coronawarnapp.eventregistration.storage.repo.TraceLocationRepository
+import de.rki.coronawarnapp.presencetracing.checkins.qrcode.TraceLocation
+import de.rki.coronawarnapp.presencetracing.storage.repo.TraceLocationRepository
import de.rki.coronawarnapp.server.protocols.internal.pt.TraceLocationOuterClass
import de.rki.coronawarnapp.util.TimeStamper
import io.mockk.MockKAnnotations
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/storage/retention/TraceLocationDbCleanUpPeriodicWorkerTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/storage/retention/TraceLocationDbCleanUpPeriodicWorkerTest.kt
similarity index 95%
rename from Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/storage/retention/TraceLocationDbCleanUpPeriodicWorkerTest.kt
rename to Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/storage/retention/TraceLocationDbCleanUpPeriodicWorkerTest.kt
index 152d9f4170396a93dc9f6a2c5e7929116971e62c..1e372dd2d5b682379e554a3fc49ed72fda967cc0 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/storage/retention/TraceLocationDbCleanUpPeriodicWorkerTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/storage/retention/TraceLocationDbCleanUpPeriodicWorkerTest.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.eventregistration.storage.retention
+package de.rki.coronawarnapp.presencetracing.storage.retention
import android.content.Context
import androidx.work.ListenableWorker
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/storage/retention/TraceLocationRetentionTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/storage/retention/TraceLocationRetentionTest.kt
similarity index 92%
rename from Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/storage/retention/TraceLocationRetentionTest.kt
rename to Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/storage/retention/TraceLocationRetentionTest.kt
index d0f58ebbc8de7827753a9d2f70cffd5423ec0b68..ee9d8bb36aa59882997ce276ad9e2868e43b525b 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/storage/retention/TraceLocationRetentionTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/presencetracing/storage/retention/TraceLocationRetentionTest.kt
@@ -1,6 +1,6 @@
-package de.rki.coronawarnapp.eventregistration.storage.retention
+package de.rki.coronawarnapp.presencetracing.storage.retention
-import de.rki.coronawarnapp.eventregistration.checkins.qrcode.TraceLocation
+import de.rki.coronawarnapp.presencetracing.checkins.qrcode.TraceLocation
import de.rki.coronawarnapp.server.protocols.internal.pt.TraceLocationOuterClass
import io.kotest.matchers.shouldBe
import okio.ByteString.Companion.encode
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/submission/task/SubmissionTaskTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/submission/task/SubmissionTaskTest.kt
index 778d26c72e6670b9339992f8fcdeb119a7fc115b..1ebc52af489fd60fa81b8470ff6b12cfb78af9a2 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/submission/task/SubmissionTaskTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/submission/task/SubmissionTaskTest.kt
@@ -4,9 +4,9 @@ import com.google.android.gms.nearby.exposurenotification.TemporaryExposureKey
import de.rki.coronawarnapp.appconfig.AppConfigProvider
import de.rki.coronawarnapp.appconfig.ConfigData
import de.rki.coronawarnapp.datadonation.analytics.modules.keysubmission.AnalyticsKeySubmissionCollector
-import de.rki.coronawarnapp.eventregistration.checkins.CheckIn
-import de.rki.coronawarnapp.eventregistration.checkins.CheckInRepository
-import de.rki.coronawarnapp.eventregistration.checkins.CheckInsTransformer
+import de.rki.coronawarnapp.presencetracing.checkins.CheckIn
+import de.rki.coronawarnapp.presencetracing.checkins.CheckInRepository
+import de.rki.coronawarnapp.presencetracing.checkins.CheckInsTransformer
import de.rki.coronawarnapp.exception.NoRegistrationTokenSetException
import de.rki.coronawarnapp.notification.ShareTestResultNotificationService
import de.rki.coronawarnapp.notification.TestResultAvailableNotificationService
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/eventregistration/attendee/checkins/CheckInsViewModelTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/presencetracing/attendee/checkins/CheckInsViewModelTest.kt
similarity index 90%
rename from Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/eventregistration/attendee/checkins/CheckInsViewModelTest.kt
rename to Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/presencetracing/attendee/checkins/CheckInsViewModelTest.kt
index 7efbed5de4b31e4457ff92bac769a757a49b9eaa..dbb826612e6d7ebc4439768e9978e2e3030643ec 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/eventregistration/attendee/checkins/CheckInsViewModelTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/presencetracing/attendee/checkins/CheckInsViewModelTest.kt
@@ -1,16 +1,16 @@
-package de.rki.coronawarnapp.ui.eventregistration.attendee.checkins
+package de.rki.coronawarnapp.ui.presencetracing.attendee.checkins
import androidx.lifecycle.SavedStateHandle
-import de.rki.coronawarnapp.eventregistration.checkins.CheckIn
-import de.rki.coronawarnapp.eventregistration.checkins.CheckInRepository
-import de.rki.coronawarnapp.eventregistration.checkins.qrcode.QRCodeUriParser
-import de.rki.coronawarnapp.eventregistration.checkins.qrcode.TraceLocationVerifier
+import de.rki.coronawarnapp.presencetracing.checkins.CheckIn
+import de.rki.coronawarnapp.presencetracing.checkins.CheckInRepository
+import de.rki.coronawarnapp.presencetracing.checkins.qrcode.QRCodeUriParser
+import de.rki.coronawarnapp.presencetracing.checkins.qrcode.TraceLocationVerifier
import de.rki.coronawarnapp.presencetracing.checkins.checkout.CheckOutHandler
import de.rki.coronawarnapp.server.protocols.internal.pt.TraceLocationOuterClass
-import de.rki.coronawarnapp.ui.eventregistration.attendee.checkins.items.ActiveCheckInVH
-import de.rki.coronawarnapp.ui.eventregistration.attendee.checkins.items.CameraPermissionVH
-import de.rki.coronawarnapp.ui.eventregistration.attendee.checkins.items.PastCheckInVH
-import de.rki.coronawarnapp.ui.eventregistration.attendee.checkins.permission.CameraPermissionProvider
+import de.rki.coronawarnapp.ui.presencetracing.attendee.checkins.items.ActiveCheckInVH
+import de.rki.coronawarnapp.ui.presencetracing.attendee.checkins.items.CameraPermissionVH
+import de.rki.coronawarnapp.ui.presencetracing.attendee.checkins.items.PastCheckInVH
+import de.rki.coronawarnapp.ui.presencetracing.attendee.checkins.permission.CameraPermissionProvider
import io.kotest.matchers.shouldBe
import io.kotest.matchers.types.shouldBeInstanceOf
import io.mockk.MockKAnnotations
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/eventregistration/attendee/checkins/permission/CameraPermissionProviderTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/presencetracing/attendee/checkins/permission/CameraPermissionProviderTest.kt
similarity index 97%
rename from Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/eventregistration/attendee/checkins/permission/CameraPermissionProviderTest.kt
rename to Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/presencetracing/attendee/checkins/permission/CameraPermissionProviderTest.kt
index 60e1b1e25a194716431061af0032f05a0f9f6c38..61c6f0af1f0b4afabe4ce506f1255b5b6c27d470 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/eventregistration/attendee/checkins/permission/CameraPermissionProviderTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/presencetracing/attendee/checkins/permission/CameraPermissionProviderTest.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.ui.eventregistration.attendee.checkins.permission
+package de.rki.coronawarnapp.ui.presencetracing.attendee.checkins.permission
import android.content.Context
import de.rki.coronawarnapp.util.permission.CameraPermissionHelper
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/eventregistration/attendee/scan/ScanCheckInQrCodeViewModelTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/presencetracing/attendee/scan/ScanCheckInQrCodeViewModelTest.kt
similarity index 96%
rename from Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/eventregistration/attendee/scan/ScanCheckInQrCodeViewModelTest.kt
rename to Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/presencetracing/attendee/scan/ScanCheckInQrCodeViewModelTest.kt
index 04b028e6338742c9f3e0ce5d9e1d1ad2220eaf1b..991ff951b66a1fbd02790442638020e2d403135c 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/eventregistration/attendee/scan/ScanCheckInQrCodeViewModelTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/presencetracing/attendee/scan/ScanCheckInQrCodeViewModelTest.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.ui.eventregistration.attendee.scan
+package de.rki.coronawarnapp.ui.presencetracing.attendee.scan
import com.google.zxing.Result
import com.journeyapps.barcodescanner.BarcodeResult
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/eventregistration/checkin/ConfirmCheckInViewModelTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/presencetracing/checkin/ConfirmCheckInViewModelTest.kt
similarity index 100%
rename from Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/eventregistration/checkin/ConfirmCheckInViewModelTest.kt
rename to Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/presencetracing/checkin/ConfirmCheckInViewModelTest.kt
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/eventregistration/organizer/category/TraceLocationCategoryViewModelTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/presencetracing/organizer/category/TraceLocationCategoryViewModelTest.kt
similarity index 91%
rename from Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/eventregistration/organizer/category/TraceLocationCategoryViewModelTest.kt
rename to Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/presencetracing/organizer/category/TraceLocationCategoryViewModelTest.kt
index 9e323401de2231a7c48f6391e72c8317dc1fbba2..7ec5fdbd3421ec74de325258c4a562d792487233 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/eventregistration/organizer/category/TraceLocationCategoryViewModelTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/presencetracing/organizer/category/TraceLocationCategoryViewModelTest.kt
@@ -1,11 +1,11 @@
-package de.rki.coronawarnapp.ui.eventregistration.organizer.category
+package de.rki.coronawarnapp.ui.presencetracing.organizer.category
import de.rki.coronawarnapp.R
import de.rki.coronawarnapp.server.protocols.internal.pt.TraceLocationOuterClass
-import de.rki.coronawarnapp.ui.eventregistration.organizer.category.adapter.category.TraceLocationCategory
-import de.rki.coronawarnapp.ui.eventregistration.organizer.category.adapter.category.TraceLocationUIType
-import de.rki.coronawarnapp.ui.eventregistration.organizer.category.adapter.header.TraceLocationHeaderItem
-import de.rki.coronawarnapp.ui.eventregistration.organizer.category.adapter.separator.TraceLocationSeparatorItem
+import de.rki.coronawarnapp.ui.presencetracing.organizer.category.adapter.category.TraceLocationCategory
+import de.rki.coronawarnapp.ui.presencetracing.organizer.category.adapter.category.TraceLocationUIType
+import de.rki.coronawarnapp.ui.presencetracing.organizer.category.adapter.header.TraceLocationHeaderItem
+import de.rki.coronawarnapp.ui.presencetracing.organizer.category.adapter.separator.TraceLocationSeparatorItem
import io.kotest.matchers.shouldBe
import org.junit.jupiter.api.Test
import org.junit.jupiter.api.extension.ExtendWith
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/eventregistration/organizer/create/TraceLocationCreateViewModelTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/presencetracing/organizer/create/TraceLocationCreateViewModelTest.kt
similarity index 94%
rename from Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/eventregistration/organizer/create/TraceLocationCreateViewModelTest.kt
rename to Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/presencetracing/organizer/create/TraceLocationCreateViewModelTest.kt
index 5aec07edce9544c0022fec3dd91a06c6b5cc726f..2736f0d6a4fa231b0042554025af3b66bad965f6 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/eventregistration/organizer/create/TraceLocationCreateViewModelTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/presencetracing/organizer/create/TraceLocationCreateViewModelTest.kt
@@ -1,11 +1,11 @@
-package de.rki.coronawarnapp.ui.eventregistration.organizer.create
+package de.rki.coronawarnapp.ui.presencetracing.organizer.create
import de.rki.coronawarnapp.R
-import de.rki.coronawarnapp.eventregistration.checkins.qrcode.TraceLocation
-import de.rki.coronawarnapp.eventregistration.events.TraceLocationCreator
+import de.rki.coronawarnapp.presencetracing.checkins.qrcode.TraceLocation
+import de.rki.coronawarnapp.presencetracing.locations.TraceLocationCreator
import de.rki.coronawarnapp.server.protocols.internal.pt.TraceLocationOuterClass
-import de.rki.coronawarnapp.ui.eventregistration.organizer.category.adapter.category.TraceLocationCategory
-import de.rki.coronawarnapp.ui.eventregistration.organizer.category.adapter.category.TraceLocationUIType
+import de.rki.coronawarnapp.ui.presencetracing.organizer.category.adapter.category.TraceLocationCategory
+import de.rki.coronawarnapp.ui.presencetracing.organizer.category.adapter.category.TraceLocationUIType
import io.kotest.matchers.shouldBe
import io.mockk.MockKAnnotations
import io.mockk.coEvery
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/eventregistration/organizer/poster/QrCodePosterViewModelTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/presencetracing/organizer/poster/QrCodePosterViewModelTest.kt
similarity index 84%
rename from Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/eventregistration/organizer/poster/QrCodePosterViewModelTest.kt
rename to Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/presencetracing/organizer/poster/QrCodePosterViewModelTest.kt
index 7ead8a9e213ea9be2b9fb76e8e05cfda3975a3ed..7d843d40c657bd1e0adc97f8ca448aedd471d96d 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/eventregistration/organizer/poster/QrCodePosterViewModelTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/presencetracing/organizer/poster/QrCodePosterViewModelTest.kt
@@ -1,11 +1,11 @@
-package de.rki.coronawarnapp.ui.eventregistration.organizer.poster
+package de.rki.coronawarnapp.ui.presencetracing.organizer.poster
import android.graphics.Bitmap
-import de.rki.coronawarnapp.eventregistration.checkins.qrcode.PosterTemplateProvider
-import de.rki.coronawarnapp.eventregistration.checkins.qrcode.QrCodeGenerator
-import de.rki.coronawarnapp.eventregistration.checkins.qrcode.Template
-import de.rki.coronawarnapp.eventregistration.checkins.qrcode.TraceLocation
-import de.rki.coronawarnapp.eventregistration.storage.repo.TraceLocationRepository
+import de.rki.coronawarnapp.presencetracing.checkins.qrcode.PosterTemplateProvider
+import de.rki.coronawarnapp.presencetracing.checkins.qrcode.QrCodeGenerator
+import de.rki.coronawarnapp.presencetracing.checkins.qrcode.Template
+import de.rki.coronawarnapp.presencetracing.checkins.qrcode.TraceLocation
+import de.rki.coronawarnapp.presencetracing.storage.repo.TraceLocationRepository
import de.rki.coronawarnapp.server.protocols.internal.pt.QrCodePosterTemplate.QRCodePosterTemplateAndroid.QRCodeTextBoxAndroid
import de.rki.coronawarnapp.util.files.FileSharing
import io.kotest.matchers.shouldBe
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/Base32Test.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/Base32Test.kt
similarity index 92%
rename from Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/Base32Test.kt
rename to Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/Base32Test.kt
index b6c534779aa7fa598647526f9d881935f6676143..92e08398518bafc4470cc7c6e463b77675f7a830 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/Base32Test.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/Base32Test.kt
@@ -1,7 +1,5 @@
-package de.rki.coronawarnapp.eventregistration
+package de.rki.coronawarnapp.util
-import de.rki.coronawarnapp.util.base32
-import de.rki.coronawarnapp.util.decodeBase32
import io.kotest.matchers.shouldBe
import okio.ByteString.Companion.toByteString
import org.junit.jupiter.params.ParameterizedTest
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/DataResetTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/DataResetTest.kt
index 742faf11606a3d64d9aaf813fb81ce1a47744d93..38c405c76885fa2c6c6c7927832ef032bcd8269b 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/DataResetTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/DataResetTest.kt
@@ -10,9 +10,9 @@ import de.rki.coronawarnapp.datadonation.analytics.storage.AnalyticsSettings
import de.rki.coronawarnapp.datadonation.survey.SurveySettings
import de.rki.coronawarnapp.diagnosiskeys.download.DownloadDiagnosisKeysSettings
import de.rki.coronawarnapp.diagnosiskeys.storage.KeyCacheRepository
-import de.rki.coronawarnapp.eventregistration.TraceLocationSettings
-import de.rki.coronawarnapp.eventregistration.checkins.CheckInRepository
-import de.rki.coronawarnapp.eventregistration.storage.repo.TraceLocationRepository
+import de.rki.coronawarnapp.presencetracing.TraceLocationSettings
+import de.rki.coronawarnapp.presencetracing.checkins.CheckInRepository
+import de.rki.coronawarnapp.presencetracing.storage.repo.TraceLocationRepository
import de.rki.coronawarnapp.main.CWASettings
import de.rki.coronawarnapp.nearby.modules.detectiontracker.ExposureDetectionTracker
import de.rki.coronawarnapp.presencetracing.warning.storage.TraceWarningRepository
@@ -22,7 +22,7 @@ import de.rki.coronawarnapp.storage.OnboardingSettings
import de.rki.coronawarnapp.storage.TracingSettings
import de.rki.coronawarnapp.submission.SubmissionRepository
import de.rki.coronawarnapp.submission.SubmissionSettings
-import de.rki.coronawarnapp.ui.eventregistration.TraceLocationPreferences
+import de.rki.coronawarnapp.ui.presencetracing.TraceLocationPreferences
import io.mockk.MockKAnnotations
import io.mockk.coVerify
import io.mockk.impl.annotations.MockK
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/NoPaddingTestProvider.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/NoPaddingTestProvider.kt
similarity index 96%
rename from Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/NoPaddingTestProvider.kt
rename to Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/NoPaddingTestProvider.kt
index 69f2287a9c2b998162cac5e059fcf592345341e4..4630acdca5b4369a3ccce8b1ce703ed4bbf362d8 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/NoPaddingTestProvider.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/NoPaddingTestProvider.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.eventregistration
+package de.rki.coronawarnapp.util
import org.junit.jupiter.api.extension.ExtensionContext
import org.junit.jupiter.params.provider.Arguments
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/WithPaddingTestProvider.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/WithPaddingTestProvider.kt
similarity index 96%
rename from Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/WithPaddingTestProvider.kt
rename to Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/WithPaddingTestProvider.kt
index c54ed7c290fc4c4267f12ff54535f2603b1f473c..0b2bcfef8beb8ac215077df2f1ad33b283d6eb64 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/WithPaddingTestProvider.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/WithPaddingTestProvider.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.eventregistration
+package de.rki.coronawarnapp.util
import org.junit.jupiter.api.extension.ExtensionContext
import org.junit.jupiter.params.provider.Arguments
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/worker/WorkerBinderTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/worker/WorkerBinderTest.kt
index 67bdaf6650019a2e6368f755d05c613af186b8d9..5f94538cd6fd726a3bc983a0dde5227b696bfe0e 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/worker/WorkerBinderTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/worker/WorkerBinderTest.kt
@@ -10,8 +10,8 @@ import de.rki.coronawarnapp.datadonation.analytics.Analytics
import de.rki.coronawarnapp.datadonation.analytics.worker.DataDonationAnalyticsScheduler
import de.rki.coronawarnapp.deadman.DeadmanNotificationScheduler
import de.rki.coronawarnapp.deadman.DeadmanNotificationSender
-import de.rki.coronawarnapp.eventregistration.storage.repo.TraceLocationRepository
-import de.rki.coronawarnapp.eventregistration.storage.retention.TraceLocationDbCleanUpScheduler
+import de.rki.coronawarnapp.presencetracing.storage.repo.TraceLocationRepository
+import de.rki.coronawarnapp.presencetracing.storage.retention.TraceLocationDbCleanUpScheduler
import de.rki.coronawarnapp.nearby.ENFClient
import de.rki.coronawarnapp.notification.GeneralNotifications
import de.rki.coronawarnapp.notification.TestResultAvailableNotificationService