From 537573950fdda2120cdfae306ba955416ac573b1 Mon Sep 17 00:00:00 2001
From: chris-cwa <69595386+chris-cwa@users.noreply.github.com>
Date: Mon, 22 Feb 2021 16:46:07 +0100
Subject: [PATCH] use copy constructor, made 'invalidated'-flag optional
(#2432)
Co-authored-by: Lukas Lechner <lukas.lechner@sap.com>
---
.../coronawarnapp/datadonation/OTPAuthorizationResult.kt | 4 ++--
.../de/rki/coronawarnapp/datadonation/survey/Surveys.kt | 3 +--
.../coronawarnapp/datadonation/storage/OTPRepositoryTest.kt | 6 ++----
3 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/datadonation/OTPAuthorizationResult.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/datadonation/OTPAuthorizationResult.kt
index 49dc05c9c..f99851e7b 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/datadonation/OTPAuthorizationResult.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/datadonation/OTPAuthorizationResult.kt
@@ -14,8 +14,8 @@ data class OTPAuthorizationResult(
@SerializedName("redeemedAt")
val redeemedAt: Instant,
@SerializedName("invalidated")
- val invalidated: Boolean
+ val invalidated: Boolean = false
) {
- fun toInvalidatedInstance() = OTPAuthorizationResult(uuid, authorized, redeemedAt, true)
+ fun toInvalidatedInstance() = copy(invalidated = true)
}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/datadonation/survey/Surveys.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/datadonation/survey/Surveys.kt
index 121025261..8b52f3e8c 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/datadonation/survey/Surveys.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/datadonation/survey/Surveys.kt
@@ -93,8 +93,7 @@ class Surveys @Inject constructor(
val result = OTPAuthorizationResult(
uuid = oneTimePassword.uuid,
authorized = errorCode == null,
- redeemedAt = now,
- invalidated = false
+ redeemedAt = now
)
oneTimePasswordRepo.otpAuthorizationResult = result
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/datadonation/storage/OTPRepositoryTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/datadonation/storage/OTPRepositoryTest.kt
index b9908423a..63d916e3d 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/datadonation/storage/OTPRepositoryTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/datadonation/storage/OTPRepositoryTest.kt
@@ -69,8 +69,7 @@ class OTPRepositoryTest : BaseTest() {
settings.otpAuthorizationResult = OTPAuthorizationResult(
UUID.randomUUID(),
true,
- Instant.now(),
- false
+ Instant.now()
)
settings.otpAuthorizationResult shouldNotBe null
@@ -88,8 +87,7 @@ class OTPRepositoryTest : BaseTest() {
OTPRepository(settings).otpAuthorizationResult = OTPAuthorizationResult(
UUID.randomUUID(),
true,
- Instant.now(),
- false
+ Instant.now()
)
settings.oneTimePassword shouldBe null
}
--
GitLab