From 49eaac6dbcc33963f8dd63217f39656c475300f5 Mon Sep 17 00:00:00 2001 From: Mohamed Metwalli <Mohamed.Metwalli@sap.com> Date: Tue, 16 Feb 2021 11:48:23 +0100 Subject: [PATCH] Run klint formatting --- .../ui/onboarding/OnboardingAnalyticsFragmentTest.kt | 10 ++++++---- .../worker/DataDonationAnalyticsWorkBuilder.kt | 3 ++- .../rki/coronawarnapp/datadonation/survey/Surveys.kt | 10 ++++++---- .../coronawarnapp/release/NewReleaseInfoFragment.kt | 5 +++-- .../ui/onboarding/OnboardingAnalyticsFragment.kt | 2 +- .../ui/onboarding/OnboardingDeltaAnalyticsFragment.kt | 10 +++++----- .../SettingsPrivacyPreservingAnalyticsFragment.kt | 8 ++++---- 7 files changed, 27 insertions(+), 21 deletions(-) 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 afcc0661a..c6d4cd2f7 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 541b8d3a6..5b5e92550 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 4034bbc3e..bf2bf4f0b 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 491339fea..7ade626fc 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 c9c9578f2..8727896d4 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 475e1642e..e6e9ba278 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 4fb5d4d29..9ceb7d072 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 { -- GitLab