From 895a58e9d72a514379ac748f7e0936e3a6033302 Mon Sep 17 00:00:00 2001
From: Kolya Opahle <k.opahle@sap.com>
Date: Thu, 19 Nov 2020 15:13:51 +0100
Subject: [PATCH] check if rawConfig contains riskCalculationParameters
Signed-off-by: Kolya Opahle <k.opahle@sap.com>
---
.../mapping/ExposureWindowRiskCalculationConfigMapper.kt | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/appconfig/mapping/ExposureWindowRiskCalculationConfigMapper.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/appconfig/mapping/ExposureWindowRiskCalculationConfigMapper.kt
index e64fdc2ba..ab55b97ee 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/appconfig/mapping/ExposureWindowRiskCalculationConfigMapper.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/appconfig/mapping/ExposureWindowRiskCalculationConfigMapper.kt
@@ -2,6 +2,7 @@ package de.rki.coronawarnapp.appconfig.mapping
import dagger.Reusable
import de.rki.coronawarnapp.appconfig.ExposureWindowRiskCalculationConfig
+import de.rki.coronawarnapp.appconfig.internal.ApplicationConfigurationInvalidException
import de.rki.coronawarnapp.server.protocols.internal.v2.AppConfigAndroid
import de.rki.coronawarnapp.server.protocols.internal.v2.RiskCalculationParametersOuterClass
import javax.inject.Inject
@@ -11,7 +12,14 @@ class ExposureWindowRiskCalculationConfigMapper @Inject constructor() :
ExposureWindowRiskCalculationConfig.Mapper {
override fun map(rawConfig: AppConfigAndroid.ApplicationConfigurationAndroid): ExposureWindowRiskCalculationConfig {
+ if (!rawConfig.hasRiskCalculationParameters()) {
+ throw ApplicationConfigurationInvalidException(
+ message = "Risk Calculation Parameters are missing"
+ )
+ }
+
val riskCalculationParameters = rawConfig.riskCalculationParameters
+
return ExposureWindowRiskCalculationContainer(
minutesAtAttenuationFilters = riskCalculationParameters
.minutesAtAttenuationFiltersList,
--
GitLab