From ee2d71b0501327b415e04a28c6a876d36eee2dbe Mon Sep 17 00:00:00 2001
From: Juraj Kusnier <jurajkusnier@users.noreply.github.com>
Date: Fri, 9 Apr 2021 14:45:28 +0200
Subject: [PATCH] Fix QR code timezone (EXPOSUREAPP-6249) (#2786)
* Use default timezone
* Remove unused imports
---
.../organizer/create/TraceLocationCreateFragment.kt | 5 ++---
.../organizer/create/TraceLocationCreateViewModel.kt | 5 ++---
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/create/TraceLocationCreateFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/create/TraceLocationCreateFragment.kt
index 9fa2a6e40..8c2cee883 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/create/TraceLocationCreateFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/create/TraceLocationCreateFragment.kt
@@ -25,7 +25,6 @@ import de.rki.coronawarnapp.util.ui.popBackStack
import de.rki.coronawarnapp.util.ui.viewBindingLazy
import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider
import de.rki.coronawarnapp.util.viewmodel.cwaViewModelsAssisted
-import org.joda.time.DateTimeZone
import org.joda.time.Duration
import org.joda.time.LocalDate
import org.joda.time.LocalDateTime
@@ -160,14 +159,14 @@ class TraceLocationCreateFragment : Fragment(R.layout.trace_location_create_frag
MaterialDatePicker
.Builder
.datePicker()
- .setSelection(defaultValue?.toDateTime(DateTimeZone.UTC)?.millis)
+ .setSelection(defaultValue?.toDateTime()?.millis)
.apply {
if (minConstraint != null) {
setCalendarConstraints(
CalendarConstraints.Builder()
.setValidator(
DateValidatorPointForward
- .from(minConstraint.withMillisOfDay(0).toDateTime(DateTimeZone.UTC).millis)
+ .from(minConstraint.withMillisOfDay(0).toDateTime().millis)
)
.build()
)
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/create/TraceLocationCreateViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/create/TraceLocationCreateViewModel.kt
index 55a2af790..da0c66171 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/create/TraceLocationCreateViewModel.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/organizer/create/TraceLocationCreateViewModel.kt
@@ -19,7 +19,6 @@ import de.rki.coronawarnapp.util.coroutine.DispatcherProvider
import de.rki.coronawarnapp.util.ui.SingleLiveEvent
import de.rki.coronawarnapp.util.viewmodel.CWAViewModel
import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactory
-import org.joda.time.DateTimeZone
import org.joda.time.Duration
import org.joda.time.LocalDateTime
import timber.log.Timber
@@ -64,8 +63,8 @@ class TraceLocationCreateViewModel @AssistedInject constructor(
type = category.type,
description = description,
address = address,
- startDate = begin?.toDateTime(DateTimeZone.UTC)?.toInstant(),
- endDate = end?.toDateTime(DateTimeZone.UTC)?.toInstant(),
+ startDate = begin?.toDateTime()?.toInstant(),
+ endDate = end?.toDateTime()?.toInstant(),
defaultCheckInLengthInMinutes = checkInLength.standardMinutes.toInt()
)
--
GitLab