From 0c46cf27dc40f6a2a1675bfc9ec55bb2fddc4bb1 Mon Sep 17 00:00:00 2001
From: Matthias Urhahn <matthias.urhahn@sap.com>
Date: Thu, 11 Mar 2021 18:31:30 +0100
Subject: [PATCH] Fix build error due to protobuf value changing from int to
long.
---
.../checkins/qrcode/QRCodeVerifyResult.kt | 4 ++--
.../attendee/checkin/VerifiedTraceLocation.kt | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/checkins/qrcode/QRCodeVerifyResult.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/checkins/qrcode/QRCodeVerifyResult.kt
index 239d4dab1..99f87f3c2 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/checkins/qrcode/QRCodeVerifyResult.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/checkins/qrcode/QRCodeVerifyResult.kt
@@ -8,8 +8,8 @@ data class QRCodeVerifyResult(
val singedTraceLocation: SignedEventOuterClass.SignedEvent
) {
fun isBeforeStartTime(now: Instant): Boolean =
- singedTraceLocation.event.start != 0 && singedTraceLocation.event.start > now.seconds
+ singedTraceLocation.event.start != 0L && singedTraceLocation.event.start > now.seconds
fun isAfterEndTime(now: Instant): Boolean =
- singedTraceLocation.event.end != 0 && singedTraceLocation.event.end < now.seconds
+ singedTraceLocation.event.end != 0L && singedTraceLocation.event.end < now.seconds
}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/checkin/VerifiedTraceLocation.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/checkin/VerifiedTraceLocation.kt
index b733005d9..b8730e425 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/checkin/VerifiedTraceLocation.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/checkin/VerifiedTraceLocation.kt
@@ -21,8 +21,8 @@ fun QRCodeVerifyResult.toVerifiedTraceLocation() =
with(singedTraceLocation.event) {
VerifiedTraceLocation(
guid = guid.toByteArray().toByteString().base64(),
- start = start.instant(),
- end = end.instant(),
+ start = start.toInstant(),
+ end = end.toInstant(),
description = description,
defaultCheckInLengthInMinutes = defaultCheckInLengthInMinutes
)
@@ -31,5 +31,5 @@ fun QRCodeVerifyResult.toVerifiedTraceLocation() =
/**
* Converts time in seconds into [Instant]
*/
-private fun Int.instant() =
- if (this == 0) null else Instant.ofEpochMilli(TimeUnit.SECONDS.toMillis(toLong()))
+private fun Long.toInstant() =
+ if (this == 0L) null else Instant.ofEpochMilli(TimeUnit.SECONDS.toMillis(this))
--
GitLab