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 239d4dab1903788908c4da7d51110739b3e9d438..99f87f3c26f46851e75635cfabfe4306ccdc1b58 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 b733005d9a76f408e812216ee96298af0bf64ba6..b8730e425dc9dc22b1d524f8fb7c9a1560b401c7 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))