diff --git a/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/vaccination/ui/details/VaccinationDetailsFragmentTest.kt b/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/covidcertificate/vaccination/ui/details/VaccinationDetailsFragmentTest.kt
similarity index 96%
rename from Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/vaccination/ui/details/VaccinationDetailsFragmentTest.kt
rename to Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/covidcertificate/vaccination/ui/details/VaccinationDetailsFragmentTest.kt
index c19839d46d1dbf9d72b428dec85bf4179944c579..1af6f3743a1cf8d5c2fac62ccda27da56d3731dc 100644
--- a/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/vaccination/ui/details/VaccinationDetailsFragmentTest.kt
+++ b/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/covidcertificate/vaccination/ui/details/VaccinationDetailsFragmentTest.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.vaccination.ui.details
+package de.rki.coronawarnapp.covidcertificate.vaccination.ui.details
import android.content.Context
import android.graphics.Bitmap
@@ -13,7 +13,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
import dagger.Module
import dagger.android.ContributesAndroidInjector
import de.rki.coronawarnapp.R
-import de.rki.coronawarnapp.vaccination.core.VaccinationCertificate
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.VaccinationCertificate
import io.mockk.MockKAnnotations
import io.mockk.every
import io.mockk.impl.annotations.MockK
diff --git a/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/vaccination/ui/list/VaccinationListFragmentTest.kt b/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/covidcertificate/vaccination/ui/list/VaccinationListFragmentTest.kt
similarity index 86%
rename from Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/vaccination/ui/list/VaccinationListFragmentTest.kt
rename to Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/covidcertificate/vaccination/ui/list/VaccinationListFragmentTest.kt
index a017ec7b73ddda132d9d8e5cd549a2c5c30e99bf..a35f99170a4d003c5a82a909b239ac50a9d0daf5 100644
--- a/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/vaccination/ui/list/VaccinationListFragmentTest.kt
+++ b/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/covidcertificate/vaccination/ui/list/VaccinationListFragmentTest.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.vaccination.ui.list
+package de.rki.coronawarnapp.covidcertificate.vaccination.ui.list
import android.content.Context
import android.graphics.BitmapFactory
@@ -11,16 +11,16 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
import dagger.Module
import dagger.android.ContributesAndroidInjector
import de.rki.coronawarnapp.R
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.VaccinatedPerson
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.VaccinatedPerson.Status.COMPLETE
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.VaccinatedPerson.Status.IMMUNITY
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.VaccinatedPerson.Status.INCOMPLETE
+import de.rki.coronawarnapp.covidcertificate.vaccination.ui.list.adapter.VaccinationListItem
+import de.rki.coronawarnapp.covidcertificate.vaccination.ui.list.adapter.viewholder.VaccinationListImmunityInformationCardItemVH.VaccinationListImmunityInformationCardItem
+import de.rki.coronawarnapp.covidcertificate.vaccination.ui.list.adapter.viewholder.VaccinationListNameCardItemVH.VaccinationListNameCardItem
+import de.rki.coronawarnapp.covidcertificate.vaccination.ui.list.adapter.viewholder.VaccinationListQrCodeCardItemVH.VaccinationListQrCodeCardItem
+import de.rki.coronawarnapp.covidcertificate.vaccination.ui.list.adapter.viewholder.VaccinationListVaccinationCardItemVH.VaccinationListVaccinationCardItem
import de.rki.coronawarnapp.util.TimeAndDateExtensions.toDayFormat
-import de.rki.coronawarnapp.vaccination.core.VaccinatedPerson
-import de.rki.coronawarnapp.vaccination.core.VaccinatedPerson.Status.COMPLETE
-import de.rki.coronawarnapp.vaccination.core.VaccinatedPerson.Status.IMMUNITY
-import de.rki.coronawarnapp.vaccination.core.VaccinatedPerson.Status.INCOMPLETE
-import de.rki.coronawarnapp.vaccination.ui.list.adapter.VaccinationListItem
-import de.rki.coronawarnapp.vaccination.ui.list.adapter.viewholder.VaccinationListImmunityInformationCardItemVH.VaccinationListImmunityInformationCardItem
-import de.rki.coronawarnapp.vaccination.ui.list.adapter.viewholder.VaccinationListNameCardItemVH.VaccinationListNameCardItem
-import de.rki.coronawarnapp.vaccination.ui.list.adapter.viewholder.VaccinationListQrCodeCardItemVH.VaccinationListQrCodeCardItem
-import de.rki.coronawarnapp.vaccination.ui.list.adapter.viewholder.VaccinationListVaccinationCardItemVH.VaccinationListVaccinationCardItem
import io.mockk.MockKAnnotations
import io.mockk.every
import io.mockk.impl.annotations.MockK
diff --git a/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/main/home/HomeData.kt b/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/main/home/HomeData.kt
index 5d57baaa46585ec091a6c244c33f6753adb3bdc4..e12a5aa4f0fd3a606a469d5119c59b0ec0ce277f 100644
--- a/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/main/home/HomeData.kt
+++ b/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/main/home/HomeData.kt
@@ -9,6 +9,9 @@ import de.rki.coronawarnapp.coronatest.type.pcr.SubmissionStatePCR.TestNegative
import de.rki.coronawarnapp.coronatest.type.pcr.SubmissionStatePCR.TestPending
import de.rki.coronawarnapp.coronatest.type.pcr.SubmissionStatePCR.TestPositive
import de.rki.coronawarnapp.coronatest.type.rapidantigen.SubmissionStateRAT
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.VaccinatedPerson
+import de.rki.coronawarnapp.covidcertificate.vaccination.ui.cards.ImmuneVaccinationCard
+import de.rki.coronawarnapp.covidcertificate.vaccination.ui.cards.VaccinationCard
import de.rki.coronawarnapp.risk.RiskState
import de.rki.coronawarnapp.submission.ui.homecards.PcrTestErrorCard
import de.rki.coronawarnapp.submission.ui.homecards.PcrTestInvalidCard
@@ -31,9 +34,6 @@ import de.rki.coronawarnapp.tracing.ui.homecards.TracingDisabledCard
import de.rki.coronawarnapp.tracing.ui.homecards.TracingFailedCard
import de.rki.coronawarnapp.tracing.ui.homecards.TracingProgressCard
import de.rki.coronawarnapp.util.TimeAndDateExtensions.toLocalDateUtc
-import de.rki.coronawarnapp.vaccination.core.VaccinatedPerson
-import de.rki.coronawarnapp.vaccination.ui.cards.ImmuneVaccinationCard
-import de.rki.coronawarnapp.vaccination.ui.cards.VaccinationCard
import io.mockk.every
import io.mockk.mockk
import org.joda.time.Duration
diff --git a/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/vaccination/VaccinationConsentFragmentTest.kt b/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/vaccination/VaccinationConsentFragmentTest.kt
index 280bb1d9cb34dc1f474d92b548a24b4acdaee37c..3ef969a112b80105a768b6bf8eb7eb70a25d099f 100644
--- a/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/vaccination/VaccinationConsentFragmentTest.kt
+++ b/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/vaccination/VaccinationConsentFragmentTest.kt
@@ -3,9 +3,9 @@ package de.rki.coronawarnapp.ui.vaccination
import androidx.test.ext.junit.runners.AndroidJUnit4
import dagger.Module
import dagger.android.ContributesAndroidInjector
-import de.rki.coronawarnapp.vaccination.ui.consent.VaccinationConsentFragment
-import de.rki.coronawarnapp.vaccination.ui.consent.VaccinationConsentFragmentArgs
-import de.rki.coronawarnapp.vaccination.ui.consent.VaccinationConsentViewModel
+import de.rki.coronawarnapp.covidcertificate.vaccination.ui.consent.VaccinationConsentFragment
+import de.rki.coronawarnapp.covidcertificate.vaccination.ui.consent.VaccinationConsentFragmentArgs
+import de.rki.coronawarnapp.covidcertificate.vaccination.ui.consent.VaccinationConsentViewModel
import io.mockk.MockKAnnotations
import io.mockk.impl.annotations.MockK
import org.junit.After
diff --git a/Corona-Warn-App/src/androidTest/java/testhelpers/FragmentTestModuleRegistrar.kt b/Corona-Warn-App/src/androidTest/java/testhelpers/FragmentTestModuleRegistrar.kt
index c2cd3038e54570e48777ce2153f85d958fa542a0..c8d1be3d5f7627a65ec5a00f7024e585f794c9af 100644
--- a/Corona-Warn-App/src/androidTest/java/testhelpers/FragmentTestModuleRegistrar.kt
+++ b/Corona-Warn-App/src/androidTest/java/testhelpers/FragmentTestModuleRegistrar.kt
@@ -3,6 +3,8 @@ package testhelpers
import dagger.Module
import de.rki.coronawarnapp.bugreporting.DebugLogTestModule
import de.rki.coronawarnapp.bugreporting.DebugLogUploadTestModule
+import de.rki.coronawarnapp.covidcertificate.vaccination.ui.details.VaccinationDetailsFragmentTestModule
+import de.rki.coronawarnapp.covidcertificate.vaccination.ui.list.VaccinationListFragmentTestModule
import de.rki.coronawarnapp.ui.contactdiary.ContactDiaryDayFragmentTestModule
import de.rki.coronawarnapp.ui.contactdiary.ContactDiaryEditLocationsFragmentTestModule
import de.rki.coronawarnapp.ui.contactdiary.ContactDiaryEditPersonsFragmentTestModule
@@ -38,8 +40,6 @@ import de.rki.coronawarnapp.ui.submission.SubmissionYourConsentFragmentTestModul
import de.rki.coronawarnapp.ui.submission.covidcertificate.RequestCovidCertificateFragmentTestModule
import de.rki.coronawarnapp.ui.tracing.TracingDetailsFragmentTestTestModule
import de.rki.coronawarnapp.ui.vaccination.VaccinationConsentFragmentTestModule
-import de.rki.coronawarnapp.vaccination.ui.details.VaccinationDetailsFragmentTestModule
-import de.rki.coronawarnapp.vaccination.ui.list.VaccinationListFragmentTestModule
@Module(
includes = [
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 12d682335609b9558ff9502c6ede71b33cf31f14..61cfe815eb6208a57c604b5f411f2f6ac365c1f0 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
@@ -5,13 +5,13 @@ import androidx.lifecycle.asLiveData
import dagger.assisted.AssistedFactory
import dagger.assisted.AssistedInject
import de.rki.coronawarnapp.contactdiary.ui.ContactDiarySettings
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.VaccinationSettings
import de.rki.coronawarnapp.environment.BuildConfigWrap
import de.rki.coronawarnapp.main.CWASettings
import de.rki.coronawarnapp.presencetracing.TraceLocationSettings
import de.rki.coronawarnapp.util.coroutine.DispatcherProvider
import de.rki.coronawarnapp.util.viewmodel.CWAViewModel
import de.rki.coronawarnapp.util.viewmodel.SimpleCWAViewModelFactory
-import de.rki.coronawarnapp.vaccination.core.VaccinationSettings
class DeltaOnboardingFragmentViewModel @AssistedInject constructor(
private val settings: CWASettings,
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 1a38018c9f50f3a1f57939d4d1c45123e17dd17f..e9b71a70568681e1083261c7ff6011b1fd4b81e7 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,11 +17,12 @@ import de.rki.coronawarnapp.bugreporting.loghistory.LogHistoryTree
import de.rki.coronawarnapp.contactdiary.retention.ContactDiaryWorkScheduler
import de.rki.coronawarnapp.coronatest.CoronaTestRepository
import de.rki.coronawarnapp.coronatest.notification.ShareTestResultNotificationService
-import de.rki.coronawarnapp.coronatest.type.common.TestCertificateRetrievalScheduler
import de.rki.coronawarnapp.coronatest.type.pcr.execution.PCRResultScheduler
import de.rki.coronawarnapp.coronatest.type.pcr.notification.PCRTestResultAvailableNotificationService
import de.rki.coronawarnapp.coronatest.type.rapidantigen.execution.RAResultScheduler
import de.rki.coronawarnapp.coronatest.type.rapidantigen.notification.RATTestResultAvailableNotificationService
+import de.rki.coronawarnapp.covidcertificate.test.core.execution.TestCertificateRetrievalScheduler
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.execution.VaccinationUpdateScheduler
import de.rki.coronawarnapp.datadonation.analytics.worker.DataDonationAnalyticsScheduler
import de.rki.coronawarnapp.deadman.DeadmanNotificationScheduler
import de.rki.coronawarnapp.exception.reporting.ErrorReportReceiver
@@ -43,7 +44,6 @@ import de.rki.coronawarnapp.util.device.ForegroundState
import de.rki.coronawarnapp.util.di.AppInjector
import de.rki.coronawarnapp.util.di.ApplicationComponent
import de.rki.coronawarnapp.util.hasAPILevel
-import de.rki.coronawarnapp.vaccination.core.execution.VaccinationUpdateScheduler
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.flow.launchIn
import kotlinx.coroutines.flow.onEach
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/bugreporting/censors/vaccination/CertificateQrCodeCensor.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/bugreporting/censors/vaccination/CertificateQrCodeCensor.kt
index 83c22418c7b6b6abe8cb5eaca26ac82b059009c4..fe0d08c1c83191d1cf216edf70e56c92b78fe4d1 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/bugreporting/censors/vaccination/CertificateQrCodeCensor.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/bugreporting/censors/vaccination/CertificateQrCodeCensor.kt
@@ -3,8 +3,8 @@ package de.rki.coronawarnapp.bugreporting.censors.vaccination
import dagger.Reusable
import de.rki.coronawarnapp.bugreporting.censors.BugCensor
import de.rki.coronawarnapp.bugreporting.censors.BugCensor.CensorContainer
-import de.rki.coronawarnapp.vaccination.core.certificate.VaccinationDGCV1
-import de.rki.coronawarnapp.vaccination.core.qrcode.VaccinationCertificateData
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.certificate.VaccinationDGCV1
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.qrcode.VaccinationCertificateData
import java.util.LinkedList
import javax.inject.Inject
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/coronatest/type/common/TestCertificateIdentifier.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/coronatest/type/common/TestCertificateIdentifier.kt
deleted file mode 100644
index 1c3642a39554921616e505a07100eadda8e83f82..0000000000000000000000000000000000000000
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/coronatest/type/common/TestCertificateIdentifier.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package de.rki.coronawarnapp.coronatest.type.common
-
-typealias TestCertificateIdentifier = String
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/DigitalCovidCertificateModule.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/DigitalCovidCertificateModule.kt
new file mode 100644
index 0000000000000000000000000000000000000000..f99403437330ace983a3c86c592dac778b2710eb
--- /dev/null
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/DigitalCovidCertificateModule.kt
@@ -0,0 +1,15 @@
+package de.rki.coronawarnapp.covidcertificate
+
+import dagger.Module
+import de.rki.coronawarnapp.covidcertificate.test.core.server.TestCertificateServerModule
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.VaccinationModule
+import de.rki.coronawarnapp.covidcertificate.valueset.CertificateValueSetModule
+
+@Module(
+ includes = [
+ CertificateValueSetModule::class,
+ TestCertificateServerModule::class,
+ VaccinationModule::class,
+ ]
+)
+abstract class DigitalCovidCertificateModule
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/CertificatePersonIdentifier.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/common/CertificatePersonIdentifier.kt
similarity index 87%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/CertificatePersonIdentifier.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/common/CertificatePersonIdentifier.kt
index 3c4744fc379d6b2c98e8a7e9632f99205ea124dd..dcfd255a303c3aa5a0f5939cd72eede1ecbf909e 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/CertificatePersonIdentifier.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/common/CertificatePersonIdentifier.kt
@@ -1,13 +1,13 @@
-package de.rki.coronawarnapp.vaccination.core
+package de.rki.coronawarnapp.covidcertificate.common
import de.rki.coronawarnapp.covidcertificate.exception.InvalidHealthCertificateException.ErrorCode.VC_DOB_MISMATCH
import de.rki.coronawarnapp.covidcertificate.exception.InvalidHealthCertificateException.ErrorCode.VC_NAME_MISMATCH
import de.rki.coronawarnapp.covidcertificate.exception.InvalidVaccinationCertificateException
-import de.rki.coronawarnapp.covidcertificate.test.TestCertificateDccV1
-import de.rki.coronawarnapp.covidcertificate.test.TestCertificateQRCode
+import de.rki.coronawarnapp.covidcertificate.test.core.certificate.TestCertificateDccV1
+import de.rki.coronawarnapp.covidcertificate.test.core.qrcode.TestCertificateQRCode
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.certificate.VaccinationDGCV1
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.qrcode.VaccinationCertificateQRCode
import de.rki.coronawarnapp.util.HashExtensions.toSHA256
-import de.rki.coronawarnapp.vaccination.core.certificate.VaccinationDGCV1
-import de.rki.coronawarnapp.vaccination.core.qrcode.VaccinationCertificateQRCode
import org.joda.time.LocalDate
import timber.log.Timber
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/TestCertificateData.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/TestCertificateData.kt
deleted file mode 100644
index 8858296812f1cd3fe089cf7ac88f8c599a3c8e00..0000000000000000000000000000000000000000
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/TestCertificateData.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package de.rki.coronawarnapp.covidcertificate.test
-
-import de.rki.coronawarnapp.vaccination.core.certificate.CoseCertificateHeader
-
-data class TestCertificateData(
- val header: CoseCertificateHeader,
- val certificate: TestCertificateDccV1,
-)
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/TestCertificateQRCode.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/TestCertificateQRCode.kt
deleted file mode 100644
index 6cc65a07b63d365aed9841ef0618609961f02c0c..0000000000000000000000000000000000000000
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/TestCertificateQRCode.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package de.rki.coronawarnapp.covidcertificate.test
-
-data class TestCertificateQRCode(
- val qrCode: String,
- val testCertificateData: TestCertificateData,
-)
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/TestCertificate.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/core/TestCertificate.kt
similarity index 80%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/TestCertificate.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/core/TestCertificate.kt
index 85196fbe97a4974655e22365556cefd51fe2e2e3..b03f5ab10ebf27469a7f873cdff8fbac09f25ba9 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/TestCertificate.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/core/TestCertificate.kt
@@ -1,7 +1,7 @@
-package de.rki.coronawarnapp.covidcertificate.test
+package de.rki.coronawarnapp.covidcertificate.test.core
-import de.rki.coronawarnapp.vaccination.core.CertificatePersonIdentifier
-import de.rki.coronawarnapp.vaccination.core.qrcode.QrCodeString
+import de.rki.coronawarnapp.covidcertificate.common.CertificatePersonIdentifier
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.qrcode.QrCodeString
import org.joda.time.Instant
import org.joda.time.LocalDate
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/coronatest/TestCertificateRepository.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/core/TestCertificateRepository.kt
similarity index 93%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/coronatest/TestCertificateRepository.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/core/TestCertificateRepository.kt
index b50985a1d33607cb1ee978e3a63c8ce8e530d8d7..ad3e5707f4b2ddb6c9985776646ddc7126b946bb 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/coronatest/TestCertificateRepository.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/core/TestCertificateRepository.kt
@@ -1,21 +1,20 @@
-package de.rki.coronawarnapp.coronatest
+package de.rki.coronawarnapp.covidcertificate.test.core
import de.rki.coronawarnapp.bugreporting.reportProblem
-import de.rki.coronawarnapp.coronatest.storage.TestCertificateStorage
import de.rki.coronawarnapp.coronatest.type.CoronaTest
-import de.rki.coronawarnapp.coronatest.type.TestCertificateWrapper
-import de.rki.coronawarnapp.coronatest.type.common.TestCertificateContainer
-import de.rki.coronawarnapp.coronatest.type.common.TestCertificateIdentifier
-import de.rki.coronawarnapp.coronatest.type.common.TestCertificateProcessor
-import de.rki.coronawarnapp.coronatest.type.pcr.PCRCertificateData
-import de.rki.coronawarnapp.coronatest.type.rapidantigen.RACertificateData
-import de.rki.coronawarnapp.covidcertificate.test.TestCertificateQRCodeExtractor
+import de.rki.coronawarnapp.covidcertificate.test.core.qrcode.TestCertificateQRCodeExtractor
+import de.rki.coronawarnapp.covidcertificate.test.core.storage.PCRCertificateData
+import de.rki.coronawarnapp.covidcertificate.test.core.storage.RACertificateData
+import de.rki.coronawarnapp.covidcertificate.test.core.storage.TestCertificateContainer
+import de.rki.coronawarnapp.covidcertificate.test.core.storage.TestCertificateIdentifier
+import de.rki.coronawarnapp.covidcertificate.test.core.storage.TestCertificateProcessor
+import de.rki.coronawarnapp.covidcertificate.test.core.storage.TestCertificateStorage
+import de.rki.coronawarnapp.covidcertificate.valueset.ValueSetsRepository
import de.rki.coronawarnapp.util.coroutine.AppScope
import de.rki.coronawarnapp.util.coroutine.DispatcherProvider
import de.rki.coronawarnapp.util.flow.HotDataFlow
import de.rki.coronawarnapp.util.flow.combine
import de.rki.coronawarnapp.util.mutate
-import de.rki.coronawarnapp.vaccination.core.repository.ValueSetsRepository
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.SharingStarted
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/coronatest/type/TestCertificateWrapper.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/core/TestCertificateWrapper.kt
similarity index 58%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/coronatest/type/TestCertificateWrapper.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/core/TestCertificateWrapper.kt
index b9ec3f1609657d1004819259f2b8ca522ba04fdf..2be76074c81765443b9c52167bf4d028cceadaab 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/coronatest/type/TestCertificateWrapper.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/core/TestCertificateWrapper.kt
@@ -1,9 +1,8 @@
-package de.rki.coronawarnapp.coronatest.type
+package de.rki.coronawarnapp.covidcertificate.test.core
-import de.rki.coronawarnapp.coronatest.type.common.TestCertificateContainer
-import de.rki.coronawarnapp.coronatest.type.common.TestCertificateIdentifier
-import de.rki.coronawarnapp.covidcertificate.test.TestCertificate
-import de.rki.coronawarnapp.vaccination.core.server.valueset.valuesets.TestCertificateValueSets
+import de.rki.coronawarnapp.covidcertificate.test.core.storage.TestCertificateContainer
+import de.rki.coronawarnapp.covidcertificate.test.core.storage.TestCertificateIdentifier
+import de.rki.coronawarnapp.covidcertificate.valueset.valuesets.TestCertificateValueSets
data class TestCertificateWrapper(
private val valueSets: TestCertificateValueSets,
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/core/certificate/TestCertificateData.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/core/certificate/TestCertificateData.kt
new file mode 100644
index 0000000000000000000000000000000000000000..862b61f0cccfd289520fceec03a2ceec608ba3f0
--- /dev/null
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/core/certificate/TestCertificateData.kt
@@ -0,0 +1,8 @@
+package de.rki.coronawarnapp.covidcertificate.test.core.certificate
+
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.certificate.CoseCertificateHeader
+
+data class TestCertificateData(
+ val header: CoseCertificateHeader,
+ val certificate: TestCertificateDccV1,
+)
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/TestCertificateDccParser.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/core/certificate/TestCertificateDccParser.kt
similarity index 97%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/TestCertificateDccParser.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/core/certificate/TestCertificateDccParser.kt
index d4456a57f06a6e551811a181f9cfb6c22c29bee7..61a4a1ac1b9a4e4cbc9f4c19233811706c845fab 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/TestCertificateDccParser.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/core/certificate/TestCertificateDccParser.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.covidcertificate.test
+package de.rki.coronawarnapp.covidcertificate.test.core.certificate
import com.google.gson.Gson
import com.upokecenter.cbor.CBORObject
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/TestCertificateDccV1.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/core/certificate/TestCertificateDccV1.kt
similarity index 97%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/TestCertificateDccV1.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/core/certificate/TestCertificateDccV1.kt
index 1ef5539ab30cee11aae104a661e065ad0408136e..062878f47a7d70928fd447d32672fa7966f820f1 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/TestCertificateDccV1.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/core/certificate/TestCertificateDccV1.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.covidcertificate.test
+package de.rki.coronawarnapp.covidcertificate.test.core.certificate
import com.google.gson.annotations.SerializedName
import org.joda.time.Instant
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/coronatest/type/common/TestCertificateRetrievalScheduler.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/core/execution/TestCertificateRetrievalScheduler.kt
similarity index 95%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/coronatest/type/common/TestCertificateRetrievalScheduler.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/core/execution/TestCertificateRetrievalScheduler.kt
index f0391294d2f23710d4b1b4774eee0b4130694505..2ad3ee6454b7fa8be7038f7c5b0fd0bb5654db43 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/coronatest/type/common/TestCertificateRetrievalScheduler.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/core/execution/TestCertificateRetrievalScheduler.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.coronatest.type.common
+package de.rki.coronawarnapp.covidcertificate.test.core.execution
import androidx.work.BackoffPolicy
import androidx.work.Constraints
@@ -7,7 +7,8 @@ import androidx.work.NetworkType
import androidx.work.OneTimeWorkRequestBuilder
import androidx.work.WorkManager
import de.rki.coronawarnapp.coronatest.CoronaTestRepository
-import de.rki.coronawarnapp.coronatest.TestCertificateRepository
+import de.rki.coronawarnapp.coronatest.type.common.ResultScheduler
+import de.rki.coronawarnapp.covidcertificate.test.core.TestCertificateRepository
import de.rki.coronawarnapp.util.coroutine.AppScope
import de.rki.coronawarnapp.util.device.ForegroundState
import de.rki.coronawarnapp.util.flow.combine
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/coronatest/type/common/TestCertificateRetrievalWorker.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/core/execution/TestCertificateRetrievalWorker.kt
similarity index 92%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/coronatest/type/common/TestCertificateRetrievalWorker.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/core/execution/TestCertificateRetrievalWorker.kt
index 262204eb0eccb161e5f942374b74569ab9253e5d..8dc80c437b24c3db1d710c14ad741a62e763f214 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/coronatest/type/common/TestCertificateRetrievalWorker.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/core/execution/TestCertificateRetrievalWorker.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.coronatest.type.common
+package de.rki.coronawarnapp.covidcertificate.test.core.execution
import android.content.Context
import androidx.work.CoroutineWorker
@@ -6,7 +6,7 @@ import androidx.work.WorkerParameters
import dagger.assisted.Assisted
import dagger.assisted.AssistedFactory
import dagger.assisted.AssistedInject
-import de.rki.coronawarnapp.coronatest.TestCertificateRepository
+import de.rki.coronawarnapp.covidcertificate.test.core.TestCertificateRepository
import de.rki.coronawarnapp.util.worker.InjectedWorkerFactory
import de.rki.coronawarnapp.worker.BackgroundConstants
import timber.log.Timber
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/core/qrcode/TestCertificateQRCode.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/core/qrcode/TestCertificateQRCode.kt
new file mode 100644
index 0000000000000000000000000000000000000000..9dc25f420f8d04bc554f895c5fbfecd71fa00589
--- /dev/null
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/core/qrcode/TestCertificateQRCode.kt
@@ -0,0 +1,8 @@
+package de.rki.coronawarnapp.covidcertificate.test.core.qrcode
+
+import de.rki.coronawarnapp.covidcertificate.test.core.certificate.TestCertificateData
+
+data class TestCertificateQRCode(
+ val qrCode: String,
+ val testCertificateData: TestCertificateData,
+)
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/TestCertificateQRCodeExtractor.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/core/qrcode/TestCertificateQRCodeExtractor.kt
similarity index 90%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/TestCertificateQRCodeExtractor.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/core/qrcode/TestCertificateQRCodeExtractor.kt
index 92c07570359c1e4990018e62005d54d501b8b81f..cf8963cbd514e1ba0783549c213d9cea4b0279f7 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/TestCertificateQRCodeExtractor.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/core/qrcode/TestCertificateQRCodeExtractor.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.covidcertificate.test
+package de.rki.coronawarnapp.covidcertificate.test.core.qrcode
import com.upokecenter.cbor.CBORObject
import dagger.Reusable
@@ -10,12 +10,14 @@ import de.rki.coronawarnapp.covidcertificate.exception.InvalidHealthCertificateE
import de.rki.coronawarnapp.covidcertificate.exception.InvalidHealthCertificateException.ErrorCode.HC_ZLIB_COMPRESSION_FAILED
import de.rki.coronawarnapp.covidcertificate.exception.InvalidHealthCertificateException.ErrorCode.HC_ZLIB_DECOMPRESSION_FAILED
import de.rki.coronawarnapp.covidcertificate.exception.InvalidTestCertificateException
+import de.rki.coronawarnapp.covidcertificate.test.core.certificate.TestCertificateData
+import de.rki.coronawarnapp.covidcertificate.test.core.certificate.TestCertificateDccParser
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.certificate.HealthCertificateCOSEDecoder
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.certificate.HealthCertificateHeaderParser
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.certificate.RawCOSEObject
import de.rki.coronawarnapp.util.compression.deflate
import de.rki.coronawarnapp.util.compression.inflate
import de.rki.coronawarnapp.util.encoding.Base45Decoder
-import de.rki.coronawarnapp.vaccination.core.certificate.HealthCertificateCOSEDecoder
-import de.rki.coronawarnapp.vaccination.core.certificate.HealthCertificateHeaderParser
-import de.rki.coronawarnapp.vaccination.core.certificate.RawCOSEObject
import timber.log.Timber
import javax.inject.Inject
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/server/CovidCertificateApiV1.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/core/server/TestCertificateApiV1.kt
similarity index 92%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/server/CovidCertificateApiV1.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/core/server/TestCertificateApiV1.kt
index 58f8f045aa7a1a5e7eae23106243b311593a58af..e8b7558e353f28b0b91f9c1117a887e1a7ec91f6 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/server/CovidCertificateApiV1.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/core/server/TestCertificateApiV1.kt
@@ -1,11 +1,11 @@
-package de.rki.coronawarnapp.covidcertificate.server
+package de.rki.coronawarnapp.covidcertificate.test.core.server
import com.google.gson.annotations.SerializedName
import retrofit2.Response
import retrofit2.http.Body
import retrofit2.http.POST
-interface CovidCertificateApiV1 {
+interface TestCertificateApiV1 {
data class PublicKeyUploadRequest(
@SerializedName("registrationToken") val registrationToken: String,
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/server/TestCertificateComponents.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/core/server/TestCertificateComponents.kt
similarity index 68%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/server/TestCertificateComponents.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/core/server/TestCertificateComponents.kt
index d27332408c278baeaa267c121e70eefe94d03253..c0f71f4803763d2fb3c29b4664c8ff7f9d185792 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/server/TestCertificateComponents.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/core/server/TestCertificateComponents.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.covidcertificate.server
+package de.rki.coronawarnapp.covidcertificate.test.core.server
data class TestCertificateComponents(
val dataEncryptionKeyBase64: String,
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/server/CovidCertificateServer.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/core/server/TestCertificateServer.kt
similarity index 86%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/server/CovidCertificateServer.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/core/server/TestCertificateServer.kt
index cd3b0b40bae4898a8b28eaae22de63fe7f185921..d0d7a71319fa7698aa5d3e2bd2746f4d7f9ef519 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/server/CovidCertificateServer.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/core/server/TestCertificateServer.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.covidcertificate.server
+package de.rki.coronawarnapp.covidcertificate.test.core.server
import dagger.Lazy
import dagger.Reusable
@@ -21,10 +21,10 @@ import de.rki.coronawarnapp.covidcertificate.exception.TestCertificateServerExce
import de.rki.coronawarnapp.covidcertificate.exception.TestCertificateServerException.ErrorCode.PKR_500
import de.rki.coronawarnapp.covidcertificate.exception.TestCertificateServerException.ErrorCode.PKR_FAILED
import de.rki.coronawarnapp.covidcertificate.exception.TestCertificateServerException.ErrorCode.PKR_NO_NETWORK
-import de.rki.coronawarnapp.covidcertificate.server.CovidCertificateApiV1.ComponentsResponse.Reason.INTERNAL
-import de.rki.coronawarnapp.covidcertificate.server.CovidCertificateApiV1.ComponentsResponse.Reason.LAB_INVALID_RESPONSE
-import de.rki.coronawarnapp.covidcertificate.server.CovidCertificateApiV1.ComponentsResponse.Reason.SIGNING_CLIENT_ERROR
-import de.rki.coronawarnapp.covidcertificate.server.CovidCertificateApiV1.ComponentsResponse.Reason.SIGNING_SERVER_ERROR
+import de.rki.coronawarnapp.covidcertificate.test.core.server.TestCertificateApiV1.ComponentsResponse.Reason.INTERNAL
+import de.rki.coronawarnapp.covidcertificate.test.core.server.TestCertificateApiV1.ComponentsResponse.Reason.LAB_INVALID_RESPONSE
+import de.rki.coronawarnapp.covidcertificate.test.core.server.TestCertificateApiV1.ComponentsResponse.Reason.SIGNING_CLIENT_ERROR
+import de.rki.coronawarnapp.covidcertificate.test.core.server.TestCertificateApiV1.ComponentsResponse.Reason.SIGNING_SERVER_ERROR
import de.rki.coronawarnapp.util.coroutine.DispatcherProvider
import de.rki.coronawarnapp.util.encryption.rsa.RSAKey
import de.rki.coronawarnapp.util.network.NetworkStateProvider
@@ -34,13 +34,13 @@ import timber.log.Timber
import javax.inject.Inject
@Reusable
-class CovidCertificateServer @Inject constructor(
- private val dccApi: Lazy<CovidCertificateApiV1>,
+class TestCertificateServer @Inject constructor(
+ private val dccApi: Lazy<TestCertificateApiV1>,
private val dispatcherProvider: DispatcherProvider,
private val networkStateProvider: NetworkStateProvider
) {
- private val api: CovidCertificateApiV1
+ private val api: TestCertificateApiV1
get() = dccApi.get()
@Throws(TestCertificateServerException::class)
@@ -54,7 +54,7 @@ class CovidCertificateServer @Inject constructor(
}
try {
val response = api.sendPublicKey(
- requestBody = CovidCertificateApiV1.PublicKeyUploadRequest(
+ requestBody = TestCertificateApiV1.PublicKeyUploadRequest(
registrationToken = testRegistrationToken,
publicKey = publicKey.base64
)
@@ -81,7 +81,7 @@ class CovidCertificateServer @Inject constructor(
throw TestCertificateServerException(DCC_COMP_NO_NETWORK)
}
val response = api.getComponents(
- requestBody = CovidCertificateApiV1.ComponentsRequest(testRegistrationToken)
+ requestBody = TestCertificateApiV1.ComponentsRequest(testRegistrationToken)
)
when (response.code()) {
202 -> throw TestCertificateServerException(DCC_COMP_202)
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/server/CovidCertificateModule.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/core/server/TestCertificateServerModule.kt
similarity index 87%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/server/CovidCertificateModule.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/core/server/TestCertificateServerModule.kt
index 0cd432e90bfb0fda2fb2445449909204ad2ee6e5..4949f5161ede63238719035c55f7975a5c3d92e2 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/server/CovidCertificateModule.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/core/server/TestCertificateServerModule.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.covidcertificate.server
+package de.rki.coronawarnapp.covidcertificate.test.core.server
import dagger.Module
import dagger.Provides
@@ -13,7 +13,7 @@ import retrofit2.converter.gson.GsonConverterFactory
import java.lang.reflect.Type
@Module
-class CovidCertificateModule {
+class TestCertificateServerModule {
/**
* Handles DCC server 202 "retry later" response with 0-byte bodies.
@@ -39,11 +39,11 @@ class CovidCertificateModule {
@DCCHttpClient httpClient: OkHttpClient,
@DCCServerUrl url: String,
gsonConverterFactory: GsonConverterFactory
- ): CovidCertificateApiV1 = Retrofit.Builder()
+ ): TestCertificateApiV1 = Retrofit.Builder()
.client(httpClient)
.baseUrl(url)
.addConverterFactory(nullConverter)
.addConverterFactory(gsonConverterFactory)
.build()
- .create(CovidCertificateApiV1::class.java)
+ .create(TestCertificateApiV1::class.java)
}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/coronatest/type/pcr/PCRCertificateData.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/core/storage/PCRCertificateData.kt
similarity index 92%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/coronatest/type/pcr/PCRCertificateData.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/core/storage/PCRCertificateData.kt
index 148d5c5a87a61d8cdec492cfc6b9bbdef096d2d7..118bf5bc112a3fc4399a49210542b1f6069c7256 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/coronatest/type/pcr/PCRCertificateData.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/core/storage/PCRCertificateData.kt
@@ -1,9 +1,8 @@
-package de.rki.coronawarnapp.coronatest.type.pcr
+package de.rki.coronawarnapp.covidcertificate.test.core.storage
import com.google.gson.annotations.SerializedName
import de.rki.coronawarnapp.coronatest.type.CoronaTest
import de.rki.coronawarnapp.coronatest.type.RegistrationToken
-import de.rki.coronawarnapp.coronatest.type.common.StoredTestCertificateData
import de.rki.coronawarnapp.util.encryption.rsa.RSAKey
import okio.ByteString
import org.joda.time.Instant
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/coronatest/type/rapidantigen/RACertificateData.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/core/storage/RACertificateData.kt
similarity index 92%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/coronatest/type/rapidantigen/RACertificateData.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/core/storage/RACertificateData.kt
index 89f8cfaf368a9916ca7630a210fc5aff2149035c..dfcb82bad80c8f2000c505ce3929fb62dc6f1f64 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/coronatest/type/rapidantigen/RACertificateData.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/core/storage/RACertificateData.kt
@@ -1,9 +1,8 @@
-package de.rki.coronawarnapp.coronatest.type.rapidantigen
+package de.rki.coronawarnapp.covidcertificate.test.core.storage
import com.google.gson.annotations.SerializedName
import de.rki.coronawarnapp.coronatest.type.CoronaTest
import de.rki.coronawarnapp.coronatest.type.RegistrationToken
-import de.rki.coronawarnapp.coronatest.type.common.StoredTestCertificateData
import de.rki.coronawarnapp.util.encryption.rsa.RSAKey
import okio.ByteString
import org.joda.time.Instant
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/coronatest/type/common/StoredTestCertificateData.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/core/storage/StoredTestCertificateData.kt
similarity index 91%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/coronatest/type/common/StoredTestCertificateData.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/core/storage/StoredTestCertificateData.kt
index 70234ef8c25fd69b8cb7b23ff0abc2f2417a1460..131c18e26608fb530f939f6cccc0cbb49128133d 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/coronatest/type/common/StoredTestCertificateData.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/core/storage/StoredTestCertificateData.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.coronatest.type.common
+package de.rki.coronawarnapp.covidcertificate.test.core.storage
import de.rki.coronawarnapp.coronatest.type.CoronaTest
import de.rki.coronawarnapp.coronatest.type.RegistrationToken
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/coronatest/type/common/TestCertificateContainer.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/core/storage/TestCertificateContainer.kt
similarity index 85%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/coronatest/type/common/TestCertificateContainer.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/core/storage/TestCertificateContainer.kt
index 13f2b62f62feb65d337d210081aa9b937b68fe63..e97c7b8767bbead57ab0a49609d33fe9eb925cf1 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/coronatest/type/common/TestCertificateContainer.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/core/storage/TestCertificateContainer.kt
@@ -1,12 +1,12 @@
-package de.rki.coronawarnapp.coronatest.type.common
+package de.rki.coronawarnapp.covidcertificate.test.core.storage
-import de.rki.coronawarnapp.covidcertificate.test.TestCertificate
-import de.rki.coronawarnapp.covidcertificate.test.TestCertificateData
-import de.rki.coronawarnapp.covidcertificate.test.TestCertificateQRCodeExtractor
-import de.rki.coronawarnapp.vaccination.core.CertificatePersonIdentifier
-import de.rki.coronawarnapp.vaccination.core.personIdentifier
-import de.rki.coronawarnapp.vaccination.core.qrcode.QrCodeString
-import de.rki.coronawarnapp.vaccination.core.server.valueset.valuesets.TestCertificateValueSets
+import de.rki.coronawarnapp.covidcertificate.common.CertificatePersonIdentifier
+import de.rki.coronawarnapp.covidcertificate.common.personIdentifier
+import de.rki.coronawarnapp.covidcertificate.test.core.TestCertificate
+import de.rki.coronawarnapp.covidcertificate.test.core.certificate.TestCertificateData
+import de.rki.coronawarnapp.covidcertificate.test.core.qrcode.TestCertificateQRCodeExtractor
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.qrcode.QrCodeString
+import de.rki.coronawarnapp.covidcertificate.valueset.valuesets.TestCertificateValueSets
import org.joda.time.Instant
import org.joda.time.LocalDate
import java.util.Locale
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/core/storage/TestCertificateIdentifier.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/core/storage/TestCertificateIdentifier.kt
new file mode 100644
index 0000000000000000000000000000000000000000..9de185a474a05502f427bab0f19b5f0bdad703e5
--- /dev/null
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/core/storage/TestCertificateIdentifier.kt
@@ -0,0 +1,3 @@
+package de.rki.coronawarnapp.covidcertificate.test.core.storage
+
+typealias TestCertificateIdentifier = String
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/coronatest/type/common/TestCertificateProcessor.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/core/storage/TestCertificateProcessor.kt
similarity index 92%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/coronatest/type/common/TestCertificateProcessor.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/core/storage/TestCertificateProcessor.kt
index 2bf24175b2720966b49f07b0f62b3a5e95f9682c..4d7e14c25ec6582142e155f6fd4a0cd1fa090f44 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/coronatest/type/common/TestCertificateProcessor.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/core/storage/TestCertificateProcessor.kt
@@ -1,16 +1,14 @@
-package de.rki.coronawarnapp.coronatest.type.common
+package de.rki.coronawarnapp.covidcertificate.test.core.storage
import dagger.Reusable
import de.rki.coronawarnapp.appconfig.AppConfigProvider
import de.rki.coronawarnapp.coronatest.type.CoronaTest
-import de.rki.coronawarnapp.coronatest.type.pcr.PCRCertificateData
-import de.rki.coronawarnapp.coronatest.type.rapidantigen.RACertificateData
import de.rki.coronawarnapp.covidcertificate.exception.InvalidHealthCertificateException
import de.rki.coronawarnapp.covidcertificate.exception.InvalidTestCertificateException
import de.rki.coronawarnapp.covidcertificate.exception.TestCertificateServerException
-import de.rki.coronawarnapp.covidcertificate.server.CovidCertificateServer
-import de.rki.coronawarnapp.covidcertificate.server.TestCertificateComponents
-import de.rki.coronawarnapp.covidcertificate.test.TestCertificateQRCodeExtractor
+import de.rki.coronawarnapp.covidcertificate.test.core.qrcode.TestCertificateQRCodeExtractor
+import de.rki.coronawarnapp.covidcertificate.test.core.server.TestCertificateComponents
+import de.rki.coronawarnapp.covidcertificate.test.core.server.TestCertificateServer
import de.rki.coronawarnapp.util.TimeStamper
import de.rki.coronawarnapp.util.encryption.rsa.RSACryptography
import de.rki.coronawarnapp.util.encryption.rsa.RSAKeyPairGenerator
@@ -24,7 +22,7 @@ import javax.inject.Inject
@Reusable
class TestCertificateProcessor @Inject constructor(
private val timeStamper: TimeStamper,
- private val certificateServer: CovidCertificateServer,
+ private val certificateServer: TestCertificateServer,
private val rsaKeyPairGenerator: RSAKeyPairGenerator,
private val rsaCryptography: RSACryptography,
private val appConfigProvider: AppConfigProvider,
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/coronatest/storage/TestCertificateStorage.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/core/storage/TestCertificateStorage.kt
similarity index 91%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/coronatest/storage/TestCertificateStorage.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/core/storage/TestCertificateStorage.kt
index c56688b65a75b9250475acd91bd5be14c64ed68e..087486024444e89c955a9d87d4ba1b3ed5123e0c 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/coronatest/storage/TestCertificateStorage.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/core/storage/TestCertificateStorage.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.coronatest.storage
+package de.rki.coronawarnapp.covidcertificate.test.core.storage
import android.content.Context
import androidx.core.content.edit
@@ -6,12 +6,9 @@ import com.google.gson.Gson
import com.google.gson.reflect.TypeToken
import de.rki.coronawarnapp.coronatest.server.CoronaTestResult
import de.rki.coronawarnapp.coronatest.type.CoronaTest
-import de.rki.coronawarnapp.coronatest.type.common.StoredTestCertificateData
-import de.rki.coronawarnapp.coronatest.type.pcr.PCRCertificateData
-import de.rki.coronawarnapp.coronatest.type.rapidantigen.RACertificateData
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.repository.storage.ContainerPostProcessor
import de.rki.coronawarnapp.util.di.AppContext
import de.rki.coronawarnapp.util.serialization.BaseGson
-import de.rki.coronawarnapp.vaccination.core.repository.storage.ContainerPostProcessor
import timber.log.Timber
import javax.inject.Inject
import javax.inject.Singleton
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/greencertificate/ui/certificates/CertificatesAdapter.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/ui/CertificatesAdapter.kt
similarity index 74%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/greencertificate/ui/certificates/CertificatesAdapter.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/ui/CertificatesAdapter.kt
index 7fc2da0796f645a5e317ca709aaa32f3f1f466d6..41a700c645df7214a93cbec367d066dbf862b589 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/greencertificate/ui/certificates/CertificatesAdapter.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/ui/CertificatesAdapter.kt
@@ -1,9 +1,16 @@
-package de.rki.coronawarnapp.greencertificate.ui.certificates
+package de.rki.coronawarnapp.covidcertificate.test.ui
import android.view.ViewGroup
import androidx.annotation.LayoutRes
import androidx.viewbinding.ViewBinding
-import de.rki.coronawarnapp.greencertificate.ui.certificates.items.CertificatesItem
+import de.rki.coronawarnapp.covidcertificate.test.ui.cards.CovidTestCertificateCard
+import de.rki.coronawarnapp.covidcertificate.test.ui.cards.CovidTestCertificateErrorCard
+import de.rki.coronawarnapp.covidcertificate.test.ui.items.CertificatesItem
+import de.rki.coronawarnapp.covidcertificate.vaccination.ui.cards.CreateVaccinationCard
+import de.rki.coronawarnapp.covidcertificate.vaccination.ui.cards.HeaderInfoVaccinationCard
+import de.rki.coronawarnapp.covidcertificate.vaccination.ui.cards.ImmuneVaccinationCard
+import de.rki.coronawarnapp.covidcertificate.vaccination.ui.cards.NoCovidTestCertificatesCard
+import de.rki.coronawarnapp.covidcertificate.vaccination.ui.cards.VaccinationCard
import de.rki.coronawarnapp.util.lists.BindableVH
import de.rki.coronawarnapp.util.lists.diffutil.AsyncDiffUtilAdapter
import de.rki.coronawarnapp.util.lists.diffutil.AsyncDiffer
@@ -11,13 +18,6 @@ import de.rki.coronawarnapp.util.lists.modular.ModularAdapter
import de.rki.coronawarnapp.util.lists.modular.mods.DataBinderMod
import de.rki.coronawarnapp.util.lists.modular.mods.StableIdMod
import de.rki.coronawarnapp.util.lists.modular.mods.TypedVHCreatorMod
-import de.rki.coronawarnapp.vaccination.ui.cards.NoCovidTestCertificatesCard
-import de.rki.coronawarnapp.vaccination.ui.cards.CreateVaccinationCard
-import de.rki.coronawarnapp.vaccination.ui.cards.HeaderInfoVaccinationCard
-import de.rki.coronawarnapp.vaccination.ui.cards.ImmuneVaccinationCard
-import de.rki.coronawarnapp.vaccination.ui.cards.VaccinationCard
-import de.rki.coronawarnapp.greencertificate.ui.certificates.cards.CovidTestCertificateErrorCard
-import de.rki.coronawarnapp.greencertificate.ui.certificates.cards.CovidTestCertificateCard
class CertificatesAdapter :
ModularAdapter<CertificatesAdapter.CertificatesItemVH<CertificatesItem, ViewBinding>>(),
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/greencertificate/ui/certificates/CertificatesFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/ui/CertificatesFragment.kt
similarity index 95%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/greencertificate/ui/certificates/CertificatesFragment.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/ui/CertificatesFragment.kt
index 4cbbc72e932c2eb85b39ce4946fb7b781dc3751f..228d1e33330e32f43149bf98cb3a90e962fb6aeb 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/greencertificate/ui/certificates/CertificatesFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/ui/CertificatesFragment.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.greencertificate.ui.certificates
+package de.rki.coronawarnapp.covidcertificate.test.ui
import android.os.Bundle
import android.view.View
@@ -7,6 +7,7 @@ import androidx.fragment.app.Fragment
import androidx.navigation.fragment.findNavController
import androidx.recyclerview.widget.DefaultItemAnimator
import de.rki.coronawarnapp.R
+import de.rki.coronawarnapp.covidcertificate.vaccination.ui.list.VaccinationListFragment
import de.rki.coronawarnapp.databinding.FragmentCertificatesBinding
import de.rki.coronawarnapp.util.di.AutoInject
import de.rki.coronawarnapp.util.lists.decorations.TopBottomPaddingDecorator
@@ -17,7 +18,6 @@ import de.rki.coronawarnapp.util.ui.observe2
import de.rki.coronawarnapp.util.ui.viewBinding
import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider
import de.rki.coronawarnapp.util.viewmodel.cwaViewModels
-import de.rki.coronawarnapp.vaccination.ui.list.VaccinationListFragment
import javax.inject.Inject
class CertificatesFragment : Fragment(R.layout.fragment_certificates), AutoInject {
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/greencertificate/ui/certificates/CertificatesFragmentEvents.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/ui/CertificatesFragmentEvents.kt
similarity index 85%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/greencertificate/ui/certificates/CertificatesFragmentEvents.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/ui/CertificatesFragmentEvents.kt
index dfff785888822adf39098a12d7f3ac5e26e7c8dd..af40e9f704570011c894891a0ed85c4ce6b091fb 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/greencertificate/ui/certificates/CertificatesFragmentEvents.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/ui/CertificatesFragmentEvents.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.greencertificate.ui.certificates
+package de.rki.coronawarnapp.covidcertificate.test.ui
sealed class CertificatesFragmentEvents {
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/greencertificate/ui/certificates/CertificatesFragmentModule.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/ui/CertificatesFragmentModule.kt
similarity index 89%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/greencertificate/ui/certificates/CertificatesFragmentModule.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/ui/CertificatesFragmentModule.kt
index a0e9ec938fef274d033efae607e075cc3050bb38..ae38d73a53186cf059b1c83015771378e1db27d7 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/greencertificate/ui/certificates/CertificatesFragmentModule.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/ui/CertificatesFragmentModule.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.greencertificate.ui.certificates
+package de.rki.coronawarnapp.covidcertificate.test.ui
import dagger.Binds
import dagger.Module
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/greencertificate/ui/certificates/CertificatesViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/ui/CertificatesViewModel.kt
similarity index 76%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/greencertificate/ui/certificates/CertificatesViewModel.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/ui/CertificatesViewModel.kt
index c6a1d592f8269142450a197d3d47004c6d239d6e..33a26b263fe19f09009c279ce5b0dcdbcd0b3d86 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/greencertificate/ui/certificates/CertificatesViewModel.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/ui/CertificatesViewModel.kt
@@ -1,26 +1,26 @@
-package de.rki.coronawarnapp.greencertificate.ui.certificates
+package de.rki.coronawarnapp.covidcertificate.test.ui
import androidx.lifecycle.LiveData
import androidx.lifecycle.asLiveData
import dagger.assisted.AssistedFactory
import dagger.assisted.AssistedInject
-import de.rki.coronawarnapp.coronatest.TestCertificateRepository
-import de.rki.coronawarnapp.coronatest.type.TestCertificateWrapper
-import de.rki.coronawarnapp.coronatest.type.common.TestCertificateIdentifier
-import de.rki.coronawarnapp.greencertificate.ui.certificates.cards.CovidTestCertificateCard
-import de.rki.coronawarnapp.greencertificate.ui.certificates.cards.CovidTestCertificateErrorCard
-import de.rki.coronawarnapp.greencertificate.ui.certificates.items.CertificatesItem
+import de.rki.coronawarnapp.covidcertificate.test.core.TestCertificateRepository
+import de.rki.coronawarnapp.covidcertificate.test.core.TestCertificateWrapper
+import de.rki.coronawarnapp.covidcertificate.test.core.storage.TestCertificateIdentifier
+import de.rki.coronawarnapp.covidcertificate.test.ui.cards.CovidTestCertificateCard
+import de.rki.coronawarnapp.covidcertificate.test.ui.cards.CovidTestCertificateErrorCard
+import de.rki.coronawarnapp.covidcertificate.test.ui.items.CertificatesItem
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.VaccinatedPerson
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.VaccinationSettings
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.repository.VaccinationRepository
+import de.rki.coronawarnapp.covidcertificate.vaccination.ui.cards.CreateVaccinationCard
+import de.rki.coronawarnapp.covidcertificate.vaccination.ui.cards.HeaderInfoVaccinationCard
+import de.rki.coronawarnapp.covidcertificate.vaccination.ui.cards.ImmuneVaccinationCard
+import de.rki.coronawarnapp.covidcertificate.vaccination.ui.cards.NoCovidTestCertificatesCard
+import de.rki.coronawarnapp.covidcertificate.vaccination.ui.cards.VaccinationCard
import de.rki.coronawarnapp.util.ui.SingleLiveEvent
import de.rki.coronawarnapp.util.viewmodel.CWAViewModel
import de.rki.coronawarnapp.util.viewmodel.SimpleCWAViewModelFactory
-import de.rki.coronawarnapp.vaccination.core.VaccinatedPerson
-import de.rki.coronawarnapp.vaccination.core.VaccinationSettings
-import de.rki.coronawarnapp.vaccination.core.repository.VaccinationRepository
-import de.rki.coronawarnapp.vaccination.ui.cards.CreateVaccinationCard
-import de.rki.coronawarnapp.vaccination.ui.cards.HeaderInfoVaccinationCard
-import de.rki.coronawarnapp.vaccination.ui.cards.ImmuneVaccinationCard
-import de.rki.coronawarnapp.vaccination.ui.cards.NoCovidTestCertificatesCard
-import de.rki.coronawarnapp.vaccination.ui.cards.VaccinationCard
import kotlinx.coroutines.flow.combine
class CertificatesViewModel @AssistedInject constructor(
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/greencertificate/ui/CovidCertificateUIModule.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/ui/CovidCertificateUIModule.kt
similarity index 50%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/greencertificate/ui/CovidCertificateUIModule.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/ui/CovidCertificateUIModule.kt
index 10506dcec1ff69ad4ec21ec27d734eaadd967b44..8bc95ef2ad4b954ec34eb1f43dc84f68180aab3d 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/greencertificate/ui/CovidCertificateUIModule.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/ui/CovidCertificateUIModule.kt
@@ -1,11 +1,9 @@
-package de.rki.coronawarnapp.greencertificate.ui
+package de.rki.coronawarnapp.covidcertificate.test.ui
import dagger.Module
import dagger.android.ContributesAndroidInjector
-import de.rki.coronawarnapp.greencertificate.ui.certificates.CertificatesFragment
-import de.rki.coronawarnapp.greencertificate.ui.certificates.CertificatesFragmentModule
-import de.rki.coronawarnapp.greencertificate.ui.certificates.details.CovidCertificateDetailsFragment
-import de.rki.coronawarnapp.greencertificate.ui.certificates.details.CovidCertificateDetailsModule
+import de.rki.coronawarnapp.covidcertificate.test.ui.details.CovidCertificateDetailsFragment
+import de.rki.coronawarnapp.covidcertificate.test.ui.details.CovidCertificateDetailsModule
@Module
abstract class CovidCertificateUIModule {
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/greencertificate/ui/certificates/cards/CovidCertificateTestItem.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/ui/cards/CovidCertificateTestItem.kt
similarity index 55%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/greencertificate/ui/certificates/cards/CovidCertificateTestItem.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/ui/cards/CovidCertificateTestItem.kt
index b84241da202c6cb4e2516129142f8d11af22ba03..bc27a92dd94416a5e9e1f45b22b9f384af8f8856 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/greencertificate/ui/certificates/cards/CovidCertificateTestItem.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/ui/cards/CovidCertificateTestItem.kt
@@ -1,6 +1,6 @@
-package de.rki.coronawarnapp.greencertificate.ui.certificates.cards
+package de.rki.coronawarnapp.covidcertificate.test.ui.cards
-import de.rki.coronawarnapp.greencertificate.ui.certificates.items.CertificatesItem
+import de.rki.coronawarnapp.covidcertificate.test.ui.items.CertificatesItem
import org.joda.time.Instant
interface CovidCertificateTestItem : CertificatesItem {
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/greencertificate/ui/certificates/cards/CovidTestCertificateCard.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/ui/cards/CovidTestCertificateCard.kt
similarity index 91%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/greencertificate/ui/certificates/cards/CovidTestCertificateCard.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/ui/cards/CovidTestCertificateCard.kt
index 57d1fd3701b204fbce907a8d649f7a602ba24cae..791baaf5ab8d8625f9aa814583dd4d9975107aad 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/greencertificate/ui/certificates/cards/CovidTestCertificateCard.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/ui/cards/CovidTestCertificateCard.kt
@@ -1,9 +1,9 @@
-package de.rki.coronawarnapp.greencertificate.ui.certificates.cards
+package de.rki.coronawarnapp.covidcertificate.test.ui.cards
import android.view.ViewGroup
import de.rki.coronawarnapp.R
+import de.rki.coronawarnapp.covidcertificate.test.ui.CertificatesAdapter
import de.rki.coronawarnapp.databinding.CovidTestSuccessCardBinding
-import de.rki.coronawarnapp.greencertificate.ui.certificates.CertificatesAdapter
import de.rki.coronawarnapp.util.TimeAndDateExtensions.toShortDayFormat
import de.rki.coronawarnapp.util.TimeAndDateExtensions.toShortTimeFormat
import de.rki.coronawarnapp.util.lists.diffutil.HasPayloadDiffer
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/greencertificate/ui/certificates/cards/CovidTestCertificateErrorCard.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/ui/cards/CovidTestCertificateErrorCard.kt
similarity index 90%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/greencertificate/ui/certificates/cards/CovidTestCertificateErrorCard.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/ui/cards/CovidTestCertificateErrorCard.kt
index 63e1e5a5484ed78394243cc4cf5ef2cb56512317..2b67415637fb9ce4103f873902807b72a9dece95 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/greencertificate/ui/certificates/cards/CovidTestCertificateErrorCard.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/ui/cards/CovidTestCertificateErrorCard.kt
@@ -1,9 +1,9 @@
-package de.rki.coronawarnapp.greencertificate.ui.certificates.cards
+package de.rki.coronawarnapp.covidcertificate.test.ui.cards
import android.view.ViewGroup
import de.rki.coronawarnapp.R
+import de.rki.coronawarnapp.covidcertificate.test.ui.CertificatesAdapter
import de.rki.coronawarnapp.databinding.CovidTestErrorCardBinding
-import de.rki.coronawarnapp.greencertificate.ui.certificates.CertificatesAdapter
import de.rki.coronawarnapp.util.TimeAndDateExtensions.toShortDayFormat
import de.rki.coronawarnapp.util.TimeAndDateExtensions.toShortTimeFormat
import de.rki.coronawarnapp.util.lists.diffutil.HasPayloadDiffer
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/greencertificate/ui/certificates/details/CovidCertificateDetailsFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/ui/details/CovidCertificateDetailsFragment.kt
similarity index 98%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/greencertificate/ui/certificates/details/CovidCertificateDetailsFragment.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/ui/details/CovidCertificateDetailsFragment.kt
index 592be573684cb914b3eee2ff5df58f8d3a2ff60b..ae32afd1905d6b97daf944cccf12e4eb8487214a 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/greencertificate/ui/certificates/details/CovidCertificateDetailsFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/ui/details/CovidCertificateDetailsFragment.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.greencertificate.ui.certificates.details
+package de.rki.coronawarnapp.covidcertificate.test.ui.details
import android.graphics.Bitmap
import android.os.Bundle
@@ -12,7 +12,7 @@ import androidx.navigation.fragment.navArgs
import com.google.android.material.appbar.AppBarLayout
import de.rki.coronawarnapp.R
import de.rki.coronawarnapp.bugreporting.ui.toErrorDialogBuilder
-import de.rki.coronawarnapp.covidcertificate.test.TestCertificate
+import de.rki.coronawarnapp.covidcertificate.test.core.TestCertificate
import de.rki.coronawarnapp.databinding.FragmentCovidCertificateDetailsBinding
import de.rki.coronawarnapp.ui.qrcode.fullscreen.QrCodeFullScreenFragmentArgs
import de.rki.coronawarnapp.ui.view.onOffsetChange
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/greencertificate/ui/certificates/details/CovidCertificateDetailsModule.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/ui/details/CovidCertificateDetailsModule.kt
similarity index 88%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/greencertificate/ui/certificates/details/CovidCertificateDetailsModule.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/ui/details/CovidCertificateDetailsModule.kt
index 5b77eb139d510dd6694a444b6fc0325459280932..2846c57e371822be705c0cd4be3d455a752b4814 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/greencertificate/ui/certificates/details/CovidCertificateDetailsModule.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/ui/details/CovidCertificateDetailsModule.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.greencertificate.ui.certificates.details
+package de.rki.coronawarnapp.covidcertificate.test.ui.details
import dagger.Binds
import dagger.Module
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/greencertificate/ui/certificates/details/CovidCertificateDetailsNavigation.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/ui/details/CovidCertificateDetailsNavigation.kt
similarity index 73%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/greencertificate/ui/certificates/details/CovidCertificateDetailsNavigation.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/ui/details/CovidCertificateDetailsNavigation.kt
index b1e6b4e12de0691fb7947961a54edff4e0a01584..b064ccfdaeecd4a2ae2c6b472e7aed57ce1a9304 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/greencertificate/ui/certificates/details/CovidCertificateDetailsNavigation.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/ui/details/CovidCertificateDetailsNavigation.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.greencertificate.ui.certificates.details
+package de.rki.coronawarnapp.covidcertificate.test.ui.details
sealed class CovidCertificateDetailsNavigation {
object Back : CovidCertificateDetailsNavigation()
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/greencertificate/ui/certificates/details/CovidCertificateDetailsViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/ui/details/CovidCertificateDetailsViewModel.kt
similarity index 89%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/greencertificate/ui/certificates/details/CovidCertificateDetailsViewModel.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/ui/details/CovidCertificateDetailsViewModel.kt
index 7c3bb3b9993f5b0125e34774e7fb0634dd3e2b12..62e1bef00fac4029c59d563f8108cf8db1d58a03 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/greencertificate/ui/certificates/details/CovidCertificateDetailsViewModel.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/ui/details/CovidCertificateDetailsViewModel.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.greencertificate.ui.certificates.details
+package de.rki.coronawarnapp.covidcertificate.test.ui.details
import android.graphics.Bitmap
import androidx.lifecycle.LiveData
@@ -7,9 +7,9 @@ import androidx.lifecycle.asLiveData
import dagger.assisted.Assisted
import dagger.assisted.AssistedFactory
import dagger.assisted.AssistedInject
-import de.rki.coronawarnapp.coronatest.TestCertificateRepository
-import de.rki.coronawarnapp.coronatest.type.common.TestCertificateIdentifier
-import de.rki.coronawarnapp.covidcertificate.test.TestCertificate
+import de.rki.coronawarnapp.covidcertificate.test.core.TestCertificate
+import de.rki.coronawarnapp.covidcertificate.test.core.TestCertificateRepository
+import de.rki.coronawarnapp.covidcertificate.test.core.storage.TestCertificateIdentifier
import de.rki.coronawarnapp.presencetracing.checkins.qrcode.QrCodeGenerator
import de.rki.coronawarnapp.util.coroutine.DispatcherProvider
import de.rki.coronawarnapp.util.ui.SingleLiveEvent
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/greencertificate/ui/certificates/items/CertificatesItem.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/ui/items/CertificatesItem.kt
similarity index 58%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/greencertificate/ui/certificates/items/CertificatesItem.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/ui/items/CertificatesItem.kt
index c0d0ec32ca135bd6dd1740a4f2a0668b1555c92d..ec7c5198c6016e25bee488d6bedbf3fd5af6db63 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/greencertificate/ui/certificates/items/CertificatesItem.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/ui/items/CertificatesItem.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.greencertificate.ui.certificates.items
+package de.rki.coronawarnapp.covidcertificate.test.ui.items
import de.rki.coronawarnapp.util.lists.HasStableId
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/VaccinatedPerson.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/VaccinatedPerson.kt
similarity index 86%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/VaccinatedPerson.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/VaccinatedPerson.kt
index e51293a2e8c6d688e5a7fe511fd447bb7af455ea..a5592ef6d6dc3326b94b358152778b8fb183828f 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/VaccinatedPerson.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/VaccinatedPerson.kt
@@ -1,8 +1,9 @@
-package de.rki.coronawarnapp.vaccination.core
+package de.rki.coronawarnapp.covidcertificate.vaccination.core
+import de.rki.coronawarnapp.covidcertificate.common.CertificatePersonIdentifier
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.repository.storage.VaccinatedPersonData
+import de.rki.coronawarnapp.covidcertificate.valueset.valuesets.VaccinationValueSets
import de.rki.coronawarnapp.util.TimeAndDateExtensions.toLocalDateUtc
-import de.rki.coronawarnapp.vaccination.core.repository.storage.VaccinatedPersonData
-import de.rki.coronawarnapp.vaccination.core.server.valueset.valuesets.VaccinationValueSets
import org.joda.time.Duration
import org.joda.time.Instant
import org.joda.time.LocalDate
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/VaccinationCertificate.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/VaccinationCertificate.kt
similarity index 75%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/VaccinationCertificate.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/VaccinationCertificate.kt
index ed77a4dd560beefce5314a70fffcdc94db086b7d..9428b8f24277c61487681eade344f93c656a278a 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/VaccinationCertificate.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/VaccinationCertificate.kt
@@ -1,6 +1,7 @@
-package de.rki.coronawarnapp.vaccination.core
+package de.rki.coronawarnapp.covidcertificate.vaccination.core
-import de.rki.coronawarnapp.vaccination.core.qrcode.QrCodeString
+import de.rki.coronawarnapp.covidcertificate.common.CertificatePersonIdentifier
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.qrcode.QrCodeString
import org.joda.time.Instant
import org.joda.time.LocalDate
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/VaccinationException.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/VaccinationException.kt
similarity index 62%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/VaccinationException.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/VaccinationException.kt
index 4963bf1bd500fddac6397d6da57a8f06a5d8eaf5..da1c1911f63931bd18a6bb237bdd51f455053989 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/VaccinationException.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/VaccinationException.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.vaccination.core
+package de.rki.coronawarnapp.covidcertificate.vaccination.core
open class VaccinationException(
cause: Throwable?,
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/VaccinationModule.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/VaccinationModule.kt
similarity index 62%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/VaccinationModule.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/VaccinationModule.kt
index e8c20bd7126a10e2af24b8d262145783ddaf83a1..047534e6edbe942345297ea3a1ddd14b9d68a28a 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/VaccinationModule.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/VaccinationModule.kt
@@ -1,19 +1,14 @@
-package de.rki.coronawarnapp.vaccination.core
+package de.rki.coronawarnapp.covidcertificate.vaccination.core
import dagger.Binds
import dagger.Module
import dagger.multibindings.IntoMap
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.execution.task.VaccinationUpdateTask
import de.rki.coronawarnapp.task.Task
import de.rki.coronawarnapp.task.TaskFactory
import de.rki.coronawarnapp.task.TaskTypeKey
-import de.rki.coronawarnapp.vaccination.core.execution.task.VaccinationUpdateTask
-import de.rki.coronawarnapp.vaccination.core.server.VaccinationServerModule
-@Module(
- includes = [
- VaccinationServerModule::class
- ]
-)
+@Module
abstract class VaccinationModule {
@Binds
@IntoMap
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/VaccinationPreferences.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/VaccinationPreferences.kt
similarity index 91%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/VaccinationPreferences.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/VaccinationPreferences.kt
index 1c0597590793b93d1a4979249a0992f0f48fe738..dfef6623a2aa8e1a5f5f1a5c2daee99dec73666f 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/VaccinationPreferences.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/VaccinationPreferences.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.vaccination.core
+package de.rki.coronawarnapp.covidcertificate.vaccination.core
import android.content.Context
import de.rki.coronawarnapp.util.di.AppContext
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/VaccinationSettings.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/VaccinationSettings.kt
similarity index 85%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/VaccinationSettings.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/VaccinationSettings.kt
index 1fe9dbda18b8e4178555e078f2e1b6ba55c5d239..ae1f8443addc2c02f6620c2ee25488636b32456e 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/VaccinationSettings.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/VaccinationSettings.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.vaccination.core
+package de.rki.coronawarnapp.covidcertificate.vaccination.core
import javax.inject.Inject
import javax.inject.Singleton
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/certificate/CoseCertificateHeader.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/certificate/CoseCertificateHeader.kt
similarity index 65%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/certificate/CoseCertificateHeader.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/certificate/CoseCertificateHeader.kt
index 2818cf35b5693f525a5acbf55cf977ff4b202556..8b26288ecd9b01916062cfb94da86ed5bb6bc1fe 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/certificate/CoseCertificateHeader.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/certificate/CoseCertificateHeader.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.vaccination.core.certificate
+package de.rki.coronawarnapp.covidcertificate.vaccination.core.certificate
import org.joda.time.Instant
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/certificate/HealthCertificateCOSEDecoder.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/certificate/HealthCertificateCOSEDecoder.kt
similarity index 96%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/certificate/HealthCertificateCOSEDecoder.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/certificate/HealthCertificateCOSEDecoder.kt
index f084c7673186622b6c24275bf78e9fb484bdd3a6..4662a3c8421543191e70f06128ac8c4571de993e 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/certificate/HealthCertificateCOSEDecoder.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/certificate/HealthCertificateCOSEDecoder.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.vaccination.core.certificate
+package de.rki.coronawarnapp.covidcertificate.vaccination.core.certificate
import com.upokecenter.cbor.CBORObject
import de.rki.coronawarnapp.covidcertificate.cryptography.AesCryptography
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/certificate/HealthCertificateHeader.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/certificate/HealthCertificateHeader.kt
similarity index 72%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/certificate/HealthCertificateHeader.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/certificate/HealthCertificateHeader.kt
index 87271fc061c37e54f01a9cb6a4750b57df5ed631..ed7761cb5158b520e4bf782915d5290070286105 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/certificate/HealthCertificateHeader.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/certificate/HealthCertificateHeader.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.vaccination.core.certificate
+package de.rki.coronawarnapp.covidcertificate.vaccination.core.certificate
import org.joda.time.Instant
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/certificate/HealthCertificateHeaderParser.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/certificate/HealthCertificateHeaderParser.kt
similarity index 95%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/certificate/HealthCertificateHeaderParser.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/certificate/HealthCertificateHeaderParser.kt
index 3bfa90a6d3bd96922c443746f269b3514b88c93d..8878f55ad166a44a2be098a3895b98032046c901 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/certificate/HealthCertificateHeaderParser.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/certificate/HealthCertificateHeaderParser.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.vaccination.core.certificate
+package de.rki.coronawarnapp.covidcertificate.vaccination.core.certificate
import com.upokecenter.cbor.CBORObject
import dagger.Reusable
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/certificate/RawCOSEObject.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/certificate/RawCOSEObject.kt
new file mode 100644
index 0000000000000000000000000000000000000000..c3b69dfe1a6aebf05b081b6a6ce2c03ceb455c45
--- /dev/null
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/certificate/RawCOSEObject.kt
@@ -0,0 +1,3 @@
+package de.rki.coronawarnapp.covidcertificate.vaccination.core.certificate
+
+typealias RawCOSEObject = ByteArray
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/certificate/VaccinationDGCV1.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/certificate/VaccinationDGCV1.kt
similarity index 96%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/certificate/VaccinationDGCV1.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/certificate/VaccinationDGCV1.kt
index 0fca7a0101289b434bd8069951df51e84a323327..29ed5027005f7fd4b88e0335fe6e0250b9dfd240 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/certificate/VaccinationDGCV1.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/certificate/VaccinationDGCV1.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.vaccination.core.certificate
+package de.rki.coronawarnapp.covidcertificate.vaccination.core.certificate
import com.google.gson.annotations.SerializedName
import org.joda.time.LocalDate
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/certificate/VaccinationDGCV1Parser.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/certificate/VaccinationDGCV1Parser.kt
similarity index 97%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/certificate/VaccinationDGCV1Parser.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/certificate/VaccinationDGCV1Parser.kt
index 5f28a369bf8f947ed2b4379298ea400230dd3b4f..e60e0f17092ab2b3a471cebb9276390b938f2641 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/certificate/VaccinationDGCV1Parser.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/certificate/VaccinationDGCV1Parser.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.vaccination.core.certificate
+package de.rki.coronawarnapp.covidcertificate.vaccination.core.certificate
import com.google.gson.Gson
import com.upokecenter.cbor.CBORObject
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/execution/VaccinationUpdateScheduler.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/execution/VaccinationUpdateScheduler.kt
similarity index 92%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/execution/VaccinationUpdateScheduler.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/execution/VaccinationUpdateScheduler.kt
index 5393642f6da98b91c3e16e73b3260c7bedb1a8cc..b58242c8e03bbe328feac51024972f609794d76a 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/execution/VaccinationUpdateScheduler.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/execution/VaccinationUpdateScheduler.kt
@@ -1,8 +1,11 @@
-package de.rki.coronawarnapp.vaccination.core.execution
+package de.rki.coronawarnapp.covidcertificate.vaccination.core.execution
import androidx.work.ExistingPeriodicWorkPolicy
import androidx.work.WorkInfo
import androidx.work.WorkManager
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.execution.task.VaccinationUpdateTask
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.execution.worker.VaccinationUpdateWorkerRequestBuilder
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.repository.VaccinationRepository
import de.rki.coronawarnapp.task.TaskController
import de.rki.coronawarnapp.task.TaskFactory
import de.rki.coronawarnapp.task.common.DefaultTaskRequest
@@ -11,9 +14,6 @@ import de.rki.coronawarnapp.util.TimeStamper
import de.rki.coronawarnapp.util.coroutine.AppScope
import de.rki.coronawarnapp.util.coroutine.await
import de.rki.coronawarnapp.util.device.ForegroundState
-import de.rki.coronawarnapp.vaccination.core.execution.task.VaccinationUpdateTask
-import de.rki.coronawarnapp.vaccination.core.execution.worker.VaccinationUpdateWorkerRequestBuilder
-import de.rki.coronawarnapp.vaccination.core.repository.VaccinationRepository
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.flow.catch
import kotlinx.coroutines.flow.combine
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/execution/task/VaccinationUpdateTask.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/execution/task/VaccinationUpdateTask.kt
similarity index 93%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/execution/task/VaccinationUpdateTask.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/execution/task/VaccinationUpdateTask.kt
index fdb14d5e90df4e916c192a18b504460112397c4e..77d919a9f8cab99b00c50ecbdf82667d0a6511cb 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/execution/task/VaccinationUpdateTask.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/execution/task/VaccinationUpdateTask.kt
@@ -1,13 +1,13 @@
-package de.rki.coronawarnapp.vaccination.core.execution.task
+package de.rki.coronawarnapp.covidcertificate.vaccination.core.execution.task
import de.rki.coronawarnapp.appconfig.AppConfigProvider
import de.rki.coronawarnapp.bugreporting.reportProblem
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.repository.VaccinationRepository
import de.rki.coronawarnapp.task.Task
import de.rki.coronawarnapp.task.TaskFactory
+import de.rki.coronawarnapp.task.common.DefaultProgress
import de.rki.coronawarnapp.task.common.Finished
import de.rki.coronawarnapp.task.common.Started
-import de.rki.coronawarnapp.task.common.DefaultProgress
-import de.rki.coronawarnapp.vaccination.core.repository.VaccinationRepository
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.MutableStateFlow
import org.joda.time.Duration
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/execution/worker/VaccinationUpdateWorker.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/execution/worker/VaccinationUpdateWorker.kt
similarity index 92%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/execution/worker/VaccinationUpdateWorker.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/execution/worker/VaccinationUpdateWorker.kt
index a22d1c1f885925005fb62c74e54bb99ccbe13302..e308b3789ba3093974520ea8500d42b40d7bbbc1 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/execution/worker/VaccinationUpdateWorker.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/execution/worker/VaccinationUpdateWorker.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.vaccination.core.execution.worker
+package de.rki.coronawarnapp.covidcertificate.vaccination.core.execution.worker
import android.content.Context
import androidx.work.CoroutineWorker
@@ -7,12 +7,12 @@ import dagger.assisted.Assisted
import dagger.assisted.AssistedFactory
import dagger.assisted.AssistedInject
import de.rki.coronawarnapp.bugreporting.reportProblem
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.execution.task.VaccinationUpdateTask
import de.rki.coronawarnapp.task.TaskController
import de.rki.coronawarnapp.task.TaskFactory
import de.rki.coronawarnapp.task.common.DefaultTaskRequest
import de.rki.coronawarnapp.task.submitBlocking
import de.rki.coronawarnapp.util.worker.InjectedWorkerFactory
-import de.rki.coronawarnapp.vaccination.core.execution.task.VaccinationUpdateTask
import timber.log.Timber
class VaccinationUpdateWorker @AssistedInject constructor(
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/execution/worker/VaccinationUpdateWorkerRequestBuilder.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/execution/worker/VaccinationUpdateWorkerRequestBuilder.kt
similarity index 93%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/execution/worker/VaccinationUpdateWorkerRequestBuilder.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/execution/worker/VaccinationUpdateWorkerRequestBuilder.kt
index 62b491fe6415cd54eef28cf5891720c64a2e1b02..c97b9f6bf087a5e3c795d958195057a06ff842a6 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/execution/worker/VaccinationUpdateWorkerRequestBuilder.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/execution/worker/VaccinationUpdateWorkerRequestBuilder.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.vaccination.core.execution.worker
+package de.rki.coronawarnapp.covidcertificate.vaccination.core.execution.worker
import androidx.work.BackoffPolicy
import androidx.work.Constraints
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/qrcode/VaccinationCertificateData.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/qrcode/VaccinationCertificateData.kt
new file mode 100644
index 0000000000000000000000000000000000000000..5fcafc3822bbd7953f795040f116b18b84365a9b
--- /dev/null
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/qrcode/VaccinationCertificateData.kt
@@ -0,0 +1,12 @@
+package de.rki.coronawarnapp.covidcertificate.vaccination.core.qrcode
+
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.certificate.CoseCertificateHeader
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.certificate.VaccinationDGCV1
+
+/**
+ * Represents the parsed data from the QR code
+ */
+data class VaccinationCertificateData(
+ val header: CoseCertificateHeader,
+ val certificate: VaccinationDGCV1,
+)
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/qrcode/VaccinationCertificateQRCode.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/qrcode/VaccinationCertificateQRCode.kt
similarity index 81%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/qrcode/VaccinationCertificateQRCode.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/qrcode/VaccinationCertificateQRCode.kt
index 5d72448a8a526c2954b15ffb67fa244fb20768b5..c90117e5eb8fa6c2358e5020fadff5f0ec166866 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/qrcode/VaccinationCertificateQRCode.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/qrcode/VaccinationCertificateQRCode.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.vaccination.core.qrcode
+package de.rki.coronawarnapp.covidcertificate.vaccination.core.qrcode
data class VaccinationCertificateQRCode(
val qrCodeString: QrCodeString,
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/qrcode/VaccinationQRCodeExtractor.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/qrcode/VaccinationQRCodeExtractor.kt
similarity index 86%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/qrcode/VaccinationQRCodeExtractor.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/qrcode/VaccinationQRCodeExtractor.kt
index b987371d4c4214631e67ff3bd5136f4da8374520..b467ddff11814510f3a8fa9cd7c3794e98b0b319 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/qrcode/VaccinationQRCodeExtractor.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/qrcode/VaccinationQRCodeExtractor.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.vaccination.core.qrcode
+package de.rki.coronawarnapp.covidcertificate.vaccination.core.qrcode
import de.rki.coronawarnapp.bugreporting.censors.vaccination.CertificateQrCodeCensor
import de.rki.coronawarnapp.coronatest.qrcode.QrCodeExtractor
@@ -7,12 +7,12 @@ import de.rki.coronawarnapp.covidcertificate.exception.InvalidHealthCertificateE
import de.rki.coronawarnapp.covidcertificate.exception.InvalidHealthCertificateException.ErrorCode.HC_CBOR_DECODING_FAILED
import de.rki.coronawarnapp.covidcertificate.exception.InvalidHealthCertificateException.ErrorCode.HC_ZLIB_DECOMPRESSION_FAILED
import de.rki.coronawarnapp.covidcertificate.exception.InvalidVaccinationCertificateException
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.certificate.HealthCertificateCOSEDecoder
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.certificate.HealthCertificateHeaderParser
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.certificate.RawCOSEObject
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.certificate.VaccinationDGCV1Parser
import de.rki.coronawarnapp.util.compression.inflate
import de.rki.coronawarnapp.util.encoding.Base45Decoder
-import de.rki.coronawarnapp.vaccination.core.certificate.HealthCertificateCOSEDecoder
-import de.rki.coronawarnapp.vaccination.core.certificate.HealthCertificateHeaderParser
-import de.rki.coronawarnapp.vaccination.core.certificate.RawCOSEObject
-import de.rki.coronawarnapp.vaccination.core.certificate.VaccinationDGCV1Parser
import timber.log.Timber
import javax.inject.Inject
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/qrcode/VaccinationQRCodeValidator.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/qrcode/VaccinationQRCodeValidator.kt
similarity index 94%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/qrcode/VaccinationQRCodeValidator.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/qrcode/VaccinationQRCodeValidator.kt
index c5dae3f0c6da6e6a277ad21f0f048d47e88b2d82..9fe4b3a577c755f5667297e0d18d4282ed2e65aa 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/qrcode/VaccinationQRCodeValidator.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/qrcode/VaccinationQRCodeValidator.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.vaccination.core.qrcode
+package de.rki.coronawarnapp.covidcertificate.vaccination.core.qrcode
import dagger.Reusable
import de.rki.coronawarnapp.coronatest.qrcode.QrCodeExtractor
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/repository/VaccinationRepository.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/repository/VaccinationRepository.kt
similarity index 84%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/repository/VaccinationRepository.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/repository/VaccinationRepository.kt
index c0a9e1670da1afb4e9eed7e98ae81ae9b4c8be5b..c8b7136e6ca65aa023603fbd8d25c693365a3b8b 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/repository/VaccinationRepository.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/repository/VaccinationRepository.kt
@@ -1,24 +1,25 @@
-package de.rki.coronawarnapp.vaccination.core.repository
+package de.rki.coronawarnapp.covidcertificate.vaccination.core.repository
import de.rki.coronawarnapp.bugreporting.reportProblem
+import de.rki.coronawarnapp.covidcertificate.common.CertificatePersonIdentifier
+import de.rki.coronawarnapp.covidcertificate.common.personIdentifier
import de.rki.coronawarnapp.covidcertificate.exception.InvalidHealthCertificateException.ErrorCode.VC_ALREADY_REGISTERED
import de.rki.coronawarnapp.covidcertificate.exception.InvalidVaccinationCertificateException
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.VaccinatedPerson
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.VaccinationCertificate
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.qrcode.VaccinationCertificateQRCode
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.qrcode.VaccinationQRCodeExtractor
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.repository.errors.VaccinationCertificateNotFoundException
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.repository.storage.VaccinatedPersonData
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.repository.storage.VaccinationContainer
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.repository.storage.VaccinationStorage
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.repository.storage.toVaccinationContainer
+import de.rki.coronawarnapp.covidcertificate.valueset.ValueSetsRepository
import de.rki.coronawarnapp.util.TimeStamper
import de.rki.coronawarnapp.util.coroutine.AppScope
import de.rki.coronawarnapp.util.coroutine.DispatcherProvider
import de.rki.coronawarnapp.util.flow.HotDataFlow
import de.rki.coronawarnapp.util.flow.combine
-import de.rki.coronawarnapp.vaccination.core.CertificatePersonIdentifier
-import de.rki.coronawarnapp.vaccination.core.VaccinatedPerson
-import de.rki.coronawarnapp.vaccination.core.VaccinationCertificate
-import de.rki.coronawarnapp.vaccination.core.personIdentifier
-import de.rki.coronawarnapp.vaccination.core.qrcode.VaccinationCertificateQRCode
-import de.rki.coronawarnapp.vaccination.core.qrcode.VaccinationQRCodeExtractor
-import de.rki.coronawarnapp.vaccination.core.repository.errors.VaccinationCertificateNotFoundException
-import de.rki.coronawarnapp.vaccination.core.repository.storage.VaccinatedPersonData
-import de.rki.coronawarnapp.vaccination.core.repository.storage.VaccinationContainer
-import de.rki.coronawarnapp.vaccination.core.repository.storage.VaccinationStorage
-import de.rki.coronawarnapp.vaccination.core.repository.storage.toVaccinationContainer
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.SharingStarted
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/repository/errors/VaccinatedPersonNotFoundException.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/repository/errors/VaccinatedPersonNotFoundException.kt
new file mode 100644
index 0000000000000000000000000000000000000000..8ad45faa3eef29ea9c59a0d59b97c21a140d0dfb
--- /dev/null
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/repository/errors/VaccinatedPersonNotFoundException.kt
@@ -0,0 +1,10 @@
+package de.rki.coronawarnapp.covidcertificate.vaccination.core.repository.errors
+
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.VaccinationException
+
+class VaccinatedPersonNotFoundException(
+ message: String
+) : VaccinationException(
+ message = message,
+ cause = null
+)
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/repository/errors/VaccinationCertificateNotFoundException.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/repository/errors/VaccinationCertificateNotFoundException.kt
new file mode 100644
index 0000000000000000000000000000000000000000..f67ab42fb802d1eaffc117a8f736131a5b8ed63f
--- /dev/null
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/repository/errors/VaccinationCertificateNotFoundException.kt
@@ -0,0 +1,10 @@
+package de.rki.coronawarnapp.covidcertificate.vaccination.core.repository.errors
+
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.VaccinationException
+
+class VaccinationCertificateNotFoundException(
+ message: String
+) : VaccinationException(
+ message = message,
+ cause = null
+)
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/repository/storage/ContainerPostProcessor.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/repository/storage/ContainerPostProcessor.kt
similarity index 87%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/repository/storage/ContainerPostProcessor.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/repository/storage/ContainerPostProcessor.kt
index 013f39609253a2eb7d58dc36fe130a2c4ecb6f2e..ce35f0c23ab1a56326830e7e2c8590046daa0561 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/repository/storage/ContainerPostProcessor.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/repository/storage/ContainerPostProcessor.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.vaccination.core.repository.storage
+package de.rki.coronawarnapp.covidcertificate.vaccination.core.repository.storage
import com.google.gson.Gson
import com.google.gson.TypeAdapter
@@ -7,7 +7,7 @@ import com.google.gson.reflect.TypeToken
import com.google.gson.stream.JsonReader
import com.google.gson.stream.JsonWriter
import dagger.Reusable
-import de.rki.coronawarnapp.vaccination.core.qrcode.VaccinationQRCodeExtractor
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.qrcode.VaccinationQRCodeExtractor
import timber.log.Timber
import java.io.IOException
import javax.inject.Inject
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/repository/storage/VaccinatedPersonData.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/repository/storage/VaccinatedPersonData.kt
similarity index 64%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/repository/storage/VaccinatedPersonData.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/repository/storage/VaccinatedPersonData.kt
index ab650258968eb02d6f03bc272d86b212261c273c..516e8867f4648fbe1516696dbc65a3f771759974 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/repository/storage/VaccinatedPersonData.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/repository/storage/VaccinatedPersonData.kt
@@ -1,7 +1,7 @@
-package de.rki.coronawarnapp.vaccination.core.repository.storage
+package de.rki.coronawarnapp.covidcertificate.vaccination.core.repository.storage
import com.google.gson.annotations.SerializedName
-import de.rki.coronawarnapp.vaccination.core.CertificatePersonIdentifier
+import de.rki.coronawarnapp.covidcertificate.common.CertificatePersonIdentifier
data class VaccinatedPersonData(
@SerializedName("vaccinationData") val vaccinations: Set<VaccinationContainer> = emptySet()
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/repository/storage/VaccinationContainer.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/repository/storage/VaccinationContainer.kt
similarity index 81%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/repository/storage/VaccinationContainer.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/repository/storage/VaccinationContainer.kt
index 0e1b1cd06a0e9eda726447f65e2c3bfd88d1ce42..1b8804fe1945961a92771f47172579576958b626 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/repository/storage/VaccinationContainer.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/repository/storage/VaccinationContainer.kt
@@ -1,17 +1,17 @@
-package de.rki.coronawarnapp.vaccination.core.repository.storage
+package de.rki.coronawarnapp.covidcertificate.vaccination.core.repository.storage
import androidx.annotation.Keep
import com.google.gson.annotations.SerializedName
-import de.rki.coronawarnapp.vaccination.core.CertificatePersonIdentifier
-import de.rki.coronawarnapp.vaccination.core.VaccinationCertificate
-import de.rki.coronawarnapp.vaccination.core.certificate.CoseCertificateHeader
-import de.rki.coronawarnapp.vaccination.core.certificate.VaccinationDGCV1
-import de.rki.coronawarnapp.vaccination.core.personIdentifier
-import de.rki.coronawarnapp.vaccination.core.qrcode.QrCodeString
-import de.rki.coronawarnapp.vaccination.core.qrcode.VaccinationCertificateData
-import de.rki.coronawarnapp.vaccination.core.qrcode.VaccinationCertificateQRCode
-import de.rki.coronawarnapp.vaccination.core.qrcode.VaccinationQRCodeExtractor
-import de.rki.coronawarnapp.vaccination.core.server.valueset.valuesets.VaccinationValueSets
+import de.rki.coronawarnapp.covidcertificate.common.CertificatePersonIdentifier
+import de.rki.coronawarnapp.covidcertificate.common.personIdentifier
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.VaccinationCertificate
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.certificate.CoseCertificateHeader
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.certificate.VaccinationDGCV1
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.qrcode.QrCodeString
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.qrcode.VaccinationCertificateData
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.qrcode.VaccinationCertificateQRCode
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.qrcode.VaccinationQRCodeExtractor
+import de.rki.coronawarnapp.covidcertificate.valueset.valuesets.VaccinationValueSets
import org.joda.time.Instant
import org.joda.time.LocalDate
import java.util.Locale
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/repository/storage/VaccinationStorage.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/repository/storage/VaccinationStorage.kt
similarity index 96%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/repository/storage/VaccinationStorage.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/repository/storage/VaccinationStorage.kt
index 1424b943171378f04cc41ee44a398e0705afc95f..0b92bea2a9e707bedccb08b461d7794f6b36dc96 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/repository/storage/VaccinationStorage.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/repository/storage/VaccinationStorage.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.vaccination.core.repository.storage
+package de.rki.coronawarnapp.covidcertificate.vaccination.core.repository.storage
import android.content.Context
import androidx.core.content.edit
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/ui/VaccinationUIModule.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/ui/VaccinationUIModule.kt
new file mode 100644
index 0000000000000000000000000000000000000000..a912530513999c63b31b1dac6b1df6ef02fffa38
--- /dev/null
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/ui/VaccinationUIModule.kt
@@ -0,0 +1,28 @@
+package de.rki.coronawarnapp.covidcertificate.vaccination.ui
+
+import dagger.Module
+import dagger.android.ContributesAndroidInjector
+import de.rki.coronawarnapp.covidcertificate.vaccination.ui.consent.VaccinationConsentFragment
+import de.rki.coronawarnapp.covidcertificate.vaccination.ui.consent.VaccinationConsentFragmentModule
+import de.rki.coronawarnapp.covidcertificate.vaccination.ui.details.VaccinationDetailsFragment
+import de.rki.coronawarnapp.covidcertificate.vaccination.ui.details.VaccinationDetailsFragmentModule
+import de.rki.coronawarnapp.covidcertificate.vaccination.ui.list.VaccinationListFragment
+import de.rki.coronawarnapp.covidcertificate.vaccination.ui.list.VaccinationListFragmentModule
+import de.rki.coronawarnapp.covidcertificate.vaccination.ui.scan.VaccinationQrCodeScanFragment
+import de.rki.coronawarnapp.covidcertificate.vaccination.ui.scan.VaccinationQrCodeScanModule
+
+@Module
+abstract class VaccinationUIModule {
+
+ @ContributesAndroidInjector(modules = [VaccinationListFragmentModule::class])
+ abstract fun vaccinationListFragment(): VaccinationListFragment
+
+ @ContributesAndroidInjector(modules = [VaccinationDetailsFragmentModule::class])
+ abstract fun vaccinationDetailsFragment(): VaccinationDetailsFragment
+
+ @ContributesAndroidInjector(modules = [VaccinationQrCodeScanModule::class])
+ abstract fun vaccinationQrCodeScanFragment(): VaccinationQrCodeScanFragment
+
+ @ContributesAndroidInjector(modules = [VaccinationConsentFragmentModule::class])
+ abstract fun vaccinationConsentFragment(): VaccinationConsentFragment
+}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/cards/CreateVaccinationCard.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/ui/cards/CreateVaccinationCard.kt
similarity index 85%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/cards/CreateVaccinationCard.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/ui/cards/CreateVaccinationCard.kt
index 7332aa4cee7a388119ecc3240e96daddcc775caf..e45d550ef3b1dfa80d2adfb7197a9c3f6ed9dbc9 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/cards/CreateVaccinationCard.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/ui/cards/CreateVaccinationCard.kt
@@ -1,10 +1,10 @@
-package de.rki.coronawarnapp.vaccination.ui.cards
+package de.rki.coronawarnapp.covidcertificate.vaccination.ui.cards
import android.view.ViewGroup
import de.rki.coronawarnapp.R
+import de.rki.coronawarnapp.covidcertificate.test.ui.CertificatesAdapter
+import de.rki.coronawarnapp.covidcertificate.test.ui.items.CertificatesItem
import de.rki.coronawarnapp.databinding.VaccinationHomeRegistrationCardBinding
-import de.rki.coronawarnapp.greencertificate.ui.certificates.CertificatesAdapter
-import de.rki.coronawarnapp.greencertificate.ui.certificates.items.CertificatesItem
import de.rki.coronawarnapp.util.lists.diffutil.HasPayloadDiffer
class CreateVaccinationCard(parent: ViewGroup) :
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/cards/HeaderInfoVaccinationCard.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/ui/cards/HeaderInfoVaccinationCard.kt
similarity index 78%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/cards/HeaderInfoVaccinationCard.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/ui/cards/HeaderInfoVaccinationCard.kt
index e62941fc9bfffa16aae2b11fa60b9c93682d8ffb..a2026dfa69f6b8ee8061f7a914e5e1b113876b57 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/cards/HeaderInfoVaccinationCard.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/ui/cards/HeaderInfoVaccinationCard.kt
@@ -1,10 +1,10 @@
-package de.rki.coronawarnapp.vaccination.ui.cards
+package de.rki.coronawarnapp.covidcertificate.vaccination.ui.cards
import android.view.ViewGroup
import de.rki.coronawarnapp.R
+import de.rki.coronawarnapp.covidcertificate.test.ui.CertificatesAdapter
+import de.rki.coronawarnapp.covidcertificate.test.ui.items.CertificatesItem
import de.rki.coronawarnapp.databinding.VaccinationHeaderInfoCardBinding
-import de.rki.coronawarnapp.greencertificate.ui.certificates.CertificatesAdapter
-import de.rki.coronawarnapp.greencertificate.ui.certificates.items.CertificatesItem
class HeaderInfoVaccinationCard(parent: ViewGroup) :
CertificatesAdapter.CertificatesItemVH<HeaderInfoVaccinationCard.Item, VaccinationHeaderInfoCardBinding>(
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/cards/ImmuneVaccinationCard.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/ui/cards/ImmuneVaccinationCard.kt
similarity index 87%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/cards/ImmuneVaccinationCard.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/ui/cards/ImmuneVaccinationCard.kt
index 8fe1b7018d717249f9cfd02e563bc58f1a36adb3..09e83c5d9e14fc1f2d056528405f6dbbdcca238c 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/cards/ImmuneVaccinationCard.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/ui/cards/ImmuneVaccinationCard.kt
@@ -1,12 +1,12 @@
-package de.rki.coronawarnapp.vaccination.ui.cards
+package de.rki.coronawarnapp.covidcertificate.vaccination.ui.cards
import android.view.ViewGroup
import de.rki.coronawarnapp.R
+import de.rki.coronawarnapp.covidcertificate.test.ui.CertificatesAdapter
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.VaccinatedPerson
import de.rki.coronawarnapp.databinding.VaccinationHomeImmuneCardBinding
-import de.rki.coronawarnapp.greencertificate.ui.certificates.CertificatesAdapter
import de.rki.coronawarnapp.util.TimeAndDateExtensions.toDayFormat
import de.rki.coronawarnapp.util.lists.diffutil.HasPayloadDiffer
-import de.rki.coronawarnapp.vaccination.core.VaccinatedPerson
class ImmuneVaccinationCard(parent: ViewGroup) :
CertificatesAdapter.CertificatesItemVH<ImmuneVaccinationCard.Item, VaccinationHomeImmuneCardBinding>(
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/cards/NoCovidTestCertificatesCard.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/ui/cards/NoCovidTestCertificatesCard.kt
similarity index 78%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/cards/NoCovidTestCertificatesCard.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/ui/cards/NoCovidTestCertificatesCard.kt
index a1da82315c7782bce3b1b4aeef3232e6ad1908f2..dae5c0dba1c885464b7000b4135013f5a65b8f91 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/cards/NoCovidTestCertificatesCard.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/ui/cards/NoCovidTestCertificatesCard.kt
@@ -1,10 +1,10 @@
-package de.rki.coronawarnapp.vaccination.ui.cards
+package de.rki.coronawarnapp.covidcertificate.vaccination.ui.cards
import android.view.ViewGroup
import de.rki.coronawarnapp.R
+import de.rki.coronawarnapp.covidcertificate.test.ui.CertificatesAdapter
+import de.rki.coronawarnapp.covidcertificate.test.ui.items.CertificatesItem
import de.rki.coronawarnapp.databinding.VaccinationBottomInfoCardBinding
-import de.rki.coronawarnapp.greencertificate.ui.certificates.CertificatesAdapter
-import de.rki.coronawarnapp.greencertificate.ui.certificates.items.CertificatesItem
class NoCovidTestCertificatesCard(parent: ViewGroup) :
CertificatesAdapter.CertificatesItemVH<NoCovidTestCertificatesCard.Item, VaccinationBottomInfoCardBinding>(
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/cards/VaccinationCard.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/ui/cards/VaccinationCard.kt
similarity index 89%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/cards/VaccinationCard.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/ui/cards/VaccinationCard.kt
index bd2d4c7ad0021ee2da97ebd0ff40be370a353c6e..911ca7e1e45c52100006acaf2b1cdb2a86418dc5 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/cards/VaccinationCard.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/ui/cards/VaccinationCard.kt
@@ -1,11 +1,11 @@
-package de.rki.coronawarnapp.vaccination.ui.cards
+package de.rki.coronawarnapp.covidcertificate.vaccination.ui.cards
import android.view.ViewGroup
import de.rki.coronawarnapp.R
+import de.rki.coronawarnapp.covidcertificate.test.ui.CertificatesAdapter
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.VaccinatedPerson
import de.rki.coronawarnapp.databinding.VaccinationHomeCardBinding
-import de.rki.coronawarnapp.greencertificate.ui.certificates.CertificatesAdapter
import de.rki.coronawarnapp.util.lists.diffutil.HasPayloadDiffer
-import de.rki.coronawarnapp.vaccination.core.VaccinatedPerson
class VaccinationCard(parent: ViewGroup) :
CertificatesAdapter.CertificatesItemVH<VaccinationCard.Item, VaccinationHomeCardBinding>(
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/ui/cards/VaccinationStatusItem.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/ui/cards/VaccinationStatusItem.kt
new file mode 100644
index 0000000000000000000000000000000000000000..0216d7eea4c3df9009ba8aaf52cd76a67c349c07
--- /dev/null
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/ui/cards/VaccinationStatusItem.kt
@@ -0,0 +1,11 @@
+package de.rki.coronawarnapp.covidcertificate.vaccination.ui.cards
+
+import de.rki.coronawarnapp.covidcertificate.test.ui.items.CertificatesItem
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.VaccinatedPerson
+
+interface VaccinationStatusItem : CertificatesItem {
+ val vaccinatedPerson: VaccinatedPerson
+
+ override val stableId: Long
+ get() = vaccinatedPerson.identifier.hashCode().toLong()
+}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/consent/VaccinationConsentFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/ui/consent/VaccinationConsentFragment.kt
similarity index 97%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/consent/VaccinationConsentFragment.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/ui/consent/VaccinationConsentFragment.kt
index b19db038c8926c515f017f2cdff8a8e6436bbd55..49e64766849f48005f1f3d71582d288d475f8c82 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/consent/VaccinationConsentFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/ui/consent/VaccinationConsentFragment.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.vaccination.ui.consent
+package de.rki.coronawarnapp.covidcertificate.vaccination.ui.consent
import android.os.Bundle
import android.view.View
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/consent/VaccinationConsentFragmentModule.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/ui/consent/VaccinationConsentFragmentModule.kt
similarity index 88%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/consent/VaccinationConsentFragmentModule.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/ui/consent/VaccinationConsentFragmentModule.kt
index cfb33134fdcaaa9b47f312769c2fb5055fa66e14..e2a7be9f3813590c08dd498e7c8c2c1206a55860 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/consent/VaccinationConsentFragmentModule.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/ui/consent/VaccinationConsentFragmentModule.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.vaccination.ui.consent
+package de.rki.coronawarnapp.covidcertificate.vaccination.ui.consent
import dagger.Binds
import dagger.Module
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/consent/VaccinationConsentNavigationEvent.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/ui/consent/VaccinationConsentNavigationEvent.kt
similarity index 73%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/consent/VaccinationConsentNavigationEvent.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/ui/consent/VaccinationConsentNavigationEvent.kt
index 865937c0df0906298bf6d610cf6c658645ca0094..52a1b33fb0c2d747fd9992d5ead645064a7b568c 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/consent/VaccinationConsentNavigationEvent.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/ui/consent/VaccinationConsentNavigationEvent.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.vaccination.ui.consent
+package de.rki.coronawarnapp.covidcertificate.vaccination.ui.consent
sealed class VaccinationConsentNavigationEvent {
object NavigateToDataPrivacy : VaccinationConsentNavigationEvent()
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/consent/VaccinationConsentViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/ui/consent/VaccinationConsentViewModel.kt
similarity index 87%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/consent/VaccinationConsentViewModel.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/ui/consent/VaccinationConsentViewModel.kt
index 28327dfb7eacbd5c5aa09b3d2c419802570051b6..0c2c4bafd184936a2b7e9466c9919fa4c713e385 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/consent/VaccinationConsentViewModel.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/ui/consent/VaccinationConsentViewModel.kt
@@ -1,12 +1,12 @@
-package de.rki.coronawarnapp.vaccination.ui.consent
+package de.rki.coronawarnapp.covidcertificate.vaccination.ui.consent
import dagger.assisted.AssistedFactory
import dagger.assisted.AssistedInject
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.VaccinationSettings
import de.rki.coronawarnapp.util.coroutine.DispatcherProvider
import de.rki.coronawarnapp.util.ui.SingleLiveEvent
import de.rki.coronawarnapp.util.viewmodel.CWAViewModel
import de.rki.coronawarnapp.util.viewmodel.SimpleCWAViewModelFactory
-import de.rki.coronawarnapp.vaccination.core.VaccinationSettings
class VaccinationConsentViewModel @AssistedInject constructor(
private val vaccinationSettings: VaccinationSettings,
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/details/VaccinationDetailsFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/ui/details/VaccinationDetailsFragment.kt
similarity index 97%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/details/VaccinationDetailsFragment.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/ui/details/VaccinationDetailsFragment.kt
index 4465a63f7ccb1aba1f6833c48616a991dc5ebfd2..8ea0ed355e85b3fd4167a9cacc2add4d19036a6b 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/details/VaccinationDetailsFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/ui/details/VaccinationDetailsFragment.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.vaccination.ui.details
+package de.rki.coronawarnapp.covidcertificate.vaccination.ui.details
import android.os.Bundle
import android.view.View
@@ -11,6 +11,7 @@ import androidx.navigation.fragment.navArgs
import com.google.android.material.appbar.AppBarLayout
import de.rki.coronawarnapp.R
import de.rki.coronawarnapp.bugreporting.ui.toErrorDialogBuilder
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.VaccinationCertificate
import de.rki.coronawarnapp.databinding.FragmentVaccinationDetailsBinding
import de.rki.coronawarnapp.ui.qrcode.fullscreen.QrCodeFullScreenFragmentArgs
import de.rki.coronawarnapp.ui.view.onOffsetChange
@@ -20,7 +21,6 @@ import de.rki.coronawarnapp.util.ui.popBackStack
import de.rki.coronawarnapp.util.ui.viewBinding
import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider
import de.rki.coronawarnapp.util.viewmodel.cwaViewModelsAssisted
-import de.rki.coronawarnapp.vaccination.core.VaccinationCertificate
import org.joda.time.format.DateTimeFormat
import javax.inject.Inject
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/details/VaccinationDetailsFragmentModule.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/ui/details/VaccinationDetailsFragmentModule.kt
similarity index 88%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/details/VaccinationDetailsFragmentModule.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/ui/details/VaccinationDetailsFragmentModule.kt
index 62e9906d2577086ae40ee382f6e66fede9fa27f4..f4d86d341dbcca83744f16a35722e99910893fcb 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/details/VaccinationDetailsFragmentModule.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/ui/details/VaccinationDetailsFragmentModule.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.vaccination.ui.details
+package de.rki.coronawarnapp.covidcertificate.vaccination.ui.details
import dagger.Binds
import dagger.Module
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/details/VaccinationDetailsNavigation.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/ui/details/VaccinationDetailsNavigation.kt
similarity index 72%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/details/VaccinationDetailsNavigation.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/ui/details/VaccinationDetailsNavigation.kt
index d1151ff28fdef732ead8dc049bedc638f3f2d871..45d2d1754f6f2c43e364b0f3fabd4807b4857c41 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/details/VaccinationDetailsNavigation.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/ui/details/VaccinationDetailsNavigation.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.vaccination.ui.details
+package de.rki.coronawarnapp.covidcertificate.vaccination.ui.details
sealed class VaccinationDetailsNavigation {
object Back : VaccinationDetailsNavigation()
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/details/VaccinationDetailsViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/ui/details/VaccinationDetailsViewModel.kt
similarity index 90%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/details/VaccinationDetailsViewModel.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/ui/details/VaccinationDetailsViewModel.kt
index 3a1181d329277738c9fe8c4abe76c30403ca9724..863a6c7c995a75acccb7af1a9a757560763a149a 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/details/VaccinationDetailsViewModel.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/ui/details/VaccinationDetailsViewModel.kt
@@ -1,18 +1,18 @@
-package de.rki.coronawarnapp.vaccination.ui.details
+package de.rki.coronawarnapp.covidcertificate.vaccination.ui.details
import android.graphics.Bitmap
import androidx.lifecycle.asLiveData
import dagger.assisted.Assisted
import dagger.assisted.AssistedFactory
import dagger.assisted.AssistedInject
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.VaccinatedPerson
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.VaccinationCertificate
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.repository.VaccinationRepository
import de.rki.coronawarnapp.presencetracing.checkins.qrcode.QrCodeGenerator
import de.rki.coronawarnapp.util.coroutine.DispatcherProvider
import de.rki.coronawarnapp.util.ui.SingleLiveEvent
import de.rki.coronawarnapp.util.viewmodel.CWAViewModel
import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactory
-import de.rki.coronawarnapp.vaccination.core.VaccinatedPerson
-import de.rki.coronawarnapp.vaccination.core.VaccinationCertificate
-import de.rki.coronawarnapp.vaccination.core.repository.VaccinationRepository
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.map
import timber.log.Timber
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/list/VaccinationListFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/ui/list/VaccinationListFragment.kt
similarity index 90%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/list/VaccinationListFragment.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/ui/list/VaccinationListFragment.kt
index 9c3768891b87a83378c714760d5f9f1949dc9b9f..b129fd94038631bb80221271c1a3a1d1e2b6fe5c 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/list/VaccinationListFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/ui/list/VaccinationListFragment.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.vaccination.ui.list
+package de.rki.coronawarnapp.covidcertificate.vaccination.ui.list
import android.os.Bundle
import android.view.View
@@ -14,6 +14,12 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder
import com.google.android.material.imageview.ShapeableImageView
import de.rki.coronawarnapp.R
import de.rki.coronawarnapp.bugreporting.ui.toErrorDialogBuilder
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.VaccinatedPerson
+import de.rki.coronawarnapp.covidcertificate.vaccination.ui.list.VaccinationListViewModel.Event.DeleteVaccinationEvent
+import de.rki.coronawarnapp.covidcertificate.vaccination.ui.list.VaccinationListViewModel.Event.NavigateBack
+import de.rki.coronawarnapp.covidcertificate.vaccination.ui.list.VaccinationListViewModel.Event.NavigateToVaccinationCertificateDetails
+import de.rki.coronawarnapp.covidcertificate.vaccination.ui.list.VaccinationListViewModel.Event.NavigateToVaccinationQrCodeScanScreen
+import de.rki.coronawarnapp.covidcertificate.vaccination.ui.list.adapter.VaccinationListAdapter
import de.rki.coronawarnapp.databinding.FragmentVaccinationListBinding
import de.rki.coronawarnapp.ui.qrcode.fullscreen.QrCodeFullScreenFragmentArgs
import de.rki.coronawarnapp.ui.view.onOffsetChange
@@ -25,12 +31,6 @@ import de.rki.coronawarnapp.util.ui.popBackStack
import de.rki.coronawarnapp.util.ui.viewBinding
import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider
import de.rki.coronawarnapp.util.viewmodel.cwaViewModelsAssisted
-import de.rki.coronawarnapp.vaccination.core.VaccinatedPerson
-import de.rki.coronawarnapp.vaccination.ui.list.VaccinationListViewModel.Event.DeleteVaccinationEvent
-import de.rki.coronawarnapp.vaccination.ui.list.VaccinationListViewModel.Event.NavigateBack
-import de.rki.coronawarnapp.vaccination.ui.list.VaccinationListViewModel.Event.NavigateToVaccinationCertificateDetails
-import de.rki.coronawarnapp.vaccination.ui.list.VaccinationListViewModel.Event.NavigateToVaccinationQrCodeScanScreen
-import de.rki.coronawarnapp.vaccination.ui.list.adapter.VaccinationListAdapter
import javax.inject.Inject
class VaccinationListFragment : Fragment(R.layout.fragment_vaccination_list), AutoInject {
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/list/VaccinationListFragmentModule.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/ui/list/VaccinationListFragmentModule.kt
similarity index 88%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/list/VaccinationListFragmentModule.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/ui/list/VaccinationListFragmentModule.kt
index 86c2cb094926468e4163fcdc2c637f1d04ac2ca6..bcffd957ae6b59439f17b73c75ee09eb75386cb7 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/list/VaccinationListFragmentModule.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/ui/list/VaccinationListFragmentModule.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.vaccination.ui.list
+package de.rki.coronawarnapp.covidcertificate.vaccination.ui.list
import dagger.Binds
import dagger.Module
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/list/VaccinationListViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/ui/list/VaccinationListViewModel.kt
similarity index 87%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/list/VaccinationListViewModel.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/ui/list/VaccinationListViewModel.kt
index a4e200153ccea27b40c5e3422cd31964e594ff8f..707490bbe27856c9b78f3a883c78525d1ef93f42 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/list/VaccinationListViewModel.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/ui/list/VaccinationListViewModel.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.vaccination.ui.list
+package de.rki.coronawarnapp.covidcertificate.vaccination.ui.list
import android.content.Context
import android.graphics.Bitmap
@@ -8,6 +8,14 @@ import dagger.assisted.Assisted
import dagger.assisted.AssistedFactory
import dagger.assisted.AssistedInject
import de.rki.coronawarnapp.contactdiary.util.getLocale
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.VaccinatedPerson
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.repository.VaccinationRepository
+import de.rki.coronawarnapp.covidcertificate.vaccination.ui.list.adapter.VaccinationListItem
+import de.rki.coronawarnapp.covidcertificate.vaccination.ui.list.adapter.viewholder.VaccinationListImmunityInformationCardItemVH.VaccinationListImmunityInformationCardItem
+import de.rki.coronawarnapp.covidcertificate.vaccination.ui.list.adapter.viewholder.VaccinationListNameCardItemVH.VaccinationListNameCardItem
+import de.rki.coronawarnapp.covidcertificate.vaccination.ui.list.adapter.viewholder.VaccinationListQrCodeCardItemVH.VaccinationListQrCodeCardItem
+import de.rki.coronawarnapp.covidcertificate.vaccination.ui.list.adapter.viewholder.VaccinationListVaccinationCardItemVH.VaccinationListVaccinationCardItem
+import de.rki.coronawarnapp.covidcertificate.valueset.ValueSetsRepository
import de.rki.coronawarnapp.presencetracing.checkins.qrcode.QrCodeGenerator
import de.rki.coronawarnapp.util.TimeAndDateExtensions.toDayFormat
import de.rki.coronawarnapp.util.coroutine.AppScope
@@ -15,14 +23,6 @@ import de.rki.coronawarnapp.util.di.AppContext
import de.rki.coronawarnapp.util.ui.SingleLiveEvent
import de.rki.coronawarnapp.util.viewmodel.CWAViewModel
import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactory
-import de.rki.coronawarnapp.vaccination.core.VaccinatedPerson
-import de.rki.coronawarnapp.vaccination.core.repository.VaccinationRepository
-import de.rki.coronawarnapp.vaccination.core.repository.ValueSetsRepository
-import de.rki.coronawarnapp.vaccination.ui.list.adapter.VaccinationListItem
-import de.rki.coronawarnapp.vaccination.ui.list.adapter.viewholder.VaccinationListImmunityInformationCardItemVH.VaccinationListImmunityInformationCardItem
-import de.rki.coronawarnapp.vaccination.ui.list.adapter.viewholder.VaccinationListNameCardItemVH.VaccinationListNameCardItem
-import de.rki.coronawarnapp.vaccination.ui.list.adapter.viewholder.VaccinationListQrCodeCardItemVH.VaccinationListQrCodeCardItem
-import de.rki.coronawarnapp.vaccination.ui.list.adapter.viewholder.VaccinationListVaccinationCardItemVH.VaccinationListVaccinationCardItem
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.catch
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/list/adapter/VaccinationListAdapter.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/ui/list/adapter/VaccinationListAdapter.kt
similarity index 63%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/list/adapter/VaccinationListAdapter.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/ui/list/adapter/VaccinationListAdapter.kt
index 0bca114ae463ddd046ecd17410c90d4a6a11d794..3fa17a05ab738cfa642fb761ba0c36a475aa1c1e 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/list/adapter/VaccinationListAdapter.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/ui/list/adapter/VaccinationListAdapter.kt
@@ -1,8 +1,16 @@
-package de.rki.coronawarnapp.vaccination.ui.list.adapter
+package de.rki.coronawarnapp.covidcertificate.vaccination.ui.list.adapter
import android.view.ViewGroup
import androidx.annotation.LayoutRes
import androidx.viewbinding.ViewBinding
+import de.rki.coronawarnapp.covidcertificate.vaccination.ui.list.adapter.viewholder.VaccinationListImmunityInformationCardItemVH
+import de.rki.coronawarnapp.covidcertificate.vaccination.ui.list.adapter.viewholder.VaccinationListImmunityInformationCardItemVH.VaccinationListImmunityInformationCardItem
+import de.rki.coronawarnapp.covidcertificate.vaccination.ui.list.adapter.viewholder.VaccinationListNameCardItemVH
+import de.rki.coronawarnapp.covidcertificate.vaccination.ui.list.adapter.viewholder.VaccinationListNameCardItemVH.VaccinationListNameCardItem
+import de.rki.coronawarnapp.covidcertificate.vaccination.ui.list.adapter.viewholder.VaccinationListQrCodeCardItemVH
+import de.rki.coronawarnapp.covidcertificate.vaccination.ui.list.adapter.viewholder.VaccinationListQrCodeCardItemVH.VaccinationListQrCodeCardItem
+import de.rki.coronawarnapp.covidcertificate.vaccination.ui.list.adapter.viewholder.VaccinationListVaccinationCardItemVH
+import de.rki.coronawarnapp.covidcertificate.vaccination.ui.list.adapter.viewholder.VaccinationListVaccinationCardItemVH.VaccinationListVaccinationCardItem
import de.rki.coronawarnapp.util.lists.BindableVH
import de.rki.coronawarnapp.util.lists.HasStableId
import de.rki.coronawarnapp.util.lists.diffutil.AsyncDiffUtilAdapter
@@ -11,14 +19,6 @@ import de.rki.coronawarnapp.util.lists.modular.ModularAdapter
import de.rki.coronawarnapp.util.lists.modular.mods.DataBinderMod
import de.rki.coronawarnapp.util.lists.modular.mods.StableIdMod
import de.rki.coronawarnapp.util.lists.modular.mods.TypedVHCreatorMod
-import de.rki.coronawarnapp.vaccination.ui.list.adapter.viewholder.VaccinationListImmunityInformationCardItemVH
-import de.rki.coronawarnapp.vaccination.ui.list.adapter.viewholder.VaccinationListImmunityInformationCardItemVH.VaccinationListImmunityInformationCardItem
-import de.rki.coronawarnapp.vaccination.ui.list.adapter.viewholder.VaccinationListNameCardItemVH
-import de.rki.coronawarnapp.vaccination.ui.list.adapter.viewholder.VaccinationListNameCardItemVH.VaccinationListNameCardItem
-import de.rki.coronawarnapp.vaccination.ui.list.adapter.viewholder.VaccinationListQrCodeCardItemVH
-import de.rki.coronawarnapp.vaccination.ui.list.adapter.viewholder.VaccinationListQrCodeCardItemVH.VaccinationListQrCodeCardItem
-import de.rki.coronawarnapp.vaccination.ui.list.adapter.viewholder.VaccinationListVaccinationCardItemVH
-import de.rki.coronawarnapp.vaccination.ui.list.adapter.viewholder.VaccinationListVaccinationCardItemVH.VaccinationListVaccinationCardItem
class VaccinationListAdapter :
ModularAdapter<VaccinationListAdapter.ItemVH<VaccinationListItem, ViewBinding>>(),
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/list/adapter/viewholder/VaccinationListImmunityInformationCardItemVH.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/ui/list/adapter/viewholder/VaccinationListImmunityInformationCardItemVH.kt
similarity index 74%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/list/adapter/viewholder/VaccinationListImmunityInformationCardItemVH.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/ui/list/adapter/viewholder/VaccinationListImmunityInformationCardItemVH.kt
index f6824b79b04a1ca22d84eb29a73a7871ff0bc2d0..8f30d3940133de55144206c9b31e1f9d9a4ae4ac 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/list/adapter/viewholder/VaccinationListImmunityInformationCardItemVH.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/ui/list/adapter/viewholder/VaccinationListImmunityInformationCardItemVH.kt
@@ -1,11 +1,11 @@
-package de.rki.coronawarnapp.vaccination.ui.list.adapter.viewholder
+package de.rki.coronawarnapp.covidcertificate.vaccination.ui.list.adapter.viewholder
import android.view.ViewGroup
import de.rki.coronawarnapp.R
+import de.rki.coronawarnapp.covidcertificate.vaccination.ui.list.adapter.VaccinationListAdapter
+import de.rki.coronawarnapp.covidcertificate.vaccination.ui.list.adapter.VaccinationListItem
+import de.rki.coronawarnapp.covidcertificate.vaccination.ui.list.adapter.viewholder.VaccinationListImmunityInformationCardItemVH.VaccinationListImmunityInformationCardItem
import de.rki.coronawarnapp.databinding.VaccinationListImmunityCardBinding
-import de.rki.coronawarnapp.vaccination.ui.list.adapter.VaccinationListAdapter
-import de.rki.coronawarnapp.vaccination.ui.list.adapter.VaccinationListItem
-import de.rki.coronawarnapp.vaccination.ui.list.adapter.viewholder.VaccinationListImmunityInformationCardItemVH.VaccinationListImmunityInformationCardItem
import org.joda.time.Duration
class VaccinationListImmunityInformationCardItemVH(parent: ViewGroup) :
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/list/adapter/viewholder/VaccinationListNameCardItemVH.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/ui/list/adapter/viewholder/VaccinationListNameCardItemVH.kt
similarity index 71%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/list/adapter/viewholder/VaccinationListNameCardItemVH.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/ui/list/adapter/viewholder/VaccinationListNameCardItemVH.kt
index 5cd1501ca2a27854aeedeb23575a690a5938ec3e..f073acb5408a1946401aadb4b707c8c128d807a3 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/list/adapter/viewholder/VaccinationListNameCardItemVH.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/ui/list/adapter/viewholder/VaccinationListNameCardItemVH.kt
@@ -1,11 +1,11 @@
-package de.rki.coronawarnapp.vaccination.ui.list.adapter.viewholder
+package de.rki.coronawarnapp.covidcertificate.vaccination.ui.list.adapter.viewholder
import android.view.ViewGroup
import de.rki.coronawarnapp.R
+import de.rki.coronawarnapp.covidcertificate.vaccination.ui.list.adapter.VaccinationListAdapter
+import de.rki.coronawarnapp.covidcertificate.vaccination.ui.list.adapter.VaccinationListItem
+import de.rki.coronawarnapp.covidcertificate.vaccination.ui.list.adapter.viewholder.VaccinationListNameCardItemVH.VaccinationListNameCardItem
import de.rki.coronawarnapp.databinding.VaccinationListNameCardBinding
-import de.rki.coronawarnapp.vaccination.ui.list.adapter.VaccinationListAdapter
-import de.rki.coronawarnapp.vaccination.ui.list.adapter.VaccinationListItem
-import de.rki.coronawarnapp.vaccination.ui.list.adapter.viewholder.VaccinationListNameCardItemVH.VaccinationListNameCardItem
class VaccinationListNameCardItemVH(parent: ViewGroup) :
VaccinationListAdapter.ItemVH<VaccinationListNameCardItem, VaccinationListNameCardBinding>(
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/list/adapter/viewholder/VaccinationListQrCodeCardItemVH.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/ui/list/adapter/viewholder/VaccinationListQrCodeCardItemVH.kt
similarity index 81%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/list/adapter/viewholder/VaccinationListQrCodeCardItemVH.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/ui/list/adapter/viewholder/VaccinationListQrCodeCardItemVH.kt
index 3c84ae55250f6e9d91255b4326ba5365fc3892ca..11c936aab9ae69672c0a68055770002b906d12a4 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/list/adapter/viewholder/VaccinationListQrCodeCardItemVH.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/ui/list/adapter/viewholder/VaccinationListQrCodeCardItemVH.kt
@@ -1,13 +1,13 @@
-package de.rki.coronawarnapp.vaccination.ui.list.adapter.viewholder
+package de.rki.coronawarnapp.covidcertificate.vaccination.ui.list.adapter.viewholder
import android.graphics.Bitmap
import android.view.ViewGroup
import de.rki.coronawarnapp.R
+import de.rki.coronawarnapp.covidcertificate.vaccination.ui.list.adapter.VaccinationListAdapter
+import de.rki.coronawarnapp.covidcertificate.vaccination.ui.list.adapter.VaccinationListItem
+import de.rki.coronawarnapp.covidcertificate.vaccination.ui.list.adapter.viewholder.VaccinationListQrCodeCardItemVH.VaccinationListQrCodeCardItem
import de.rki.coronawarnapp.databinding.IncludeCertificateQrcodeCardBinding
import de.rki.coronawarnapp.util.TimeAndDateExtensions.toShortDayFormat
-import de.rki.coronawarnapp.vaccination.ui.list.adapter.VaccinationListAdapter
-import de.rki.coronawarnapp.vaccination.ui.list.adapter.VaccinationListItem
-import de.rki.coronawarnapp.vaccination.ui.list.adapter.viewholder.VaccinationListQrCodeCardItemVH.VaccinationListQrCodeCardItem
import org.joda.time.Instant
import org.joda.time.LocalDate
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/list/adapter/viewholder/VaccinationListVaccinationCardItemVH.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/ui/list/adapter/viewholder/VaccinationListVaccinationCardItemVH.kt
similarity index 86%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/list/adapter/viewholder/VaccinationListVaccinationCardItemVH.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/ui/list/adapter/viewholder/VaccinationListVaccinationCardItemVH.kt
index 82f2a8388585b70ba8f570710b5728f9f1f91889..5c254efe417d573d3618d90ce26e8ccd91d16d38 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/list/adapter/viewholder/VaccinationListVaccinationCardItemVH.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/ui/list/adapter/viewholder/VaccinationListVaccinationCardItemVH.kt
@@ -1,19 +1,19 @@
-package de.rki.coronawarnapp.vaccination.ui.list.adapter.viewholder
+package de.rki.coronawarnapp.covidcertificate.vaccination.ui.list.adapter.viewholder
import android.view.Gravity
import android.view.ViewGroup
import androidx.appcompat.widget.PopupMenu
import androidx.recyclerview.widget.RecyclerView
import de.rki.coronawarnapp.R
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.VaccinatedPerson
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.VaccinatedPerson.Status.COMPLETE
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.VaccinatedPerson.Status.IMMUNITY
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.VaccinatedPerson.Status.INCOMPLETE
+import de.rki.coronawarnapp.covidcertificate.vaccination.ui.list.adapter.VaccinationListAdapter
+import de.rki.coronawarnapp.covidcertificate.vaccination.ui.list.adapter.VaccinationListItem
+import de.rki.coronawarnapp.covidcertificate.vaccination.ui.list.adapter.viewholder.VaccinationListVaccinationCardItemVH.VaccinationListVaccinationCardItem
import de.rki.coronawarnapp.databinding.VaccinationListVaccinationCardBinding
import de.rki.coronawarnapp.util.list.Swipeable
-import de.rki.coronawarnapp.vaccination.core.VaccinatedPerson
-import de.rki.coronawarnapp.vaccination.core.VaccinatedPerson.Status.COMPLETE
-import de.rki.coronawarnapp.vaccination.core.VaccinatedPerson.Status.IMMUNITY
-import de.rki.coronawarnapp.vaccination.core.VaccinatedPerson.Status.INCOMPLETE
-import de.rki.coronawarnapp.vaccination.ui.list.adapter.VaccinationListAdapter
-import de.rki.coronawarnapp.vaccination.ui.list.adapter.VaccinationListItem
-import de.rki.coronawarnapp.vaccination.ui.list.adapter.viewholder.VaccinationListVaccinationCardItemVH.VaccinationListVaccinationCardItem
import java.util.Objects
class VaccinationListVaccinationCardItemVH(parent: ViewGroup) :
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/scan/VaccinationQrCodeScanFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/ui/scan/VaccinationQrCodeScanFragment.kt
similarity index 98%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/scan/VaccinationQrCodeScanFragment.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/ui/scan/VaccinationQrCodeScanFragment.kt
index 48a09d1257473491fbe4bd5167242d3af602a449..ffb9537416eda49f1d4d29d61afed701da3542a7 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/scan/VaccinationQrCodeScanFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/ui/scan/VaccinationQrCodeScanFragment.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.vaccination.ui.scan
+package de.rki.coronawarnapp.covidcertificate.vaccination.ui.scan
import android.Manifest
import android.content.pm.PackageManager
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/scan/VaccinationQrCodeScanModule.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/ui/scan/VaccinationQrCodeScanModule.kt
similarity index 89%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/scan/VaccinationQrCodeScanModule.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/ui/scan/VaccinationQrCodeScanModule.kt
index aa5cd02dfd000d4e78466d6a5e9d5fd85f072ea7..bc581306a761d7bdfd9e46489b4ca2f98e401dc8 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/scan/VaccinationQrCodeScanModule.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/ui/scan/VaccinationQrCodeScanModule.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.vaccination.ui.scan
+package de.rki.coronawarnapp.covidcertificate.vaccination.ui.scan
import dagger.Binds
import dagger.Module
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/scan/VaccinationQrCodeScanViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/ui/scan/VaccinationQrCodeScanViewModel.kt
similarity index 86%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/scan/VaccinationQrCodeScanViewModel.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/ui/scan/VaccinationQrCodeScanViewModel.kt
index 5f8695e78f98984d521d1009476ec8bb96a6bc21..adbddadf7608994aa37288d4413cd22436cbcb95 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/scan/VaccinationQrCodeScanViewModel.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/ui/scan/VaccinationQrCodeScanViewModel.kt
@@ -1,14 +1,14 @@
-package de.rki.coronawarnapp.vaccination.ui.scan
+package de.rki.coronawarnapp.covidcertificate.vaccination.ui.scan
import com.journeyapps.barcodescanner.BarcodeResult
import dagger.assisted.AssistedFactory
import dagger.assisted.AssistedInject
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.qrcode.VaccinationQRCodeValidator
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.repository.VaccinationRepository
import de.rki.coronawarnapp.util.permission.CameraSettings
import de.rki.coronawarnapp.util.ui.SingleLiveEvent
import de.rki.coronawarnapp.util.viewmodel.CWAViewModel
import de.rki.coronawarnapp.util.viewmodel.SimpleCWAViewModelFactory
-import de.rki.coronawarnapp.vaccination.core.qrcode.VaccinationQRCodeValidator
-import de.rki.coronawarnapp.vaccination.core.repository.VaccinationRepository
import timber.log.Timber
class VaccinationQrCodeScanViewModel @AssistedInject constructor(
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/server/valueset/VaccinationValueSetModule.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/valueset/CertificateValueSetModule.kt
similarity index 82%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/server/valueset/VaccinationValueSetModule.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/valueset/CertificateValueSetModule.kt
index 2b3413d14169f086392e7ab3df76a867f2acb57a..dd3100e22d9a3ead782e003f58422054f80c39b1 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/server/valueset/VaccinationValueSetModule.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/valueset/CertificateValueSetModule.kt
@@ -1,9 +1,11 @@
-package de.rki.coronawarnapp.vaccination.core.server.valueset
+package de.rki.coronawarnapp.covidcertificate.valueset
import android.content.Context
import dagger.Module
import dagger.Provides
import dagger.Reusable
+import de.rki.coronawarnapp.covidcertificate.valueset.server.CertificateValueSet
+import de.rki.coronawarnapp.covidcertificate.valueset.server.CertificateValueSetApiV1
import de.rki.coronawarnapp.environment.download.DownloadCDNHttpClient
import de.rki.coronawarnapp.environment.download.DownloadCDNServerUrl
import de.rki.coronawarnapp.util.di.AppContext
@@ -17,10 +19,10 @@ import java.io.File
import java.util.concurrent.TimeUnit
@Module
-class VaccinationValueSetModule {
+class CertificateValueSetModule {
@Reusable
- @ValueSet
+ @CertificateValueSet
@Provides
fun cache(
@AppContext context: Context
@@ -35,8 +37,8 @@ class VaccinationValueSetModule {
fun api(
@DownloadCDNHttpClient httpClient: OkHttpClient,
@DownloadCDNServerUrl url: String,
- @ValueSet cache: Cache
- ): VaccinationValueSetApiV1 {
+ @CertificateValueSet cache: Cache
+ ): CertificateValueSetApiV1 {
val client = httpClient.newBuilder()
.addNetworkInterceptor(CacheInterceptor())
.cache(cache)
@@ -46,7 +48,7 @@ class VaccinationValueSetModule {
.client(client)
.baseUrl(url)
.build()
- .create(VaccinationValueSetApiV1::class.java)
+ .create(CertificateValueSetApiV1::class.java)
}
private class CacheInterceptor : Interceptor {
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/repository/ValueSetsRepository.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/valueset/ValueSetsRepository.kt
similarity index 74%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/repository/ValueSetsRepository.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/valueset/ValueSetsRepository.kt
index 78c2bde01c6a61d1ecabf3885e66d7210c2aab38..eae1302048eae9d8c9cf8c89af6dbb08873e8425 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/repository/ValueSetsRepository.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/valueset/ValueSetsRepository.kt
@@ -1,16 +1,16 @@
-package de.rki.coronawarnapp.vaccination.core.repository
+package de.rki.coronawarnapp.covidcertificate.valueset
import dagger.Reusable
+import de.rki.coronawarnapp.covidcertificate.valueset.server.CertificateValueSetServer
+import de.rki.coronawarnapp.covidcertificate.valueset.valuesets.TestCertificateValueSets
+import de.rki.coronawarnapp.covidcertificate.valueset.valuesets.VaccinationValueSets
+import de.rki.coronawarnapp.covidcertificate.valueset.valuesets.ValueSetsContainer
+import de.rki.coronawarnapp.covidcertificate.valueset.valuesets.ValueSetsStorage
+import de.rki.coronawarnapp.covidcertificate.valueset.valuesets.emptyValueSetsContainer
+import de.rki.coronawarnapp.covidcertificate.valueset.valuesets.isEmpty
import de.rki.coronawarnapp.util.coroutine.AppScope
import de.rki.coronawarnapp.util.coroutine.DispatcherProvider
import de.rki.coronawarnapp.util.flow.HotDataFlow
-import de.rki.coronawarnapp.vaccination.core.repository.storage.ValueSetsStorage
-import de.rki.coronawarnapp.vaccination.core.server.valueset.VaccinationServer
-import de.rki.coronawarnapp.vaccination.core.server.valueset.valuesets.TestCertificateValueSets
-import de.rki.coronawarnapp.vaccination.core.server.valueset.valuesets.VaccinationValueSets
-import de.rki.coronawarnapp.vaccination.core.server.valueset.valuesets.ValueSetsContainer
-import de.rki.coronawarnapp.vaccination.core.server.valueset.valuesets.emptyValueSetsContainer
-import de.rki.coronawarnapp.vaccination.core.server.valueset.valuesets.isEmpty
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.SharingStarted
@@ -26,7 +26,7 @@ import javax.inject.Inject
@Reusable
class ValueSetsRepository @Inject constructor(
- private val vaccinationServer: VaccinationServer,
+ private val certificateValueSetServer: CertificateValueSetServer,
private val valueSetsStorage: ValueSetsStorage,
@AppScope private val scope: CoroutineScope,
dispatcherProvider: DispatcherProvider
@@ -66,14 +66,14 @@ class ValueSetsRepository @Inject constructor(
private suspend fun getValueSetFromServer(languageCode: Locale): ValueSetsContainer? {
Timber.v("getValueSetFromServer(languageCode=%s)", languageCode)
- var container = vaccinationServer.getVaccinationValueSets(languageCode = languageCode)
+ var container = certificateValueSetServer.getVaccinationValueSets(languageCode = languageCode)
if (container.isEmpty()) {
Timber.d(
"Got no value sets from server for %s... Try fallback to value sets for en",
languageCode.language
)
- container = vaccinationServer.getVaccinationValueSets(languageCode = Locale.ENGLISH)
+ container = certificateValueSetServer.getVaccinationValueSets(languageCode = Locale.ENGLISH)
}
return container
@@ -82,7 +82,7 @@ class ValueSetsRepository @Inject constructor(
suspend fun clear() {
Timber.d("Clearing value sets")
- vaccinationServer.clear()
+ certificateValueSetServer.clear()
internalData.updateBlocking {
Timber.v("Resetting value sets")
emptyValueSetsContainer
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/server/valueset/internal/VaccinationValueSetMapper.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/valueset/internal/DccValueSetMapper.kt
similarity index 74%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/server/valueset/internal/VaccinationValueSetMapper.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/valueset/internal/DccValueSetMapper.kt
index f7d901d43a5c3e2b4b0fd90ebf15b1aae0b65d1f..5833e17c1b96a8058775827efdd36a49b8789a9c 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/server/valueset/internal/VaccinationValueSetMapper.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/valueset/internal/DccValueSetMapper.kt
@@ -1,11 +1,10 @@
-package de.rki.coronawarnapp.vaccination.core.server.valueset.internal
+package de.rki.coronawarnapp.covidcertificate.valueset.internal
+import de.rki.coronawarnapp.covidcertificate.valueset.valuesets.DefaultValueSet
+import de.rki.coronawarnapp.covidcertificate.valueset.valuesets.TestCertificateValueSets
+import de.rki.coronawarnapp.covidcertificate.valueset.valuesets.VaccinationValueSets
+import de.rki.coronawarnapp.covidcertificate.valueset.valuesets.ValueSetsContainer
import de.rki.coronawarnapp.server.protocols.internal.dgc.ValueSetsOuterClass
-import de.rki.coronawarnapp.vaccination.core.server.valueset.valuesets.DefaultValueSet
-import de.rki.coronawarnapp.vaccination.core.server.valueset.valuesets.TestCertificateValueSets
-import de.rki.coronawarnapp.vaccination.core.server.valueset.valuesets.VaccinationValueSets
-import de.rki.coronawarnapp.vaccination.core.server.valueset.valuesets.ValueSets
-import de.rki.coronawarnapp.vaccination.core.server.valueset.valuesets.ValueSetsContainer
import timber.log.Timber
import java.util.Locale
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/server/valueset/internal/ValueSetInvalidSignatureException.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/valueset/internal/ValueSetInvalidSignatureException.kt
similarity index 80%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/server/valueset/internal/ValueSetInvalidSignatureException.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/valueset/internal/ValueSetInvalidSignatureException.kt
index 6de24adafb228da191c3f7d076ef1729b8ad3540..5a218d35a9c556aa1fba85f6d4115007e221ae00 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/server/valueset/internal/ValueSetInvalidSignatureException.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/valueset/internal/ValueSetInvalidSignatureException.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.vaccination.core.server.valueset.internal
+package de.rki.coronawarnapp.covidcertificate.valueset.internal
import de.rki.coronawarnapp.exception.reporting.ErrorCodes
import de.rki.coronawarnapp.util.security.InvalidSignatureException
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/server/valueset/ValueSet.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/valueset/server/CertificateValueSet.kt
similarity index 50%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/server/valueset/ValueSet.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/valueset/server/CertificateValueSet.kt
index 1300c045c0d8f448781ddcaa327bb7f2959fe09f..9721ba413f8e50ef7c5bead14159a54a04d2220d 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/server/valueset/ValueSet.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/valueset/server/CertificateValueSet.kt
@@ -1,8 +1,8 @@
-package de.rki.coronawarnapp.vaccination.core.server.valueset
+package de.rki.coronawarnapp.covidcertificate.valueset.server
import javax.inject.Qualifier
@Qualifier
@MustBeDocumented
@Retention(AnnotationRetention.RUNTIME)
-annotation class ValueSet
+annotation class CertificateValueSet
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/server/valueset/VaccinationValueSetApiV1.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/valueset/server/CertificateValueSetApiV1.kt
similarity index 71%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/server/valueset/VaccinationValueSetApiV1.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/valueset/server/CertificateValueSetApiV1.kt
index d30f63ada3e13187b20aa2952192c35b9ea9df20..b7f560ac677316edd296e62eb4db83e18e9808c6 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/server/valueset/VaccinationValueSetApiV1.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/valueset/server/CertificateValueSetApiV1.kt
@@ -1,11 +1,11 @@
-package de.rki.coronawarnapp.vaccination.core.server.valueset
+package de.rki.coronawarnapp.covidcertificate.valueset.server
import okhttp3.ResponseBody
import retrofit2.Response
import retrofit2.http.GET
import retrofit2.http.Path
-interface VaccinationValueSetApiV1 {
+interface CertificateValueSetApiV1 {
@GET("/version/v1/ehn-dgc/{lang}/value-sets")
suspend fun getValueSets(@Path("lang") languageCode: String): Response<ResponseBody>
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/server/valueset/VaccinationServer.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/valueset/server/CertificateValueSetServer.kt
similarity index 86%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/server/valueset/VaccinationServer.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/valueset/server/CertificateValueSetServer.kt
index c5479ab4da7cef183c0056ef03e075404f6dc5ac..8d88f880b6b5b53e205cfd43f35a442ab595b0cb 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/server/valueset/VaccinationServer.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/valueset/server/CertificateValueSetServer.kt
@@ -1,16 +1,16 @@
-package de.rki.coronawarnapp.vaccination.core.server.valueset
+package de.rki.coronawarnapp.covidcertificate.valueset.server
import androidx.annotation.VisibleForTesting
import dagger.Lazy
import dagger.Reusable
+import de.rki.coronawarnapp.covidcertificate.valueset.internal.ValueSetInvalidSignatureException
+import de.rki.coronawarnapp.covidcertificate.valueset.internal.toValueSetsContainer
+import de.rki.coronawarnapp.covidcertificate.valueset.valuesets.ValueSetsContainer
import de.rki.coronawarnapp.server.protocols.internal.dgc.ValueSetsOuterClass
import de.rki.coronawarnapp.util.ZipHelper.readIntoMap
import de.rki.coronawarnapp.util.ZipHelper.unzip
import de.rki.coronawarnapp.util.coroutine.DispatcherProvider
import de.rki.coronawarnapp.util.security.SignatureValidation
-import de.rki.coronawarnapp.vaccination.core.server.valueset.internal.ValueSetInvalidSignatureException
-import de.rki.coronawarnapp.vaccination.core.server.valueset.internal.toValueSetsContainer
-import de.rki.coronawarnapp.vaccination.core.server.valueset.valuesets.ValueSetsContainer
import kotlinx.coroutines.withContext
import okhttp3.Cache
import okhttp3.ResponseBody
@@ -25,9 +25,9 @@ import javax.inject.Inject
* Talks with CWA servers
*/
@Reusable
-class VaccinationServer @Inject constructor(
- @ValueSet private val cache: Cache,
- private val apiV1: Lazy<VaccinationValueSetApiV1>,
+class CertificateValueSetServer @Inject constructor(
+ @CertificateValueSet private val cache: Cache,
+ private val apiV1: Lazy<CertificateValueSetApiV1>,
private val dispatcherProvider: DispatcherProvider,
private val signatureValidation: SignatureValidation
) {
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/server/valueset/valuesets/DefaultValueSet.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/valueset/valuesets/DefaultValueSet.kt
similarity index 85%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/server/valueset/valuesets/DefaultValueSet.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/valueset/valuesets/DefaultValueSet.kt
index 359c4b86e66a95921b77b870a68f60ce2403786c..bf8d268cdc339982862689ee482b7375d6cfe624 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/server/valueset/valuesets/DefaultValueSet.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/valueset/valuesets/DefaultValueSet.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.vaccination.core.server.valueset.valuesets
+package de.rki.coronawarnapp.covidcertificate.valueset.valuesets
import androidx.annotation.Keep
import com.google.gson.annotations.SerializedName
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/server/valueset/valuesets/TestCertificateValueSets.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/valueset/valuesets/TestCertificateValueSets.kt
similarity index 93%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/server/valueset/valuesets/TestCertificateValueSets.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/valueset/valuesets/TestCertificateValueSets.kt
index 40e8aa0ec01051eee739d81da534343c4ef97afa..c412d2656ab71d99f10788fac12cc54404f665ae 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/server/valueset/valuesets/TestCertificateValueSets.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/valueset/valuesets/TestCertificateValueSets.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.vaccination.core.server.valueset.valuesets
+package de.rki.coronawarnapp.covidcertificate.valueset.valuesets
import androidx.annotation.Keep
import com.google.gson.annotations.SerializedName
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/server/valueset/valuesets/VaccinationValueSets.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/valueset/valuesets/VaccinationValueSets.kt
similarity index 93%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/server/valueset/valuesets/VaccinationValueSets.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/valueset/valuesets/VaccinationValueSets.kt
index 9d072729f158b0bdc8592f5c270b864e326d3227..c15738bfce2e3881e0afa81052e7ff2aa59cc333 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/server/valueset/valuesets/VaccinationValueSets.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/valueset/valuesets/VaccinationValueSets.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.vaccination.core.server.valueset.valuesets
+package de.rki.coronawarnapp.covidcertificate.valueset.valuesets
import androidx.annotation.Keep
import com.google.gson.annotations.SerializedName
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/server/valueset/valuesets/ValueSets.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/valueset/valuesets/ValueSets.kt
similarity index 88%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/server/valueset/valuesets/ValueSets.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/valueset/valuesets/ValueSets.kt
index ed79db1c40d13fb4254d702f895d979fea65971e..80a7321bcc2fdf9af227ad873358e287be513e20 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/server/valueset/valuesets/ValueSets.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/valueset/valuesets/ValueSets.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.vaccination.core.server.valueset.valuesets
+package de.rki.coronawarnapp.covidcertificate.valueset.valuesets
import java.util.Locale
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/server/valueset/valuesets/ValueSetsContainer.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/valueset/valuesets/ValueSetsContainer.kt
similarity index 90%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/server/valueset/valuesets/ValueSetsContainer.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/valueset/valuesets/ValueSetsContainer.kt
index 8787b55ffadbdb6f8c2dfd7dafb3bd0794fd3fef..d1af578833b007c0a41254fb8e07f05676bff20a 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/server/valueset/valuesets/ValueSetsContainer.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/valueset/valuesets/ValueSetsContainer.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.vaccination.core.server.valueset.valuesets
+package de.rki.coronawarnapp.covidcertificate.valueset.valuesets
import androidx.annotation.Keep
import com.google.gson.annotations.SerializedName
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/repository/storage/ValueSetsStorage.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/valueset/valuesets/ValueSetsStorage.kt
similarity index 81%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/repository/storage/ValueSetsStorage.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/valueset/valuesets/ValueSetsStorage.kt
index afbaaebc8b8642a426d1976d932603b3d342e755..9c45cf1edc9529097b92d5db1105bdb94281c7a6 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/repository/storage/ValueSetsStorage.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/valueset/valuesets/ValueSetsStorage.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.vaccination.core.repository.storage
+package de.rki.coronawarnapp.covidcertificate.valueset.valuesets
import android.content.Context
import android.content.SharedPreferences
@@ -8,8 +8,6 @@ import dagger.Reusable
import de.rki.coronawarnapp.util.di.AppContext
import de.rki.coronawarnapp.util.serialization.BaseGson
import de.rki.coronawarnapp.util.serialization.fromJson
-import de.rki.coronawarnapp.vaccination.core.server.valueset.valuesets.ValueSetsContainer
-import de.rki.coronawarnapp.vaccination.core.server.valueset.valuesets.emptyValueSetsContainer
import timber.log.Timber
import javax.inject.Inject
@@ -54,8 +52,10 @@ class ValueSetsStorage @Inject constructor(
}
}
}
-}
-private const val PREF_NAME = "valuesets_localdata"
-private const val PKEY_VALUE_SETS_PREFIX = "valueset"
-private const val PKEY_VALUE_SETS_CONTAINER_PREFIX = "valuesets_container"
+ companion object {
+ private const val PREF_NAME = "valuesets_localdata"
+ private const val PKEY_VALUE_SETS_PREFIX = "valueset"
+ private const val PKEY_VALUE_SETS_CONTAINER_PREFIX = "valuesets_container"
+ }
+}
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 a55f59dbd258a45c9ba9252411bed5b2173cbd84..7b05ff4b3a0705dd0e78b0d9893387e8915910b0 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
@@ -15,7 +15,6 @@ import de.rki.coronawarnapp.presencetracing.warning.storage.TraceWarningReposito
import de.rki.coronawarnapp.task.Task
import de.rki.coronawarnapp.task.TaskCancellationException
import de.rki.coronawarnapp.task.TaskFactory
-import de.rki.coronawarnapp.task.common.Finished
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.first
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/risk/RiskLevelTask.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/risk/RiskLevelTask.kt
index 8a5d733cb1be611c57e6d695c6609ade158d1ee4..b174210001f84d9573e95a6f995ac2e2370f57be 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/risk/RiskLevelTask.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/risk/RiskLevelTask.kt
@@ -19,9 +19,9 @@ import de.rki.coronawarnapp.risk.storage.RiskLevelStorage
import de.rki.coronawarnapp.task.Task
import de.rki.coronawarnapp.task.TaskCancellationException
import de.rki.coronawarnapp.task.TaskFactory
+import de.rki.coronawarnapp.task.common.DefaultProgress
import de.rki.coronawarnapp.task.common.Finished
import de.rki.coronawarnapp.task.common.Started
-import de.rki.coronawarnapp.task.common.DefaultProgress
import de.rki.coronawarnapp.util.TimeStamper
import de.rki.coronawarnapp.util.device.BackgroundModeStatus
import kotlinx.coroutines.flow.Flow
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 d902ba1adcec59e262896568405930b275c753a3..b9a628633897316295d23bfff2b14ad59636323c 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
@@ -4,8 +4,9 @@ import dagger.Binds
import dagger.Module
import dagger.android.ContributesAndroidInjector
import dagger.multibindings.IntoMap
+import de.rki.coronawarnapp.covidcertificate.test.ui.CovidCertificateUIModule
+import de.rki.coronawarnapp.covidcertificate.vaccination.ui.VaccinationUIModule
import de.rki.coronawarnapp.datadonation.analytics.ui.AnalyticsUIModule
-import de.rki.coronawarnapp.greencertificate.ui.CovidCertificateUIModule
import de.rki.coronawarnapp.release.NewReleaseInfoFragment
import de.rki.coronawarnapp.release.NewReleaseInfoFragmentModule
import de.rki.coronawarnapp.tracing.ui.details.TracingDetailsFragmentModule
@@ -26,7 +27,6 @@ import de.rki.coronawarnapp.ui.submission.viewmodel.SubmissionFragmentModule
import de.rki.coronawarnapp.util.viewmodel.CWAViewModel
import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactory
import de.rki.coronawarnapp.util.viewmodel.CWAViewModelKey
-import de.rki.coronawarnapp.vaccination.ui.VaccinationUIModule
@Module(
includes = [
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 7952b2e729d07b2ad1c0ea5151f75772c7cd3b7d..6fe194da45ba54ed22a245032879f0a93aeb8556 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
@@ -6,6 +6,7 @@ import androidx.lifecycle.asLiveData
import dagger.assisted.AssistedFactory
import dagger.assisted.AssistedInject
import de.rki.coronawarnapp.contactdiary.ui.ContactDiarySettings
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.VaccinationSettings
import de.rki.coronawarnapp.environment.EnvironmentSetup
import de.rki.coronawarnapp.playbook.BackgroundNoise
import de.rki.coronawarnapp.presencetracing.TraceLocationSettings
@@ -17,7 +18,6 @@ import de.rki.coronawarnapp.util.device.BackgroundModeStatus
import de.rki.coronawarnapp.util.ui.SingleLiveEvent
import de.rki.coronawarnapp.util.viewmodel.CWAViewModel
import de.rki.coronawarnapp.util.viewmodel.SimpleCWAViewModelFactory
-import de.rki.coronawarnapp.vaccination.core.VaccinationSettings
import kotlinx.coroutines.flow.first
import kotlinx.coroutines.flow.map
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 d549a308af695e9e842abd3586f7905127f49fb5..b75e523a1e49a607e4a4d52fe522fb96a5815d89 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
@@ -20,6 +20,8 @@ import de.rki.coronawarnapp.coronatest.type.pcr.toSubmissionState
import de.rki.coronawarnapp.coronatest.type.rapidantigen.RACoronaTest
import de.rki.coronawarnapp.coronatest.type.rapidantigen.SubmissionStateRAT
import de.rki.coronawarnapp.coronatest.type.rapidantigen.toSubmissionState
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.VaccinationSettings
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.repository.VaccinationRepository
import de.rki.coronawarnapp.main.CWASettings
import de.rki.coronawarnapp.statistics.source.StatisticsProvider
import de.rki.coronawarnapp.statistics.ui.homecards.StatisticsHomeCard
@@ -74,8 +76,6 @@ import de.rki.coronawarnapp.util.shortcuts.AppShortcutsHelper
import de.rki.coronawarnapp.util.ui.SingleLiveEvent
import de.rki.coronawarnapp.util.viewmodel.CWAViewModel
import de.rki.coronawarnapp.util.viewmodel.SimpleCWAViewModelFactory
-import de.rki.coronawarnapp.vaccination.core.VaccinationSettings
-import de.rki.coronawarnapp.vaccination.core.repository.VaccinationRepository
import kotlinx.coroutines.flow.distinctUntilChanged
import kotlinx.coroutines.flow.map
import kotlinx.coroutines.flow.onEach
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 a4b73983030e27bb16cb5a9368439fe6869f0fa2..1f6f88ae6974863c3da1262151001e7375c883e6 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
@@ -6,8 +6,11 @@ import de.rki.coronawarnapp.bugreporting.BugReportingSettings
import de.rki.coronawarnapp.contactdiary.storage.ContactDiaryPreferences
import de.rki.coronawarnapp.contactdiary.storage.repo.ContactDiaryRepository
import de.rki.coronawarnapp.coronatest.CoronaTestRepository
-import de.rki.coronawarnapp.coronatest.TestCertificateRepository
import de.rki.coronawarnapp.coronatest.antigen.profile.RATProfileSettings
+import de.rki.coronawarnapp.covidcertificate.test.core.TestCertificateRepository
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.VaccinationPreferences
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.repository.VaccinationRepository
+import de.rki.coronawarnapp.covidcertificate.valueset.ValueSetsRepository
import de.rki.coronawarnapp.datadonation.analytics.Analytics
import de.rki.coronawarnapp.datadonation.analytics.storage.AnalyticsSettings
import de.rki.coronawarnapp.datadonation.survey.SurveySettings
@@ -26,9 +29,6 @@ import de.rki.coronawarnapp.storage.TracingSettings
import de.rki.coronawarnapp.submission.SubmissionRepository
import de.rki.coronawarnapp.submission.SubmissionSettings
import de.rki.coronawarnapp.ui.presencetracing.TraceLocationPreferences
-import de.rki.coronawarnapp.vaccination.core.VaccinationPreferences
-import de.rki.coronawarnapp.vaccination.core.repository.VaccinationRepository
-import de.rki.coronawarnapp.vaccination.core.repository.ValueSetsRepository
import kotlinx.coroutines.sync.Mutex
import kotlinx.coroutines.sync.withLock
import timber.log.Timber
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 9cb1bf7c24feb06d15ab72ed501459e7d7b61d9f..7582acfcdef9c87909c9489f4c35def8bae162cb 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
@@ -14,7 +14,7 @@ import de.rki.coronawarnapp.bugreporting.BugReportingSharedModule
import de.rki.coronawarnapp.bugreporting.debuglog.DebugLogger
import de.rki.coronawarnapp.coronatest.CoronaTestModule
import de.rki.coronawarnapp.coronatest.server.VerificationModule
-import de.rki.coronawarnapp.covidcertificate.server.CovidCertificateModule
+import de.rki.coronawarnapp.covidcertificate.DigitalCovidCertificateModule
import de.rki.coronawarnapp.datadonation.DataDonationModule
import de.rki.coronawarnapp.diagnosiskeys.DiagnosisKeysModule
import de.rki.coronawarnapp.diagnosiskeys.DownloadDiagnosisKeysTaskModule
@@ -46,7 +46,6 @@ import de.rki.coronawarnapp.util.encryptionmigration.EncryptionErrorResetTool
import de.rki.coronawarnapp.util.security.SecurityModule
import de.rki.coronawarnapp.util.serialization.SerializationModule
import de.rki.coronawarnapp.util.worker.WorkerBinder
-import de.rki.coronawarnapp.vaccination.core.VaccinationModule
import javax.inject.Singleton
@Singleton
@@ -81,8 +80,7 @@ import javax.inject.Singleton
SecurityModule::class,
PresenceTracingModule::class,
CoronaTestModule::class,
- VaccinationModule::class,
- CovidCertificateModule::class,
+ DigitalCovidCertificateModule::class,
]
)
interface ApplicationComponent : AndroidInjector<CoronaWarnApplication> {
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 5c751de715c9549b0139879c998fdfd57722b463..a80ff22e3751062ae654584672de2d5975996fe7 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
@@ -5,9 +5,10 @@ import dagger.Binds
import dagger.Module
import dagger.multibindings.IntoMap
import de.rki.coronawarnapp.contactdiary.retention.ContactDiaryRetentionWorker
-import de.rki.coronawarnapp.coronatest.type.common.TestCertificateRetrievalWorker
import de.rki.coronawarnapp.coronatest.type.pcr.execution.PCRResultRetrievalWorker
import de.rki.coronawarnapp.coronatest.type.rapidantigen.execution.RAResultRetrievalWorker
+import de.rki.coronawarnapp.covidcertificate.test.core.execution.TestCertificateRetrievalWorker
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.execution.worker.VaccinationUpdateWorker
import de.rki.coronawarnapp.datadonation.analytics.worker.DataDonationAnalyticsPeriodicWorker
import de.rki.coronawarnapp.deadman.DeadmanNotificationOneTimeWorker
import de.rki.coronawarnapp.deadman.DeadmanNotificationPeriodicWorker
@@ -19,7 +20,6 @@ import de.rki.coronawarnapp.presencetracing.checkins.checkout.auto.AutoCheckOutW
import de.rki.coronawarnapp.presencetracing.risk.execution.PresenceTracingWarningWorker
import de.rki.coronawarnapp.presencetracing.storage.retention.TraceLocationDbCleanUpPeriodicWorker
import de.rki.coronawarnapp.submission.auto.SubmissionWorker
-import de.rki.coronawarnapp.vaccination.core.execution.worker.VaccinationUpdateWorker
@Module
abstract class WorkerBinder {
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/certificate/RawCOSEObject.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/certificate/RawCOSEObject.kt
deleted file mode 100644
index 0a13bb0971b82d0456b0539469d6e0e63a16d690..0000000000000000000000000000000000000000
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/certificate/RawCOSEObject.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package de.rki.coronawarnapp.vaccination.core.certificate
-
-typealias RawCOSEObject = ByteArray
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/qrcode/VaccinationCertificateData.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/qrcode/VaccinationCertificateData.kt
deleted file mode 100644
index 31da1c88bc2ad193a46614debcbcaea02feae7a6..0000000000000000000000000000000000000000
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/qrcode/VaccinationCertificateData.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package de.rki.coronawarnapp.vaccination.core.qrcode
-
-import de.rki.coronawarnapp.vaccination.core.certificate.CoseCertificateHeader
-import de.rki.coronawarnapp.vaccination.core.certificate.VaccinationDGCV1
-
-/**
- * Represents the parsed data from the QR code
- */
-data class VaccinationCertificateData(
- val header: CoseCertificateHeader,
- val certificate: VaccinationDGCV1,
-)
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/repository/errors/VaccinatedPersonNotFoundException.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/repository/errors/VaccinatedPersonNotFoundException.kt
deleted file mode 100644
index 34e54c6f088361b3679092e07e728ca63d970a28..0000000000000000000000000000000000000000
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/repository/errors/VaccinatedPersonNotFoundException.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package de.rki.coronawarnapp.vaccination.core.repository.errors
-
-import de.rki.coronawarnapp.vaccination.core.VaccinationException
-
-class VaccinatedPersonNotFoundException(
- message: String
-) : VaccinationException(
- message = message,
- cause = null
-)
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/repository/errors/VaccinationCertificateNotFoundException.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/repository/errors/VaccinationCertificateNotFoundException.kt
deleted file mode 100644
index 2b3562f9093a0d15fe7e7c812d0de28f299ac056..0000000000000000000000000000000000000000
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/repository/errors/VaccinationCertificateNotFoundException.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package de.rki.coronawarnapp.vaccination.core.repository.errors
-
-import de.rki.coronawarnapp.vaccination.core.VaccinationException
-
-class VaccinationCertificateNotFoundException(
- message: String
-) : VaccinationException(
- message = message,
- cause = null
-)
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/server/VaccinationServerModule.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/server/VaccinationServerModule.kt
deleted file mode 100644
index 0b7411416d8d8bd90e5f36241c5f211f6c43ed6f..0000000000000000000000000000000000000000
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/server/VaccinationServerModule.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package de.rki.coronawarnapp.vaccination.core.server
-
-import dagger.Module
-import de.rki.coronawarnapp.vaccination.core.server.valueset.VaccinationValueSetModule
-
-@Module(
- includes = [
- VaccinationValueSetModule::class
- ]
-)
-abstract class VaccinationServerModule
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/VaccinationUIModule.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/VaccinationUIModule.kt
deleted file mode 100644
index e01ea64a568da58ef96cea1812d585aec6ea2f9c..0000000000000000000000000000000000000000
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/VaccinationUIModule.kt
+++ /dev/null
@@ -1,28 +0,0 @@
-package de.rki.coronawarnapp.vaccination.ui
-
-import dagger.Module
-import dagger.android.ContributesAndroidInjector
-import de.rki.coronawarnapp.vaccination.ui.consent.VaccinationConsentFragment
-import de.rki.coronawarnapp.vaccination.ui.consent.VaccinationConsentFragmentModule
-import de.rki.coronawarnapp.vaccination.ui.details.VaccinationDetailsFragment
-import de.rki.coronawarnapp.vaccination.ui.details.VaccinationDetailsFragmentModule
-import de.rki.coronawarnapp.vaccination.ui.list.VaccinationListFragment
-import de.rki.coronawarnapp.vaccination.ui.list.VaccinationListFragmentModule
-import de.rki.coronawarnapp.vaccination.ui.scan.VaccinationQrCodeScanFragment
-import de.rki.coronawarnapp.vaccination.ui.scan.VaccinationQrCodeScanModule
-
-@Module
-abstract class VaccinationUIModule {
-
- @ContributesAndroidInjector(modules = [VaccinationListFragmentModule::class])
- abstract fun vaccinationListFragment(): VaccinationListFragment
-
- @ContributesAndroidInjector(modules = [VaccinationDetailsFragmentModule::class])
- abstract fun vaccinationDetailsFragment(): VaccinationDetailsFragment
-
- @ContributesAndroidInjector(modules = [VaccinationQrCodeScanModule::class])
- abstract fun vaccinationQrCodeScanFragment(): VaccinationQrCodeScanFragment
-
- @ContributesAndroidInjector(modules = [VaccinationConsentFragmentModule::class])
- abstract fun vaccinationConsentFragment(): VaccinationConsentFragment
-}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/cards/VaccinationStatusItem.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/cards/VaccinationStatusItem.kt
deleted file mode 100644
index 18a09e0e752c94ff893aeeefac0e0c26ab36643e..0000000000000000000000000000000000000000
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/ui/cards/VaccinationStatusItem.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package de.rki.coronawarnapp.vaccination.ui.cards
-
-import de.rki.coronawarnapp.greencertificate.ui.certificates.items.CertificatesItem
-import de.rki.coronawarnapp.vaccination.core.VaccinatedPerson
-
-interface VaccinationStatusItem : CertificatesItem {
- val vaccinatedPerson: VaccinatedPerson
-
- override val stableId: Long
- get() = vaccinatedPerson.identifier.hashCode().toLong()
-}
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_certificates.xml b/Corona-Warn-App/src/main/res/layout/fragment_certificates.xml
index 1ce0b67b87f725d81edb1179dd1cc278950d5768..54fc467de2af5903216a7a1d94e0f275eddc0180 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_certificates.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_certificates.xml
@@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- tools:context=".greencertificate.ui.certificates.CertificatesFragment">
+ tools:context=".covidcertificate.test.ui.CertificatesFragment">
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
diff --git a/Corona-Warn-App/src/main/res/layout/vaccination_consent_fragment.xml b/Corona-Warn-App/src/main/res/layout/vaccination_consent_fragment.xml
index 340a37d67711f201d31569b43ee49985906fc420..3cff980a655c035a27775b1683995824b2ad2736 100644
--- a/Corona-Warn-App/src/main/res/layout/vaccination_consent_fragment.xml
+++ b/Corona-Warn-App/src/main/res/layout/vaccination_consent_fragment.xml
@@ -5,7 +5,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/colorBackground"
- tools:context="de.rki.coronawarnapp.vaccination.ui.consent.VaccinationConsentFragment">
+ tools:context="de.rki.coronawarnapp.covidcertificate.vaccination.ui.consent.VaccinationConsentFragment">
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
diff --git a/Corona-Warn-App/src/main/res/navigation/green_certificate_graph.xml b/Corona-Warn-App/src/main/res/navigation/green_certificate_graph.xml
index 01bba7f756b10ba7780be42bddbb6230bba3d9e9..f38cdb7fb4db60bb48e3abf7159527a05fd8e3e2 100644
--- a/Corona-Warn-App/src/main/res/navigation/green_certificate_graph.xml
+++ b/Corona-Warn-App/src/main/res/navigation/green_certificate_graph.xml
@@ -7,7 +7,7 @@
<fragment
android:id="@+id/certificatesFragment"
- android:name="de.rki.coronawarnapp.greencertificate.ui.certificates.CertificatesFragment"
+ android:name="de.rki.coronawarnapp.covidcertificate.test.ui.CertificatesFragment"
android:label="fragment_certificates"
tools:layout="@layout/fragment_certificates">
@@ -26,7 +26,7 @@
<fragment
android:id="@+id/vaccinationConsentFragment"
- android:name="de.rki.coronawarnapp.vaccination.ui.consent.VaccinationConsentFragment"
+ android:name="de.rki.coronawarnapp.covidcertificate.vaccination.ui.consent.VaccinationConsentFragment"
android:label="vaccination_consent_fragment"
tools:layout="@layout/vaccination_consent_fragment">
<argument
@@ -51,7 +51,7 @@
<fragment
android:id="@+id/covidCertificateDetailsFragment"
- android:name="de.rki.coronawarnapp.greencertificate.ui.certificates.details.CovidCertificateDetailsFragment"
+ android:name="de.rki.coronawarnapp.covidcertificate.test.ui.details.CovidCertificateDetailsFragment"
android:label="CovidCertificateDetailsFragment"
tools:layout="@layout/fragment_covid_certificate_details">
diff --git a/Corona-Warn-App/src/main/res/navigation/vaccination_nav_graph.xml b/Corona-Warn-App/src/main/res/navigation/vaccination_nav_graph.xml
index 74ba33a60f5af566e4f12927b5e33765ad4e985d..aeb23461ad7891fb411110910168880b6693ae5d 100644
--- a/Corona-Warn-App/src/main/res/navigation/vaccination_nav_graph.xml
+++ b/Corona-Warn-App/src/main/res/navigation/vaccination_nav_graph.xml
@@ -7,7 +7,7 @@
<fragment
android:id="@+id/vaccinationQrCodeScanFragment"
- android:name="de.rki.coronawarnapp.vaccination.ui.scan.VaccinationQrCodeScanFragment"
+ android:name="de.rki.coronawarnapp.covidcertificate.vaccination.ui.scan.VaccinationQrCodeScanFragment"
android:label="VaccinationQrCodeScanFragment"
tools:layout="@layout/fragment_scan_qr_code">
<action
@@ -20,7 +20,7 @@
<fragment
android:id="@+id/vaccinationListFragment"
- android:name="de.rki.coronawarnapp.vaccination.ui.list.VaccinationListFragment"
+ android:name="de.rki.coronawarnapp.covidcertificate.vaccination.ui.list.VaccinationListFragment"
android:label="fragment_vaccination_list"
tools:layout="@layout/fragment_vaccination_list">
<argument
@@ -37,7 +37,7 @@
<fragment
android:id="@+id/vaccinationDetailsFragment"
- android:name="de.rki.coronawarnapp.vaccination.ui.details.VaccinationDetailsFragment"
+ android:name="de.rki.coronawarnapp.covidcertificate.vaccination.ui.details.VaccinationDetailsFragment"
android:label="fragment_vaccination_details"
tools:layout="@layout/fragment_vaccination_details">
<argument
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/CoronaWarnApplicationTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/CoronaWarnApplicationTest.kt
index b42bb083255a12b0b01d76a69784892282b9172d..4a47302e03614b11a1b1720f7916f1a958f0c195 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/CoronaWarnApplicationTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/CoronaWarnApplicationTest.kt
@@ -7,11 +7,12 @@ import de.rki.coronawarnapp.appconfig.devicetime.DeviceTimeHandler
import de.rki.coronawarnapp.contactdiary.retention.ContactDiaryWorkScheduler
import de.rki.coronawarnapp.coronatest.CoronaTestRepository
import de.rki.coronawarnapp.coronatest.notification.ShareTestResultNotificationService
-import de.rki.coronawarnapp.coronatest.type.common.TestCertificateRetrievalScheduler
import de.rki.coronawarnapp.coronatest.type.pcr.execution.PCRResultScheduler
import de.rki.coronawarnapp.coronatest.type.pcr.notification.PCRTestResultAvailableNotificationService
import de.rki.coronawarnapp.coronatest.type.rapidantigen.execution.RAResultScheduler
import de.rki.coronawarnapp.coronatest.type.rapidantigen.notification.RATTestResultAvailableNotificationService
+import de.rki.coronawarnapp.covidcertificate.test.core.execution.TestCertificateRetrievalScheduler
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.execution.VaccinationUpdateScheduler
import de.rki.coronawarnapp.datadonation.analytics.worker.DataDonationAnalyticsScheduler
import de.rki.coronawarnapp.deadman.DeadmanNotificationScheduler
import de.rki.coronawarnapp.notification.GeneralNotifications
@@ -28,7 +29,6 @@ import de.rki.coronawarnapp.util.WatchdogService
import de.rki.coronawarnapp.util.device.ForegroundState
import de.rki.coronawarnapp.util.di.AppInjector
import de.rki.coronawarnapp.util.di.ApplicationComponent
-import de.rki.coronawarnapp.vaccination.core.execution.VaccinationUpdateScheduler
import io.mockk.MockKAnnotations
import io.mockk.Runs
import io.mockk.every
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/bugreporting/censors/vaccination/CertificateQrCodeCensorTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/bugreporting/censors/vaccination/CertificateQrCodeCensorTest.kt
index d76f485edcb574882a874c0d91ee5c66624af335..572a3d710e0cfab7100da833c0b893f766a42655 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/bugreporting/censors/vaccination/CertificateQrCodeCensorTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/bugreporting/censors/vaccination/CertificateQrCodeCensorTest.kt
@@ -1,7 +1,7 @@
package de.rki.coronawarnapp.bugreporting.censors.vaccination
-import de.rki.coronawarnapp.vaccination.core.certificate.VaccinationDGCV1
-import de.rki.coronawarnapp.vaccination.core.qrcode.VaccinationCertificateData
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.certificate.VaccinationDGCV1
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.qrcode.VaccinationCertificateData
import io.kotest.matchers.shouldBe
import io.mockk.MockKAnnotations
import io.mockk.mockk
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/coronatest/CoronaTestTestComponent.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/coronatest/CoronaTestTestComponent.kt
index 98d5cd5057f748d3631802056e89d878e9b91d25..cc0db91130df0ad8c2d29e579cdfcd938471d211 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/coronatest/CoronaTestTestComponent.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/coronatest/CoronaTestTestComponent.kt
@@ -2,8 +2,8 @@ package de.rki.coronawarnapp.coronatest
import dagger.Component
import dagger.Module
-import de.rki.coronawarnapp.coronatest.storage.TestCertificateStorageTest
import de.rki.coronawarnapp.coronatest.type.TestCertificateContainerTest
+import de.rki.coronawarnapp.covidcertificate.storage.TestCertificateStorageTest
import de.rki.coronawarnapp.util.serialization.SerializationModule
import javax.inject.Singleton
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/coronatest/type/TestCertificateContainerTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/coronatest/type/TestCertificateContainerTest.kt
index b50001b929e9254d01120308f3d4b691ce1d829a..8c42b1e213257a704b966a54a50df594a490bf29 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/coronatest/type/TestCertificateContainerTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/coronatest/type/TestCertificateContainerTest.kt
@@ -1,7 +1,7 @@
package de.rki.coronawarnapp.coronatest.type
import de.rki.coronawarnapp.coronatest.DaggerCoronaTestTestComponent
-import de.rki.coronawarnapp.coronatest.TestCertificateTestData
+import de.rki.coronawarnapp.covidcertificate.test.TestCertificateTestData
import io.kotest.matchers.shouldBe
import io.kotest.matchers.shouldNotBe
import io.mockk.mockk
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/vaccination/core/VaccinatedPersonIdentifierTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/common/CertificatePersonIdentifierTest.kt
similarity index 96%
rename from Corona-Warn-App/src/test/java/de/rki/coronawarnapp/vaccination/core/VaccinatedPersonIdentifierTest.kt
rename to Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/common/CertificatePersonIdentifierTest.kt
index faac0915b223c08de102b4d0a84811e57d1fd3b6..2b4da93088477abfdd84f0e59fed62f3be700786 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/vaccination/core/VaccinatedPersonIdentifierTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/common/CertificatePersonIdentifierTest.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.vaccination.core
+package de.rki.coronawarnapp.covidcertificate.common
import de.rki.coronawarnapp.covidcertificate.exception.InvalidHealthCertificateException.ErrorCode.VC_DOB_MISMATCH
import de.rki.coronawarnapp.covidcertificate.exception.InvalidHealthCertificateException.ErrorCode.VC_NAME_MISMATCH
@@ -10,7 +10,7 @@ import org.joda.time.LocalDate
import org.junit.jupiter.api.Test
import testhelpers.BaseTest
-class VaccinatedPersonIdentifierTest : BaseTest() {
+class CertificatePersonIdentifierTest : BaseTest() {
private val testPersonMaxData = CertificatePersonIdentifier(
dateOfBirth = LocalDate.parse("1966-11-11"),
firstNameStandardized = "ANDREAS",
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/coronatest/type/common/TestCertificateProcessorTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/execution/TestCertificateProcessorTest.kt
similarity index 84%
rename from Corona-Warn-App/src/test/java/de/rki/coronawarnapp/coronatest/type/common/TestCertificateProcessorTest.kt
rename to Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/execution/TestCertificateProcessorTest.kt
index b409eb693632a06370a709c6c8ed95439b1ca6cc..cada4eae052b53069cb6eb37d3bb76b59612e7f4 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/coronatest/type/common/TestCertificateProcessorTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/execution/TestCertificateProcessorTest.kt
@@ -1,13 +1,15 @@
-package de.rki.coronawarnapp.coronatest.type.common
+package de.rki.coronawarnapp.covidcertificate.execution
import de.rki.coronawarnapp.appconfig.AppConfigProvider
import de.rki.coronawarnapp.appconfig.ConfigData
import de.rki.coronawarnapp.appconfig.CovidCertificateConfig
-import de.rki.coronawarnapp.coronatest.type.pcr.PCRCertificateData
-import de.rki.coronawarnapp.covidcertificate.server.CovidCertificateServer
-import de.rki.coronawarnapp.covidcertificate.server.TestCertificateComponents
-import de.rki.coronawarnapp.covidcertificate.test.TestCertificateQRCode
-import de.rki.coronawarnapp.covidcertificate.test.TestCertificateQRCodeExtractor
+import de.rki.coronawarnapp.covidcertificate.test.core.qrcode.TestCertificateQRCode
+import de.rki.coronawarnapp.covidcertificate.test.core.qrcode.TestCertificateQRCodeExtractor
+import de.rki.coronawarnapp.covidcertificate.test.core.server.TestCertificateComponents
+import de.rki.coronawarnapp.covidcertificate.test.core.server.TestCertificateServer
+import de.rki.coronawarnapp.covidcertificate.test.core.storage.PCRCertificateData
+import de.rki.coronawarnapp.covidcertificate.test.core.storage.StoredTestCertificateData
+import de.rki.coronawarnapp.covidcertificate.test.core.storage.TestCertificateProcessor
import de.rki.coronawarnapp.util.TimeStamper
import de.rki.coronawarnapp.util.encryption.rsa.RSACryptography
import de.rki.coronawarnapp.util.encryption.rsa.RSAKeyPairGenerator
@@ -31,7 +33,7 @@ import testhelpers.coroutines.runBlockingTest2
class TestCertificateProcessorTest : BaseTest() {
@MockK lateinit var timeStamper: TimeStamper
- @MockK lateinit var certificateServer: CovidCertificateServer
+ @MockK lateinit var certificateServer: TestCertificateServer
@MockK lateinit var rsaCryptography: RSACryptography
@MockK lateinit var qrCodeExtractor: TestCertificateQRCodeExtractor
@MockK lateinit var appConfigProvider: AppConfigProvider
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/coronatest/type/common/TestCertificateRetrievalSchedulerTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/execution/TestCertificateRetrievalSchedulerTest.kt
similarity index 94%
rename from Corona-Warn-App/src/test/java/de/rki/coronawarnapp/coronatest/type/common/TestCertificateRetrievalSchedulerTest.kt
rename to Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/execution/TestCertificateRetrievalSchedulerTest.kt
index fb8cf540c0dea7b6d14902ef17fbb2a2ec89eda5..26617d4a7fedc92d88d0cf9facac1f1e8f9a153e 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/coronatest/type/common/TestCertificateRetrievalSchedulerTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/execution/TestCertificateRetrievalSchedulerTest.kt
@@ -1,12 +1,13 @@
-package de.rki.coronawarnapp.coronatest.type.common
+package de.rki.coronawarnapp.covidcertificate.execution
import androidx.work.OneTimeWorkRequest
import androidx.work.WorkInfo
import androidx.work.WorkManager
import de.rki.coronawarnapp.coronatest.CoronaTestRepository
-import de.rki.coronawarnapp.coronatest.TestCertificateRepository
import de.rki.coronawarnapp.coronatest.type.CoronaTest
-import de.rki.coronawarnapp.coronatest.type.TestCertificateWrapper
+import de.rki.coronawarnapp.covidcertificate.test.core.TestCertificateRepository
+import de.rki.coronawarnapp.covidcertificate.test.core.TestCertificateWrapper
+import de.rki.coronawarnapp.covidcertificate.test.core.execution.TestCertificateRetrievalScheduler
import de.rki.coronawarnapp.util.device.ForegroundState
import io.mockk.MockKAnnotations
import io.mockk.Runs
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/coronatest/type/common/TestCertificateRetrievalWorkerTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/execution/TestCertificateRetrievalWorkerTest.kt
similarity index 90%
rename from Corona-Warn-App/src/test/java/de/rki/coronawarnapp/coronatest/type/common/TestCertificateRetrievalWorkerTest.kt
rename to Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/execution/TestCertificateRetrievalWorkerTest.kt
index 4d189398bd1842c5f8f55eb07dd5bbacf3f0157c..7739eb15d5af474f35a7418ff0a142cc2f557faf 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/coronatest/type/common/TestCertificateRetrievalWorkerTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/execution/TestCertificateRetrievalWorkerTest.kt
@@ -1,10 +1,11 @@
-package de.rki.coronawarnapp.coronatest.type.common
+package de.rki.coronawarnapp.covidcertificate.execution
import android.content.Context
import androidx.work.ListenableWorker
import androidx.work.WorkRequest
import androidx.work.WorkerParameters
-import de.rki.coronawarnapp.coronatest.TestCertificateRepository
+import de.rki.coronawarnapp.covidcertificate.test.core.TestCertificateRepository
+import de.rki.coronawarnapp.covidcertificate.test.core.execution.TestCertificateRetrievalWorker
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/coronatest/type/pcr/PCRTestCertificateTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/storage/PCRTestCertificateTest.kt
similarity index 57%
rename from Corona-Warn-App/src/test/java/de/rki/coronawarnapp/coronatest/type/pcr/PCRTestCertificateTest.kt
rename to Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/storage/PCRTestCertificateTest.kt
index b07ad0c9e341c8834edd651bafe91cd8ed560ab3..1c1beb77369e5bf92735c86069d46e0149749884 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/coronatest/type/pcr/PCRTestCertificateTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/storage/PCRTestCertificateTest.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.coronatest.type.pcr
+package de.rki.coronawarnapp.covidcertificate.storage
import testhelpers.BaseTest
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/coronatest/type/rapidantigen/RATestCertificateTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/storage/RATestCertificateTest.kt
similarity index 55%
rename from Corona-Warn-App/src/test/java/de/rki/coronawarnapp/coronatest/type/rapidantigen/RATestCertificateTest.kt
rename to Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/storage/RATestCertificateTest.kt
index cc976227393176d156b458cf176217a3a5c2bae5..a954074ce438de9d12fe48d501495f099671e3a0 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/coronatest/type/rapidantigen/RATestCertificateTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/storage/RATestCertificateTest.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.coronatest.type.rapidantigen
+package de.rki.coronawarnapp.covidcertificate.storage
import testhelpers.BaseTest
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/coronatest/storage/TestCertificateStorageTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/storage/TestCertificateStorageTest.kt
similarity index 96%
rename from Corona-Warn-App/src/test/java/de/rki/coronawarnapp/coronatest/storage/TestCertificateStorageTest.kt
rename to Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/storage/TestCertificateStorageTest.kt
index 7f29705d8e8f648e4e48cf8b9d715b9b1383f78d..449f154a80d0a3b24da537e9cc5f3158724878cc 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/coronatest/storage/TestCertificateStorageTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/storage/TestCertificateStorageTest.kt
@@ -1,11 +1,12 @@
-package de.rki.coronawarnapp.coronatest.storage
+package de.rki.coronawarnapp.covidcertificate.storage
import android.content.Context
import androidx.core.content.edit
import de.rki.coronawarnapp.coronatest.DaggerCoronaTestTestComponent
-import de.rki.coronawarnapp.coronatest.TestCertificateTestData
+import de.rki.coronawarnapp.covidcertificate.test.TestCertificateTestData
+import de.rki.coronawarnapp.covidcertificate.test.core.storage.TestCertificateStorage
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.repository.storage.ContainerPostProcessor
import de.rki.coronawarnapp.util.serialization.SerializationModule
-import de.rki.coronawarnapp.vaccination.core.repository.storage.ContainerPostProcessor
import io.kotest.matchers.shouldBe
import io.mockk.MockKAnnotations
import io.mockk.every
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/coronatest/TestCertificateRepositoryTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/test/TestCertificateRepositoryTest.kt
similarity index 77%
rename from Corona-Warn-App/src/test/java/de/rki/coronawarnapp/coronatest/TestCertificateRepositoryTest.kt
rename to Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/test/TestCertificateRepositoryTest.kt
index 00b314260d2ebc0433ce37ca06254b9957680d5a..3a4dd7cdef30fb5d9727f75f905893447150fdb8 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/coronatest/TestCertificateRepositoryTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/test/TestCertificateRepositoryTest.kt
@@ -1,13 +1,14 @@
-package de.rki.coronawarnapp.coronatest
+package de.rki.coronawarnapp.covidcertificate.test
import de.rki.coronawarnapp.appconfig.CovidCertificateConfig
-import de.rki.coronawarnapp.coronatest.storage.TestCertificateStorage
-import de.rki.coronawarnapp.coronatest.type.common.StoredTestCertificateData
-import de.rki.coronawarnapp.coronatest.type.common.TestCertificateProcessor
-import de.rki.coronawarnapp.coronatest.type.pcr.PCRCertificateData
-import de.rki.coronawarnapp.covidcertificate.test.TestCertificateQRCode
-import de.rki.coronawarnapp.covidcertificate.test.TestCertificateQRCodeExtractor
-import de.rki.coronawarnapp.vaccination.core.repository.ValueSetsRepository
+import de.rki.coronawarnapp.covidcertificate.test.core.TestCertificateRepository
+import de.rki.coronawarnapp.covidcertificate.test.core.qrcode.TestCertificateQRCode
+import de.rki.coronawarnapp.covidcertificate.test.core.qrcode.TestCertificateQRCodeExtractor
+import de.rki.coronawarnapp.covidcertificate.test.core.storage.PCRCertificateData
+import de.rki.coronawarnapp.covidcertificate.test.core.storage.StoredTestCertificateData
+import de.rki.coronawarnapp.covidcertificate.test.core.storage.TestCertificateProcessor
+import de.rki.coronawarnapp.covidcertificate.test.core.storage.TestCertificateStorage
+import de.rki.coronawarnapp.covidcertificate.valueset.ValueSetsRepository
import io.mockk.MockKAnnotations
import io.mockk.coEvery
import io.mockk.every
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/coronatest/TestCertificateTestData.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/test/TestCertificateTestData.kt
similarity index 97%
rename from Corona-Warn-App/src/test/java/de/rki/coronawarnapp/coronatest/TestCertificateTestData.kt
rename to Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/test/TestCertificateTestData.kt
index 0de056a4501d158461578c680059255c9397d278..e6da753eb92a102b7916032147d183d729219e3d 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/coronatest/TestCertificateTestData.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/test/TestCertificateTestData.kt
@@ -1,9 +1,9 @@
-package de.rki.coronawarnapp.coronatest
+package de.rki.coronawarnapp.covidcertificate.test
-import de.rki.coronawarnapp.coronatest.type.common.TestCertificateContainer
-import de.rki.coronawarnapp.coronatest.type.pcr.PCRCertificateData
-import de.rki.coronawarnapp.coronatest.type.rapidantigen.RACertificateData
-import de.rki.coronawarnapp.covidcertificate.test.TestCertificateQRCodeExtractor
+import de.rki.coronawarnapp.covidcertificate.test.core.qrcode.TestCertificateQRCodeExtractor
+import de.rki.coronawarnapp.covidcertificate.test.core.storage.PCRCertificateData
+import de.rki.coronawarnapp.covidcertificate.test.core.storage.RACertificateData
+import de.rki.coronawarnapp.covidcertificate.test.core.storage.TestCertificateContainer
import de.rki.coronawarnapp.util.encryption.rsa.RSAKey
import okio.ByteString.Companion.decodeBase64
import org.joda.time.Instant
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/test/TestCertificateDccParserTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/test/core/qrcode/TestCertificateDccParserTest.kt
similarity index 88%
rename from Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/test/TestCertificateDccParserTest.kt
rename to Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/test/core/qrcode/TestCertificateDccParserTest.kt
index 64d989fb9026dbcc6a7111af9696e6b172d2df0a..3603b4954f0f6f006d5186e58389aeb3ae221fee 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/test/TestCertificateDccParserTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/test/core/qrcode/TestCertificateDccParserTest.kt
@@ -1,7 +1,9 @@
-package de.rki.coronawarnapp.covidcertificate.test
+package de.rki.coronawarnapp.covidcertificate.test.core.qrcode
import com.google.gson.Gson
import com.upokecenter.cbor.CBORObject
+import de.rki.coronawarnapp.covidcertificate.test.TestData
+import de.rki.coronawarnapp.covidcertificate.test.core.certificate.TestCertificateDccParser
import io.kotest.matchers.shouldBe
import okio.ByteString.Companion.decodeHex
import org.joda.time.LocalDate
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/test/TestCertificateQRCodeExtractorTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/test/core/qrcode/TestCertificateQRCodeExtractorTest.kt
similarity index 91%
rename from Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/test/TestCertificateQRCodeExtractorTest.kt
rename to Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/test/core/qrcode/TestCertificateQRCodeExtractorTest.kt
index 8d8b76c47dfd4d0a818602db4013f74c5b7982d6..8b67db97d8cfff3a79aac07179c8f67e705f4387 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/test/TestCertificateQRCodeExtractorTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/test/core/qrcode/TestCertificateQRCodeExtractorTest.kt
@@ -1,12 +1,14 @@
-package de.rki.coronawarnapp.covidcertificate.test
+package de.rki.coronawarnapp.covidcertificate.test.core.qrcode
import com.google.gson.Gson
import de.rki.coronawarnapp.covidcertificate.cryptography.AesCryptography
import de.rki.coronawarnapp.covidcertificate.exception.InvalidHealthCertificateException
import de.rki.coronawarnapp.covidcertificate.exception.InvalidTestCertificateException
-import de.rki.coronawarnapp.vaccination.core.VaccinationQrCodeTestData
-import de.rki.coronawarnapp.vaccination.core.certificate.HealthCertificateCOSEDecoder
-import de.rki.coronawarnapp.vaccination.core.certificate.HealthCertificateHeaderParser
+import de.rki.coronawarnapp.covidcertificate.test.TestData
+import de.rki.coronawarnapp.covidcertificate.test.core.certificate.TestCertificateDccParser
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.VaccinationQrCodeTestData
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.certificate.HealthCertificateCOSEDecoder
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.certificate.HealthCertificateHeaderParser
import io.kotest.assertions.throwables.shouldThrow
import io.kotest.matchers.shouldBe
import okio.ByteString.Companion.decodeBase64
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/server/CovidCertificateApiV1Test.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/test/core/server/CovidCertificateApiV1Test.kt
similarity index 87%
rename from Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/server/CovidCertificateApiV1Test.kt
rename to Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/test/core/server/CovidCertificateApiV1Test.kt
index 07a5352649ebe8b132e461a302a947930346a18c..cd0da93b8ce592dbd6f673a1ab5cba56ad14802a 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/server/CovidCertificateApiV1Test.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/test/core/server/CovidCertificateApiV1Test.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.covidcertificate.server
+package de.rki.coronawarnapp.covidcertificate.test.core.server
import de.rki.coronawarnapp.http.HttpModule
import io.kotest.matchers.shouldBe
@@ -31,10 +31,10 @@ class CovidCertificateApiV1Test : BaseTest() {
webServer.shutdown()
}
- private fun createAPI(): CovidCertificateApiV1 {
+ private fun createAPI(): TestCertificateApiV1 {
val httpModule = HttpModule()
- return CovidCertificateModule().let {
+ return TestCertificateServerModule().let {
val downloadHttpClient = httpModule.defaultHttpClient()
it.apiV1(
httpClient = downloadHttpClient,
@@ -54,7 +54,7 @@ class CovidCertificateApiV1Test : BaseTest() {
""".toJsonResponse().apply { webServer.enqueue(this) }
api.sendPublicKey(
- CovidCertificateApiV1.PublicKeyUploadRequest(
+ TestCertificateApiV1.PublicKeyUploadRequest(
registrationToken = "token1",
publicKey = "key1"
)
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/vaccination/core/VaccinatedPersonTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/VaccinatedPersonTest.kt
similarity index 93%
rename from Corona-Warn-App/src/test/java/de/rki/coronawarnapp/vaccination/core/VaccinatedPersonTest.kt
rename to Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/VaccinatedPersonTest.kt
index 7e22f16f58fea591203cc533b47f71b441a40288..bd02d7face41c0a7a78cd705544b2e474caba389 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/vaccination/core/VaccinatedPersonTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/VaccinatedPersonTest.kt
@@ -1,7 +1,7 @@
-package de.rki.coronawarnapp.vaccination.core
+package de.rki.coronawarnapp.covidcertificate.vaccination.core
-import de.rki.coronawarnapp.vaccination.core.repository.storage.VaccinatedPersonData
-import de.rki.coronawarnapp.vaccination.core.repository.storage.VaccinationContainer
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.repository.storage.VaccinatedPersonData
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.repository.storage.VaccinationContainer
import io.kotest.matchers.shouldBe
import io.mockk.every
import io.mockk.mockk
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/vaccination/core/VaccinationQrCodeTestData.java b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/VaccinationQrCodeTestData.java
similarity index 98%
rename from Corona-Warn-App/src/test/java/de/rki/coronawarnapp/vaccination/core/VaccinationQrCodeTestData.java
rename to Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/VaccinationQrCodeTestData.java
index 041a2226fbf8ba6cb8909a6102d8a772b3fc0460..c4e1fbce80e8ae59d075fab4fb492e3e4d3b7048 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/vaccination/core/VaccinationQrCodeTestData.java
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/VaccinationQrCodeTestData.java
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.vaccination.core;
+package de.rki.coronawarnapp.covidcertificate.vaccination.core;
public class VaccinationQrCodeTestData {
static public String validVaccinationQrCode = "HC1:6BFOXN*TS0BI$ZD4N9:9S6RCVN5+O30K3/XIV0W23NTDEXWK G2EP4J0BGJLFX3R3VHXK.PJ:2DPF6R:5SVBHABVCNN95SWMPHQUHQN%A0SOE+QQAB-HQ/HQ7IR.SQEEOK9SAI4- 7Y15KBPD34 QWSP0WRGTQFNPLIR.KQNA7N95U/3FJCTG90OARH9P1J4HGZJKBEG%123ZC$0BCI757TLXKIBTV5TN%2LXK-$CH4TSXKZ4S/$K%0KPQ1HEP9.PZE9Q$95:UENEUW6646936HRTO$9KZ56DE/.QC$Q3J62:6LZ6O59++9-G9+E93ZM$96TV6NRN3T59YLQM1VRMP$I/XK$M8PK66YBTJ1ZO8B-S-*O5W41FD$ 81JP%KNEV45G1H*KESHMN2/TU3UQQKE*QHXSMNV25$1PK50C9B/9OK5NE1 9V2:U6A1ELUCT16DEETUM/UIN9P8Q:KPFY1W+UN MUNU8T1PEEG%5TW5A 6YO67N6BBEWED/3LS3N6YU.:KJWKPZ9+CQP2IOMH.PR97QC:ACZAH.SYEDK3EL-FIK9J8JRBC7ADHWQYSK48UNZGG NAVEHWEOSUI2L.9OR8FHB0T5HM7I";
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/vaccination/core/VaccinationTestComponent.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/VaccinationTestComponent.kt
similarity index 59%
rename from Corona-Warn-App/src/test/java/de/rki/coronawarnapp/vaccination/core/VaccinationTestComponent.kt
rename to Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/VaccinationTestComponent.kt
index 181970bd621adbbc1eb156126f6bd70dcbd01dd7..8d1e04bbb267f7c39592ba80aa9f8e725072164e 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/vaccination/core/VaccinationTestComponent.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/VaccinationTestComponent.kt
@@ -1,12 +1,12 @@
-package de.rki.coronawarnapp.vaccination.core
+package de.rki.coronawarnapp.covidcertificate.vaccination.core
import dagger.Component
import dagger.Module
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.qrcode.VaccinationQRCodeExtractorTest
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.repository.VaccinationRepositoryTest
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.repository.storage.VaccinationContainerTest
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.repository.storage.VaccinationStorageTest
import de.rki.coronawarnapp.util.serialization.SerializationModule
-import de.rki.coronawarnapp.vaccination.core.qrcode.VaccinationQRCodeExtractorTest
-import de.rki.coronawarnapp.vaccination.core.repository.VaccinationRepositoryTest
-import de.rki.coronawarnapp.vaccination.core.repository.storage.VaccinationContainerTest
-import de.rki.coronawarnapp.vaccination.core.repository.storage.VaccinationStorageTest
import javax.inject.Singleton
@Singleton
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/vaccination/core/VaccinationTestData.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/VaccinationTestData.kt
similarity index 91%
rename from Corona-Warn-App/src/test/java/de/rki/coronawarnapp/vaccination/core/VaccinationTestData.kt
rename to Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/VaccinationTestData.kt
index 5652d7054cc15d06706e37f97a889ad54e6ecc93..7446be10c64eaadacc47f1afc89dfb23a6dcf1c9 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/vaccination/core/VaccinationTestData.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/VaccinationTestData.kt
@@ -1,12 +1,12 @@
-package de.rki.coronawarnapp.vaccination.core
-
-import de.rki.coronawarnapp.vaccination.core.certificate.HealthCertificateHeader
-import de.rki.coronawarnapp.vaccination.core.certificate.VaccinationDGCV1
-import de.rki.coronawarnapp.vaccination.core.qrcode.VaccinationCertificateData
-import de.rki.coronawarnapp.vaccination.core.qrcode.VaccinationCertificateQRCode
-import de.rki.coronawarnapp.vaccination.core.qrcode.VaccinationQRCodeExtractor
-import de.rki.coronawarnapp.vaccination.core.repository.storage.VaccinatedPersonData
-import de.rki.coronawarnapp.vaccination.core.repository.storage.VaccinationContainer
+package de.rki.coronawarnapp.covidcertificate.vaccination.core
+
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.certificate.HealthCertificateHeader
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.certificate.VaccinationDGCV1
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.qrcode.VaccinationCertificateData
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.qrcode.VaccinationCertificateQRCode
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.qrcode.VaccinationQRCodeExtractor
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.repository.storage.VaccinatedPersonData
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.repository.storage.VaccinationContainer
import org.joda.time.Instant
import javax.inject.Inject
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/vaccination/core/ValueSetTestData.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/ValueSetTestData.kt
similarity index 85%
rename from Corona-Warn-App/src/test/java/de/rki/coronawarnapp/vaccination/core/ValueSetTestData.kt
rename to Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/ValueSetTestData.kt
index 4e53a140a553e68d0779b18dfe2b96ed21b5865f..732fab8d22391c94e62838b2ed913094e5814ca5 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/vaccination/core/ValueSetTestData.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/ValueSetTestData.kt
@@ -1,9 +1,9 @@
-package de.rki.coronawarnapp.vaccination.core
+package de.rki.coronawarnapp.covidcertificate.vaccination.core
-import de.rki.coronawarnapp.vaccination.core.server.valueset.valuesets.DefaultValueSet
-import de.rki.coronawarnapp.vaccination.core.server.valueset.valuesets.TestCertificateValueSets
-import de.rki.coronawarnapp.vaccination.core.server.valueset.valuesets.VaccinationValueSets
-import de.rki.coronawarnapp.vaccination.core.server.valueset.valuesets.ValueSetsContainer
+import de.rki.coronawarnapp.covidcertificate.valueset.valuesets.DefaultValueSet
+import de.rki.coronawarnapp.covidcertificate.valueset.valuesets.TestCertificateValueSets
+import de.rki.coronawarnapp.covidcertificate.valueset.valuesets.VaccinationValueSets
+import de.rki.coronawarnapp.covidcertificate.valueset.valuesets.ValueSetsContainer
import java.util.Locale
object ValueSetTestData {
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/vaccination/core/execution/VaccinationUpdateSchedulerTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/execution/VaccinationUpdateSchedulerTest.kt
similarity index 90%
rename from Corona-Warn-App/src/test/java/de/rki/coronawarnapp/vaccination/core/execution/VaccinationUpdateSchedulerTest.kt
rename to Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/execution/VaccinationUpdateSchedulerTest.kt
index 4488f0b27dd0db557456c40ab0b14bb0527d6035..d3358a2c812be102861b3553ecd3682eebf5f843 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/vaccination/core/execution/VaccinationUpdateSchedulerTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/execution/VaccinationUpdateSchedulerTest.kt
@@ -1,16 +1,16 @@
-package de.rki.coronawarnapp.vaccination.core.execution
+package de.rki.coronawarnapp.covidcertificate.vaccination.core.execution
import androidx.work.PeriodicWorkRequest
import androidx.work.WorkInfo
import androidx.work.WorkManager
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.VaccinatedPerson
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.execution.worker.VaccinationUpdateWorkerRequestBuilder
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.repository.VaccinationRepository
import de.rki.coronawarnapp.task.TaskController
import de.rki.coronawarnapp.task.TaskRequest
import de.rki.coronawarnapp.util.CWADebug
import de.rki.coronawarnapp.util.TimeStamper
import de.rki.coronawarnapp.util.device.ForegroundState
-import de.rki.coronawarnapp.vaccination.core.VaccinatedPerson
-import de.rki.coronawarnapp.vaccination.core.execution.worker.VaccinationUpdateWorkerRequestBuilder
-import de.rki.coronawarnapp.vaccination.core.repository.VaccinationRepository
import io.mockk.Called
import io.mockk.MockKAnnotations
import io.mockk.Runs
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/vaccination/core/execution/task/VaccinationUpdateTaskTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/execution/task/VaccinationUpdateTaskTest.kt
similarity index 84%
rename from Corona-Warn-App/src/test/java/de/rki/coronawarnapp/vaccination/core/execution/task/VaccinationUpdateTaskTest.kt
rename to Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/execution/task/VaccinationUpdateTaskTest.kt
index 59c1af64093c344318739a48559cbbb27884342f..918e72b86509ca245242071bb4b8bfc56a04f1f0 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/vaccination/core/execution/task/VaccinationUpdateTaskTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/execution/task/VaccinationUpdateTaskTest.kt
@@ -1,6 +1,6 @@
-package de.rki.coronawarnapp.vaccination.core.execution.task
+package de.rki.coronawarnapp.covidcertificate.vaccination.core.execution.task
-import de.rki.coronawarnapp.vaccination.core.repository.VaccinationRepository
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.repository.VaccinationRepository
import io.mockk.MockKAnnotations
import io.mockk.Runs
import io.mockk.coEvery
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/vaccination/core/execution/worker/VaccinationUpdateWorkerTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/execution/worker/VaccinationUpdateWorkerTest.kt
similarity index 93%
rename from Corona-Warn-App/src/test/java/de/rki/coronawarnapp/vaccination/core/execution/worker/VaccinationUpdateWorkerTest.kt
rename to Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/execution/worker/VaccinationUpdateWorkerTest.kt
index 60c8a9d2558c3bd8218fa729b74a167e46af3a1d..657ee5993bdec0d28114ef3228dc626615d96f52 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/vaccination/core/execution/worker/VaccinationUpdateWorkerTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/execution/worker/VaccinationUpdateWorkerTest.kt
@@ -1,15 +1,15 @@
-package de.rki.coronawarnapp.vaccination.core.execution.worker
+package de.rki.coronawarnapp.covidcertificate.vaccination.core.execution.worker
import android.content.Context
import androidx.work.ListenableWorker
import androidx.work.WorkerParameters
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.execution.task.VaccinationUpdateTask
import de.rki.coronawarnapp.task.TaskController
import de.rki.coronawarnapp.task.TaskFactory
import de.rki.coronawarnapp.task.TaskRequest
import de.rki.coronawarnapp.task.TaskState
import de.rki.coronawarnapp.task.common.DefaultTaskRequest
import de.rki.coronawarnapp.task.submitBlocking
-import de.rki.coronawarnapp.vaccination.core.execution.task.VaccinationUpdateTask
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/vaccination/core/qrcode/VaccinationQRCodeExtractorTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/qrcode/VaccinationQRCodeExtractorTest.kt
similarity index 94%
rename from Corona-Warn-App/src/test/java/de/rki/coronawarnapp/vaccination/core/qrcode/VaccinationQRCodeExtractorTest.kt
rename to Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/qrcode/VaccinationQRCodeExtractorTest.kt
index 246301795dfbc8c789dc2b4188d4f6852ad310d7..a740c1d223c2e6d91a01d311c59afa0d70732f2d 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/vaccination/core/qrcode/VaccinationQRCodeExtractorTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/qrcode/VaccinationQRCodeExtractorTest.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.vaccination.core.qrcode
+package de.rki.coronawarnapp.covidcertificate.vaccination.core.qrcode
import de.rki.coronawarnapp.covidcertificate.exception.InvalidHealthCertificateException
import de.rki.coronawarnapp.covidcertificate.exception.InvalidHealthCertificateException.ErrorCode.HC_BASE45_DECODING_FAILED
@@ -6,9 +6,9 @@ import de.rki.coronawarnapp.covidcertificate.exception.InvalidHealthCertificateE
import de.rki.coronawarnapp.covidcertificate.exception.InvalidHealthCertificateException.ErrorCode.HC_ZLIB_DECOMPRESSION_FAILED
import de.rki.coronawarnapp.covidcertificate.exception.InvalidHealthCertificateException.ErrorCode.VC_NO_VACCINATION_ENTRY
import de.rki.coronawarnapp.covidcertificate.exception.InvalidVaccinationCertificateException
-import de.rki.coronawarnapp.vaccination.core.DaggerVaccinationTestComponent
-import de.rki.coronawarnapp.vaccination.core.VaccinationQrCodeTestData
-import de.rki.coronawarnapp.vaccination.core.VaccinationTestData
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.DaggerVaccinationTestComponent
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.VaccinationQrCodeTestData
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.VaccinationTestData
import io.kotest.assertions.throwables.shouldThrow
import io.kotest.matchers.shouldBe
import org.joda.time.Instant
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/vaccination/core/repository/VaccinationRepositoryTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/repository/VaccinationRepositoryTest.kt
similarity index 89%
rename from Corona-Warn-App/src/test/java/de/rki/coronawarnapp/vaccination/core/repository/VaccinationRepositoryTest.kt
rename to Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/repository/VaccinationRepositoryTest.kt
index 97a45dc46732865b12c2b49a27cb449fcecd8a6d..1f5e4170631a3f677690f6756924f2bb15499e3f 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/vaccination/core/repository/VaccinationRepositoryTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/repository/VaccinationRepositoryTest.kt
@@ -1,16 +1,17 @@
-package de.rki.coronawarnapp.vaccination.core.repository
+package de.rki.coronawarnapp.covidcertificate.vaccination.core.repository
import de.rki.coronawarnapp.covidcertificate.exception.InvalidHealthCertificateException.ErrorCode.VC_ALREADY_REGISTERED
import de.rki.coronawarnapp.covidcertificate.exception.InvalidHealthCertificateException.ErrorCode.VC_NAME_MISMATCH
import de.rki.coronawarnapp.covidcertificate.exception.InvalidVaccinationCertificateException
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.DaggerVaccinationTestComponent
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.VaccinationTestData
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.qrcode.VaccinationQRCodeExtractor
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.repository.errors.VaccinationCertificateNotFoundException
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.repository.storage.VaccinatedPersonData
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.repository.storage.VaccinationStorage
+import de.rki.coronawarnapp.covidcertificate.valueset.ValueSetsRepository
+import de.rki.coronawarnapp.covidcertificate.valueset.valuesets.VaccinationValueSets
import de.rki.coronawarnapp.util.TimeStamper
-import de.rki.coronawarnapp.vaccination.core.DaggerVaccinationTestComponent
-import de.rki.coronawarnapp.vaccination.core.VaccinationTestData
-import de.rki.coronawarnapp.vaccination.core.qrcode.VaccinationQRCodeExtractor
-import de.rki.coronawarnapp.vaccination.core.repository.errors.VaccinationCertificateNotFoundException
-import de.rki.coronawarnapp.vaccination.core.repository.storage.VaccinatedPersonData
-import de.rki.coronawarnapp.vaccination.core.repository.storage.VaccinationStorage
-import de.rki.coronawarnapp.vaccination.core.server.valueset.valuesets.VaccinationValueSets
import io.kotest.assertions.throwables.shouldThrow
import io.kotest.matchers.shouldBe
import io.mockk.MockKAnnotations
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/vaccination/core/repository/storage/VaccinationContainerTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/repository/storage/VaccinationContainerTest.kt
similarity index 91%
rename from Corona-Warn-App/src/test/java/de/rki/coronawarnapp/vaccination/core/repository/storage/VaccinationContainerTest.kt
rename to Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/repository/storage/VaccinationContainerTest.kt
index 23ea0b087190a451bc3e6654d4d41d8a243171a5..4498d70dca75cc2140b2babbd403b8d541c07778 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/vaccination/core/repository/storage/VaccinationContainerTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/repository/storage/VaccinationContainerTest.kt
@@ -1,10 +1,10 @@
-package de.rki.coronawarnapp.vaccination.core.repository.storage
+package de.rki.coronawarnapp.covidcertificate.vaccination.core.repository.storage
-import de.rki.coronawarnapp.vaccination.core.CertificatePersonIdentifier
-import de.rki.coronawarnapp.vaccination.core.DaggerVaccinationTestComponent
-import de.rki.coronawarnapp.vaccination.core.VaccinationTestData
-import de.rki.coronawarnapp.vaccination.core.server.valueset.valuesets.DefaultValueSet
-import de.rki.coronawarnapp.vaccination.core.server.valueset.valuesets.VaccinationValueSets
+import de.rki.coronawarnapp.covidcertificate.common.CertificatePersonIdentifier
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.DaggerVaccinationTestComponent
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.VaccinationTestData
+import de.rki.coronawarnapp.covidcertificate.valueset.valuesets.DefaultValueSet
+import de.rki.coronawarnapp.covidcertificate.valueset.valuesets.VaccinationValueSets
import io.kotest.matchers.shouldBe
import org.joda.time.Instant
import org.joda.time.LocalDate
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/vaccination/core/repository/storage/VaccinationStorageTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/repository/storage/VaccinationStorageTest.kt
similarity index 92%
rename from Corona-Warn-App/src/test/java/de/rki/coronawarnapp/vaccination/core/repository/storage/VaccinationStorageTest.kt
rename to Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/repository/storage/VaccinationStorageTest.kt
index 0649370ff5c8f6d0218ec98adaf1f44dc2ddd4bf..4da0bfea9e53f3b7075bcb43193124031d147681 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/vaccination/core/repository/storage/VaccinationStorageTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/repository/storage/VaccinationStorageTest.kt
@@ -1,10 +1,10 @@
-package de.rki.coronawarnapp.vaccination.core.repository.storage
+package de.rki.coronawarnapp.covidcertificate.vaccination.core.repository.storage
import android.content.Context
import androidx.core.content.edit
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.DaggerVaccinationTestComponent
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.VaccinationTestData
import de.rki.coronawarnapp.util.serialization.SerializationModule
-import de.rki.coronawarnapp.vaccination.core.DaggerVaccinationTestComponent
-import de.rki.coronawarnapp.vaccination.core.VaccinationTestData
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/vaccination/core/repository/storage/ValueSetsStorageTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/repository/storage/ValueSetsStorageTest.kt
similarity index 92%
rename from Corona-Warn-App/src/test/java/de/rki/coronawarnapp/vaccination/core/repository/storage/ValueSetsStorageTest.kt
rename to Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/repository/storage/ValueSetsStorageTest.kt
index fca0f2c4dc5ca162f28a06782f7ff30863b3a525..9bddcf4c849d9f46912cf6d06f8307424db1690e 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/vaccination/core/repository/storage/ValueSetsStorageTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/repository/storage/ValueSetsStorageTest.kt
@@ -1,11 +1,12 @@
-package de.rki.coronawarnapp.vaccination.core.repository.storage
+package de.rki.coronawarnapp.covidcertificate.vaccination.core.repository.storage
import android.content.Context
import androidx.core.content.edit
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.ValueSetTestData.valueSetsContainerDe
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.ValueSetTestData.valueSetsContainerEn
+import de.rki.coronawarnapp.covidcertificate.valueset.valuesets.ValueSetsStorage
+import de.rki.coronawarnapp.covidcertificate.valueset.valuesets.emptyValueSetsContainer
import de.rki.coronawarnapp.util.serialization.SerializationModule
-import de.rki.coronawarnapp.vaccination.core.ValueSetTestData.valueSetsContainerDe
-import de.rki.coronawarnapp.vaccination.core.ValueSetTestData.valueSetsContainerEn
-import de.rki.coronawarnapp.vaccination.core.server.valueset.valuesets.emptyValueSetsContainer
import io.kotest.matchers.shouldBe
import io.mockk.MockKAnnotations
import io.mockk.every
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/vaccination/core/repository/ValueSetsRepositoryTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/valueset/ValueSetsRepositoryTest.kt
similarity index 59%
rename from Corona-Warn-App/src/test/java/de/rki/coronawarnapp/vaccination/core/repository/ValueSetsRepositoryTest.kt
rename to Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/valueset/ValueSetsRepositoryTest.kt
index f50e5632a0a3019afb22517930a5438bee9c1660..fe97082431a3af107392e0208662b6fa2ef8f7c8 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/vaccination/core/repository/ValueSetsRepositoryTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/valueset/ValueSetsRepositoryTest.kt
@@ -1,14 +1,14 @@
-package de.rki.coronawarnapp.vaccination.core.repository
-
-import de.rki.coronawarnapp.vaccination.core.ValueSetTestData.testCertificateValueSetsDe
-import de.rki.coronawarnapp.vaccination.core.ValueSetTestData.testCertificateValueSetsEn
-import de.rki.coronawarnapp.vaccination.core.ValueSetTestData.vaccinationValueSetsDe
-import de.rki.coronawarnapp.vaccination.core.ValueSetTestData.vaccinationValueSetsEn
-import de.rki.coronawarnapp.vaccination.core.ValueSetTestData.valueSetsContainerDe
-import de.rki.coronawarnapp.vaccination.core.ValueSetTestData.valueSetsContainerEn
-import de.rki.coronawarnapp.vaccination.core.repository.storage.ValueSetsStorage
-import de.rki.coronawarnapp.vaccination.core.server.valueset.VaccinationServer
-import de.rki.coronawarnapp.vaccination.core.server.valueset.valuesets.emptyValueSetsContainer
+package de.rki.coronawarnapp.covidcertificate.valueset
+
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.ValueSetTestData.testCertificateValueSetsDe
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.ValueSetTestData.testCertificateValueSetsEn
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.ValueSetTestData.vaccinationValueSetsDe
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.ValueSetTestData.vaccinationValueSetsEn
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.ValueSetTestData.valueSetsContainerDe
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.ValueSetTestData.valueSetsContainerEn
+import de.rki.coronawarnapp.covidcertificate.valueset.server.CertificateValueSetServer
+import de.rki.coronawarnapp.covidcertificate.valueset.valuesets.ValueSetsStorage
+import de.rki.coronawarnapp.covidcertificate.valueset.valuesets.emptyValueSetsContainer
import io.kotest.matchers.shouldBe
import io.mockk.MockKAnnotations
import io.mockk.Ordering
@@ -29,13 +29,13 @@ import java.util.Locale
class ValueSetsRepositoryTest : BaseTest() {
- @MockK lateinit var vaccinationServer: VaccinationServer
+ @MockK lateinit var certificateValueSetServer: CertificateValueSetServer
@MockK lateinit var valueSetsStorage: ValueSetsStorage
private val testDispatcherProvider = TestDispatcherProvider()
private fun createInstance(scope: CoroutineScope) = ValueSetsRepository(
- vaccinationServer = vaccinationServer,
+ certificateValueSetServer = certificateValueSetServer,
valueSetsStorage = valueSetsStorage,
scope = scope,
dispatcherProvider = testDispatcherProvider
@@ -44,13 +44,13 @@ class ValueSetsRepositoryTest : BaseTest() {
@BeforeEach
fun setUp() {
MockKAnnotations.init(this)
- coEvery { vaccinationServer.getVaccinationValueSets(any()) } returns
+ coEvery { certificateValueSetServer.getVaccinationValueSets(any()) } returns
null
- coEvery { vaccinationServer.getVaccinationValueSets(languageCode = Locale.ENGLISH) } returns
+ coEvery { certificateValueSetServer.getVaccinationValueSets(languageCode = Locale.ENGLISH) } returns
valueSetsContainerEn
- coEvery { vaccinationServer.getVaccinationValueSets(languageCode = Locale.GERMAN) } returns
+ coEvery { certificateValueSetServer.getVaccinationValueSets(languageCode = Locale.GERMAN) } returns
valueSetsContainerDe
- every { vaccinationServer.clear() } just runs
+ every { certificateValueSetServer.clear() } just runs
every { valueSetsStorage.valueSetsContainer = any() } just runs
every { valueSetsStorage.valueSetsContainer } returns emptyValueSetsContainer
@@ -65,12 +65,12 @@ class ValueSetsRepositoryTest : BaseTest() {
}
coVerify {
- vaccinationServer.getVaccinationValueSets(languageCode = Locale.GERMAN)
+ certificateValueSetServer.getVaccinationValueSets(languageCode = Locale.GERMAN)
valueSetsStorage.valueSetsContainer = valueSetsContainerDe
}
coVerify(exactly = 0) {
- vaccinationServer.getVaccinationValueSets(languageCode = Locale.ENGLISH)
+ certificateValueSetServer.getVaccinationValueSets(languageCode = Locale.ENGLISH)
valueSetsStorage.valueSetsContainer = valueSetsContainerEn
}
}
@@ -84,16 +84,16 @@ class ValueSetsRepositoryTest : BaseTest() {
}
coVerify(ordering = Ordering.ORDERED) {
- vaccinationServer.getVaccinationValueSets(languageCode = Locale.FRENCH)
- vaccinationServer.getVaccinationValueSets(languageCode = Locale.ENGLISH)
+ certificateValueSetServer.getVaccinationValueSets(languageCode = Locale.FRENCH)
+ certificateValueSetServer.getVaccinationValueSets(languageCode = Locale.ENGLISH)
valueSetsStorage.valueSetsContainer = valueSetsContainerEn
}
}
@Test
fun `server returns nothing`() = runBlockingTest2(ignoreActive = true) {
- coEvery { vaccinationServer.getVaccinationValueSets(languageCode = Locale.GERMAN) } returns null
- coEvery { vaccinationServer.getVaccinationValueSets(languageCode = Locale.ENGLISH) } returns null
+ coEvery { certificateValueSetServer.getVaccinationValueSets(languageCode = Locale.GERMAN) } returns null
+ coEvery { certificateValueSetServer.getVaccinationValueSets(languageCode = Locale.ENGLISH) } returns null
createInstance(this).run {
triggerUpdateValueSet(languageCode = Locale.GERMAN)
@@ -104,8 +104,8 @@ class ValueSetsRepositoryTest : BaseTest() {
}
coVerify(ordering = Ordering.ORDERED) {
- vaccinationServer.getVaccinationValueSets(languageCode = Locale.GERMAN)
- vaccinationServer.getVaccinationValueSets(languageCode = Locale.ENGLISH)
+ certificateValueSetServer.getVaccinationValueSets(languageCode = Locale.GERMAN)
+ certificateValueSetServer.getVaccinationValueSets(languageCode = Locale.ENGLISH)
}
}
@@ -120,7 +120,7 @@ class ValueSetsRepositoryTest : BaseTest() {
}
coVerify {
- vaccinationServer.clear()
+ certificateValueSetServer.clear()
valueSetsStorage.valueSetsContainer = emptyValueSetsContainer
}
}
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/vaccination/core/server/valueset/VaccinationServerTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/valueset/server/CertificateValueSetServerTest.kt
similarity index 90%
rename from Corona-Warn-App/src/test/java/de/rki/coronawarnapp/vaccination/core/server/valueset/VaccinationServerTest.kt
rename to Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/valueset/server/CertificateValueSetServerTest.kt
index 1c78f8412ea1d883b5e9881b0e4b79d626959539..bd18b0305bdffb453a2d1a7d25a613f236e17116 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/vaccination/core/server/valueset/VaccinationServerTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/valueset/server/CertificateValueSetServerTest.kt
@@ -1,9 +1,9 @@
-package de.rki.coronawarnapp.vaccination.core.server.valueset
+package de.rki.coronawarnapp.covidcertificate.valueset.server
import dagger.Lazy
+import de.rki.coronawarnapp.covidcertificate.valueset.internal.ValueSetInvalidSignatureException
import de.rki.coronawarnapp.util.coroutine.DispatcherProvider
import de.rki.coronawarnapp.util.security.SignatureValidation
-import de.rki.coronawarnapp.vaccination.core.server.valueset.internal.ValueSetInvalidSignatureException
import io.kotest.assertions.throwables.shouldThrow
import io.kotest.matchers.shouldBe
import io.kotest.matchers.shouldNotBe
@@ -19,7 +19,7 @@ import org.junit.jupiter.api.Test
import testhelpers.BaseTest
import java.io.File
-class VaccinationServerTest : BaseTest() {
+class CertificateValueSetServerTest : BaseTest() {
/**
* contains both binary and signature
@@ -32,7 +32,7 @@ class VaccinationServerTest : BaseTest() {
private val invalidExportZip = File("src/test/resources/vaccination/valueset_invalid.zip")
@MockK lateinit var cache: Cache
- @MockK lateinit var apiV1: Lazy<VaccinationValueSetApiV1>
+ @MockK lateinit var apiV1: Lazy<CertificateValueSetApiV1>
@MockK lateinit var dispatcherProvider: DispatcherProvider
@MockK lateinit var signatureValidation: SignatureValidation
@@ -43,7 +43,7 @@ class VaccinationServerTest : BaseTest() {
invalidExportZip.exists() shouldBe true
}
- private fun createInstance() = VaccinationServer(
+ private fun createInstance() = CertificateValueSetServer(
cache,
apiV1,
dispatcherProvider,
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 0a3643766fb3685c31d66345b3c777a2d1b90ee9..7207e5d906348755d0391d887d1ba26c67c8103e 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
@@ -1,6 +1,7 @@
package de.rki.coronawarnapp.main
import de.rki.coronawarnapp.contactdiary.ui.ContactDiarySettings
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.VaccinationSettings
import de.rki.coronawarnapp.environment.EnvironmentSetup
import de.rki.coronawarnapp.playbook.BackgroundNoise
import de.rki.coronawarnapp.presencetracing.TraceLocationSettings
@@ -9,7 +10,6 @@ import de.rki.coronawarnapp.storage.OnboardingSettings
import de.rki.coronawarnapp.ui.main.MainActivityViewModel
import de.rki.coronawarnapp.util.CWADebug
import de.rki.coronawarnapp.util.device.BackgroundModeStatus
-import de.rki.coronawarnapp.vaccination.core.VaccinationSettings
import io.kotest.matchers.shouldBe
import io.mockk.MockKAnnotations
import io.mockk.every
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 7d9d96f3fa5151fff19408411c86ef342dc572ee..4ebef57b07e20691b991a50b97adb85bbede6c76 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
@@ -3,6 +3,8 @@ package de.rki.coronawarnapp.main.home
import android.content.Context
import de.rki.coronawarnapp.appconfig.AppConfigProvider
import de.rki.coronawarnapp.coronatest.CoronaTestRepository
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.VaccinationSettings
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.repository.VaccinationRepository
import de.rki.coronawarnapp.environment.BuildConfigWrap
import de.rki.coronawarnapp.main.CWASettings
import de.rki.coronawarnapp.statistics.source.StatisticsProvider
@@ -21,8 +23,6 @@ import de.rki.coronawarnapp.util.TimeStamper
import de.rki.coronawarnapp.util.bluetooth.BluetoothSupport
import de.rki.coronawarnapp.util.encryptionmigration.EncryptionErrorResetTool
import de.rki.coronawarnapp.util.shortcuts.AppShortcutsHelper
-import de.rki.coronawarnapp.vaccination.core.VaccinationSettings
-import de.rki.coronawarnapp.vaccination.core.repository.VaccinationRepository
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/submission/covidcertificate/RequestCovidCertificateViewModelTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/submission/covidcertificate/RequestCovidCertificateViewModelTest.kt
index 0dd5558e9d79036859b109df6a37ea9e6c9a6b74..009f839c5c79d3bfed61a95225a0f6cea8335c89 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/submission/covidcertificate/RequestCovidCertificateViewModelTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/submission/covidcertificate/RequestCovidCertificateViewModelTest.kt
@@ -20,8 +20,8 @@ import kotlinx.coroutines.flow.flowOf
import org.joda.time.Instant
import org.joda.time.LocalDate
import org.joda.time.format.DateTimeFormat
-import org.junit.jupiter.api.Test
import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Test
import org.junit.jupiter.api.extension.ExtendWith
import testhelpers.BaseTest
import testhelpers.extensions.InstantExecutorExtension
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 d0630d26f9536a66bd973c5a10782e85fd96eb23..50d196f8cf8b6fc920755e1344c9f5df78b92943 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
@@ -5,8 +5,11 @@ import de.rki.coronawarnapp.bugreporting.BugReportingSettings
import de.rki.coronawarnapp.contactdiary.storage.ContactDiaryPreferences
import de.rki.coronawarnapp.contactdiary.storage.repo.ContactDiaryRepository
import de.rki.coronawarnapp.coronatest.CoronaTestRepository
-import de.rki.coronawarnapp.coronatest.TestCertificateRepository
import de.rki.coronawarnapp.coronatest.antigen.profile.RATProfileSettings
+import de.rki.coronawarnapp.covidcertificate.test.core.TestCertificateRepository
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.VaccinationPreferences
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.repository.VaccinationRepository
+import de.rki.coronawarnapp.covidcertificate.valueset.ValueSetsRepository
import de.rki.coronawarnapp.datadonation.analytics.Analytics
import de.rki.coronawarnapp.datadonation.analytics.storage.AnalyticsSettings
import de.rki.coronawarnapp.datadonation.survey.SurveySettings
@@ -25,9 +28,6 @@ import de.rki.coronawarnapp.storage.TracingSettings
import de.rki.coronawarnapp.submission.SubmissionRepository
import de.rki.coronawarnapp.submission.SubmissionSettings
import de.rki.coronawarnapp.ui.presencetracing.TraceLocationPreferences
-import de.rki.coronawarnapp.vaccination.core.VaccinationPreferences
-import de.rki.coronawarnapp.vaccination.core.repository.VaccinationRepository
-import de.rki.coronawarnapp.vaccination.core.repository.ValueSetsRepository
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/util/worker/WorkerBinderTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/worker/WorkerBinderTest.kt
index dd06cbdc0fc31abf72208c12839c6a90e8247c01..c04bcf04992aabd614ba0a0420a86f734e00e92a 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
@@ -7,10 +7,11 @@ import dagger.Component
import dagger.Module
import dagger.Provides
import de.rki.coronawarnapp.coronatest.CoronaTestRepository
-import de.rki.coronawarnapp.coronatest.TestCertificateRepository
import de.rki.coronawarnapp.coronatest.type.pcr.execution.PCRResultScheduler
import de.rki.coronawarnapp.coronatest.type.pcr.notification.PCRTestResultAvailableNotificationService
import de.rki.coronawarnapp.coronatest.type.rapidantigen.execution.RAResultScheduler
+import de.rki.coronawarnapp.covidcertificate.test.core.TestCertificateRepository
+import de.rki.coronawarnapp.covidcertificate.vaccination.core.repository.VaccinationRepository
import de.rki.coronawarnapp.datadonation.analytics.Analytics
import de.rki.coronawarnapp.datadonation.analytics.worker.DataDonationAnalyticsScheduler
import de.rki.coronawarnapp.deadman.DeadmanNotificationScheduler
@@ -29,7 +30,6 @@ import de.rki.coronawarnapp.submission.SubmissionRepository
import de.rki.coronawarnapp.task.TaskController
import de.rki.coronawarnapp.util.di.AppContext
import de.rki.coronawarnapp.util.serialization.BaseGson
-import de.rki.coronawarnapp.vaccination.core.repository.VaccinationRepository
import io.github.classgraph.ClassGraph
import io.kotest.matchers.collections.shouldContainAll
import io.mockk.mockk