From cc3b5fbc05c12e4d21ff37449b9a4570db05d42a Mon Sep 17 00:00:00 2001
From: Chilja Gossow <49635654+chiljamgossow@users.noreply.github.com>
Date: Wed, 23 Jun 2021 16:00:07 +0200
Subject: [PATCH] Qr code not nullable (DEV) (#3516)
* not nullable
* merge conflict
---
.../recovery/core/storage/RecoveryCertificateContainer.kt | 4 ++--
.../recovery/core/storage/StoredRecoveryCertificateData.kt | 4 ++--
.../test/core/storage/types/BaseTestCertificateData.kt | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/recovery/core/storage/RecoveryCertificateContainer.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/recovery/core/storage/RecoveryCertificateContainer.kt
index 11a82d4ca..13ad6b130 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/recovery/core/storage/RecoveryCertificateContainer.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/recovery/core/storage/RecoveryCertificateContainer.kt
@@ -22,7 +22,7 @@ data class RecoveryCertificateContainer(
@delegate:Transient
private val certificateData: DccData<RecoveryDccV1> by lazy {
- data.recoveryCertificateQrCode!!.let {
+ data.recoveryCertificateQrCode.let {
(
qrCodeExtractor.extract(
it,
@@ -94,7 +94,7 @@ data class RecoveryCertificateContainer(
get() = header.expiresAt
override val qrCode: QrCodeString
- get() = data.recoveryCertificateQrCode!!
+ get() = data.recoveryCertificateQrCode
}
}
}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/recovery/core/storage/StoredRecoveryCertificateData.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/recovery/core/storage/StoredRecoveryCertificateData.kt
index f4f3dddf2..32a94f99b 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/recovery/core/storage/StoredRecoveryCertificateData.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/recovery/core/storage/StoredRecoveryCertificateData.kt
@@ -3,9 +3,9 @@ package de.rki.coronawarnapp.covidcertificate.recovery.core.storage
import com.google.gson.annotations.SerializedName
data class StoredRecoveryCertificateData(
- @SerializedName("recoveryCertificateQrCode") override val recoveryCertificateQrCode: String?,
+ @SerializedName("recoveryCertificateQrCode") override val recoveryCertificateQrCode: String,
) : StoredRecoveryCertificate
interface StoredRecoveryCertificate {
- val recoveryCertificateQrCode: String?
+ val recoveryCertificateQrCode: String
}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/core/storage/types/BaseTestCertificateData.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/core/storage/types/BaseTestCertificateData.kt
index b974fca3a..be939b8ef 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/core/storage/types/BaseTestCertificateData.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/core/storage/types/BaseTestCertificateData.kt
@@ -3,7 +3,7 @@ package de.rki.coronawarnapp.covidcertificate.test.core.storage.types
import org.joda.time.Instant
/**
- * Common data for test certificates, idepdent of whether they were retrieved or scanned.
+ * Common data for test certificates, independent of whether they were retrieved or scanned.
*/
sealed class BaseTestCertificateData {
abstract val identifier: String
--
GitLab