More accurate timestamps on risk card (EXPOSUREAPP-1991)

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/tracing/card/TracingCardState.kt

@@ -18,7 +18,7 @@ data class TracingCardState(
     override val matchedKeyCount: Int,
     override val daysSinceLastExposure: Int,
     override val activeTracingDaysInRetentionPeriod: Long,
-    override val lastTimeDiagnosisKeysFetched: Date?,
+    override val lastENFCalculation: Date?,
     override val isBackgroundJobEnabled: Boolean,
     override val isManualKeyRetrievalEnabled: Boolean,
     override val manualKeyRetrievalTime: Long,
@@ -190,10 +190,10 @@ data class TracingCardState(
         return when (riskLevelScore) {
             RiskLevelConstants.LOW_LEVEL_RISK,
             RiskLevelConstants.INCREASED_RISK -> {
-                if (lastTimeDiagnosisKeysFetched != null) {
+                if (lastENFCalculation != null) {
                     c.getString(
                         R.string.risk_card_body_time_fetched,
-                        formatRelativeDateTimeString(c, lastTimeDiagnosisKeysFetched)
+                        formatRelativeDateTimeString(c, lastENFCalculation)
                     )
                 } else {
                     c.getString(R.string.risk_card_body_not_yet_fetched)
@@ -206,10 +206,10 @@ data class TracingCardState(
                     RiskLevelConstants.LOW_LEVEL_RISK,
                     RiskLevelConstants.INCREASED_RISK,
                     RiskLevelConstants.UNKNOWN_RISK_INITIAL -> {
-                        if (lastTimeDiagnosisKeysFetched != null) {
+                        if (lastENFCalculation != null) {
                             c.getString(
                                 R.string.risk_card_body_time_fetched,
-                                formatRelativeDateTimeString(c, lastTimeDiagnosisKeysFetched)
+                                formatRelativeDateTimeString(c, lastENFCalculation)
                             )
                         } else {
                             c.getString(R.string.risk_card_body_not_yet_fetched)

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/tracing/card/TracingCardStateProvider.kt

@@ -1,6 +1,7 @@
 package de.rki.coronawarnapp.ui.tracing.card
 
 import dagger.Reusable
+import de.rki.coronawarnapp.nearby.ENFClient
 import de.rki.coronawarnapp.storage.ExposureSummaryRepository
 import de.rki.coronawarnapp.storage.RiskLevelRepository
 import de.rki.coronawarnapp.storage.SettingsRepository
@@ -9,6 +10,7 @@ import de.rki.coronawarnapp.tracing.GeneralTracingStatus
 import de.rki.coronawarnapp.util.BackgroundModeStatus
 import de.rki.coronawarnapp.util.flow.combine
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.onCompletion
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.onStart
@@ -20,7 +22,8 @@ class TracingCardStateProvider @Inject constructor(
     tracingStatus: GeneralTracingStatus,
     backgroundModeStatus: BackgroundModeStatus,
     settingsRepository: SettingsRepository,
-    tracingRepository: TracingRepository
+    tracingRepository: TracingRepository,
+    enfClient: ENFClient
 ) {
 
     // TODO Refactor these singletons away
@@ -46,8 +49,8 @@ class TracingCardStateProvider @Inject constructor(
         tracingRepository.activeTracingDaysInRetentionPeriod.onEach {
             Timber.v("activeTracingDaysInRetentionPeriod: $it")
         },
-        tracingRepository.lastTimeDiagnosisKeysFetched.onEach {
-            Timber.v("lastTimeDiagnosisKeysFetched: $it")
+        enfClient.latestFinishedCalculation().onEach {
+            Timber.v("latestFinishedCalculation: $it")
         },
         backgroundModeStatus.isAutoModeEnabled.onEach {
             Timber.v("isAutoModeEnabled: $it")
@@ -65,17 +68,22 @@ class TracingCardStateProvider @Inject constructor(
         matchedKeyCount,
         daysSinceLastExposure,
         activeTracingDaysInRetentionPeriod,
-        lastTimeDiagnosisKeysFetched,
+        lastENFCalculation,
         isBackgroundJobEnabled,
         isManualKeyRetrievalEnabled,
         manualKeyRetrievalTime ->
 
+        // TODO Remove a later version (1.7+), when everyone likely has tracked calc data
+        // When the update with this change hits, there will not yet be a last tracked calculation
+        val lastUpdateDate = lastENFCalculation?.finishedAt?.toDate()
+            ?: tracingRepository.lastTimeDiagnosisKeysFetched.first()
+
         TracingCardState(
             tracingStatus = status,
             riskLevelScore = riskLevelScore,
             isRefreshing = isRefreshing,
             lastRiskLevelScoreCalculated = riskLevelScoreLastSuccessfulCalculated,
-            lastTimeDiagnosisKeysFetched = lastTimeDiagnosisKeysFetched,
+            lastENFCalculation = lastUpdateDate,
             matchedKeyCount = matchedKeyCount,
             daysSinceLastExposure = daysSinceLastExposure,
             activeTracingDaysInRetentionPeriod = activeTracingDaysInRetentionPeriod,

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/tracing/common/BaseTracingState.kt

@@ -17,7 +17,7 @@ abstract class BaseTracingState {
     abstract val matchedKeyCount: Int
     abstract val daysSinceLastExposure: Int
     abstract val activeTracingDaysInRetentionPeriod: Long
-    abstract val lastTimeDiagnosisKeysFetched: Date?
+    abstract val lastENFCalculation: Date?
     abstract val isBackgroundJobEnabled: Boolean
     abstract val showDetails: Boolean // Only true for riskdetailsfragment
     abstract val isManualKeyRetrievalEnabled: Boolean

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/tracing/details/TracingDetailsState.kt

@@ -15,7 +15,7 @@ data class TracingDetailsState(
     override val matchedKeyCount: Int,
     override val daysSinceLastExposure: Int,
     override val activeTracingDaysInRetentionPeriod: Long,
-    override val lastTimeDiagnosisKeysFetched: Date?,
+    override val lastENFCalculation: Date?,
     override val isBackgroundJobEnabled: Boolean,
     override val isManualKeyRetrievalEnabled: Boolean,
     override val manualKeyRetrievalTime: Long,

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/tracing/details/TracingDetailsStateProvider.kt

@@ -1,6 +1,7 @@
 package de.rki.coronawarnapp.ui.tracing.details
 
 import dagger.Reusable
+import de.rki.coronawarnapp.nearby.ENFClient
 import de.rki.coronawarnapp.storage.ExposureSummaryRepository
 import de.rki.coronawarnapp.storage.RiskLevelRepository
 import de.rki.coronawarnapp.storage.SettingsRepository
@@ -9,6 +10,7 @@ import de.rki.coronawarnapp.tracing.GeneralTracingStatus
 import de.rki.coronawarnapp.util.BackgroundModeStatus
 import de.rki.coronawarnapp.util.flow.combine
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.onCompletion
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.onStart
@@ -21,7 +23,8 @@ class TracingDetailsStateProvider @Inject constructor(
     tracingStatus: GeneralTracingStatus,
     backgroundModeStatus: BackgroundModeStatus,
     settingsRepository: SettingsRepository,
-    tracingRepository: TracingRepository
+    tracingRepository: TracingRepository,
+    enfClient: ENFClient
 ) {
 
     // TODO Refactore these singletons away
@@ -33,7 +36,9 @@ class TracingDetailsStateProvider @Inject constructor(
         ExposureSummaryRepository.matchedKeyCount,
         ExposureSummaryRepository.daysSinceLastExposure,
         tracingRepository.activeTracingDaysInRetentionPeriod,
-        tracingRepository.lastTimeDiagnosisKeysFetched,
+        enfClient.latestFinishedCalculation().onEach {
+            Timber.v("latestFinishedCalculation: $it")
+        },
         backgroundModeStatus.isAutoModeEnabled,
         settingsRepository.isManualKeyRetrievalEnabledFlow,
         settingsRepository.manualKeyRetrievalTimeFlow
@@ -42,7 +47,7 @@ class TracingDetailsStateProvider @Inject constructor(
         riskLevelScoreLastSuccessfulCalculated,
         isRefreshing, matchedKeyCount,
         daysSinceLastExposure, activeTracingDaysInRetentionPeriod,
-        lastTimeDiagnosisKeysFetched,
+        lastENFCalculation,
         isBackgroundJobEnabled,
         isManualKeyRetrievalEnabled,
         manualKeyRetrievalTime ->
@@ -52,8 +57,13 @@ class TracingDetailsStateProvider @Inject constructor(
         )
         val isInformationBodyNoticeVisible =
             riskDetailPresenter.isInformationBodyNoticeVisible(
-            riskLevelScore
-        )
+                riskLevelScore
+            )
+
+        // TODO Remove a later version (1.7+), when everyone likely has tracked calc data
+        // When the update with this change hits, there will not yet be a last tracked calculation
+        val lastUpdateDate = lastENFCalculation?.finishedAt?.toDate()
+            ?: tracingRepository.lastTimeDiagnosisKeysFetched.first()
 
         TracingDetailsState(
             tracingStatus = status,
@@ -63,7 +73,7 @@ class TracingDetailsStateProvider @Inject constructor(
             matchedKeyCount = matchedKeyCount,
             daysSinceLastExposure = daysSinceLastExposure,
             activeTracingDaysInRetentionPeriod = activeTracingDaysInRetentionPeriod,
-            lastTimeDiagnosisKeysFetched = lastTimeDiagnosisKeysFetched,
+            lastENFCalculation = lastUpdateDate,
             isBackgroundJobEnabled = isBackgroundJobEnabled,
             isManualKeyRetrievalEnabled = isManualKeyRetrievalEnabled,
             manualKeyRetrievalTime = manualKeyRetrievalTime,

Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/tracing/card/TracingCardStateTest.kt

@@ -55,7 +55,7 @@ class TracingCardStateTest : BaseTest() {
         matchedKeyCount = matchedKeyCount,
         daysSinceLastExposure = daysSinceLastExposure,
         activeTracingDaysInRetentionPeriod = activeTracingDaysInRetentionPeriod,
-        lastTimeDiagnosisKeysFetched = lastTimeDiagnosisKeysFetched,
+        lastENFCalculation = lastTimeDiagnosisKeysFetched,
         isBackgroundJobEnabled = isBackgroundJobEnabled,
         isManualKeyRetrievalEnabled = isManualKeyRetrievalEnabled,
         manualKeyRetrievalTime = manualKeyRetrievalTime

Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/tracing/common/BaseTracingStateTest.kt

@@ -62,7 +62,7 @@ class BaseTracingStateTest : BaseTest() {
         override val matchedKeyCount: Int = matchedKeyCount
         override val daysSinceLastExposure: Int = daysSinceLastExposure
         override val activeTracingDaysInRetentionPeriod = activeTracingDaysInRetentionPeriod
-        override val lastTimeDiagnosisKeysFetched: Date? = lastTimeDiagnosisKeysFetched
+        override val lastENFCalculation: Date? = lastTimeDiagnosisKeysFetched
         override val isBackgroundJobEnabled: Boolean = isBackgroundJobEnabled
         override val showDetails: Boolean = showDetails
         override val isManualKeyRetrievalEnabled: Boolean = isManualKeyRetrievalEnabled

Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/tracing/details/TracingDetailsStateTest.kt

@@ -57,7 +57,7 @@ class TracingDetailsStateTest : BaseTest() {
         matchedKeyCount = matchedKeyCount,
         daysSinceLastExposure = daysSinceLastExposure,
         activeTracingDaysInRetentionPeriod = activeTracingDaysInRetentionPeriod,
-        lastTimeDiagnosisKeysFetched = lastTimeDiagnosisKeysFetched,
+        lastENFCalculation = lastTimeDiagnosisKeysFetched,
         isBackgroundJobEnabled = isBackgroundJobEnabled,
         isManualKeyRetrievalEnabled = isManualKeyRetrievalEnabled,
         manualKeyRetrievalTime = manualKeyRetrievalTime,