From eeda5d134d830a60e073bcad56c2f525771b9342 Mon Sep 17 00:00:00 2001
From: Matthias Urhahn <matthias.urhahn@sap.com>
Date: Wed, 12 May 2021 13:26:33 +0200
Subject: [PATCH] Reduce code smell debt within RiskLevelChange detektor (DEV)
#3151
Co-authored-by: Mohamed <mohamed.metwalli@sap.com>
Co-authored-by: Ralf Gehrer <ralfgehrer@users.noreply.github.com>
---
.../risk/RiskLevelChangeDetector.kt | 22 +++++++------------
1 file changed, 8 insertions(+), 14 deletions(-)
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/risk/RiskLevelChangeDetector.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/risk/RiskLevelChangeDetector.kt
index 799cf04a6..c67d04d38 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/risk/RiskLevelChangeDetector.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/risk/RiskLevelChangeDetector.kt
@@ -113,17 +113,13 @@ class RiskLevelChangeDetector @Inject constructor(
) {
// Save riskLevelTurnedRedTime if not already set before for high risk detection
Timber.i("riskLevelTurnedRedTime=%s", testResultDonorSettings.riskLevelTurnedRedTime.value)
- if (testResultDonorSettings.riskLevelTurnedRedTime.value == null) {
- if (newEwRiskState.isIncreasedRisk) {
- testResultDonorSettings.riskLevelTurnedRedTime.update {
- newEwRiskState.calculatedAt
- }
- Timber.i(
- "riskLevelTurnedRedTime: newRiskState=%s, riskLevelTurnedRedTime=%s",
- newEwRiskState.riskState,
- newEwRiskState.calculatedAt
- )
- }
+ if (testResultDonorSettings.riskLevelTurnedRedTime.value == null && newEwRiskState.isIncreasedRisk) {
+ testResultDonorSettings.riskLevelTurnedRedTime.update { newEwRiskState.calculatedAt }
+ Timber.i(
+ "riskLevelTurnedRedTime: newRiskState=%s, riskLevelTurnedRedTime=%s",
+ newEwRiskState.riskState,
+ newEwRiskState.calculatedAt
+ )
}
// Save most recent date of high or low risks
@@ -136,9 +132,7 @@ class RiskLevelChangeDetector @Inject constructor(
lastRiskEncounterAt
)
- testResultDonorSettings.mostRecentDateWithHighOrLowRiskLevel.update {
- lastRiskEncounterAt
- }
+ testResultDonorSettings.mostRecentDateWithHighOrLowRiskLevel.update { lastRiskEncounterAt }
}
}
--
GitLab