Merge branch 'release/2.0.x' into fix/camera_item_blinking

corona-warn-app · Apr 12, 2021 · e77123c · e77123c
2 parents 75ef038 + a09d78f
commit e77123c
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/...java/de/rki/coronawarnapp/ui/eventregistration/attendee/checkins/items/ActiveCheckInVH.kt b/...java/de/rki/coronawarnapp/ui/eventregistration/attendee/checkins/items/ActiveCheckInVH.kt
@@ -53,8 +53,7 @@ class ActiveCheckInVH(parent: ViewGroup) :
         traceLocationCardHighlightView.setCaption(startDate.toString(DateTimeFormat.mediumDate()))
 
         checkoutInfo.text = run {
-            val checkoutAt = curItem.checkin.checkInEnd
-            val checkoutIn = Duration(Instant.now(), checkoutAt).let {
+            val checkoutIn = Duration(curItem.checkin.checkInStart, curItem.checkin.checkInEnd).let {
                 val periodType = when {
                     it.isLongerThan(Duration.standardHours(1)) -> PeriodType.hours()
                     it.isLongerThan(Duration.standardDays(1)) -> PeriodType.days()