Merge pull request #1867 from corona-warn-app/fix/merge-18x-into-19x-v2

Merge 1.8.x into 1.9.x

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/nearby/modules/diagnosiskeyprovider/DefaultDiagnosisKeyProvider.kt

@@ -59,6 +59,7 @@ class DefaultDiagnosisKeyProvider @Inject constructor(
             provideDiagnosisKeysTask
                 .addOnSuccessListener { cont.resume(true) }
                 .addOnFailureListener {
+                    Timber.w("Key submission failed because ${it.message}")
                     val wrappedException =
                         when (it is ApiException &&
                             it.statusCode == ReportingConstants.STATUS_CODE_REACHED_REQUEST_LIMIT) {

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/storage/TracingRepository.kt

@@ -26,7 +26,6 @@ import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
 import org.joda.time.Duration
 import timber.log.Timber
-import java.util.NoSuchElementException
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -153,11 +152,10 @@ class TracingRepository @Inject constructor(
         val taskLastFinishedAt = try {
             taskController.tasks.first()
                 .filter { it.taskState.type == DownloadDiagnosisKeysTask::class }
-                .mapNotNull { it.taskState.finishedAt }
-                .sortedDescending()
-                .first()
-        } catch (e: NoSuchElementException) {
-            Timber.tag(TAG).v("download did not run recently - no task with a finishedAt date found")
+                .mapNotNull { it.taskState.finishedAt ?: it.taskState.startedAt }
+                .maxOrNull()!!
+        } catch (e: NullPointerException) {
+            Timber.tag(TAG).v("download did not run recently - no task with a date found")
             return true
         }