external/tachiyomi
1
0
Fork 0
mirror of https://github.com/tachiyomiorg/tachiyomi.git synced 2024-11-10 14:47:48 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix DST issue (#6831)

Browse source
This commit is contained in:
Andreas 2022-04-02 14:52:53 +02:00 committed by GitHub
parent 5409af0a6c
commit dd490f2ac9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/src/main/java/eu/kanade/tachiyomi/util/lang/DateExtensions.kt
View file

@ -112,8 +112,8 @@ fun Date.toRelativeString(
val days = difference.floorDiv(MILLISECONDS_IN_DAY).toInt()
return when {
difference < 0 -> context.getString(R.string.recently)
difference <= MILLISECONDS_IN_DAY -> context.getString(R.string.relative_time_today)
difference <= MILLISECONDS_IN_DAY.times(range) -> context.resources.getQuantityString(
difference < MILLISECONDS_IN_DAY -> context.getString(R.string.relative_time_today)
difference < MILLISECONDS_IN_DAY.times(range) -> context.resources.getQuantityString(
R.plurals.relative_time,
days,
days
@ -126,7 +126,8 @@ private val Date.timeWithOffset: Long
get() {
return Calendar.getInstance().run {
time = this@timeWithOffset
this@timeWithOffset.time + timeZone.rawOffset
val dstOffset = get(Calendar.DST_OFFSET)
this@timeWithOffset.time + timeZone.rawOffset + dstOffset
}
}