feat: extract to a new class/file the new parsers

app/src/androidTest/kotlin/com/wire/android/util/DateTimeUtilTest.kt

@@ -25,11 +25,11 @@ import kotlin.time.measureTime
 class DateTimeUtilTest {
 
     @Test
-    fun givenDates_OutputPerformanceOfFormattersInDevice() {
+    fun givenDates_OutputPerformanceForServerDateFormattersInDevice() {
         // warmup
         val date = Clock.System.now().toIsoDateTimeString()
         repeat(ITERATIONS / 2) {
-            ServerDateTimeFormatter.serverDateOld(date)
+            serverDateOld(date)
             date.serverDate()
         }
 
@@ -43,14 +43,41 @@ class DateTimeUtilTest {
         // datetime format
         val duration2 = measureTime {
             repeat(ITERATIONS) {
-                ServerDateTimeFormatter.serverDateOld(date)
+                serverDateOld(date)
             }
         }
 
         println("The duration of using ServerDate/LocalDateTimeFormat was: $duration1")
         println("The duration of using ServerDateOld/SimpleDateFormat was: $duration2")
     }
 
+    @Test
+    fun givenDates_OutputPerformanceForDeviceDateFormattersInDevice() {
+        // warmup
+        val date = Clock.System.now().toIsoDateTimeString()
+        repeat(ITERATIONS / 2) {
+            date.deviceDateTimeFormat()
+            date.deviceDateTimeFormatOld()
+        }
+
+        // Old DateFormat from text api
+        val duration1 = measureTime {
+            repeat(ITERATIONS) {
+                date.deviceDateTimeFormat()
+            }
+        }
+
+        // New DateTimeFormatter from time api
+        val duration2 = measureTime {
+            repeat(ITERATIONS) {
+                date.deviceDateTimeFormatOld()
+            }
+        }
+
+        println("The duration of using TextApi/DateFormat was: $duration1")
+        println("The duration of using TimeApi/DateTimeFormatter was: $duration2")
+    }
+
     companion object {
         const val ITERATIONS = 1_000_000
     }

app/src/main/kotlin/com/wire/android/util/DateAndTimeParsers.kt

@@ -0,0 +1,58 @@
+/*
+ * Wire
+ * Copyright (C) 2024 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ */
+package com.wire.android.util
+
+import com.wire.android.appLogger
+import java.text.ParseException
+import java.time.LocalDateTime
+import java.time.ZoneId
+import java.time.ZoneOffset
+import java.time.format.DateTimeFormatter
+import java.time.format.FormatStyle
+import java.util.Date
+import java.util.Locale
+
+fun String.deviceDateTimeFormat(): String? = DateAndTimeParsers.deviceDateTimeFormat(this)
+fun String.serverDate(): Date? = DateAndTimeParsers.serverDate(this)
+
+class DateAndTimeParsers private constructor() {
+
+    companion object {
+        private val dateTimeFormatter = DateTimeFormatter.ISO_DATE_TIME.withZone(ZoneId.of("UTC"))
+        private val longDateShortTimeFormat = DateTimeFormatter.ofLocalizedDateTime(FormatStyle.LONG, FormatStyle.SHORT)
+            .withZone(ZoneId.systemDefault()).withLocale(Locale.getDefault())
+
+        fun serverDate(stringVal: String): Date? {
+            return try {
+                Date(LocalDateTime.parse(stringVal, dateTimeFormatter).toInstant(ZoneOffset.UTC).toEpochMilli())
+            } catch (e: Exception) {
+                appLogger.e("There was an error parsing the server date")
+                null
+            }
+        }
+
+        fun deviceDateTimeFormat(stringVal: String): String? {
+            return try {
+                stringVal.serverDate()?.let { longDateShortTimeFormat.format(it.toInstant()) }
+            } catch (e: ParseException) {
+                null
+            }
+        }
+    }
+
+}

app/src/main/kotlin/com/wire/android/util/DateTimeUtil.kt

@@ -26,16 +26,15 @@ import java.text.DateFormat
 import java.text.ParseException
 import java.text.SimpleDateFormat
 import java.time.LocalDate
-import java.time.LocalDateTime
 import java.time.ZoneId
-import java.time.ZoneOffset
-import java.time.format.DateTimeFormatter
 import java.time.temporal.ChronoUnit
 import java.util.Calendar
 import java.util.Date
 import java.util.Locale
 import java.util.TimeZone
 
+private val serverDateTimeFormat =
+    SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", Locale.getDefault()).apply { timeZone = TimeZone.getTimeZone("UTC") }
 private val mediumDateTimeFormat = DateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.MEDIUM)
 private val longDateShortTimeFormat = DateFormat.getDateTimeInstance(DateFormat.LONG, DateFormat.SHORT)
 private val mediumOnlyDateTimeFormat = DateFormat.getDateInstance(DateFormat.MEDIUM)
@@ -65,7 +64,11 @@ fun String.formatMediumDateTime(): String? =
         null
     }
 
-fun String.deviceDateTimeFormat(): String? =
+@Deprecated(
+    message = "This implementation uses discouraged SimpleDateFormat and it will be removed",
+    replaceWith = ReplaceWith("DateAndTimeParsers.serverDate() or String.serverDate()"),
+)
+fun String.deviceDateTimeFormatOld(): String? =
     try {
         this.serverDate()?.let { longDateShortTimeFormat.format(it) }
     } catch (e: ParseException) {
@@ -79,10 +82,13 @@ fun String.formatFullDateShortTime(): String? =
         null
     }
 
-private val dateTimeFormatter = DateTimeFormatter.ISO_DATE_TIME.withZone(ZoneId.of("UTC"))
-fun String.serverDate(): Date? = try {
-    Date(LocalDateTime.parse(this, dateTimeFormatter).toInstant(ZoneOffset.UTC).toEpochMilli())
-} catch (e: Exception) {
+@Deprecated(
+    message = "This implementation uses discouraged SimpleDateFormat and it will be removed",
+    replaceWith = ReplaceWith("DateAndTimeParsers.serverDate() or String.serverDate()"),
+)
+fun serverDateOld(stringDate: String): Date? = try {
+    serverDateTimeFormat.parse(stringDate)
+} catch (e: ParseException) {
     appLogger.e("There was an error parsing the server date")
     null
 }
@@ -240,23 +246,3 @@ fun String.groupedUIMessageDateTime(now: Long): MessageDateTimeGroup? = this
 fun Date.toMediumOnlyDateTime(): String = mediumOnlyDateTimeFormat.format(this)
 fun Instant.uiReadReceiptDateTime(): String = readReceiptDateTimeFormat.format(Date(this.toEpochMilliseconds()))
 fun Instant.fileDateTime(): String = fileDateTimeFormat.format(Date(this.toEpochMilliseconds()))
-
-/**
- * Deprecated Wrapper class for old server date formatter.
- * Just keeping it around to validate old behavior and benchmarks.
- */
-sealed class ServerDateTimeFormatter {
-
-    companion object {
-        private val serverDateTimeFormat =
-            SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", Locale.getDefault()).apply { timeZone = TimeZone.getTimeZone("UTC") }
-
-        @Deprecated("Prefer using serverDate()")
-        fun serverDateOld(stringDate: String): Date? = try {
-            serverDateTimeFormat.parse(stringDate)
-        } catch (e: ParseException) {
-            appLogger.e("There was an error parsing the server date")
-            null
-        }
-    }
-}

app/src/test/kotlin/com/wire/android/util/DateTimeUtilKtTest.kt

@@ -139,7 +139,13 @@ class DateTimeUtilKtTest {
 
         @Test
         fun `given a new serverDate is called, the formatted result should be the same with LocalDateTime format`() {
-            assertEquals(ServerDateTimeFormatter.serverDateOld(baseDate), baseDate.serverDate())
+            assertEquals(serverDateOld(baseDate), baseDate.serverDate())
+        }
+
+        @Test
+        fun `given a valid date, when performing a transformation, then the formatted result should be the same with DateTimeFormatter`() {
+            val result = "2022-03-24T18:02:30.360Z"
+            assertEquals(result.deviceDateTimeFormat(), result.deviceDateTimeFormatOld())
         }
     }