diff --git a/CHANGELOG.md b/CHANGELOG.md index 97ba89e30..af3543ff6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,7 +17,7 @@ The format is a modified version of [Keep a Changelog](https://keepachangelog.co ### Fixed - Fix MAL `main_picture` nullability breaking search if a result doesn't have a cover set ([@MajorTanya](https://github.com/MajorTanya)) ([#1618](https://github.com/mihonapp/mihon/pull/1618)) -- Fix Bangumi tracking 401 errors due to Mihon sending expired credentials ([@MajorTanya](https://github.com/MajorTanya)) ([#1681](https://github.com/mihonapp/mihon/pull/1681)) +- Fix Bangumi and MAL tracking 401 errors due to Mihon sending expired credentials ([@MajorTanya](https://github.com/MajorTanya)) ([#1681](https://github.com/mihonapp/mihon/pull/1681), [#1682](https://github.com/mihonapp/mihon/pull/1682)) ### Other - Add zoned "Current time" to debug info and include year & timezone in logcat output ([@MajorTanya](https://github.com/MajorTanya)) ([#1672](https://github.com/mihonapp/mihon/pull/1672)) diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/myanimelist/dto/MALOAuth.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/myanimelist/dto/MALOAuth.kt index 2f3a5f8e8..342016bfe 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/track/myanimelist/dto/MALOAuth.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/myanimelist/dto/MALOAuth.kt @@ -1,5 +1,6 @@ package eu.kanade.tachiyomi.data.track.myanimelist.dto +import kotlinx.serialization.EncodeDefault import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable @@ -14,10 +15,11 @@ data class MALOAuth( @SerialName("expires_in") val expiresIn: Long, @SerialName("created_at") - val createdAt: Long = System.currentTimeMillis(), + @EncodeDefault + val createdAt: Long = System.currentTimeMillis() / 1000, ) { // Assumes expired a minute earlier - private val adjustedExpiresIn: Long = (expiresIn - 60) * 1000 + private val adjustedExpiresIn: Long = (expiresIn - 60) - fun isExpired() = createdAt + adjustedExpiresIn < System.currentTimeMillis() + fun isExpired() = createdAt + adjustedExpiresIn < System.currentTimeMillis() / 1000 }