Skip to content

Commit 688d55e

Browse files
authored
fix: #1942 utc timestamp being parsed as local time (#1953)
1 parent 40c23b7 commit 688d55e

File tree

3 files changed

+11
-5
lines changed

3 files changed

+11
-5
lines changed

frontend/appflowy_flutter/lib/plugins/database_view/calendar/application/calendar_bloc.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,7 @@ class CalendarBloc extends Bloc<CalendarEvent, CalendarState> {
173173

174174
final date = DateTime.fromMillisecondsSinceEpoch(
175175
eventPB.timestamp.toInt() * 1000,
176+
isUtc: true,
176177
);
177178
return CalendarEventData(
178179
title: eventPB.title,

frontend/appflowy_flutter/lib/plugins/database_view/widgets/row/cells/date_cell/date_cal_bloc.dart

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,10 @@ Option<DateCellData> calDataFromCellData(DateCellDataPB? cellData) {
264264
Option<DateCellData> dateData = none();
265265
if (cellData != null) {
266266
final timestamp = cellData.timestamp * 1000;
267-
final date = DateTime.fromMillisecondsSinceEpoch(timestamp.toInt());
267+
final date = DateTime.fromMillisecondsSinceEpoch(
268+
timestamp.toInt(),
269+
isUtc: true,
270+
);
268271
dateData = Some(DateCellData(
269272
date: date,
270273
time: time,

frontend/appflowy_flutter/lib/plugins/trash/src/trash_cell.dart

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,12 @@ class TrashCell extends StatelessWidget {
6161
}
6262

6363
String dateFormatter($fixnum.Int64 inputTimestamps) {
64-
var outputFormat = DateFormat('MM/dd/yyyy hh:mm a');
65-
var date =
66-
DateTime.fromMillisecondsSinceEpoch(inputTimestamps.toInt() * 1000);
67-
var outputDate = outputFormat.format(date);
64+
final outputFormat = DateFormat('MM/dd/yyyy hh:mm a');
65+
final date = DateTime.fromMillisecondsSinceEpoch(
66+
inputTimestamps.toInt() * 1000,
67+
isUtc: true,
68+
);
69+
final outputDate = outputFormat.format(date);
6870
return outputDate;
6971
}
7072
}

0 commit comments

Comments
 (0)