From 82d322dacc472f069f55a5f4011f0d8bdcb5a7be Mon Sep 17 00:00:00 2001
From: Mohamed Metwalli <mohamed.metwalli@sap.com>
Date: Mon, 25 Jan 2021 12:22:32 +0100
Subject: [PATCH] Dagger2 Assisted Inject (Dev) #2181
* Migrate to dagger2 assisted injection
* bump version
* Fix Worker test
* Fix failing test
* Remove Square AssistedInject from Technical file
* Set nav-graph in Ui Thread to prevent crashing
* bump dagger to 2.31.2
---
Corona-Warn-App/build.gradle | 8 ++-----
.../SubmissionContactFragmentTest.kt | 3 ++-
.../SubmissionDispatcherFragmentTest.kt | 7 ++++--
...bmissionTestResultAvailableFragmentTest.kt | 4 ++--
...ssionTestResultConsentGivenFragmentTest.kt | 7 ++++--
.../viewmodels/MockViewModelModule.kt | 23 ++-----------------
.../miscinfo/MiscInfoFragmentViewModel.kt | 5 ++--
.../ui/AppConfigTestFragmentViewModel.kt | 5 ++--
.../ui/ContactDiaryTestFragmentViewModel.kt | 5 ++--
.../crash.ui/SettingsCrashReportViewModel.kt | 5 ++--
.../ui/DebugOptionsFragmentViewModel.kt | 5 ++--
.../ui/KeyDownloadTestFragmentViewModel.kt | 5 ++--
.../test/menu/ui/TestMenuFragmentViewModel.kt | 5 ++--
...iskLevelCalculationFragmentCWAViewModel.kt | 7 +++---
.../ui/SubmissionTestFragmentViewModel.kt | 5 ++--
.../ui/TestTaskControllerFragmentViewModel.kt | 5 ++--
.../src/main/assets/technical.html | 4 ----
.../debuglog/ui/DebugLogViewModel.kt | 5 ++--
.../retention/ContactDiaryRetentionWorker.kt | 7 +++---
.../ui/day/ContactDiaryDayViewModel.kt | 7 +++---
.../ContactDiaryLocationListViewModel.kt | 7 +++---
.../person/ContactDiaryPersonListViewModel.kt | 7 +++---
.../ContactDiaryEditLocationsViewModel.kt | 5 ++--
.../edit/ContactDiaryEditPersonsViewModel.kt | 5 ++--
...ContactDiaryOnboardingFragmentViewModel.kt | 5 ++--
.../overview/ContactDiaryOverviewViewModel.kt | 5 ++--
...DiaryLocationBottomSheetDialogViewModel.kt | 7 +++---
...ctDiaryPersonBottomSheetDialogViewModel.kt | 7 +++---
.../DeadmanNotificationOneTimeWorker.kt | 7 +++---
.../DeadmanNotificationPeriodicWorker.kt | 7 +++---
.../nearby/ExposureStateUpdateWorker.kt | 7 +++---
.../nearby/TracingPermissionHelper.kt | 7 +++---
.../submission/auto/SubmissionWorker.kt | 7 +++---
.../data/tekhistory/TEKHistoryUpdater.kt | 7 +++---
.../tracing/states/TracingStateProvider.kt | 7 +++---
.../TracingDetailsFragmentViewModel.kt | 5 ++--
.../SettingsTracingFragmentViewModel.kt | 5 ++--
.../InformationFragmentViewModel.kt | 5 ++--
...erabilityConfigurationFragmentViewModel.kt | 5 ++--
.../ui/launcher/LauncherActivityViewModel.kt | 5 ++--
.../ui/main/MainActivityViewModel.kt | 5 ++--
.../ui/main/home/HomeFragmentViewModel.kt | 5 ++--
...gDeltaInteroperabilityFragmentViewModel.kt | 5 ++--
.../onboarding/OnboardingFragmentViewModel.kt | 5 ++--
.../OnboardingNotificationsViewModel.kt | 5 ++--
.../onboarding/OnboardingPrivacyViewModel.kt | 5 ++--
.../ui/onboarding/OnboardingTestViewModel.kt | 5 ++--
.../OnboardingTracingFragmentViewModel.kt | 5 ++--
.../ui/settings/SettingsResetViewModel.kt | 5 ++--
...ingsBackgroundPriorityFragmentViewModel.kt | 5 ++--
.../NotificationSettingsFragmentViewModel.kt | 5 ++--
.../start/SettingsFragmentViewModel.kt | 5 ++--
.../consent/SubmissionConsentViewModel.kt | 5 ++--
.../SubmissionQRCodeInfoFragmentViewModel.kt | 5 ++--
.../scan/SubmissionQRCodeScanViewModel.kt | 5 ++--
.../SubmissionTestResultAvailableViewModel.kt | 5 ++--
.../SubmissionResultReadyViewModel.kt | 5 ++--
.../SubmissionSymptomCalendarViewModel.kt | 7 +++---
.../SubmissionSymptomIntroductionViewModel.kt | 5 ++--
.../submission/tan/SubmissionTanViewModel.kt | 5 ++--
.../SubmissionTestResultInvalidViewModel.kt | 5 ++--
.../SubmissionTestResultNegativeViewModel.kt | 5 ++--
.../SubmissionTestResultPendingViewModel.kt | 5 ++--
...bmissionTestResultConsentGivenViewModel.kt | 5 ++--
.../SubmissionTestResultNoConsentViewModel.kt | 5 ++--
.../viewmodel/SubmissionContactViewModel.kt | 5 ++--
.../SubmissionDispatcherViewModel.kt | 5 ++--
...tPositiveOtherWarningNoConsentViewModel.kt | 5 ++--
.../SubmissionYourConsentViewModel.kt | 5 ++--
.../util/di/ApplicationComponent.kt | 1 -
.../util/di/AssistedInjectModule.kt | 8 -------
.../util/ui/LiveDataExtensions.kt | 1 -
.../viewmodel/CWAViewModelFactoryProvider.kt | 22 +++++++++---------
.../worker/BackgroundNoiseOneTimeWorker.kt | 7 +++---
.../worker/BackgroundNoisePeriodicWorker.kt | 7 +++---
.../DiagnosisKeyRetrievalOneTimeWorker.kt | 7 +++---
.../DiagnosisKeyRetrievalPeriodicWorker.kt | 7 +++---
...gnosisTestResultRetrievalPeriodicWorker.kt | 7 +++---
.../util/device/ForegroundStateTest.kt | 3 +++
.../util/worker/WorkerBinderTest.kt | 3 +--
80 files changed, 254 insertions(+), 215 deletions(-)
delete mode 100644 Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/di/AssistedInjectModule.kt
diff --git a/Corona-Warn-App/build.gradle b/Corona-Warn-App/build.gradle
index 3616d8b0a..c4e67dc43 100644
--- a/Corona-Warn-App/build.gradle
+++ b/Corona-Warn-App/build.gradle
@@ -197,7 +197,7 @@ android {
returnDefaultValues = true
}
- // Using orchestration toegether with mockk on x86 (32bit) emulator images crashes
+ // Using orchestration together with mockk on x86 (32bit) emulator images crashes
// Leaving this in here as reminder
// https://github.com/android/android-test/issues/352
// https://github.com/mockk/mockk/issues/466
@@ -319,7 +319,7 @@ dependencies {
implementation "androidx.recyclerview:recyclerview-selection:1.1.0-rc03"
// DAGGER
- def dagger_version = "2.30.1"
+ def dagger_version = "2.31.2"
implementation "com.google.dagger:dagger:$dagger_version"
implementation "com.google.dagger:dagger-android:$dagger_version"
implementation "com.google.dagger:dagger-android-support:$dagger_version"
@@ -330,10 +330,6 @@ dependencies {
kaptTest "com.google.dagger:dagger-android-processor:$dagger_version"
kaptAndroidTest "com.google.dagger:dagger-android-processor:$dagger_version"
- def assisted_injection_version = "0.6.0"
- compileOnly "com.squareup.inject:assisted-inject-annotations-dagger2:$assisted_injection_version"
- kapt "com.squareup.inject:assisted-inject-processor-dagger2:$assisted_injection_version"
-
// QR
implementation('com.journeyapps:zxing-android-embedded:4.1.0') { transitive = false }
// noinspection GradleDependency - needed for SDK 23 compatibility, in combination with com.journeyapps:zxing-android-embedded:4.1.0
diff --git a/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/submission/SubmissionContactFragmentTest.kt b/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/submission/SubmissionContactFragmentTest.kt
index eaa2c2896..2fc4006c2 100644
--- a/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/submission/SubmissionContactFragmentTest.kt
+++ b/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/submission/SubmissionContactFragmentTest.kt
@@ -7,6 +7,7 @@ import androidx.test.espresso.Espresso.onView
import androidx.test.espresso.action.ViewActions.click
import androidx.test.espresso.matcher.ViewMatchers.withId
import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.internal.runner.junit4.statement.UiThreadStatement.runOnUiThread
import dagger.Module
import dagger.android.ContributesAndroidInjector
import de.rki.coronawarnapp.R
@@ -68,7 +69,7 @@ class SubmissionContactFragmentTest : BaseUITest() {
@Test
fun testContactEnterTanClicked() {
val navController = TestNavHostController(ApplicationProvider.getApplicationContext())
- navController.setGraph(R.navigation.nav_graph)
+ runOnUiThread { navController.setGraph(R.navigation.nav_graph) }
launchFragmentInContainer2<SubmissionContactFragment>().onFragment { fragment ->
Navigation.setViewNavController(fragment.requireView(), navController)
}
diff --git a/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/submission/SubmissionDispatcherFragmentTest.kt b/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/submission/SubmissionDispatcherFragmentTest.kt
index e47846666..cc5d49e1f 100644
--- a/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/submission/SubmissionDispatcherFragmentTest.kt
+++ b/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/submission/SubmissionDispatcherFragmentTest.kt
@@ -8,6 +8,7 @@ import androidx.test.espresso.action.ViewActions.click
import androidx.test.espresso.action.ViewActions.scrollTo
import androidx.test.espresso.matcher.ViewMatchers.withId
import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.internal.runner.junit4.statement.UiThreadStatement.runOnUiThread
import dagger.Module
import dagger.android.ContributesAndroidInjector
import de.rki.coronawarnapp.R
@@ -41,8 +42,10 @@ class SubmissionDispatcherFragmentTest : BaseUITest() {
private fun createViewModel() = SubmissionDispatcherViewModel()
- private val navController = TestNavHostController(ApplicationProvider.getApplicationContext()).apply {
- setGraph(R.navigation.nav_graph)
+ private val navController = TestNavHostController(
+ ApplicationProvider.getApplicationContext()
+ ).apply {
+ runOnUiThread { setGraph(R.navigation.nav_graph) }
}
@Before
diff --git a/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/submission/SubmissionTestResultAvailableFragmentTest.kt b/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/submission/SubmissionTestResultAvailableFragmentTest.kt
index b0370de7b..aac51198e 100644
--- a/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/submission/SubmissionTestResultAvailableFragmentTest.kt
+++ b/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/submission/SubmissionTestResultAvailableFragmentTest.kt
@@ -6,7 +6,7 @@ import dagger.Module
import dagger.android.ContributesAndroidInjector
import de.rki.coronawarnapp.submission.SubmissionRepository
import de.rki.coronawarnapp.submission.auto.AutoSubmission
-import de.rki.coronawarnapp.submission.data.tekhistory.TEKHistoryUpdater_AssistedFactory
+import de.rki.coronawarnapp.submission.data.tekhistory.TEKHistoryUpdater_Factory_Impl
import de.rki.coronawarnapp.ui.submission.resultavailable.SubmissionTestResultAvailableFragment
import de.rki.coronawarnapp.ui.submission.resultavailable.SubmissionTestResultAvailableViewModel
import io.mockk.MockKAnnotations
@@ -31,7 +31,7 @@ class SubmissionTestResultAvailableFragmentTest : BaseUITest() {
lateinit var viewModel: SubmissionTestResultAvailableViewModel
@MockK lateinit var submissionRepository: SubmissionRepository
- @MockK lateinit var tekHistoryUpdaterFactory: TEKHistoryUpdater_AssistedFactory
+ @MockK lateinit var tekHistoryUpdaterFactory: TEKHistoryUpdater_Factory_Impl
@MockK lateinit var autoSubmission: AutoSubmission
@Rule
diff --git a/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/submission/SubmissionTestResultConsentGivenFragmentTest.kt b/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/submission/SubmissionTestResultConsentGivenFragmentTest.kt
index 2d1ef2e0c..39ccea98e 100644
--- a/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/submission/SubmissionTestResultConsentGivenFragmentTest.kt
+++ b/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/submission/SubmissionTestResultConsentGivenFragmentTest.kt
@@ -9,6 +9,7 @@ import androidx.test.espresso.Espresso.onView
import androidx.test.espresso.action.ViewActions.click
import androidx.test.espresso.matcher.ViewMatchers.withId
import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.internal.runner.junit4.statement.UiThreadStatement.runOnUiThread
import dagger.Module
import dagger.android.ContributesAndroidInjector
import de.rki.coronawarnapp.R
@@ -54,8 +55,10 @@ class SubmissionTestResultConsentGivenFragmentTest : BaseUITest() {
private lateinit var viewModel: SubmissionTestResultConsentGivenViewModel
- private val navController = TestNavHostController(ApplicationProvider.getApplicationContext()).apply {
- setGraph(R.navigation.nav_graph)
+ private val navController = TestNavHostController(
+ ApplicationProvider.getApplicationContext()
+ ).apply {
+ runOnUiThread { setGraph(R.navigation.nav_graph) }
}
@Before
diff --git a/Corona-Warn-App/src/androidTest/java/testhelpers/viewmodels/MockViewModelModule.kt b/Corona-Warn-App/src/androidTest/java/testhelpers/viewmodels/MockViewModelModule.kt
index 1a4527b79..e8467d83b 100644
--- a/Corona-Warn-App/src/androidTest/java/testhelpers/viewmodels/MockViewModelModule.kt
+++ b/Corona-Warn-App/src/androidTest/java/testhelpers/viewmodels/MockViewModelModule.kt
@@ -1,35 +1,16 @@
package testhelpers.viewmodels
-import android.os.Bundle
-import androidx.lifecycle.SavedStateHandle
-import androidx.savedstate.SavedStateRegistryOwner
import dagger.Module
import dagger.Provides
import de.rki.coronawarnapp.util.viewmodel.CWAViewModel
import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactory
-import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider
@Module
class MockViewModelModule {
@Provides
- fun viewmodelFactoryProvider(): CWAViewModelFactoryProvider.Factory {
- val factory = object : CWAViewModelFactoryProvider.Factory {
- override fun create(
- savedStateOwner: SavedStateRegistryOwner,
- defaultSavedState: Bundle?,
- assistAction: ((CWAViewModelFactory<out CWAViewModel>, SavedStateHandle) -> CWAViewModel)?
- ): CWAViewModelFactoryProvider {
- return CWAViewModelFactoryProvider(
- CREATORS,
- savedStateOwner,
- defaultSavedState,
- assistAction
- )
- }
- }
- return factory
- }
+ fun viewModelCreators(): MutableMap<Class<out CWAViewModel>, CWAViewModelFactory<out CWAViewModel>> =
+ CREATORS
companion object {
val CREATORS: MutableMap<Class<out CWAViewModel>, CWAViewModelFactory<out CWAViewModel>> =
diff --git a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/miscinfo/MiscInfoFragmentViewModel.kt b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/miscinfo/MiscInfoFragmentViewModel.kt
index 13ea95fa0..e18ff6c3b 100644
--- a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/miscinfo/MiscInfoFragmentViewModel.kt
+++ b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/miscinfo/MiscInfoFragmentViewModel.kt
@@ -4,7 +4,8 @@ import android.content.Context
import androidx.core.content.pm.PackageInfoCompat
import androidx.lifecycle.asLiveData
import com.google.android.gms.common.GoogleApiAvailability
-import com.squareup.inject.assisted.AssistedInject
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
import de.rki.coronawarnapp.nearby.ENFClient
import de.rki.coronawarnapp.risk.TimeVariables
import de.rki.coronawarnapp.storage.tracing.TracingIntervalRepository
@@ -59,6 +60,6 @@ class MiscInfoFragmentViewModel @AssistedInject constructor(
emit(TimeVariables.getActiveTracingDaysInRetentionPeriod())
}.asLiveData(context = dispatcherProvider.Default)
- @AssistedInject.Factory
+ @AssistedFactory
interface Factory : SimpleCWAViewModelFactory<MiscInfoFragmentViewModel>
}
diff --git a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/appconfig/ui/AppConfigTestFragmentViewModel.kt b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/appconfig/ui/AppConfigTestFragmentViewModel.kt
index 5bfa83d25..1f98cae3f 100644
--- a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/appconfig/ui/AppConfigTestFragmentViewModel.kt
+++ b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/appconfig/ui/AppConfigTestFragmentViewModel.kt
@@ -1,7 +1,8 @@
package de.rki.coronawarnapp.test.appconfig.ui
import androidx.lifecycle.asLiveData
-import com.squareup.inject.assisted.AssistedInject
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
import de.rki.coronawarnapp.appconfig.AppConfigProvider
import de.rki.coronawarnapp.storage.TestSettings
import de.rki.coronawarnapp.util.coroutine.DispatcherProvider
@@ -43,6 +44,6 @@ class AppConfigTestFragmentViewModel @AssistedInject constructor(
testSettings.isDeviceTimeCheckDisabled.update { !it }
}
- @AssistedInject.Factory
+ @AssistedFactory
interface Factory : SimpleCWAViewModelFactory<AppConfigTestFragmentViewModel>
}
diff --git a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/contactdiary/ui/ContactDiaryTestFragmentViewModel.kt b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/contactdiary/ui/ContactDiaryTestFragmentViewModel.kt
index 44df7a141..5afc9df32 100644
--- a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/contactdiary/ui/ContactDiaryTestFragmentViewModel.kt
+++ b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/contactdiary/ui/ContactDiaryTestFragmentViewModel.kt
@@ -1,7 +1,8 @@
package de.rki.coronawarnapp.test.contactdiary.ui
import androidx.lifecycle.asLiveData
-import com.squareup.inject.assisted.AssistedInject
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
import de.rki.coronawarnapp.contactdiary.model.ContactDiaryLocationVisit
import de.rki.coronawarnapp.contactdiary.model.ContactDiaryPersonEncounter
import de.rki.coronawarnapp.contactdiary.model.DefaultContactDiaryLocation
@@ -107,6 +108,6 @@ class ContactDiaryTestFragmentViewModel @AssistedInject constructor(
}
}
- @AssistedInject.Factory
+ @AssistedFactory
interface Factory : SimpleCWAViewModelFactory<ContactDiaryTestFragmentViewModel>
}
diff --git a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/crash.ui/SettingsCrashReportViewModel.kt b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/crash.ui/SettingsCrashReportViewModel.kt
index 44d3e0cd0..e9a0f09ea 100644
--- a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/crash.ui/SettingsCrashReportViewModel.kt
+++ b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/crash.ui/SettingsCrashReportViewModel.kt
@@ -4,7 +4,8 @@ import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.asLiveData
import androidx.lifecycle.map
-import com.squareup.inject.assisted.AssistedInject
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
import de.rki.coronawarnapp.bugreporting.event.BugEvent
import de.rki.coronawarnapp.bugreporting.reportProblem
import de.rki.coronawarnapp.bugreporting.storage.repository.BugRepository
@@ -54,6 +55,6 @@ class SettingsCrashReportViewModel @AssistedInject constructor(
" ${bugEvent.stackTrace}\n\n" +
" # Corresponding Log: \n\n ${bugEvent.logHistory}"
- @AssistedInject.Factory
+ @AssistedFactory
interface Factory : SimpleCWAViewModelFactory<SettingsCrashReportViewModel>
}
diff --git a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/debugoptions/ui/DebugOptionsFragmentViewModel.kt b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/debugoptions/ui/DebugOptionsFragmentViewModel.kt
index e9b4bda7f..9d959a1db 100644
--- a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/debugoptions/ui/DebugOptionsFragmentViewModel.kt
+++ b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/debugoptions/ui/DebugOptionsFragmentViewModel.kt
@@ -1,6 +1,7 @@
package de.rki.coronawarnapp.test.debugoptions.ui
-import com.squareup.inject.assisted.AssistedInject
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
import de.rki.coronawarnapp.environment.EnvironmentSetup
import de.rki.coronawarnapp.environment.EnvironmentSetup.Type.Companion.toEnvironmentType
import de.rki.coronawarnapp.test.debugoptions.ui.EnvironmentState.Companion.toEnvironmentState
@@ -28,6 +29,6 @@ class DebugOptionsFragmentViewModel @AssistedInject constructor(
}
}
- @AssistedInject.Factory
+ @AssistedFactory
interface Factory : SimpleCWAViewModelFactory<DebugOptionsFragmentViewModel>
}
diff --git a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/keydownload/ui/KeyDownloadTestFragmentViewModel.kt b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/keydownload/ui/KeyDownloadTestFragmentViewModel.kt
index c2dbd49fc..8a51aa231 100644
--- a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/keydownload/ui/KeyDownloadTestFragmentViewModel.kt
+++ b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/keydownload/ui/KeyDownloadTestFragmentViewModel.kt
@@ -2,7 +2,8 @@ package de.rki.coronawarnapp.test.keydownload.ui
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.asLiveData
-import com.squareup.inject.assisted.AssistedInject
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
import de.rki.coronawarnapp.diagnosiskeys.download.KeyPackageSyncTool
import de.rki.coronawarnapp.diagnosiskeys.storage.KeyCacheRepository
import de.rki.coronawarnapp.storage.TestSettings
@@ -75,6 +76,6 @@ class KeyDownloadTestFragmentViewModel @AssistedInject constructor(
keyCacheRepository.delete(listOf(it.info))
}
- @AssistedInject.Factory
+ @AssistedFactory
interface Factory : SimpleCWAViewModelFactory<KeyDownloadTestFragmentViewModel>
}
diff --git a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/menu/ui/TestMenuFragmentViewModel.kt b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/menu/ui/TestMenuFragmentViewModel.kt
index e77ffd41f..a28ebf709 100644
--- a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/menu/ui/TestMenuFragmentViewModel.kt
+++ b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/menu/ui/TestMenuFragmentViewModel.kt
@@ -1,7 +1,8 @@
package de.rki.coronawarnapp.test.menu.ui
import androidx.lifecycle.MutableLiveData
-import com.squareup.inject.assisted.AssistedInject
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
import de.rki.coronawarnapp.miscinfo.MiscInfoFragment
import de.rki.coronawarnapp.test.appconfig.ui.AppConfigTestFragment
import de.rki.coronawarnapp.test.contactdiary.ui.ContactDiaryTestFragment
@@ -36,6 +37,6 @@ class TestMenuFragmentViewModel @AssistedInject constructor() : CWAViewModel() {
showTestScreenEvent.postValue(it)
}
- @AssistedInject.Factory
+ @AssistedFactory
interface Factory : SimpleCWAViewModelFactory<TestMenuFragmentViewModel>
}
diff --git a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/risklevel/ui/TestRiskLevelCalculationFragmentCWAViewModel.kt b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/risklevel/ui/TestRiskLevelCalculationFragmentCWAViewModel.kt
index 986a7e4af..7066eebed 100644
--- a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/risklevel/ui/TestRiskLevelCalculationFragmentCWAViewModel.kt
+++ b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/risklevel/ui/TestRiskLevelCalculationFragmentCWAViewModel.kt
@@ -5,8 +5,9 @@ import androidx.lifecycle.SavedStateHandle
import androidx.lifecycle.asLiveData
import com.google.gson.Gson
import com.google.gson.GsonBuilder
-import com.squareup.inject.assisted.Assisted
-import com.squareup.inject.assisted.AssistedInject
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
import de.rki.coronawarnapp.appconfig.AppConfigProvider
import de.rki.coronawarnapp.appconfig.ConfigData
import de.rki.coronawarnapp.diagnosiskeys.download.DownloadDiagnosisKeysSettings
@@ -238,7 +239,7 @@ class TestRiskLevelCalculationFragmentCWAViewModel @AssistedInject constructor(
testSettings.fakeExposureWindows.update { newMode }
}
- @AssistedInject.Factory
+ @AssistedFactory
interface Factory : CWAViewModelFactory<TestRiskLevelCalculationFragmentCWAViewModel> {
fun create(
handle: SavedStateHandle,
diff --git a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/submission/ui/SubmissionTestFragmentViewModel.kt b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/submission/ui/SubmissionTestFragmentViewModel.kt
index 9e7e02ee6..72cc9dc6f 100644
--- a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/submission/ui/SubmissionTestFragmentViewModel.kt
+++ b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/submission/ui/SubmissionTestFragmentViewModel.kt
@@ -6,7 +6,8 @@ import androidx.lifecycle.LiveData
import androidx.lifecycle.asLiveData
import com.google.android.gms.nearby.exposurenotification.TemporaryExposureKey
import com.google.gson.Gson
-import com.squareup.inject.assisted.AssistedInject
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
import de.rki.coronawarnapp.storage.LocalData
import de.rki.coronawarnapp.submission.SubmissionRepository
import de.rki.coronawarnapp.submission.data.tekhistory.TEKHistoryStorage
@@ -118,6 +119,6 @@ class SubmissionTestFragmentViewModel @AssistedInject constructor(
}
}
- @AssistedInject.Factory
+ @AssistedFactory
interface Factory : SimpleCWAViewModelFactory<SubmissionTestFragmentViewModel>
}
diff --git a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/tasks/ui/TestTaskControllerFragmentViewModel.kt b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/tasks/ui/TestTaskControllerFragmentViewModel.kt
index 82b274e9b..f3b909b0f 100644
--- a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/tasks/ui/TestTaskControllerFragmentViewModel.kt
+++ b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/tasks/ui/TestTaskControllerFragmentViewModel.kt
@@ -3,7 +3,8 @@ package de.rki.coronawarnapp.test.tasks.ui
import androidx.lifecycle.LiveData
import androidx.lifecycle.asLiveData
import androidx.lifecycle.liveData
-import com.squareup.inject.assisted.AssistedInject
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
import de.rki.coronawarnapp.task.Task
import de.rki.coronawarnapp.task.TaskController
import de.rki.coronawarnapp.task.TaskFactory
@@ -116,6 +117,6 @@ class TestTaskControllerFragmentViewModel @AssistedInject constructor(
)
}
- @AssistedInject.Factory
+ @AssistedFactory
interface Factory : SimpleCWAViewModelFactory<TestTaskControllerFragmentViewModel>
}
diff --git a/Corona-Warn-App/src/main/assets/technical.html b/Corona-Warn-App/src/main/assets/technical.html
index dda06e116..ab77f6194 100644
--- a/Corona-Warn-App/src/main/assets/technical.html
+++ b/Corona-Warn-App/src/main/assets/technical.html
@@ -66,10 +66,6 @@
Licensor: Google<br/>
Website: https://github.com/google/dagger<br/>
License: Apache 2.0
-<p>Component: AssistedInject<br/>
- Licensor: Square<br/>
- Website: https://github.com/square/AssistedInject<br/>
- License: Apache 2.0
<p>Component: Conscrypt<br/>
Licensor: Conscrypt<br/>
Website: https://github.com/google/conscrypt<br/>
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/bugreporting/debuglog/ui/DebugLogViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/bugreporting/debuglog/ui/DebugLogViewModel.kt
index 027a0793c..d31e9f34a 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/bugreporting/debuglog/ui/DebugLogViewModel.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/bugreporting/debuglog/ui/DebugLogViewModel.kt
@@ -2,7 +2,8 @@ package de.rki.coronawarnapp.bugreporting.debuglog.ui
import androidx.lifecycle.LiveData
import androidx.lifecycle.asLiveData
-import com.squareup.inject.assisted.AssistedInject
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
import de.rki.coronawarnapp.R
import de.rki.coronawarnapp.bugreporting.debuglog.DebugLogger
import de.rki.coronawarnapp.nearby.ENFClient
@@ -110,6 +111,6 @@ class DebugLogViewModel @AssistedInject constructor(
val currentSize: Long = 0
)
- @AssistedInject.Factory
+ @AssistedFactory
interface Factory : SimpleCWAViewModelFactory<DebugLogViewModel>
}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/retention/ContactDiaryRetentionWorker.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/retention/ContactDiaryRetentionWorker.kt
index 129c4b2c8..ee821d957 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/retention/ContactDiaryRetentionWorker.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/retention/ContactDiaryRetentionWorker.kt
@@ -3,8 +3,9 @@ package de.rki.coronawarnapp.contactdiary.retention
import android.content.Context
import androidx.work.CoroutineWorker
import androidx.work.WorkerParameters
-import com.squareup.inject.assisted.Assisted
-import com.squareup.inject.assisted.AssistedInject
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
import de.rki.coronawarnapp.task.TaskController
import de.rki.coronawarnapp.task.common.DefaultTaskRequest
import de.rki.coronawarnapp.task.submitBlocking
@@ -41,7 +42,7 @@ class ContactDiaryRetentionWorker @AssistedInject constructor(
return Result.success()
}
- @AssistedInject.Factory
+ @AssistedFactory
interface Factory : InjectedWorkerFactory<ContactDiaryRetentionWorker>
companion object {
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/ContactDiaryDayViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/ContactDiaryDayViewModel.kt
index 8f7cd9cc5..d023f0b5d 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/ContactDiaryDayViewModel.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/ContactDiaryDayViewModel.kt
@@ -2,8 +2,9 @@ package de.rki.coronawarnapp.contactdiary.ui.day
import android.content.Context
import androidx.lifecycle.asLiveData
-import com.squareup.inject.assisted.Assisted
-import com.squareup.inject.assisted.AssistedInject
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
import de.rki.coronawarnapp.R
import de.rki.coronawarnapp.contactdiary.ui.day.tabs.ContactDiaryDayTab
import de.rki.coronawarnapp.contactdiary.util.getLocale
@@ -50,7 +51,7 @@ class ContactDiaryDayViewModel @AssistedInject constructor(
val dayTextContentDescription: (Context) -> String
)
- @AssistedInject.Factory
+ @AssistedFactory
interface Factory : CWAViewModelFactory<ContactDiaryDayViewModel> {
fun create(selectedDay: String): ContactDiaryDayViewModel
}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/tabs/location/ContactDiaryLocationListViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/tabs/location/ContactDiaryLocationListViewModel.kt
index f015f8fec..f232f9f94 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/tabs/location/ContactDiaryLocationListViewModel.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/tabs/location/ContactDiaryLocationListViewModel.kt
@@ -1,8 +1,9 @@
package de.rki.coronawarnapp.contactdiary.ui.day.tabs.location
import androidx.lifecycle.asLiveData
-import com.squareup.inject.assisted.Assisted
-import com.squareup.inject.assisted.AssistedInject
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
import de.rki.coronawarnapp.R
import de.rki.coronawarnapp.contactdiary.model.ContactDiaryLocation
import de.rki.coronawarnapp.contactdiary.model.DefaultContactDiaryLocationVisit
@@ -73,7 +74,7 @@ class ContactDiaryLocationListViewModel @AssistedInject constructor(
}
}
- @AssistedInject.Factory
+ @AssistedFactory
interface Factory : CWAViewModelFactory<ContactDiaryLocationListViewModel> {
fun create(selectedDay: String): ContactDiaryLocationListViewModel
}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/tabs/person/ContactDiaryPersonListViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/tabs/person/ContactDiaryPersonListViewModel.kt
index 6c6db515a..3051b597a 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/tabs/person/ContactDiaryPersonListViewModel.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/tabs/person/ContactDiaryPersonListViewModel.kt
@@ -1,8 +1,9 @@
package de.rki.coronawarnapp.contactdiary.ui.day.tabs.person
import androidx.lifecycle.asLiveData
-import com.squareup.inject.assisted.Assisted
-import com.squareup.inject.assisted.AssistedInject
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
import de.rki.coronawarnapp.R
import de.rki.coronawarnapp.contactdiary.model.ContactDiaryPerson
import de.rki.coronawarnapp.contactdiary.model.DefaultContactDiaryPersonEncounter
@@ -72,7 +73,7 @@ class ContactDiaryPersonListViewModel @AssistedInject constructor(
}
}
- @AssistedInject.Factory
+ @AssistedFactory
interface Factory : CWAViewModelFactory<ContactDiaryPersonListViewModel> {
fun create(selectedDay: String): ContactDiaryPersonListViewModel
}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/edit/ContactDiaryEditLocationsViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/edit/ContactDiaryEditLocationsViewModel.kt
index 10fee646b..76f288d4e 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/edit/ContactDiaryEditLocationsViewModel.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/edit/ContactDiaryEditLocationsViewModel.kt
@@ -1,7 +1,8 @@
package de.rki.coronawarnapp.contactdiary.ui.edit
import androidx.lifecycle.asLiveData
-import com.squareup.inject.assisted.AssistedInject
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
import de.rki.coronawarnapp.contactdiary.model.ContactDiaryLocation
import de.rki.coronawarnapp.contactdiary.storage.entity.ContactDiaryLocationEntity
import de.rki.coronawarnapp.contactdiary.storage.entity.toContactDiaryLocationEntity
@@ -49,7 +50,7 @@ class ContactDiaryEditLocationsViewModel @AssistedInject constructor(
navigationEvent.postValue(NavigationEvent.ShowLocationDetailSheet(location.toContactDiaryLocationEntity()))
}
- @AssistedInject.Factory
+ @AssistedFactory
interface Factory : SimpleCWAViewModelFactory<ContactDiaryEditLocationsViewModel>
sealed class NavigationEvent {
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/edit/ContactDiaryEditPersonsViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/edit/ContactDiaryEditPersonsViewModel.kt
index 5faebc22c..052ec29c6 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/edit/ContactDiaryEditPersonsViewModel.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/edit/ContactDiaryEditPersonsViewModel.kt
@@ -1,7 +1,8 @@
package de.rki.coronawarnapp.contactdiary.ui.edit
import androidx.lifecycle.asLiveData
-import com.squareup.inject.assisted.AssistedInject
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
import de.rki.coronawarnapp.contactdiary.model.ContactDiaryPerson
import de.rki.coronawarnapp.contactdiary.storage.entity.ContactDiaryPersonEntity
import de.rki.coronawarnapp.contactdiary.storage.entity.toContactDiaryPersonEntity
@@ -50,7 +51,7 @@ class ContactDiaryEditPersonsViewModel @AssistedInject constructor(
navigationEvent.postValue(NavigationEvent.ShowPersonDetailSheet(person.toContactDiaryPersonEntity()))
}
- @AssistedInject.Factory
+ @AssistedFactory
interface Factory : SimpleCWAViewModelFactory<ContactDiaryEditPersonsViewModel>
sealed class NavigationEvent {
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/onboarding/ContactDiaryOnboardingFragmentViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/onboarding/ContactDiaryOnboardingFragmentViewModel.kt
index 0edf3bfbb..cce9ca805 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/onboarding/ContactDiaryOnboardingFragmentViewModel.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/onboarding/ContactDiaryOnboardingFragmentViewModel.kt
@@ -1,6 +1,7 @@
package de.rki.coronawarnapp.contactdiary.ui.onboarding
-import com.squareup.inject.assisted.AssistedInject
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
import de.rki.coronawarnapp.ui.SingleLiveEvent
import de.rki.coronawarnapp.util.viewmodel.CWAViewModel
import de.rki.coronawarnapp.util.viewmodel.SimpleCWAViewModelFactory
@@ -20,6 +21,6 @@ class ContactDiaryOnboardingFragmentViewModel @AssistedInject constructor() : CW
routeToScreen.postValue(ContactDiaryOnboardingNavigationEvents.NavigateToPrivacyFragment)
}
- @AssistedInject.Factory
+ @AssistedFactory
interface Factory : SimpleCWAViewModelFactory<ContactDiaryOnboardingFragmentViewModel>
}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/overview/ContactDiaryOverviewViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/overview/ContactDiaryOverviewViewModel.kt
index 5f59c1dde..98db07ac3 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/overview/ContactDiaryOverviewViewModel.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/overview/ContactDiaryOverviewViewModel.kt
@@ -4,7 +4,8 @@ import android.content.Context
import androidx.annotation.DrawableRes
import androidx.annotation.StringRes
import androidx.lifecycle.asLiveData
-import com.squareup.inject.assisted.AssistedInject
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
import de.rki.coronawarnapp.R
import de.rki.coronawarnapp.contactdiary.model.ContactDiaryLocationVisit
import de.rki.coronawarnapp.contactdiary.model.ContactDiaryPersonEncounter
@@ -183,7 +184,7 @@ class ContactDiaryOverviewViewModel @AssistedInject constructor(
// According to tech spec german locale only
private fun LocalDate.toFormattedString(): String = toString("dd.MM.yyyy", Locale.GERMAN)
- @AssistedInject.Factory
+ @AssistedFactory
interface Factory : SimpleCWAViewModelFactory<ContactDiaryOverviewViewModel>
companion object {
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/sheets/location/ContactDiaryLocationBottomSheetDialogViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/sheets/location/ContactDiaryLocationBottomSheetDialogViewModel.kt
index df1d4d017..14263b7dc 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/sheets/location/ContactDiaryLocationBottomSheetDialogViewModel.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/sheets/location/ContactDiaryLocationBottomSheetDialogViewModel.kt
@@ -1,8 +1,9 @@
package de.rki.coronawarnapp.contactdiary.ui.sheets.location
import androidx.lifecycle.asLiveData
-import com.squareup.inject.assisted.Assisted
-import com.squareup.inject.assisted.AssistedInject
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
import de.rki.coronawarnapp.contactdiary.model.DefaultContactDiaryLocation
import de.rki.coronawarnapp.contactdiary.model.DefaultContactDiaryLocationVisit
import de.rki.coronawarnapp.contactdiary.storage.entity.ContactDiaryLocationEntity
@@ -92,7 +93,7 @@ class ContactDiaryLocationBottomSheetDialogViewModel @AssistedInject constructor
private val TAG = ContactDiaryLocationBottomSheetDialogViewModel::class.java.simpleName
}
- @AssistedInject.Factory
+ @AssistedFactory
interface Factory : CWAViewModelFactory<ContactDiaryLocationBottomSheetDialogViewModel> {
fun create(addedAt: String?): ContactDiaryLocationBottomSheetDialogViewModel
}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/sheets/person/ContactDiaryPersonBottomSheetDialogViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/sheets/person/ContactDiaryPersonBottomSheetDialogViewModel.kt
index 8eae6adf7..6f96510f3 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/sheets/person/ContactDiaryPersonBottomSheetDialogViewModel.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/sheets/person/ContactDiaryPersonBottomSheetDialogViewModel.kt
@@ -1,8 +1,9 @@
package de.rki.coronawarnapp.contactdiary.ui.sheets.person
import androidx.lifecycle.asLiveData
-import com.squareup.inject.assisted.Assisted
-import com.squareup.inject.assisted.AssistedInject
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
import de.rki.coronawarnapp.contactdiary.model.DefaultContactDiaryPerson
import de.rki.coronawarnapp.contactdiary.model.DefaultContactDiaryPersonEncounter
import de.rki.coronawarnapp.contactdiary.storage.entity.ContactDiaryPersonEntity
@@ -92,7 +93,7 @@ class ContactDiaryPersonBottomSheetDialogViewModel @AssistedInject constructor(
private val TAG = ContactDiaryPersonBottomSheetDialogViewModel::class.java.simpleName
}
- @AssistedInject.Factory
+ @AssistedFactory
interface Factory : CWAViewModelFactory<ContactDiaryPersonBottomSheetDialogViewModel> {
fun create(addedAt: String?): ContactDiaryPersonBottomSheetDialogViewModel
}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/deadman/DeadmanNotificationOneTimeWorker.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/deadman/DeadmanNotificationOneTimeWorker.kt
index 9eec045cc..cf57b1802 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/deadman/DeadmanNotificationOneTimeWorker.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/deadman/DeadmanNotificationOneTimeWorker.kt
@@ -3,8 +3,9 @@ package de.rki.coronawarnapp.deadman
import android.content.Context
import androidx.work.CoroutineWorker
import androidx.work.WorkerParameters
-import com.squareup.inject.assisted.Assisted
-import com.squareup.inject.assisted.AssistedInject
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
import de.rki.coronawarnapp.util.worker.InjectedWorkerFactory
import de.rki.coronawarnapp.worker.BackgroundConstants
import timber.log.Timber
@@ -39,7 +40,7 @@ class DeadmanNotificationOneTimeWorker @AssistedInject constructor(
return result
}
- @AssistedInject.Factory
+ @AssistedFactory
interface Factory : InjectedWorkerFactory<DeadmanNotificationOneTimeWorker>
companion object {
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/deadman/DeadmanNotificationPeriodicWorker.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/deadman/DeadmanNotificationPeriodicWorker.kt
index efd968e15..7a0c16191 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/deadman/DeadmanNotificationPeriodicWorker.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/deadman/DeadmanNotificationPeriodicWorker.kt
@@ -3,8 +3,9 @@ package de.rki.coronawarnapp.deadman
import android.content.Context
import androidx.work.CoroutineWorker
import androidx.work.WorkerParameters
-import com.squareup.inject.assisted.Assisted
-import com.squareup.inject.assisted.AssistedInject
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
import de.rki.coronawarnapp.util.worker.InjectedWorkerFactory
import de.rki.coronawarnapp.worker.BackgroundConstants
import timber.log.Timber
@@ -41,7 +42,7 @@ class DeadmanNotificationPeriodicWorker @AssistedInject constructor(
return result
}
- @AssistedInject.Factory
+ @AssistedFactory
interface Factory : InjectedWorkerFactory<DeadmanNotificationPeriodicWorker>
companion object {
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/nearby/ExposureStateUpdateWorker.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/nearby/ExposureStateUpdateWorker.kt
index 5332793bf..818ddd3b1 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/nearby/ExposureStateUpdateWorker.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/nearby/ExposureStateUpdateWorker.kt
@@ -4,8 +4,9 @@ import android.content.Context
import androidx.work.CoroutineWorker
import androidx.work.WorkerParameters
import com.google.android.gms.common.api.ApiException
-import com.squareup.inject.assisted.Assisted
-import com.squareup.inject.assisted.AssistedInject
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
import de.rki.coronawarnapp.exception.ExceptionCategory
import de.rki.coronawarnapp.exception.reporting.report
import de.rki.coronawarnapp.risk.RiskLevelTask
@@ -33,7 +34,7 @@ class ExposureStateUpdateWorker @AssistedInject constructor(
return Result.success()
}
- @AssistedInject.Factory
+ @AssistedFactory
interface Factory : InjectedWorkerFactory<ExposureStateUpdateWorker>
companion object {
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/nearby/TracingPermissionHelper.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/nearby/TracingPermissionHelper.kt
index a7c968e5c..2e5107cb6 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/nearby/TracingPermissionHelper.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/nearby/TracingPermissionHelper.kt
@@ -3,8 +3,9 @@ package de.rki.coronawarnapp.nearby
import android.app.Activity
import android.content.Intent
import androidx.annotation.VisibleForTesting
-import com.squareup.inject.assisted.Assisted
-import com.squareup.inject.assisted.AssistedInject
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
import de.rki.coronawarnapp.storage.LocalData
import de.rki.coronawarnapp.util.coroutine.AppScope
import kotlinx.coroutines.CoroutineScope
@@ -90,7 +91,7 @@ class TracingPermissionHelper @AssistedInject constructor(
internal const val TRACING_PERMISSION_REQUESTCODE = 3010
}
- @AssistedInject.Factory
+ @AssistedFactory
interface Factory {
fun create(callback: Callback): TracingPermissionHelper
}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/submission/auto/SubmissionWorker.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/submission/auto/SubmissionWorker.kt
index 40746db26..f3e61a8a0 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/submission/auto/SubmissionWorker.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/submission/auto/SubmissionWorker.kt
@@ -3,8 +3,9 @@ package de.rki.coronawarnapp.submission.auto
import android.content.Context
import androidx.work.CoroutineWorker
import androidx.work.WorkerParameters
-import com.squareup.inject.assisted.Assisted
-import com.squareup.inject.assisted.AssistedInject
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
import de.rki.coronawarnapp.exception.ExceptionCategory
import de.rki.coronawarnapp.exception.reporting.report
import de.rki.coronawarnapp.submission.task.SubmissionTask
@@ -42,7 +43,7 @@ class SubmissionWorker @AssistedInject constructor(
Result.retry()
}
- @AssistedInject.Factory
+ @AssistedFactory
interface Factory : InjectedWorkerFactory<SubmissionWorker>
companion object {
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/submission/data/tekhistory/TEKHistoryUpdater.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/submission/data/tekhistory/TEKHistoryUpdater.kt
index 0ffae4187..bc536c4cf 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/submission/data/tekhistory/TEKHistoryUpdater.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/submission/data/tekhistory/TEKHistoryUpdater.kt
@@ -4,8 +4,9 @@ import android.app.Activity
import android.content.Intent
import androidx.annotation.VisibleForTesting
import com.google.android.gms.nearby.exposurenotification.TemporaryExposureKey
-import com.squareup.inject.assisted.Assisted
-import com.squareup.inject.assisted.AssistedInject
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
import de.rki.coronawarnapp.exception.ExceptionCategory
import de.rki.coronawarnapp.exception.reporting.report
import de.rki.coronawarnapp.nearby.ENFClient
@@ -142,7 +143,7 @@ class TEKHistoryUpdater @AssistedInject constructor(
fun onError(error: Throwable)
}
- @AssistedInject.Factory
+ @AssistedFactory
interface Factory {
fun create(callback: Callback): TEKHistoryUpdater
}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/tracing/states/TracingStateProvider.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/tracing/states/TracingStateProvider.kt
index ad7ef5454..a21a54867 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/tracing/states/TracingStateProvider.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/tracing/states/TracingStateProvider.kt
@@ -1,7 +1,8 @@
package de.rki.coronawarnapp.tracing.states
-import com.squareup.inject.assisted.Assisted
-import com.squareup.inject.assisted.AssistedInject
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
import de.rki.coronawarnapp.nearby.modules.detectiontracker.ExposureDetectionTracker
import de.rki.coronawarnapp.nearby.modules.detectiontracker.latestSubmission
import de.rki.coronawarnapp.risk.RiskState
@@ -97,7 +98,7 @@ class TracingStateProvider @AssistedInject constructor(
.onEach { Timber.d("TracingStateProvider FLOW emission: %s", it) }
.onCompletion { Timber.v("TracingStateProvider FLOW completed.") }
- @AssistedInject.Factory
+ @AssistedFactory
interface Factory {
fun create(isDetailsMode: Boolean): TracingStateProvider
}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/tracing/ui/details/TracingDetailsFragmentViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/tracing/ui/details/TracingDetailsFragmentViewModel.kt
index 2850b10e9..a6e233637 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/tracing/ui/details/TracingDetailsFragmentViewModel.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/tracing/ui/details/TracingDetailsFragmentViewModel.kt
@@ -2,7 +2,8 @@ package de.rki.coronawarnapp.tracing.ui.details
import androidx.lifecycle.LiveData
import androidx.lifecycle.asLiveData
-import com.squareup.inject.assisted.AssistedInject
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
import de.rki.coronawarnapp.risk.RiskState
import de.rki.coronawarnapp.risk.storage.RiskLevelStorage
import de.rki.coronawarnapp.risk.tryLatestResultsWithDefaults
@@ -100,6 +101,6 @@ class TracingDetailsFragmentViewModel @AssistedInject constructor(
tracingRepository.refreshDiagnosisKeys()
}
- @AssistedInject.Factory
+ @AssistedFactory
interface Factory : SimpleCWAViewModelFactory<TracingDetailsFragmentViewModel>
}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/tracing/ui/settings/SettingsTracingFragmentViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/tracing/ui/settings/SettingsTracingFragmentViewModel.kt
index e6b56eaa5..97a845b01 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/tracing/ui/settings/SettingsTracingFragmentViewModel.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/tracing/ui/settings/SettingsTracingFragmentViewModel.kt
@@ -6,7 +6,8 @@ import androidx.lifecycle.LiveData
import androidx.lifecycle.MediatorLiveData
import androidx.lifecycle.asLiveData
import androidx.lifecycle.viewModelScope
-import com.squareup.inject.assisted.AssistedInject
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
import de.rki.coronawarnapp.exception.ExceptionCategory
import de.rki.coronawarnapp.exception.reporting.report
import de.rki.coronawarnapp.nearby.InternalExposureNotificationClient
@@ -122,6 +123,6 @@ class SettingsTracingFragmentViewModel @AssistedInject constructor(
object ManualCheckingDialog : Event()
}
- @AssistedInject.Factory
+ @AssistedFactory
interface Factory : SimpleCWAViewModelFactory<SettingsTracingFragmentViewModel>
}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/information/InformationFragmentViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/information/InformationFragmentViewModel.kt
index 27f53ae57..41cd08418 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/information/InformationFragmentViewModel.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/information/InformationFragmentViewModel.kt
@@ -2,7 +2,8 @@ package de.rki.coronawarnapp.ui.information
import android.content.Context
import androidx.lifecycle.asLiveData
-import com.squareup.inject.assisted.AssistedInject
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
import de.rki.coronawarnapp.BuildConfig
import de.rki.coronawarnapp.R
import de.rki.coronawarnapp.nearby.ENFClient
@@ -29,6 +30,6 @@ class InformationFragmentViewModel @AssistedInject constructor(
context.getString(R.string.information_version).format(BuildConfig.VERSION_NAME)
).asLiveData(context = dispatcherProvider.Default)
- @AssistedInject.Factory
+ @AssistedFactory
interface Factory : SimpleCWAViewModelFactory<InformationFragmentViewModel>
}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/interoperability/InteroperabilityConfigurationFragmentViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/interoperability/InteroperabilityConfigurationFragmentViewModel.kt
index 95d96003c..4a26cc863 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/interoperability/InteroperabilityConfigurationFragmentViewModel.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/interoperability/InteroperabilityConfigurationFragmentViewModel.kt
@@ -1,7 +1,8 @@
package de.rki.coronawarnapp.ui.interoperability
import androidx.lifecycle.asLiveData
-import com.squareup.inject.assisted.AssistedInject
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
import de.rki.coronawarnapp.storage.interoperability.InteroperabilityRepository
import de.rki.coronawarnapp.util.coroutine.DispatcherProvider
import de.rki.coronawarnapp.util.ui.SingleLiveEvent
@@ -31,6 +32,6 @@ class InteroperabilityConfigurationFragmentViewModel @AssistedInject constructor
}
}
- @AssistedInject.Factory
+ @AssistedFactory
interface Factory : SimpleCWAViewModelFactory<InteroperabilityConfigurationFragmentViewModel>
}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/launcher/LauncherActivityViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/launcher/LauncherActivityViewModel.kt
index d344f94c4..d42ce56f0 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/launcher/LauncherActivityViewModel.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/launcher/LauncherActivityViewModel.kt
@@ -1,6 +1,7 @@
package de.rki.coronawarnapp.ui.launcher
-import com.squareup.inject.assisted.AssistedInject
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
import de.rki.coronawarnapp.storage.LocalData
import de.rki.coronawarnapp.update.UpdateChecker
import de.rki.coronawarnapp.util.coroutine.DispatcherProvider
@@ -26,6 +27,6 @@ class LauncherActivityViewModel @AssistedInject constructor(
}
}
- @AssistedInject.Factory
+ @AssistedFactory
interface Factory : SimpleCWAViewModelFactory<LauncherActivityViewModel>
}
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 c96e28f96..37e600e85 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
@@ -1,6 +1,7 @@
package de.rki.coronawarnapp.ui.main
-import com.squareup.inject.assisted.AssistedInject
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
import de.rki.coronawarnapp.environment.EnvironmentSetup
import de.rki.coronawarnapp.playbook.BackgroundNoise
import de.rki.coronawarnapp.storage.LocalData
@@ -65,6 +66,6 @@ class MainActivityViewModel @AssistedInject constructor(
}
}
- @AssistedInject.Factory
+ @AssistedFactory
interface Factory : SimpleCWAViewModelFactory<MainActivityViewModel>
}
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 ed78fe312..2e8a092fe 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
@@ -3,7 +3,8 @@ package de.rki.coronawarnapp.ui.main.home
import androidx.lifecycle.LiveData
import androidx.lifecycle.asLiveData
import androidx.navigation.NavDirections
-import com.squareup.inject.assisted.AssistedInject
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
import de.rki.coronawarnapp.appconfig.AppConfigProvider
import de.rki.coronawarnapp.main.CWASettings
import de.rki.coronawarnapp.notification.ShareTestResultNotificationService
@@ -301,6 +302,6 @@ class HomeFragmentViewModel @AssistedInject constructor(
cwaSettings.wasDeviceTimeIncorrectAcknowledged = true
}
- @AssistedInject.Factory
+ @AssistedFactory
interface Factory : SimpleCWAViewModelFactory<HomeFragmentViewModel>
}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingDeltaInteroperabilityFragmentViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingDeltaInteroperabilityFragmentViewModel.kt
index 10ff693cd..73c9893a9 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingDeltaInteroperabilityFragmentViewModel.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingDeltaInteroperabilityFragmentViewModel.kt
@@ -1,7 +1,8 @@
package de.rki.coronawarnapp.ui.onboarding
import androidx.lifecycle.asLiveData
-import com.squareup.inject.assisted.AssistedInject
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
import de.rki.coronawarnapp.storage.interoperability.InteroperabilityRepository
import de.rki.coronawarnapp.util.coroutine.DispatcherProvider
import de.rki.coronawarnapp.util.ui.SingleLiveEvent
@@ -24,6 +25,6 @@ class OnboardingDeltaInteroperabilityFragmentViewModel @AssistedInject construct
interopRepo.saveInteroperabilityUsed()
}
- @AssistedInject.Factory
+ @AssistedFactory
interface Factory : SimpleCWAViewModelFactory<OnboardingDeltaInteroperabilityFragmentViewModel>
}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingFragmentViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingFragmentViewModel.kt
index 2f1936746..9f5b9d59d 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingFragmentViewModel.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingFragmentViewModel.kt
@@ -1,6 +1,7 @@
package de.rki.coronawarnapp.ui.onboarding
-import com.squareup.inject.assisted.AssistedInject
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
import de.rki.coronawarnapp.ui.SingleLiveEvent
import de.rki.coronawarnapp.util.viewmodel.CWAViewModel
import de.rki.coronawarnapp.util.viewmodel.SimpleCWAViewModelFactory
@@ -16,6 +17,6 @@ class OnboardingFragmentViewModel @AssistedInject constructor() : CWAViewModel()
routeToScreen.postValue(OnboardingNavigationEvents.NavigateToEasyLanguageUrl)
}
- @AssistedInject.Factory
+ @AssistedFactory
interface Factory : SimpleCWAViewModelFactory<OnboardingFragmentViewModel>
}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingNotificationsViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingNotificationsViewModel.kt
index 12084c490..8597aa4d1 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingNotificationsViewModel.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingNotificationsViewModel.kt
@@ -1,6 +1,7 @@
package de.rki.coronawarnapp.ui.onboarding
-import com.squareup.inject.assisted.AssistedInject
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
import de.rki.coronawarnapp.ui.SingleLiveEvent
import de.rki.coronawarnapp.util.viewmodel.CWAViewModel
import de.rki.coronawarnapp.util.viewmodel.SimpleCWAViewModelFactory
@@ -13,6 +14,6 @@ class OnboardingNotificationsViewModel @AssistedInject constructor() : CWAViewMo
completedOnboardingEvent.postValue(Unit)
}
- @AssistedInject.Factory
+ @AssistedFactory
interface Factory : SimpleCWAViewModelFactory<OnboardingNotificationsViewModel>
}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingPrivacyViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingPrivacyViewModel.kt
index 5c8ce4237..f596bf7e0 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingPrivacyViewModel.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingPrivacyViewModel.kt
@@ -1,6 +1,7 @@
package de.rki.coronawarnapp.ui.onboarding
-import com.squareup.inject.assisted.AssistedInject
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
import de.rki.coronawarnapp.ui.SingleLiveEvent
import de.rki.coronawarnapp.util.viewmodel.CWAViewModel
import de.rki.coronawarnapp.util.viewmodel.SimpleCWAViewModelFactory
@@ -16,6 +17,6 @@ class OnboardingPrivacyViewModel @AssistedInject constructor() : CWAViewModel()
routeToScreen.postValue(OnboardingNavigationEvents.NavigateToOnboardingFragment)
}
- @AssistedInject.Factory
+ @AssistedFactory
interface Factory : SimpleCWAViewModelFactory<OnboardingPrivacyViewModel>
}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingTestViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingTestViewModel.kt
index 2664e877c..df46e8f35 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingTestViewModel.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingTestViewModel.kt
@@ -1,6 +1,7 @@
package de.rki.coronawarnapp.ui.onboarding
-import com.squareup.inject.assisted.AssistedInject
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
import de.rki.coronawarnapp.ui.SingleLiveEvent
import de.rki.coronawarnapp.util.viewmodel.CWAViewModel
import de.rki.coronawarnapp.util.viewmodel.SimpleCWAViewModelFactory
@@ -16,6 +17,6 @@ class OnboardingTestViewModel @AssistedInject constructor() : CWAViewModel() {
routeToScreen.postValue(OnboardingNavigationEvents.NavigateToOnboardingTracing)
}
- @AssistedInject.Factory
+ @AssistedFactory
interface Factory : SimpleCWAViewModelFactory<OnboardingTestViewModel>
}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingTracingFragmentViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingTracingFragmentViewModel.kt
index 1185467f2..e7df5ad46 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingTracingFragmentViewModel.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingTracingFragmentViewModel.kt
@@ -3,7 +3,8 @@ package de.rki.coronawarnapp.ui.onboarding
import android.app.Activity
import android.content.Intent
import androidx.lifecycle.asLiveData
-import com.squareup.inject.assisted.AssistedInject
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
import de.rki.coronawarnapp.exception.ExceptionCategory
import de.rki.coronawarnapp.exception.reporting.report
import de.rki.coronawarnapp.nearby.InternalExposureNotificationClient
@@ -88,7 +89,7 @@ class OnboardingTracingFragmentViewModel @AssistedInject constructor(
tracingPermissionHelper.handleActivityResult(requestCode, resultCode, data)
}
- @AssistedInject.Factory
+ @AssistedFactory
interface Factory : SimpleCWAViewModelFactory<OnboardingTracingFragmentViewModel>
companion object {
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/SettingsResetViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/SettingsResetViewModel.kt
index ef39ecc6f..4d413a1f0 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/SettingsResetViewModel.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/SettingsResetViewModel.kt
@@ -1,7 +1,8 @@
package de.rki.coronawarnapp.ui.settings
import com.google.android.gms.common.api.ApiException
-import com.squareup.inject.assisted.AssistedInject
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
import de.rki.coronawarnapp.exception.ExceptionCategory
import de.rki.coronawarnapp.exception.reporting.report
import de.rki.coronawarnapp.nearby.InternalExposureNotificationClient
@@ -56,6 +57,6 @@ class SettingsResetViewModel @AssistedInject constructor(
private val TAG: String? = SettingsResetFragment::class.simpleName
}
- @AssistedInject.Factory
+ @AssistedFactory
interface Factory : SimpleCWAViewModelFactory<SettingsResetViewModel>
}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/backgroundpriority/SettingsBackgroundPriorityFragmentViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/backgroundpriority/SettingsBackgroundPriorityFragmentViewModel.kt
index 1a02b2504..e29021b45 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/backgroundpriority/SettingsBackgroundPriorityFragmentViewModel.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/backgroundpriority/SettingsBackgroundPriorityFragmentViewModel.kt
@@ -2,7 +2,8 @@ package de.rki.coronawarnapp.ui.settings.backgroundpriority
import androidx.lifecycle.LiveData
import androidx.lifecycle.asLiveData
-import com.squareup.inject.assisted.AssistedInject
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
import de.rki.coronawarnapp.util.coroutine.DispatcherProvider
import de.rki.coronawarnapp.util.device.BackgroundModeStatus
import de.rki.coronawarnapp.util.viewmodel.CWAViewModel
@@ -21,6 +22,6 @@ class SettingsBackgroundPriorityFragmentViewModel @AssistedInject constructor(
}
.asLiveData(dispatcherProvider.Default)
- @AssistedInject.Factory
+ @AssistedFactory
interface Factory : SimpleCWAViewModelFactory<SettingsBackgroundPriorityFragmentViewModel>
}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/notifications/NotificationSettingsFragmentViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/notifications/NotificationSettingsFragmentViewModel.kt
index 43e2f74b5..bde6cae7e 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/notifications/NotificationSettingsFragmentViewModel.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/notifications/NotificationSettingsFragmentViewModel.kt
@@ -2,7 +2,8 @@ package de.rki.coronawarnapp.ui.settings.notifications
import androidx.lifecycle.LiveData
import androidx.lifecycle.asLiveData
-import com.squareup.inject.assisted.AssistedInject
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
import de.rki.coronawarnapp.util.coroutine.DispatcherProvider
import de.rki.coronawarnapp.util.viewmodel.CWAViewModel
import de.rki.coronawarnapp.util.viewmodel.SimpleCWAViewModelFactory
@@ -38,6 +39,6 @@ class NotificationSettingsFragmentViewModel @AssistedInject constructor(
notificationSettings.toggleNotificationsTestEnabled()
}
- @AssistedInject.Factory
+ @AssistedFactory
interface Factory : SimpleCWAViewModelFactory<NotificationSettingsFragmentViewModel>
}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/start/SettingsFragmentViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/start/SettingsFragmentViewModel.kt
index e34a1a618..0cd34185c 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/start/SettingsFragmentViewModel.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/start/SettingsFragmentViewModel.kt
@@ -2,7 +2,8 @@ package de.rki.coronawarnapp.ui.settings.start
import androidx.lifecycle.LiveData
import androidx.lifecycle.asLiveData
-import com.squareup.inject.assisted.AssistedInject
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
import de.rki.coronawarnapp.tracing.GeneralTracingStatus
import de.rki.coronawarnapp.ui.settings.notifications.NotificationSettings
import de.rki.coronawarnapp.util.coroutine.DispatcherProvider
@@ -42,6 +43,6 @@ class SettingsFragmentViewModel @AssistedInject constructor(
.map { SettingsBackgroundState((it)) }
.asLiveData(dispatcherProvider.Default)
- @AssistedInject.Factory
+ @AssistedFactory
interface Factory : SimpleCWAViewModelFactory<SettingsFragmentViewModel>
}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/qrcode/consent/SubmissionConsentViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/qrcode/consent/SubmissionConsentViewModel.kt
index d88c33332..31fd005d0 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/qrcode/consent/SubmissionConsentViewModel.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/qrcode/consent/SubmissionConsentViewModel.kt
@@ -1,7 +1,8 @@
package de.rki.coronawarnapp.ui.submission.qrcode.consent
import androidx.lifecycle.asLiveData
-import com.squareup.inject.assisted.AssistedInject
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
import de.rki.coronawarnapp.storage.interoperability.InteroperabilityRepository
import de.rki.coronawarnapp.submission.SubmissionRepository
import de.rki.coronawarnapp.ui.submission.viewmodel.SubmissionNavigationEvents
@@ -34,6 +35,6 @@ class SubmissionConsentViewModel @AssistedInject constructor(
routeToScreen.postValue(SubmissionNavigationEvents.NavigateToDataPrivacy)
}
- @AssistedInject.Factory
+ @AssistedFactory
interface Factory : SimpleCWAViewModelFactory<SubmissionConsentViewModel>
}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/qrcode/info/SubmissionQRCodeInfoFragmentViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/qrcode/info/SubmissionQRCodeInfoFragmentViewModel.kt
index f90824a82..7f4284c47 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/qrcode/info/SubmissionQRCodeInfoFragmentViewModel.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/qrcode/info/SubmissionQRCodeInfoFragmentViewModel.kt
@@ -1,6 +1,7 @@
package de.rki.coronawarnapp.ui.submission.qrcode.info
-import com.squareup.inject.assisted.AssistedInject
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
import de.rki.coronawarnapp.util.ui.SingleLiveEvent
import de.rki.coronawarnapp.util.viewmodel.CWAViewModel
import de.rki.coronawarnapp.util.viewmodel.SimpleCWAViewModelFactory
@@ -18,6 +19,6 @@ class SubmissionQRCodeInfoFragmentViewModel @AssistedInject constructor() : CWAV
navigateToQRScan.postValue(Unit)
}
- @AssistedInject.Factory
+ @AssistedFactory
interface Factory : SimpleCWAViewModelFactory<SubmissionQRCodeInfoFragmentViewModel>
}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/qrcode/scan/SubmissionQRCodeScanViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/qrcode/scan/SubmissionQRCodeScanViewModel.kt
index 37b4f7c72..5c5743d41 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/qrcode/scan/SubmissionQRCodeScanViewModel.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/qrcode/scan/SubmissionQRCodeScanViewModel.kt
@@ -1,7 +1,8 @@
package de.rki.coronawarnapp.ui.submission.qrcode.scan
import androidx.lifecycle.MutableLiveData
-import com.squareup.inject.assisted.AssistedInject
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
import de.rki.coronawarnapp.bugreporting.censors.QRCodeCensor
import de.rki.coronawarnapp.exception.ExceptionCategory
import de.rki.coronawarnapp.exception.TransactionException
@@ -97,6 +98,6 @@ class SubmissionQRCodeScanViewModel @AssistedInject constructor(
routeToScreen.postValue(SubmissionNavigationEvents.NavigateToDispatcher)
}
- @AssistedInject.Factory
+ @AssistedFactory
interface Factory : SimpleCWAViewModelFactory<SubmissionQRCodeScanViewModel>
}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/resultavailable/SubmissionTestResultAvailableViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/resultavailable/SubmissionTestResultAvailableViewModel.kt
index 0fa61081e..bb90f61cd 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/resultavailable/SubmissionTestResultAvailableViewModel.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/resultavailable/SubmissionTestResultAvailableViewModel.kt
@@ -5,7 +5,8 @@ import android.content.Intent
import androidx.lifecycle.asLiveData
import androidx.navigation.NavDirections
import com.google.android.gms.nearby.exposurenotification.TemporaryExposureKey
-import com.squareup.inject.assisted.AssistedInject
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
import de.rki.coronawarnapp.exception.ExceptionCategory
import de.rki.coronawarnapp.exception.reporting.report
import de.rki.coronawarnapp.submission.SubmissionRepository
@@ -109,6 +110,6 @@ class SubmissionTestResultAvailableViewModel @AssistedInject constructor(
tekHistoryUpdater.handleActivityResult(requestCode, resultCode, data)
}
- @AssistedInject.Factory
+ @AssistedFactory
interface Factory : SimpleCWAViewModelFactory<SubmissionTestResultAvailableViewModel>
}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/resultready/SubmissionResultReadyViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/resultready/SubmissionResultReadyViewModel.kt
index 6bdeb9959..a59d4a698 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/resultready/SubmissionResultReadyViewModel.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/resultready/SubmissionResultReadyViewModel.kt
@@ -1,7 +1,8 @@
package de.rki.coronawarnapp.ui.submission.resultready
import androidx.lifecycle.asLiveData
-import com.squareup.inject.assisted.AssistedInject
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
import de.rki.coronawarnapp.submission.auto.AutoSubmission
import de.rki.coronawarnapp.ui.submission.viewmodel.SubmissionNavigationEvents
import de.rki.coronawarnapp.util.coroutine.DispatcherProvider
@@ -41,6 +42,6 @@ class SubmissionResultReadyViewModel @AssistedInject constructor(
autoSubmission.updateLastSubmissionUserActivity()
}
- @AssistedInject.Factory
+ @AssistedFactory
interface Factory : SimpleCWAViewModelFactory<SubmissionResultReadyViewModel>
}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/symptoms/calendar/SubmissionSymptomCalendarViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/symptoms/calendar/SubmissionSymptomCalendarViewModel.kt
index e8fc814d4..bf7306dae 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/symptoms/calendar/SubmissionSymptomCalendarViewModel.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/symptoms/calendar/SubmissionSymptomCalendarViewModel.kt
@@ -2,8 +2,9 @@ package de.rki.coronawarnapp.ui.submission.symptoms.calendar
import androidx.lifecycle.asLiveData
import androidx.navigation.NavDirections
-import com.squareup.inject.assisted.Assisted
-import com.squareup.inject.assisted.AssistedInject
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
import de.rki.coronawarnapp.bugreporting.reportProblem
import de.rki.coronawarnapp.submission.SubmissionRepository
import de.rki.coronawarnapp.submission.Symptoms
@@ -99,7 +100,7 @@ class SubmissionSymptomCalendarViewModel @AssistedInject constructor(
autoSubmission.updateLastSubmissionUserActivity()
}
- @AssistedInject.Factory
+ @AssistedFactory
interface Factory : CWAViewModelFactory<SubmissionSymptomCalendarViewModel> {
fun create(symptomIndication: Symptoms.Indication): SubmissionSymptomCalendarViewModel
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/symptoms/introduction/SubmissionSymptomIntroductionViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/symptoms/introduction/SubmissionSymptomIntroductionViewModel.kt
index 363e91b4b..98897e6cd 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/symptoms/introduction/SubmissionSymptomIntroductionViewModel.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/symptoms/introduction/SubmissionSymptomIntroductionViewModel.kt
@@ -2,7 +2,8 @@ package de.rki.coronawarnapp.ui.submission.symptoms.introduction
import androidx.lifecycle.asLiveData
import androidx.navigation.NavDirections
-import com.squareup.inject.assisted.AssistedInject
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
import de.rki.coronawarnapp.submission.SubmissionRepository
import de.rki.coronawarnapp.submission.Symptoms
import de.rki.coronawarnapp.submission.auto.AutoSubmission
@@ -99,6 +100,6 @@ class SubmissionSymptomIntroductionViewModel @AssistedInject constructor(
autoSubmission.updateLastSubmissionUserActivity()
}
- @AssistedInject.Factory
+ @AssistedFactory
interface Factory : SimpleCWAViewModelFactory<SubmissionSymptomIntroductionViewModel>
}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/tan/SubmissionTanViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/tan/SubmissionTanViewModel.kt
index 86d569dda..84b91e5b5 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/tan/SubmissionTanViewModel.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/tan/SubmissionTanViewModel.kt
@@ -2,7 +2,8 @@ package de.rki.coronawarnapp.ui.submission.tan
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.asLiveData
-import com.squareup.inject.assisted.AssistedInject
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
import de.rki.coronawarnapp.exception.ExceptionCategory
import de.rki.coronawarnapp.exception.TransactionException
import de.rki.coronawarnapp.exception.http.CwaWebException
@@ -78,6 +79,6 @@ class SubmissionTanViewModel @AssistedInject constructor(
val isCorrectLength: Boolean = false
)
- @AssistedInject.Factory
+ @AssistedFactory
interface Factory : SimpleCWAViewModelFactory<SubmissionTanViewModel>
}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/testresult/invalid/SubmissionTestResultInvalidViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/testresult/invalid/SubmissionTestResultInvalidViewModel.kt
index ced591754..870df2853 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/testresult/invalid/SubmissionTestResultInvalidViewModel.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/testresult/invalid/SubmissionTestResultInvalidViewModel.kt
@@ -3,7 +3,8 @@ package de.rki.coronawarnapp.ui.submission.testresult.invalid
import androidx.lifecycle.LiveData
import androidx.lifecycle.asLiveData
import androidx.navigation.NavDirections
-import com.squareup.inject.assisted.AssistedInject
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
import de.rki.coronawarnapp.notification.TestResultAvailableNotificationService
import de.rki.coronawarnapp.submission.SubmissionRepository
import de.rki.coronawarnapp.ui.submission.testresult.TestResultUIState
@@ -46,6 +47,6 @@ class SubmissionTestResultInvalidViewModel @AssistedInject constructor(
testResultAvailableNotificationService.cancelTestResultAvailableNotification()
}
- @AssistedInject.Factory
+ @AssistedFactory
interface Factory : SimpleCWAViewModelFactory<SubmissionTestResultInvalidViewModel>
}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/testresult/negative/SubmissionTestResultNegativeViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/testresult/negative/SubmissionTestResultNegativeViewModel.kt
index f5bf911c7..b1d734482 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/testresult/negative/SubmissionTestResultNegativeViewModel.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/testresult/negative/SubmissionTestResultNegativeViewModel.kt
@@ -3,7 +3,8 @@ package de.rki.coronawarnapp.ui.submission.testresult.negative
import androidx.lifecycle.LiveData
import androidx.lifecycle.asLiveData
import androidx.navigation.NavDirections
-import com.squareup.inject.assisted.AssistedInject
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
import de.rki.coronawarnapp.notification.TestResultAvailableNotificationService
import de.rki.coronawarnapp.submission.SubmissionRepository
import de.rki.coronawarnapp.ui.submission.testresult.TestResultUIState
@@ -45,7 +46,7 @@ class SubmissionTestResultNegativeViewModel @AssistedInject constructor(
testResultAvailableNotificationService.cancelTestResultAvailableNotification()
}
- @AssistedInject.Factory
+ @AssistedFactory
interface Factory : SimpleCWAViewModelFactory<SubmissionTestResultNegativeViewModel>
companion object {
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/testresult/pending/SubmissionTestResultPendingViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/testresult/pending/SubmissionTestResultPendingViewModel.kt
index c9ae92042..931a617e7 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/testresult/pending/SubmissionTestResultPendingViewModel.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/testresult/pending/SubmissionTestResultPendingViewModel.kt
@@ -3,7 +3,8 @@ package de.rki.coronawarnapp.ui.submission.testresult.pending
import androidx.lifecycle.LiveData
import androidx.lifecycle.asLiveData
import androidx.navigation.NavDirections
-import com.squareup.inject.assisted.AssistedInject
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
import de.rki.coronawarnapp.exception.http.CwaWebException
import de.rki.coronawarnapp.notification.ShareTestResultNotificationService
import de.rki.coronawarnapp.submission.SubmissionRepository
@@ -122,7 +123,7 @@ class SubmissionTestResultPendingViewModel @AssistedInject constructor(
)
}
- @AssistedInject.Factory
+ @AssistedFactory
interface Factory : SimpleCWAViewModelFactory<SubmissionTestResultPendingViewModel>
companion object {
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/testresult/positive/SubmissionTestResultConsentGivenViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/testresult/positive/SubmissionTestResultConsentGivenViewModel.kt
index 91e793734..43592aca0 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/testresult/positive/SubmissionTestResultConsentGivenViewModel.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/testresult/positive/SubmissionTestResultConsentGivenViewModel.kt
@@ -2,7 +2,8 @@ package de.rki.coronawarnapp.ui.submission.testresult.positive
import androidx.lifecycle.LiveData
import androidx.lifecycle.asLiveData
-import com.squareup.inject.assisted.AssistedInject
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
import de.rki.coronawarnapp.notification.TestResultAvailableNotificationService
import de.rki.coronawarnapp.submission.SubmissionRepository
import de.rki.coronawarnapp.submission.auto.AutoSubmission
@@ -71,6 +72,6 @@ class SubmissionTestResultConsentGivenViewModel @AssistedInject constructor(
autoSubmission.updateLastSubmissionUserActivity()
}
- @AssistedInject.Factory
+ @AssistedFactory
interface Factory : SimpleCWAViewModelFactory<SubmissionTestResultConsentGivenViewModel>
}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/testresult/positive/SubmissionTestResultNoConsentViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/testresult/positive/SubmissionTestResultNoConsentViewModel.kt
index 104c11d68..ae6984fb4 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/testresult/positive/SubmissionTestResultNoConsentViewModel.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/testresult/positive/SubmissionTestResultNoConsentViewModel.kt
@@ -2,7 +2,8 @@ package de.rki.coronawarnapp.ui.submission.testresult.positive
import androidx.lifecycle.LiveData
import androidx.lifecycle.asLiveData
-import com.squareup.inject.assisted.AssistedInject
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
import de.rki.coronawarnapp.notification.TestResultAvailableNotificationService
import de.rki.coronawarnapp.submission.SubmissionRepository
import de.rki.coronawarnapp.ui.submission.testresult.TestResultUIState
@@ -32,6 +33,6 @@ class SubmissionTestResultNoConsentViewModel @AssistedInject constructor(
testResultAvailableNotificationService.cancelTestResultAvailableNotification()
}
- @AssistedInject.Factory
+ @AssistedFactory
interface Factory : SimpleCWAViewModelFactory<SubmissionTestResultNoConsentViewModel>
}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/viewmodel/SubmissionContactViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/viewmodel/SubmissionContactViewModel.kt
index 7b6ce3290..378401830 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/viewmodel/SubmissionContactViewModel.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/viewmodel/SubmissionContactViewModel.kt
@@ -1,6 +1,7 @@
package de.rki.coronawarnapp.ui.submission.viewmodel
-import com.squareup.inject.assisted.AssistedInject
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
import de.rki.coronawarnapp.util.ui.SingleLiveEvent
import de.rki.coronawarnapp.util.viewmodel.CWAViewModel
import de.rki.coronawarnapp.util.viewmodel.SimpleCWAViewModelFactory
@@ -22,6 +23,6 @@ class SubmissionContactViewModel @AssistedInject constructor() : CWAViewModel()
routeToScreen.postValue(SubmissionNavigationEvents.NavigateToTAN)
}
- @AssistedInject.Factory
+ @AssistedFactory
interface Factory : SimpleCWAViewModelFactory<SubmissionContactViewModel>
}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/viewmodel/SubmissionDispatcherViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/viewmodel/SubmissionDispatcherViewModel.kt
index 0bb7e7ff1..4515b7d2c 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/viewmodel/SubmissionDispatcherViewModel.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/viewmodel/SubmissionDispatcherViewModel.kt
@@ -1,6 +1,7 @@
package de.rki.coronawarnapp.ui.submission.viewmodel
-import com.squareup.inject.assisted.AssistedInject
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
import de.rki.coronawarnapp.util.ui.SingleLiveEvent
import de.rki.coronawarnapp.util.viewmodel.CWAViewModel
import de.rki.coronawarnapp.util.viewmodel.SimpleCWAViewModelFactory
@@ -25,6 +26,6 @@ class SubmissionDispatcherViewModel @AssistedInject constructor() : CWAViewModel
routeToScreen.postValue(SubmissionNavigationEvents.NavigateToConsent)
}
- @AssistedInject.Factory
+ @AssistedFactory
interface Factory : SimpleCWAViewModelFactory<SubmissionDispatcherViewModel>
}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/warnothers/SubmissionResultPositiveOtherWarningNoConsentViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/warnothers/SubmissionResultPositiveOtherWarningNoConsentViewModel.kt
index 1ce2aa558..5ba83a626 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/warnothers/SubmissionResultPositiveOtherWarningNoConsentViewModel.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/warnothers/SubmissionResultPositiveOtherWarningNoConsentViewModel.kt
@@ -5,7 +5,8 @@ import android.content.Intent
import androidx.lifecycle.asLiveData
import androidx.navigation.NavDirections
import com.google.android.gms.nearby.exposurenotification.TemporaryExposureKey
-import com.squareup.inject.assisted.AssistedInject
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
import de.rki.coronawarnapp.exception.ExceptionCategory
import de.rki.coronawarnapp.exception.reporting.report
import de.rki.coronawarnapp.nearby.ENFClient
@@ -98,7 +99,7 @@ class SubmissionResultPositiveOtherWarningNoConsentViewModel @AssistedInject con
tekHistoryUpdater.handleActivityResult(requestCode, resultCode, data)
}
- @AssistedInject.Factory
+ @AssistedFactory
interface Factory : CWAViewModelFactory<SubmissionResultPositiveOtherWarningNoConsentViewModel> {
fun create(): SubmissionResultPositiveOtherWarningNoConsentViewModel
}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/yourconsent/SubmissionYourConsentViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/yourconsent/SubmissionYourConsentViewModel.kt
index a55d1c049..767af4172 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/yourconsent/SubmissionYourConsentViewModel.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/yourconsent/SubmissionYourConsentViewModel.kt
@@ -1,7 +1,8 @@
package de.rki.coronawarnapp.ui.submission.yourconsent
import androidx.lifecycle.asLiveData
-import com.squareup.inject.assisted.AssistedInject
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
import de.rki.coronawarnapp.storage.interoperability.InteroperabilityRepository
import de.rki.coronawarnapp.submission.SubmissionRepository
import de.rki.coronawarnapp.ui.SingleLiveEvent
@@ -39,6 +40,6 @@ class SubmissionYourConsentViewModel @AssistedInject constructor(
clickEvent.postValue(SubmissionYourConsentEvents.GoLegal)
}
- @AssistedInject.Factory
+ @AssistedFactory
interface Factory : SimpleCWAViewModelFactory<SubmissionYourConsentViewModel>
}
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 376305143..0592cc608 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
@@ -46,7 +46,6 @@ import javax.inject.Singleton
@Component(
modules = [
AndroidSupportInjectionModule::class,
- AssistedInjectModule::class,
CoroutineModule::class,
AndroidModule::class,
ReceiverBinder::class,
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/di/AssistedInjectModule.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/di/AssistedInjectModule.kt
deleted file mode 100644
index 88cab114e..000000000
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/di/AssistedInjectModule.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package de.rki.coronawarnapp.util.di
-
-import com.squareup.inject.assisted.dagger2.AssistedModule
-import dagger.Module
-
-@AssistedModule
-@Module(includes = [AssistedInject_AssistedInjectModule::class])
-interface AssistedInjectModule
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/ui/LiveDataExtensions.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/ui/LiveDataExtensions.kt
index e1d652cd0..e984d9221 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/ui/LiveDataExtensions.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/ui/LiveDataExtensions.kt
@@ -4,7 +4,6 @@ import androidx.fragment.app.Fragment
import androidx.lifecycle.LifecycleOwner
import androidx.lifecycle.LiveData
import androidx.lifecycle.Observer
-import androidx.lifecycle.observe
fun <T> LiveData<T>.observe2(fragment: Fragment, callback: (T) -> Unit) {
observe(fragment.viewLifecycleOwner) {
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/viewmodel/CWAViewModelFactoryProvider.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/viewmodel/CWAViewModelFactoryProvider.kt
index 836fe2688..225a26f97 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/viewmodel/CWAViewModelFactoryProvider.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/viewmodel/CWAViewModelFactoryProvider.kt
@@ -5,24 +5,25 @@ import androidx.lifecycle.AbstractSavedStateViewModelFactory
import androidx.lifecycle.SavedStateHandle
import androidx.lifecycle.ViewModel
import androidx.savedstate.SavedStateRegistryOwner
-import com.squareup.inject.assisted.Assisted
-import com.squareup.inject.assisted.AssistedInject
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
/**
* Using fragments as example:
*
- * Step 1: Inject CWAViewModelSource.Factory into Fragment
+ * Step 1: Inject [CWAViewModelFactoryProvider.Factory] into Fragment
*
- * Step 2: Use assisted inject `CWAViewModelSource.Factory.create(...)` to create an instance of
- * CWAViewModelSource that has access to the fragments `savedStateOwner`
+ * Step 2: Use assisted inject [CWAViewModelFactoryProvider.Factory.create] to create an instance of
+ * [CWAViewModelFactoryProvider] that has access to the fragments `savedStateOwner`
*
* Step 3: On first access (like "by lazy") to the viewModel the extension function,
* i.e. `ourViewModel.onActionClicked`,
- * `cwaViewModelsAssisted` (or one of it's variants) checks the fragments viewmodel store
+ * [cwaViewModelsAssisted] (or one of it's variants) checks the fragments viewmodel store
*
* Step 4: If no viewmodel was available, this factory is tasked with creating a new viewmodel
*
- * Step 5: `CWAViewModelSource.create` is called as part of that flow and returns a new viewmodel
+ * Step 5: [CWAViewModelFactoryProvider.create] is called as part of that flow and returns a new viewmodel
*
* Step 6: The new viewmodel is cached and returned
*
@@ -38,6 +39,7 @@ class CWAViewModelFactoryProvider @AssistedInject constructor(
/**
* Called indirectly (lazy) when the viewModel is accessed in a Fragment/Activity
**/
+ @Suppress("UNCHECKED_CAST")
override fun <T : ViewModel?> create(
key: String,
modelClass: Class<T>,
@@ -45,15 +47,13 @@ class CWAViewModelFactoryProvider @AssistedInject constructor(
): T {
// Find the right factory for our ViewModel
val factory = creators.entries.find { modelClass.isAssignableFrom(it.key) }?.value
- if (factory == null) throw IllegalStateException("Unknown ViewModel factory: $modelClass")
+ ?: throw IllegalStateException("Unknown ViewModel factory: $modelClass")
// If an `assistAction` was passed from `cwaViewModels` use that to create the ViewModel
- @Suppress("UNCHECKED_CAST")
var vm: T? = assistAction?.invoke(factory, handle) as? T
// If no `assistAction` was passed, try one of the defaults
// The Fragment or Activity may have used one of them to reduce boilerplate code.
- @Suppress("UNCHECKED_CAST")
if (vm == null) {
vm = when (factory) {
is SavedStateCWAViewModelFactory<*> -> factory.create(handle) as? T
@@ -69,7 +69,7 @@ class CWAViewModelFactoryProvider @AssistedInject constructor(
* Injected into fragments/activities
* Uses assisted injection to get access to the fragments/activities SavedStateRegistryOwner
*/
- @AssistedInject.Factory
+ @AssistedFactory
interface Factory {
fun create(
savedStateOwner: SavedStateRegistryOwner,
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/worker/BackgroundNoiseOneTimeWorker.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/worker/BackgroundNoiseOneTimeWorker.kt
index 522d279d6..ad5a57f87 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/worker/BackgroundNoiseOneTimeWorker.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/worker/BackgroundNoiseOneTimeWorker.kt
@@ -3,8 +3,9 @@ package de.rki.coronawarnapp.worker
import android.content.Context
import androidx.work.CoroutineWorker
import androidx.work.WorkerParameters
-import com.squareup.inject.assisted.Assisted
-import com.squareup.inject.assisted.AssistedInject
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
import de.rki.coronawarnapp.playbook.Playbook
import de.rki.coronawarnapp.util.worker.InjectedWorkerFactory
import timber.log.Timber
@@ -39,7 +40,7 @@ class BackgroundNoiseOneTimeWorker @AssistedInject constructor(
return result
}
- @AssistedInject.Factory
+ @AssistedFactory
interface Factory : InjectedWorkerFactory<BackgroundNoiseOneTimeWorker>
companion object {
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/worker/BackgroundNoisePeriodicWorker.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/worker/BackgroundNoisePeriodicWorker.kt
index d1111667f..f66cda462 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/worker/BackgroundNoisePeriodicWorker.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/worker/BackgroundNoisePeriodicWorker.kt
@@ -3,8 +3,9 @@ package de.rki.coronawarnapp.worker
import android.content.Context
import androidx.work.CoroutineWorker
import androidx.work.WorkerParameters
-import com.squareup.inject.assisted.Assisted
-import com.squareup.inject.assisted.AssistedInject
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
import de.rki.coronawarnapp.storage.LocalData
import de.rki.coronawarnapp.util.worker.InjectedWorkerFactory
import de.rki.coronawarnapp.worker.BackgroundWorkScheduler.stop
@@ -58,7 +59,7 @@ class BackgroundNoisePeriodicWorker @AssistedInject constructor(
Timber.tag(TAG).d("$id: worker stopped")
}
- @AssistedInject.Factory
+ @AssistedFactory
interface Factory : InjectedWorkerFactory<BackgroundNoisePeriodicWorker>
companion object {
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/worker/DiagnosisKeyRetrievalOneTimeWorker.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/worker/DiagnosisKeyRetrievalOneTimeWorker.kt
index 23199d027..f087a031b 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/worker/DiagnosisKeyRetrievalOneTimeWorker.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/worker/DiagnosisKeyRetrievalOneTimeWorker.kt
@@ -3,8 +3,9 @@ package de.rki.coronawarnapp.worker
import android.content.Context
import androidx.work.CoroutineWorker
import androidx.work.WorkerParameters
-import com.squareup.inject.assisted.Assisted
-import com.squareup.inject.assisted.AssistedInject
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
import de.rki.coronawarnapp.diagnosiskeys.download.DownloadDiagnosisKeysTask
import de.rki.coronawarnapp.task.TaskController
import de.rki.coronawarnapp.task.common.DefaultTaskRequest
@@ -51,7 +52,7 @@ class DiagnosisKeyRetrievalOneTimeWorker @AssistedInject constructor(
return result
}
- @AssistedInject.Factory
+ @AssistedFactory
interface Factory : InjectedWorkerFactory<DiagnosisKeyRetrievalOneTimeWorker>
companion object {
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/worker/DiagnosisKeyRetrievalPeriodicWorker.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/worker/DiagnosisKeyRetrievalPeriodicWorker.kt
index adff8651b..d375bd226 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/worker/DiagnosisKeyRetrievalPeriodicWorker.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/worker/DiagnosisKeyRetrievalPeriodicWorker.kt
@@ -3,8 +3,9 @@ package de.rki.coronawarnapp.worker
import android.content.Context
import androidx.work.CoroutineWorker
import androidx.work.WorkerParameters
-import com.squareup.inject.assisted.Assisted
-import com.squareup.inject.assisted.AssistedInject
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
import de.rki.coronawarnapp.util.worker.InjectedWorkerFactory
import timber.log.Timber
@@ -49,7 +50,7 @@ class DiagnosisKeyRetrievalPeriodicWorker @AssistedInject constructor(
return result
}
- @AssistedInject.Factory
+ @AssistedFactory
interface Factory : InjectedWorkerFactory<DiagnosisKeyRetrievalPeriodicWorker>
companion object {
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/worker/DiagnosisTestResultRetrievalPeriodicWorker.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/worker/DiagnosisTestResultRetrievalPeriodicWorker.kt
index 9dcba978e..47b8b15f2 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/worker/DiagnosisTestResultRetrievalPeriodicWorker.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/worker/DiagnosisTestResultRetrievalPeriodicWorker.kt
@@ -3,8 +3,9 @@ package de.rki.coronawarnapp.worker
import android.content.Context
import androidx.work.CoroutineWorker
import androidx.work.WorkerParameters
-import com.squareup.inject.assisted.Assisted
-import com.squareup.inject.assisted.AssistedInject
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
import de.rki.coronawarnapp.exception.NoRegistrationTokenSetException
import de.rki.coronawarnapp.notification.NotificationConstants
import de.rki.coronawarnapp.notification.NotificationHelper
@@ -129,7 +130,7 @@ class DiagnosisTestResultRetrievalPeriodicWorker @AssistedInject constructor(
Timber.tag(TAG).d("$id: Background worker stopped")
}
- @AssistedInject.Factory
+ @AssistedFactory
interface Factory : InjectedWorkerFactory<DiagnosisTestResultRetrievalPeriodicWorker>
companion object {
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/device/ForegroundStateTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/device/ForegroundStateTest.kt
index 57ef31fc9..cbb714147 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/device/ForegroundStateTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/device/ForegroundStateTest.kt
@@ -12,9 +12,12 @@ import kotlinx.coroutines.test.runBlockingTest
import org.junit.jupiter.api.AfterEach
import org.junit.jupiter.api.BeforeEach
import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.extension.ExtendWith
import testhelpers.BaseTest
import testhelpers.coroutines.test
+import testhelpers.extensions.InstantExecutorExtension
+@ExtendWith(InstantExecutorExtension::class)
class ForegroundStateTest : BaseTest() {
@MockK lateinit var lifecycleOwner: LifecycleOwner
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 7d8d75d11..725775cbe 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
@@ -15,7 +15,6 @@ import de.rki.coronawarnapp.playbook.Playbook
import de.rki.coronawarnapp.risk.storage.RiskLevelStorage
import de.rki.coronawarnapp.task.TaskController
import de.rki.coronawarnapp.util.di.AppContext
-import de.rki.coronawarnapp.util.di.AssistedInjectModule
import de.rki.coronawarnapp.util.serialization.BaseGson
import io.github.classgraph.ClassGraph
import io.kotest.matchers.collections.shouldContainAll
@@ -68,7 +67,7 @@ class WorkerBinderTest : BaseTest() {
}
@Singleton
-@Component(modules = [AssistedInjectModule::class, WorkerBinder::class, MockProvider::class])
+@Component(modules = [WorkerBinder::class, MockProvider::class])
interface WorkerTestComponent {
val factories: @JvmSuppressWildcards Map<Class<out ListenableWorker>, Provider<InjectedWorkerFactory<out ListenableWorker>>>
--
GitLab