Skip to content
Snippets Groups Projects
Unverified Commit ee2d71b0 authored by Juraj Kusnier's avatar Juraj Kusnier Committed by GitHub
Browse files

Fix QR code timezone (EXPOSUREAPP-6249) (#2786)

* Use default timezone

* Remove unused imports
parent ffa9c3f1
No related branches found
No related tags found
No related merge requests found
......@@ -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()
)
......
......@@ -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()
)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment