From 9a560733bc9caa7ec414d7881771ea04684be3e4 Mon Sep 17 00:00:00 2001 From: Lukas Lechner <lukas.lechner@sap.com> Date: Fri, 30 Apr 2021 11:44:39 +0200 Subject: [PATCH] Delete RAT profile on app reset (#3020) Co-authored-by: harambasicluka <64483219+harambasicluka@users.noreply.github.com> --- .../main/java/de/rki/coronawarnapp/util/DataReset.kt | 7 +++++-- .../java/de/rki/coronawarnapp/util/DataResetTest.kt | 10 +++++++--- 2 files changed, 12 insertions(+), 5 deletions(-) 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 6bcdf97ff..cf09b33fc 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 @@ -7,16 +7,17 @@ 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.antigen.profile.RATProfileSettings import de.rki.coronawarnapp.datadonation.analytics.Analytics import de.rki.coronawarnapp.datadonation.analytics.storage.AnalyticsSettings import de.rki.coronawarnapp.datadonation.survey.SurveySettings import de.rki.coronawarnapp.diagnosiskeys.download.DownloadDiagnosisKeysSettings import de.rki.coronawarnapp.diagnosiskeys.storage.KeyCacheRepository +import de.rki.coronawarnapp.main.CWASettings +import de.rki.coronawarnapp.nearby.modules.detectiontracker.ExposureDetectionTracker import de.rki.coronawarnapp.presencetracing.TraceLocationSettings import de.rki.coronawarnapp.presencetracing.checkins.CheckInRepository import de.rki.coronawarnapp.presencetracing.storage.repo.TraceLocationRepository -import de.rki.coronawarnapp.main.CWASettings -import de.rki.coronawarnapp.nearby.modules.detectiontracker.ExposureDetectionTracker import de.rki.coronawarnapp.presencetracing.warning.storage.TraceWarningRepository import de.rki.coronawarnapp.risk.storage.RiskLevelStorage import de.rki.coronawarnapp.statistics.source.StatisticsProvider @@ -62,6 +63,7 @@ class DataReset @Inject constructor( private val traceLocationSettings: TraceLocationSettings, private val traceWarningRepository: TraceWarningRepository, private val coronaTestRepository: CoronaTestRepository, + private val ratProfileSettings: RATProfileSettings ) { private val mutex = Mutex() @@ -104,6 +106,7 @@ class DataReset @Inject constructor( traceLocationRepository.deleteAllTraceLocations() checkInRepository.clear() coronaTestRepository.clear() + ratProfileSettings.deleteProfile() Timber.w("CWA LOCAL DATA DELETION COMPLETED.") } 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 b78a603a9..eca8c03f5 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 @@ -6,16 +6,17 @@ 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.antigen.profile.RATProfileSettings import de.rki.coronawarnapp.datadonation.analytics.Analytics import de.rki.coronawarnapp.datadonation.analytics.storage.AnalyticsSettings import de.rki.coronawarnapp.datadonation.survey.SurveySettings import de.rki.coronawarnapp.diagnosiskeys.download.DownloadDiagnosisKeysSettings import de.rki.coronawarnapp.diagnosiskeys.storage.KeyCacheRepository +import de.rki.coronawarnapp.main.CWASettings +import de.rki.coronawarnapp.nearby.modules.detectiontracker.ExposureDetectionTracker import de.rki.coronawarnapp.presencetracing.TraceLocationSettings import de.rki.coronawarnapp.presencetracing.checkins.CheckInRepository import de.rki.coronawarnapp.presencetracing.storage.repo.TraceLocationRepository -import de.rki.coronawarnapp.main.CWASettings -import de.rki.coronawarnapp.nearby.modules.detectiontracker.ExposureDetectionTracker import de.rki.coronawarnapp.presencetracing.warning.storage.TraceWarningRepository import de.rki.coronawarnapp.risk.storage.RiskLevelStorage import de.rki.coronawarnapp.statistics.source.StatisticsProvider @@ -58,6 +59,7 @@ internal class DataResetTest : BaseTest() { @MockK lateinit var checkInRepository: CheckInRepository @MockK lateinit var traceLocationSettings: TraceLocationSettings @MockK lateinit var coronaTestRepository: CoronaTestRepository + @MockK lateinit var ratProfileSettings: RATProfileSettings @BeforeEach fun setUp() { @@ -88,7 +90,8 @@ internal class DataResetTest : BaseTest() { checkInRepository = checkInRepository, traceLocationSettings = traceLocationSettings, traceWarningRepository = traceWarningRepository, - coronaTestRepository = coronaTestRepository + coronaTestRepository = coronaTestRepository, + ratProfileSettings = ratProfileSettings ) @Test @@ -122,5 +125,6 @@ internal class DataResetTest : BaseTest() { coVerify(exactly = 1) { traceLocationRepository.deleteAllTraceLocations() } coVerify(exactly = 1) { checkInRepository.clear() } coVerify(exactly = 1) { coronaTestRepository.clear() } + coVerify(exactly = 1) { ratProfileSettings.deleteProfile() } } } -- GitLab