From ed06b5c25534238a928a4274060d52b5353ec581 Mon Sep 17 00:00:00 2001 From: Niels van Velzen Date: Mon, 21 Nov 2022 18:56:08 +0100 Subject: [PATCH] Fix TimeUtils.getDate not using UTC for offset --- .../main/java/org/jellyfin/androidtv/util/TimeUtils.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/jellyfin/androidtv/util/TimeUtils.java b/app/src/main/java/org/jellyfin/androidtv/util/TimeUtils.java index 346149c99f..77d57fbc25 100644 --- a/app/src/main/java/org/jellyfin/androidtv/util/TimeUtils.java +++ b/app/src/main/java/org/jellyfin/androidtv/util/TimeUtils.java @@ -8,6 +8,7 @@ import java.time.LocalDateTime; import java.time.ZoneId; +import java.time.ZoneOffset; import java.util.Calendar; import java.util.Date; import java.util.Locale; @@ -162,8 +163,12 @@ public static String getFriendlyDate(Context context, Date date, boolean relativ } public static Date getDate(LocalDateTime date) { + return getDate(date, ZoneOffset.UTC); + } + + public static Date getDate(LocalDateTime date, ZoneId zone) { if (date == null) return null; - return Date.from(date.atZone(ZoneId.systemDefault()).toInstant()); + return Date.from(date.atZone(zone).toInstant()); } }