File tree Expand file tree Collapse file tree 1 file changed +5
-1
lines changed
app/src/main/java/com/infomaniak/mail/ui/alertDialogs Expand file tree Collapse file tree 1 file changed +5
-1
lines changed Original file line number Diff line number Diff line change @@ -32,6 +32,7 @@ import dagger.hilt.android.qualifiers.ActivityContext
32
32
import dagger.hilt.android.scopes.ActivityScoped
33
33
import java.util.Calendar
34
34
import java.util.Date
35
+ import java.util.TimeZone
35
36
import javax.inject.Inject
36
37
import com.infomaniak.lib.core.R as RCore
37
38
@@ -153,9 +154,12 @@ open class SelectDateAndTimeForScheduledDraftDialog @Inject constructor(
153
154
)
154
155
val constraintsBuilder = CalendarConstraints .Builder ().setValidator(CompositeDateValidator .allOf(dateValidators))
155
156
157
+ // MaterialDatePicker expects the `setSelection()` time to be defined as UTC time and not local time
158
+ val utcTime = dateToDisplay.time + TimeZone .getDefault().getOffset(dateToDisplay.time)
159
+
156
160
val datePicker = MaterialDatePicker .Builder .datePicker()
157
161
.setTitleText(binding.context.getString(R .string.selectDateDialogTitle))
158
- .setSelection(dateToDisplay.time )
162
+ .setSelection(utcTime )
159
163
.setCalendarConstraints(constraintsBuilder.build())
160
164
.build()
161
165
You can’t perform that action at this time.
0 commit comments