From 254df7211c2a5345b77fca963985f3d17f435689 Mon Sep 17 00:00:00 2001 From: Koen J Date: Wed, 7 May 2025 10:36:32 +0200 Subject: [PATCH] Fixed datetime checking related to playlists on android. --- .../platformplayer/serializers/OffsetDateTimeSerializer.kt | 3 ++- app/src/main/java/com/futo/platformplayer/states/StateSync.kt | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/futo/platformplayer/serializers/OffsetDateTimeSerializer.kt b/app/src/main/java/com/futo/platformplayer/serializers/OffsetDateTimeSerializer.kt index faee4e3b..9e9d112b 100644 --- a/app/src/main/java/com/futo/platformplayer/serializers/OffsetDateTimeSerializer.kt +++ b/app/src/main/java/com/futo/platformplayer/serializers/OffsetDateTimeSerializer.kt @@ -1,5 +1,6 @@ package com.futo.platformplayer.serializers +import com.futo.platformplayer.sToOffsetDateTimeUTC import kotlinx.serialization.KSerializer import kotlinx.serialization.descriptors.PrimitiveKind import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor @@ -37,7 +38,7 @@ class OffsetDateTimeSerializer : KSerializer { return OffsetDateTime.MAX; else if(epochSecond < -9999999999) return OffsetDateTime.MIN; - return OffsetDateTime.of(LocalDateTime.ofEpochSecond(epochSecond, 0, ZoneOffset.UTC), ZoneOffset.UTC); + return epochSecond.sToOffsetDateTimeUTC() } } class OffsetDateTimeStringSerializer : KSerializer { diff --git a/app/src/main/java/com/futo/platformplayer/states/StateSync.kt b/app/src/main/java/com/futo/platformplayer/states/StateSync.kt index 57c9f93e..7e65055a 100644 --- a/app/src/main/java/com/futo/platformplayer/states/StateSync.kt +++ b/app/src/main/java/com/futo/platformplayer/states/StateSync.kt @@ -749,7 +749,7 @@ class StateSync { if(existing == null) StatePlaylists.instance.createOrUpdatePlaylist(playlist, false); - else if(existing.dateUpdate.toLocalDateTime() < playlist.dateUpdate.toLocalDateTime()) { + else if(existing.dateUpdate < playlist.dateUpdate) { existing.dateUpdate = playlist.dateUpdate; existing.name = playlist.name; existing.videos = playlist.videos;