Backend: Storage SimpleTimeMark (#2038)

2 files changed, 16 insertions, 3 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/utils/GenericWrapper.kt b/src/main/java/at/hannibal2/skyhanni/utils/GenericWrapper.kt
new file mode 100644
index 000000000..c390c0559
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/utils/GenericWrapper.kt
@@ -0,0 +1,9 @@
+package at.hannibal2.skyhanni.utils
+
+class GenericWrapper<T>(val it: T) {
+    companion object {
+        @JvmStatic
+        @JvmName("getSimpleTimeMark")
+        fun getSimpleTimeMark(it: SimpleTimeMark) = GenericWrapper(it)
+    }
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/SimpleTimeMark.kt b/src/main/java/at/hannibal2/skyhanni/utils/SimpleTimeMark.kt
index 2184322e5..4e6df449e 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/SimpleTimeMark.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/SimpleTimeMark.kt
@@ -33,9 +33,10 @@ value class SimpleTimeMark(private val millis: Long) : Comparable<SimpleTimeMark
 
     override fun compareTo(other: SimpleTimeMark): Int = millis.compareTo(other.millis)
 
-    override fun toString(): String {
-        if (millis == 0L) return "The Far Past"
-        return Instant.ofEpochMilli(millis).toString()
+    override fun toString(): String = when (this) {
+        farPast() -> "The Far Past"
+        farFuture() -> "The Far Future"
+        else -> Instant.ofEpochMilli(millis).toString()
     }
 
     fun formattedDate(pattern: String): String {
@@ -60,6 +61,9 @@ value class SimpleTimeMark(private val millis: Long) : Comparable<SimpleTimeMark
     companion object {
 
         fun now() = SimpleTimeMark(System.currentTimeMillis())
+
+        @JvmStatic
+        @JvmName("farPast")
         fun farPast() = SimpleTimeMark(0)
         fun farFuture() = SimpleTimeMark(Long.MAX_VALUE)