From d96a931daf7f9e1c922baa5266107f31ed7da655 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakob=20M=C3=B6ller?= <jakob.moeller@sap.com>
Date: Fri, 19 Jun 2020 11:13:43 +0200
Subject: [PATCH] Introduce a missing set for the rollback of the token (#662)
* Introduce a missing set for the rollback of the token so that in case of failure, the token is rollbacked properly instead of being nulled away
Signed-off-by: d067928 <jakob.moeller@sap.com>
* Fix Test
Signed-off-by: d067928 <jakob.moeller@sap.com>
---
.../transaction/RetrieveDiagnosisKeysTransaction.kt | 1 +
.../transaction/RetrieveDiagnosisKeysTransactionTest.kt | 2 ++
2 files changed, 3 insertions(+)
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/transaction/RetrieveDiagnosisKeysTransaction.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/transaction/RetrieveDiagnosisKeysTransaction.kt
index 0aa86c705..82f7d6f3b 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/transaction/RetrieveDiagnosisKeysTransaction.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/transaction/RetrieveDiagnosisKeysTransaction.kt
@@ -205,6 +205,7 @@ object RetrieveDiagnosisKeysTransaction : Transaction() {
* Executes the TOKEN Transaction State
*/
private suspend fun executeToken() = executeState(TOKEN) {
+ googleAPITokenForRollback.set(LocalData.googleApiToken())
val tempToken = UUID.randomUUID().toString()
LocalData.googleApiToken(tempToken)
return@executeState tempToken
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/transaction/RetrieveDiagnosisKeysTransactionTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/transaction/RetrieveDiagnosisKeysTransactionTest.kt
index 08915f828..e8c59395e 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/transaction/RetrieveDiagnosisKeysTransactionTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/transaction/RetrieveDiagnosisKeysTransactionTest.kt
@@ -19,6 +19,7 @@ import org.junit.Test
import java.io.File
import java.nio.file.Paths
import java.util.Date
+import java.util.UUID
/**
* RetrieveDiagnosisKeysTransaction test.
@@ -44,6 +45,7 @@ class RetrieveDiagnosisKeysTransactionTest {
every { LocalData.googleApiToken(any()) } just Runs
every { LocalData.lastTimeDiagnosisKeysFromServerFetch() } returns Date()
every { LocalData.lastTimeDiagnosisKeysFromServerFetch(any()) } just Runs
+ every { LocalData.googleApiToken() } returns UUID.randomUUID().toString()
}
@Test
--
GitLab