Parse TopRead date as a LocalDate. (#3954)

Co-authored-by: Dmitry Brant <[email protected]>

Author: Isira-Seneviratne

app/src/main/java/org/wikipedia/feed/topread/TopRead.kt

@@ -1,23 +1,26 @@
 package org.wikipedia.feed.topread
 
 import android.os.Parcelable
+import kotlinx.parcelize.IgnoredOnParcel
 import kotlinx.parcelize.Parcelize
 import kotlinx.serialization.Serializable
 import org.wikipedia.dataclient.page.PageSummary
-import org.wikipedia.util.DateUtil
-import java.lang.Exception
-import java.util.*
+import java.time.LocalDate
+import java.time.format.DateTimeFormatter
+import java.time.format.DateTimeParseException
 
 @Serializable
 @Parcelize
 class TopRead(
     val date: String = "",
     val articles: List<PageSummary> = emptyList()
 ) : Parcelable {
-    fun date(): Date {
+    @IgnoredOnParcel
+    val localDate: LocalDate by lazy {
         try {
-            return DateUtil.iso8601ShortDateParse(date)
-        } catch (e: Exception) {}
-        return Date()
+            LocalDate.parse(date, DateTimeFormatter.ISO_OFFSET_DATE)
+        } catch (e: DateTimeParseException) {
+            LocalDate.now()
+        }
     }
 }

app/src/main/java/org/wikipedia/feed/topread/TopReadListCard.kt

@@ -9,7 +9,6 @@ import org.wikipedia.feed.model.CardType
 import org.wikipedia.feed.model.ListCard
 import org.wikipedia.util.DateUtil
 import org.wikipedia.util.L10nUtil
-import java.util.concurrent.TimeUnit
 
 @Parcelize
 class TopReadListCard(private val articles: TopRead, val site: WikiSite) :
@@ -20,7 +19,7 @@ class TopReadListCard(private val articles: TopRead, val site: WikiSite) :
     }
 
     override fun subtitle(): String {
-        return DateUtil.getFeedCardDateString(articles.date())
+        return DateUtil.getShortDateString(articles.localDate)
     }
 
     override fun type(): CardType {
@@ -32,7 +31,7 @@ class TopReadListCard(private val articles: TopRead, val site: WikiSite) :
     }
 
     override fun dismissHashCode(): Int {
-        return TimeUnit.MILLISECONDS.toDays(articles.date().time).toInt() + wikiSite().hashCode()
+        return articles.localDate.toEpochDay().toInt() + wikiSite().hashCode()
     }
 
     companion object {

app/src/main/java/org/wikipedia/util/DateUtil.kt

@@ -28,10 +28,6 @@ object DateUtil {
         return Date.from(Instant.parse(date))
     }
 
-    fun iso8601ShortDateParse(date: String): Date {
-        return getCachedDateFormat("yyyy-MM-dd'Z'", Locale.ROOT, true).parse(date)!!
-    }
-
     fun iso8601LocalDateTimeParse(timestamp: String): LocalDateTime {
         return LocalDateTime.ofInstant(Instant.parse(timestamp), ZoneId.systemDefault())
     }
@@ -56,10 +52,6 @@ object DateUtil {
         return getShortDateString(date.time)
     }
 
-    fun getFeedCardDateString(date: Date): String {
-        return getShortDateString(date)
-    }
-
     fun getFeedCardShortDateString(date: Calendar): String {
         return getExtraShortDateString(date.time)
     }

app/src/test/java/org/wikipedia/feed/topread/TopReadTest.kt

@@ -7,27 +7,19 @@ import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
 import org.wikipedia.json.JsonUtil
 import org.wikipedia.test.TestFileUtil
-import java.text.SimpleDateFormat
-import java.util.*
+import java.time.LocalDate
 
 @RunWith(RobolectricTestRunner::class)
 class TopReadTest {
     @Test
     @Throws(Throwable::class)
     fun testUnmarshalManyArticles() {
         val subject = unmarshal("most_read.json")
-        MatcherAssert.assertThat(subject.date(), Matchers.`is`(date("2016-06-01Z")))
+        MatcherAssert.assertThat(subject.localDate, Matchers.`is`(LocalDate.of(2016, 6, 1)))
         MatcherAssert.assertThat(subject.articles, Matchers.notNullValue())
         MatcherAssert.assertThat(subject.articles.size, Matchers.`is`(40))
     }
 
-    @Throws(Throwable::class)
-    private fun date(str: String): Date {
-        val format = SimpleDateFormat("yyyy-MM-dd'Z'", Locale.ROOT)
-        format.timeZone = TimeZone.getTimeZone("UTC")
-        return format.parse(str)!!
-    }
-
     companion object {
         @Throws(Throwable::class)
         fun unmarshal(filename: String): TopRead {