Skip to content

Commit

Permalink
Fix TimeUtils.getDate not using UTC for offset
Browse files Browse the repository at this point in the history
  • Loading branch information
nielsvanvelzen committed Nov 22, 2022
1 parent 6629864 commit ed06b5c
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion app/src/main/java/org/jellyfin/androidtv/util/TimeUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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());
}
}

0 comments on commit ed06b5c

Please sign in to comment.