From 967fd5d812c35d4a0fcc4bd7878f61d3e65b4a71 Mon Sep 17 00:00:00 2001
From: chris-cwa <69595386+chris-cwa@users.noreply.github.com>
Date: Thu, 19 Nov 2020 17:42:48 +0100
Subject: [PATCH] Inject enf client and exposure result store (#1672)
* inject enf client and exposure result store
* Fix klint.
Co-authored-by: Matthias Urhahn <matthias.urhahn@sap.com>
---
.../test/api/ui/TestForAPIFragment.kt | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
diff --git a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/api/ui/TestForAPIFragment.kt b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/api/ui/TestForAPIFragment.kt
index d4e224e12..1de6e298a 100644
--- a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/api/ui/TestForAPIFragment.kt
+++ b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/api/ui/TestForAPIFragment.kt
@@ -32,8 +32,10 @@ import de.rki.coronawarnapp.exception.ExceptionCategory
import de.rki.coronawarnapp.exception.ExceptionCategory.INTERNAL
import de.rki.coronawarnapp.exception.TransactionException
import de.rki.coronawarnapp.exception.reporting.report
+import de.rki.coronawarnapp.nearby.ENFClient
import de.rki.coronawarnapp.nearby.InternalExposureNotificationPermissionHelper
import de.rki.coronawarnapp.receiver.ExposureStateUpdateReceiver
+import de.rki.coronawarnapp.risk.ExposureResultStore
import de.rki.coronawarnapp.risk.TimeVariables
import de.rki.coronawarnapp.server.protocols.AppleLegacyKeyExchange
import de.rki.coronawarnapp.sharing.ExposureSharingService
@@ -41,7 +43,6 @@ import de.rki.coronawarnapp.storage.AppDatabase
import de.rki.coronawarnapp.storage.tracing.TracingIntervalRepository
import de.rki.coronawarnapp.test.menu.ui.TestMenuItem
import de.rki.coronawarnapp.util.KeyFileHelper
-import de.rki.coronawarnapp.util.di.AppInjector
import de.rki.coronawarnapp.util.di.AutoInject
import de.rki.coronawarnapp.util.ui.observe2
import de.rki.coronawarnapp.util.ui.viewBindingLazy
@@ -64,6 +65,8 @@ class TestForAPIFragment : Fragment(R.layout.fragment_test_for_a_p_i),
InternalExposureNotificationPermissionHelper.Callback, AutoInject {
@Inject lateinit var viewModelFactory: CWAViewModelFactoryProvider.Factory
+ @Inject lateinit var enfClient: ENFClient
+ @Inject lateinit var exposureResultStore: ExposureResultStore
private val vm: TestForApiFragmentViewModel by cwaViewModels { viewModelFactory }
companion object {
@@ -83,14 +86,6 @@ class TestForAPIFragment : Fragment(R.layout.fragment_test_for_a_p_i),
}
}
- private val enfClient by lazy {
- AppInjector.component.enfClient
- }
-
- private val exposureSummaryRepository by lazy {
- AppInjector.component.exposureResultStore
- }
-
private var myExposureKeysJSON: String? = null
private var myExposureKeys: List<TemporaryExposureKey>? = mutableListOf()
private var otherExposureKey: AppleLegacyKeyExchange.Key? = null
@@ -166,7 +161,7 @@ class TestForAPIFragment : Fragment(R.layout.fragment_test_for_a_p_i),
buttonRetrieveExposureSummary.setOnClickListener {
vm.launch {
- val summary = exposureSummaryRepository.entities.first().exposureWindows.toString()
+ val summary = exposureResultStore.entities.first().exposureWindows.toString()
withContext(Dispatchers.Main) {
showToast(summary)
--
GitLab