From f1e432e1f843015d4923585a4b8cfda035e5f784 Mon Sep 17 00:00:00 2001
From: Garrit Franke <32395585+garritfra@users.noreply.github.com>
Date: Tue, 23 Jun 2020 14:15:10 +0200
Subject: [PATCH] Simplify method (#724) - riskLevelChangedBetweenLowAndHigh
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* Simplify riskLevelChangedBetweenLowAndHigh
* Fix lint
Co-authored-by: Jakob Möller <jakob.moeller@sap.com>
---
.../java/de/rki/coronawarnapp/risk/RiskLevel.kt | 15 ++-------------
1 file changed, 2 insertions(+), 13 deletions(-)
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/risk/RiskLevel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/risk/RiskLevel.kt
index 68db8003d..8fe72d797 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/risk/RiskLevel.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/risk/RiskLevel.kt
@@ -68,19 +68,8 @@ enum class RiskLevel(val raw: Int) {
previousRiskLevel: RiskLevel,
currentRiskLevel: RiskLevel
): Boolean {
- var riskLevelChangedBetweenLowAndHigh = false
- if (HIGH_RISK_LEVELS.contains(previousRiskLevel) && LOW_RISK_LEVELS.contains(
- currentRiskLevel
- )
- ) {
- riskLevelChangedBetweenLowAndHigh = true
- } else if (LOW_RISK_LEVELS.contains(previousRiskLevel) && HIGH_RISK_LEVELS.contains(
- currentRiskLevel
- )
- ) {
- riskLevelChangedBetweenLowAndHigh = true
- }
- return riskLevelChangedBetweenLowAndHigh
+ return HIGH_RISK_LEVELS.contains(previousRiskLevel) && LOW_RISK_LEVELS.contains(currentRiskLevel) ||
+ LOW_RISK_LEVELS.contains(previousRiskLevel) && HIGH_RISK_LEVELS.contains(currentRiskLevel)
}
}
}
--
GitLab