improvements from reviewers

corona-warn-app · Oct 30, 2020 · 965e966 · 965e966
1 parent 3c5de43
commit 965e966
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 16 deletions.
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/risk/DefaultRiskLevels.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/risk/DefaultRiskLevels.kt
@@ -81,7 +81,7 @@ class DefaultRiskLevels @Inject constructor(
     override suspend fun isIncreasedRisk(lastExposureSummary: ExposureSummary): Boolean {
         val appConfiguration = appConfigProvider.getAppConfig()
         Timber.tag(TAG).v("Retrieved configuration from backend")
-        // custom attenuation parameters to weight the attenuation
+        // custom attenuation parameters to weigh the attenuation
         // values provided by the Google API
         val attenuationParameters = appConfiguration.attenuationDuration
         // these are the defined risk classes. They will divide the calculated

diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/risk/RiskLevelTask.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/risk/RiskLevelTask.kt
@@ -8,13 +8,7 @@ import de.rki.coronawarnapp.exception.RiskLevelCalculationException
 import de.rki.coronawarnapp.exception.reporting.report
 import de.rki.coronawarnapp.nearby.ENFClient
 import de.rki.coronawarnapp.nearby.InternalExposureNotificationClient
-import de.rki.coronawarnapp.risk.RiskLevel.INCREASED_RISK
-import de.rki.coronawarnapp.risk.RiskLevel.LOW_LEVEL_RISK
-import de.rki.coronawarnapp.risk.RiskLevel.NO_CALCULATION_POSSIBLE_TRACING_OFF
-import de.rki.coronawarnapp.risk.RiskLevel.UNDETERMINED
-import de.rki.coronawarnapp.risk.RiskLevel.UNKNOWN_RISK_INITIAL
-import de.rki.coronawarnapp.risk.RiskLevel.UNKNOWN_RISK_OUTDATED_RESULTS
-import de.rki.coronawarnapp.risk.RiskLevel.UNKNOWN_RISK_OUTDATED_RESULTS_MANUAL
+import de.rki.coronawarnapp.risk.RiskLevel.*
 import de.rki.coronawarnapp.storage.LocalData
 import de.rki.coronawarnapp.storage.RiskLevelRepository
 import de.rki.coronawarnapp.task.Task
@@ -23,6 +17,7 @@ import de.rki.coronawarnapp.task.TaskFactory
 import de.rki.coronawarnapp.task.common.DefaultProgress
 import de.rki.coronawarnapp.util.ConnectivityHelper
 import de.rki.coronawarnapp.util.ConnectivityHelper.isNetworkEnabled
+import de.rki.coronawarnapp.util.TimeStamper
 import de.rki.coronawarnapp.util.di.AppContext
 import kotlinx.coroutines.channels.ConflatedBroadcastChannel
 import kotlinx.coroutines.flow.Flow
@@ -36,7 +31,8 @@ import javax.inject.Provider
 class RiskLevelTask @Inject constructor(
     private val riskLevels: RiskLevels,
     @AppContext private val context: Context,
-    private val enfClient: ENFClient
+    private val enfClient: ENFClient,
+    private val timeStamper: TimeStamper
 ) : Task<DefaultProgress, RiskLevelTask.Result> {
 
     private val internalProgress = ConflatedBroadcastChannel<DefaultProgress>()
@@ -53,23 +49,25 @@ class RiskLevelTask @Inject constructor(
                 RiskLevelRepository.setLastCalculatedRiskLevelAsCurrent()
                 return Result(UNDETERMINED)
             }
+
+            if (!enfClient.isTracingEnabled.first()) {
+                return Result(NO_CALCULATION_POSSIBLE_TRACING_OFF)
+            }
+
             with(riskLevels) {
                 return Result(
                     when {
-                        !enfClient.isTracingEnabled.first().also {
-                            checkCancel()
-                        } -> NO_CALCULATION_POSSIBLE_TRACING_OFF
-
                         calculationNotPossibleBecauseOfNoKeys().also {
                             checkCancel()
                         } -> UNKNOWN_RISK_INITIAL
 
                         calculationNotPossibleBecauseOfOutdatedResults().also {
                             checkCancel()
-                        } -> if (backgroundJobsEnabled)
+                        } -> if (backgroundJobsEnabled) {
                             UNKNOWN_RISK_OUTDATED_RESULTS
-                        else
+                        } else {
                             UNKNOWN_RISK_OUTDATED_RESULTS_MANUAL
+                        }
 
                         isIncreasedRisk(getNewExposureSummary()).also {
                             checkCancel()
@@ -82,7 +80,7 @@ class RiskLevelTask @Inject constructor(
                         else -> LOW_LEVEL_RISK
                     }.also {
                         checkCancel()
-                        updateRepository(it, System.currentTimeMillis())
+                        updateRepository(it, timeStamper.nowUTC.millis)
                     }
                 )
             }