diff --git a/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/onboarding/OnboardingAnalyticsFragmentTest.kt b/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/onboarding/OnboardingAnalyticsFragmentTest.kt index afcc0661a26d035d4fac2857d5632dac657dd0f9..c6d4cd2f7f265c9c2cafeb8aa83a1a411bb0fbb1 100644 --- a/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/onboarding/OnboardingAnalyticsFragmentTest.kt +++ b/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/onboarding/OnboardingAnalyticsFragmentTest.kt @@ -49,10 +49,12 @@ class OnboardingAnalyticsFragmentTest : BaseUITest() { fun setup() { MockKAnnotations.init(this, relaxed = true) - coEvery { districts.loadDistricts() } returns listOf(Districts.District( - districtId = 11011004, - districtName = "SK Berlin Charlottenburg-Wilmersdorf" - )) + coEvery { districts.loadDistricts() } returns listOf( + Districts.District( + districtId = 11011004, + districtName = "SK Berlin Charlottenburg-Wilmersdorf" + ) + ) viewModel = onboardingAnalyticsViewModelSpy() with(viewModel) { diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/datadonation/analytics/worker/DataDonationAnalyticsWorkBuilder.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/datadonation/analytics/worker/DataDonationAnalyticsWorkBuilder.kt index 541b8d3a60ea1ba2ece31124b3ec708ebed0feeb..5b5e92550c4c675ba438037de8f4023da37918e0 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/datadonation/analytics/worker/DataDonationAnalyticsWorkBuilder.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/datadonation/analytics/worker/DataDonationAnalyticsWorkBuilder.kt @@ -14,7 +14,8 @@ import javax.inject.Inject class DataDonationAnalyticsWorkBuilder @Inject constructor() { fun buildPeriodicWork(additionalDelay: Duration): PeriodicWorkRequest = PeriodicWorkRequestBuilder<DataDonationAnalyticsPeriodicWorker>( - DateTimeConstants.HOURS_PER_DAY.toLong(), TimeUnit.HOURS + DateTimeConstants.HOURS_PER_DAY.toLong(), + TimeUnit.HOURS ) .setInitialDelay( DateTimeConstants.HOURS_PER_DAY.toLong() + additionalDelay.standardHours, diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/datadonation/survey/Surveys.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/datadonation/survey/Surveys.kt index 4034bbc3e14ee2b00ed91d61809c4b213609b372..bf2bf4f0b4deaf919a6cc3b44784dd787e790b0f 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/datadonation/survey/Surveys.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/datadonation/survey/Surveys.kt @@ -52,10 +52,12 @@ class Surveys @Inject constructor( val oneTimePassword = oneTimePasswordRepo.otp ?: oneTimePasswordRepo.generateOTP() // check device - val attestationResult = deviceAttestation.attest(object : DeviceAttestation.Request { - override val scenarioPayload: ByteArray - get() = oneTimePassword.payloadForRequest - }) + val attestationResult = deviceAttestation.attest( + object : DeviceAttestation.Request { + override val scenarioPayload: ByteArray + get() = oneTimePassword.payloadForRequest + } + ) attestationResult.requirePass(config.safetyNetRequirements) // request validation from server diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/release/NewReleaseInfoFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/release/NewReleaseInfoFragment.kt index 491339fea079d7c9c249c2b618addfd60dc5d2e4..7ade626fc4de42d217411385aa7d4f5feb12e2d5 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/release/NewReleaseInfoFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/release/NewReleaseInfoFragment.kt @@ -56,8 +56,9 @@ class NewReleaseInfoFragment : Fragment(R.layout.new_release_info_screen_fragmen if (args.comesFromInfoScreen) { popBackStack() } else { - doNavigate(NewReleaseInfoFragmentDirections - .actionNewReleaseInfoFragmentToOnboardingDeltaAnalyticsFragment() + doNavigate( + NewReleaseInfoFragmentDirections + .actionNewReleaseInfoFragmentToOnboardingDeltaAnalyticsFragment() ) } } diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingAnalyticsFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingAnalyticsFragment.kt index c9c9578f2dfa8c4344bca9243d8eee65ab17befa..8727896d40b0c3a0b5dc66dd67e45e14d2edcdee 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingAnalyticsFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingAnalyticsFragment.kt @@ -33,7 +33,7 @@ class OnboardingAnalyticsFragment : Fragment(R.layout.fragment_onboarding_ppa), federalStateRow.setOnClickListener { doNavigate( OnboardingAnalyticsFragmentDirections.actionOnboardingAnalyticsFragmentToAnalyticsUserInputFragment( - type = AnalyticsUserInputFragment.InputType.FEDERAL_STATE + type = AnalyticsUserInputFragment.InputType.FEDERAL_STATE ) ) } diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingDeltaAnalyticsFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingDeltaAnalyticsFragment.kt index 475e1642e2fd30683b6a38c35f4d5b4ac0788bfe..e6e9ba278c958b0c58fd8e89619de7a0f1d12751 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingDeltaAnalyticsFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingDeltaAnalyticsFragment.kt @@ -36,23 +36,23 @@ class OnboardingDeltaAnalyticsFragment : Fragment(R.layout.fragment_onboarding_d OnboardingDeltaAnalyticsFragmentDirections .actionOnboardingDeltaAnalyticsFragmentToAnalyticsUserInputFragment( type = AnalyticsUserInputFragment.InputType.FEDERAL_STATE - ) + ) ) } districtRow.setOnClickListener { doNavigate( OnboardingDeltaAnalyticsFragmentDirections .actionOnboardingDeltaAnalyticsFragmentToAnalyticsUserInputFragment( - type = AnalyticsUserInputFragment.InputType.DISTRICT - ) + type = AnalyticsUserInputFragment.InputType.DISTRICT + ) ) } ageGroupRow.setOnClickListener { doNavigate( OnboardingDeltaAnalyticsFragmentDirections .actionOnboardingDeltaAnalyticsFragmentToAnalyticsUserInputFragment( - type = AnalyticsUserInputFragment.InputType.AGE_GROUP - ) + type = AnalyticsUserInputFragment.InputType.AGE_GROUP + ) ) } moreInfoRow.setOnClickListener { diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/analytics/SettingsPrivacyPreservingAnalyticsFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/analytics/SettingsPrivacyPreservingAnalyticsFragment.kt index 4fb5d4d2992fa51c7cdaaa08716f80a9802ce345..9ceb7d072ae22fd404df73d9b8ae58f55ffcfb2c 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/analytics/SettingsPrivacyPreservingAnalyticsFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/analytics/SettingsPrivacyPreservingAnalyticsFragment.kt @@ -57,8 +57,8 @@ class SettingsPrivacyPreservingAnalyticsFragment : doNavigate( SettingsPrivacyPreservingAnalyticsFragmentDirections .actionSettingsPrivacyPreservingAnalyticsFragmentToAnalyticsUserInputFragment( - type = AnalyticsUserInputFragment.InputType.FEDERAL_STATE - ) + type = AnalyticsUserInputFragment.InputType.FEDERAL_STATE + ) ) } @@ -66,8 +66,8 @@ class SettingsPrivacyPreservingAnalyticsFragment : doNavigate( SettingsPrivacyPreservingAnalyticsFragmentDirections .actionSettingsPrivacyPreservingAnalyticsFragmentToAnalyticsUserInputFragment( - type = AnalyticsUserInputFragment.InputType.DISTRICT - ) + type = AnalyticsUserInputFragment.InputType.DISTRICT + ) ) } ageGroupRow.setOnClickListener {