From f229a5e2ec66c45847db36e64efe73f52cc86b8e Mon Sep 17 00:00:00 2001
From: Andreas <andreas.everos@gmail.com>
Date: Fri, 19 Nov 2021 16:05:39 +0100
Subject: [PATCH] Tweak relative date function (#6249)

* Tweak relative date function

* Cleanup
---
 .../tachiyomi/util/lang/DateExtensions.kt     | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/lang/DateExtensions.kt b/app/src/main/java/eu/kanade/tachiyomi/util/lang/DateExtensions.kt
index c39cdd9f0..f5c86a8fb 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/util/lang/DateExtensions.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/util/lang/DateExtensions.kt
@@ -6,7 +6,6 @@ import java.text.DateFormat
 import java.util.Calendar
 import java.util.Date
 import java.util.TimeZone
-import kotlin.math.floor
 
 fun Date.toDateTimestampString(dateFormatter: DateFormat): String {
     val date = dateFormatter.format(this)
@@ -98,7 +97,7 @@ fun Long.toLocalCalendar(): Calendar? {
     }
 }
 
-private const val MILLISECONDS_IN_DAY = 86_400_000.0
+private const val MILLISECONDS_IN_DAY = 86_400_000L
 
 fun Date.toRelativeString(
     context: Context,
@@ -109,8 +108,8 @@ fun Date.toRelativeString(
         return dateFormat.format(this)
     }
     val now = Date()
-    val difference = now.time - this.time
-    val days = floor(difference / MILLISECONDS_IN_DAY).toInt()
+    val difference = now.timeWithOffset.floorNearest(MILLISECONDS_IN_DAY) - this.timeWithOffset.floorNearest(MILLISECONDS_IN_DAY)
+    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)
@@ -122,3 +121,15 @@ fun Date.toRelativeString(
         else -> dateFormat.format(this)
     }
 }
+
+private val Date.timeWithOffset: Long
+    get() {
+        return Calendar.getInstance().run {
+            time = this@timeWithOffset
+            this@timeWithOffset.time + timeZone.rawOffset
+        }
+    }
+
+fun Long.floorNearest(to: Long): Long {
+    return this.floorDiv(to) * to
+}