From c0938f58673742fa8e23c3638e5de30e14c815d7 Mon Sep 17 00:00:00 2001
From: Matthias Urhahn <matthias.urhahn@sap.com>
Date: Wed, 18 Nov 2020 21:29:13 +0100
Subject: [PATCH] Don't overwrite the Google apitoken if we don't actually
attempt submission. (#1660)
---
.../diagnosiskeys/download/DownloadDiagnosisKeysTask.kt | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/diagnosiskeys/download/DownloadDiagnosisKeysTask.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/diagnosiskeys/download/DownloadDiagnosisKeysTask.kt
index af3d1bf82..298354d97 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/diagnosiskeys/download/DownloadDiagnosisKeysTask.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/diagnosiskeys/download/DownloadDiagnosisKeysTask.kt
@@ -61,10 +61,6 @@ class DownloadDiagnosisKeysTask @Inject constructor(
val currentDate = Date(timeStamper.nowUTC.millis)
Timber.tag(TAG).d("Using $currentDate as current date in task.")
- /****************************************************
- * RETRIEVE TOKEN
- ****************************************************/
- val token = retrieveToken(rollbackItems)
throwIfCancelled()
// RETRIEVE RISK SCORE PARAMETERS
@@ -105,7 +101,9 @@ class DownloadDiagnosisKeysTask @Inject constructor(
)
)
- Timber.tag(TAG).d("Attempting submission to ENF")
+ val token = retrieveToken(rollbackItems)
+ Timber.tag(TAG).d("Attempting submission to ENF with token $token")
+
val isSubmissionSuccessful = enfClient.provideDiagnosisKeys(
keyFiles = availableKeyFiles,
configuration = exposureConfig.exposureDetectionConfiguration,
@@ -180,6 +178,7 @@ class DownloadDiagnosisKeysTask @Inject constructor(
LocalData.googleApiToken(googleAPITokenForRollback)
}
return UUID.randomUUID().toString().also {
+ Timber.tag(TAG).d("Generating and storing new token: $it")
LocalData.googleApiToken(it)
}
}
--
GitLab