fix schedule date picker not time zone safe

closes #940
sk22 · Nov 27, 2023 · f7dfebc · f7dfebc
1 parent d8c73ea
commit f7dfebc
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
@@ -1437,8 +1437,8 @@ private void pickScheduledDateTime() {
 				.withMinute(0);
 		new DatePickerDialog(getActivity(), (datePicker, year, arrayMonth, dayOfMonth) -> {
 			new TimePickerDialog(getActivity(), (timePicker, hour, minute) -> {
-				updateScheduledAt(LocalDateTime.of(year, arrayMonth + 1, dayOfMonth, hour, minute)
-						.toInstant(OffsetDateTime.now().getOffset()));
+				LocalDateTime at=LocalDateTime.of(year, arrayMonth + 1, dayOfMonth, hour, minute);
+				updateScheduledAt(at.toInstant(ZoneId.systemDefault().getRules().getOffset(at)));
 			}, soon.getHour(), soon.getMinute(), DateFormat.is24HourFormat(getActivity())).show();
 		}, soon.getYear(), soon.getMonthValue() - 1, soon.getDayOfMonth()).show();
 	}