From 72827a081246b17ca659dd4ca82359a39bdea528 Mon Sep 17 00:00:00 2001
From: Matthias Urhahn <matthias.urhahn@sap.com>
Date: Mon, 30 Nov 2020 17:40:04 +0100
Subject: [PATCH] Remove minimum tracing time requirement (EXPOSUREAPP-3051)
(#1762)
* Remove minimum tracing time requirement.
* LINT issues.
Co-authored-by: BMItter <46747780+BMItter@users.noreply.github.com>
Co-authored-by: harambasicluka <64483219+harambasicluka@users.noreply.github.com>
---
.../rki/coronawarnapp/risk/RiskLevelTask.kt | 20 ++-----------------
1 file changed, 2 insertions(+), 18 deletions(-)
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
index 22dee5064..92e4a9422 100644
--- 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
@@ -18,7 +18,6 @@ import de.rki.coronawarnapp.task.TaskFactory
import de.rki.coronawarnapp.task.common.DefaultProgress
import de.rki.coronawarnapp.util.BackgroundModeStatus
import de.rki.coronawarnapp.util.ConnectivityHelper.isNetworkEnabled
-import de.rki.coronawarnapp.util.TimeAndDateExtensions.millisecondsToHours
import de.rki.coronawarnapp.util.TimeStamper
import de.rki.coronawarnapp.util.di.AppContext
import kotlinx.coroutines.channels.ConflatedBroadcastChannel
@@ -125,30 +124,15 @@ class RiskLevelTask @Inject constructor(
Timber.d("areKeyPkgsOutDated(): Age is %dh for latest key package: %s", it.standardHours, latestDownload)
}
- return (downloadAge.isLongerThan(STALE_DOWNLOAD_LIMIT) && isActiveTracingTimeAboveThreshold()).also {
+ return (downloadAge.isLongerThan(STALE_DOWNLOAD_LIMIT)).also {
if (it) {
- Timber.tag(TAG).i("areKeyPkgsOutDated(): Calculation was not possible because reults are outdated.")
+ Timber.tag(TAG).i("areKeyPkgsOutDated(): Calculation was not possible because results are outdated.")
} else {
Timber.tag(TAG).d("areKeyPkgsOutDated(): Key pkgs are fresh :), continuing evaluation.")
}
}
}
- private fun isActiveTracingTimeAboveThreshold(): Boolean {
- Timber.tag(TAG).d("Evaluating isActiveTracingTimeAboveThreshold()")
-
- val durationTracingIsActive = TimeVariables.getTimeActiveTracingDuration()
- val activeTracingDurationInHours = durationTracingIsActive.millisecondsToHours()
- val durationTracingIsActiveThreshold = TimeVariables.getMinActivatedTracingTime().toLong()
-
- return (activeTracingDurationInHours >= durationTracingIsActiveThreshold).also {
- Timber.tag(TAG).v(
- "Active tracing time ($activeTracingDurationInHours h) is above threshold " +
- "($durationTracingIsActiveThreshold h): $it"
- )
- }
- }
-
private suspend fun calculateRiskLevel(configData: ExposureWindowRiskCalculationConfig): RiskLevelTaskResult {
Timber.tag(TAG).d("Calculating risklevel")
val exposureWindows = enfClient.exposureWindows()
--
GitLab