Clean up unnecessary uses of Date.toInstant()

Author: Isira-Seneviratne

app/src/main/java/org/wikipedia/dataclient/mwapi/MwQueryResult.kt

@@ -14,7 +14,8 @@ import org.wikipedia.page.PageTitle
 import org.wikipedia.settings.SiteInfo
 import org.wikipedia.util.DateUtil
 import org.wikipedia.util.StringUtil
-import java.util.*
+import java.time.*
+import java.util.Date
 
 @Serializable
 class MwQueryResult {
@@ -212,7 +213,10 @@ class MwQueryResult {
         private val tags: List<String>? = null
         private val oresscores: JsonElement? = null
 
-        val parsedDateTime by lazy { DateUtil.iso8601LocalDateTimeParse(timestamp) }
+        val parsedInstant: Instant by lazy { Instant.parse(timestamp) }
+        val parsedDateTime: LocalDateTime by lazy {
+            LocalDateTime.ofInstant(parsedInstant, ZoneId.systemDefault())
+        }
         val joinedTags by lazy { tags?.joinToString(separator = ", ").orEmpty() }
 
         override fun toString(): String {

app/src/main/java/org/wikipedia/dataclient/mwapi/UserInfo.kt

@@ -4,7 +4,8 @@ import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import org.wikipedia.dataclient.mwapi.MwServiceError.BlockInfo
 import org.wikipedia.util.DateUtil
-import java.util.*
+import java.time.LocalDate
+import java.util.Date
 
 @Serializable
 class UserInfo : BlockInfo() {
@@ -38,16 +39,15 @@ class UserInfo : BlockInfo() {
             return date
         }
 
-    val registrationDate: Date
-        get() {
-            var date = Date(0)
-            if (!regDate.isNullOrEmpty()) {
-                date = DateUtil.iso8601DateParse(regDate)
-            } else if (!registration.isNullOrEmpty()) {
-                date = DateUtil.iso8601DateParse(registration)
-            }
-            return date
+    val registrationDate: LocalDate by lazy {
+        if (!regDate.isNullOrEmpty()) {
+            DateUtil.iso8601LocalDateParse(regDate)
+        } else if (!registration.isNullOrEmpty()) {
+            DateUtil.iso8601LocalDateParse(registration)
+        } else {
+            LocalDate.EPOCH
         }
+    }
 
     @Serializable
     class Options {

app/src/main/java/org/wikipedia/suggestededits/SuggestedEditsRecentEditsViewModel.kt

@@ -2,14 +2,7 @@ package org.wikipedia.suggestededits
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import androidx.paging.Pager
-import androidx.paging.PagingConfig
-import androidx.paging.PagingSource
-import androidx.paging.PagingState
-import androidx.paging.cachedIn
-import androidx.paging.filter
-import androidx.paging.insertSeparators
-import androidx.paging.map
+import androidx.paging.*
 import kotlinx.coroutines.flow.map
 import org.wikipedia.WikipediaApp
 import org.wikipedia.dataclient.ServiceFactory
@@ -21,9 +14,9 @@ import org.wikipedia.suggestededits.provider.EditingSuggestionsProvider
 import org.wikipedia.util.DateUtil
 import retrofit2.HttpException
 import java.io.IOException
-import java.time.Duration
-import java.util.Calendar
-import java.util.Date
+import java.time.Instant
+import java.time.LocalDate
+import java.time.temporal.ChronoUnit
 import kotlin.math.max
 
 class SuggestedEditsRecentEditsViewModel : ViewModel() {
@@ -86,7 +79,7 @@ class SuggestedEditsRecentEditsViewModel : ViewModel() {
                     return LoadResult.Page(cachedRecentEdits, null, cachedContinueKey)
                 }
 
-                val triple = getRecentEditsCall(wikiSite, params.loadSize, Date().toInstant().toString(), "older", params.key, cachedUserInfo)
+                val triple = getRecentEditsCall(wikiSite, params.loadSize, Instant.now(), "older", params.key, cachedUserInfo)
 
                 cachedContinueKey = triple.third
                 cachedRecentEdits.addAll(triple.first)
@@ -109,12 +102,11 @@ class SuggestedEditsRecentEditsViewModel : ViewModel() {
     class RecentEditsSeparator(val date: String) : RecentEditsItemModel()
 
     companion object {
-
-        suspend fun getRecentEditsCall(wikiSite: WikiSite, count: Int, startTimeStamp: String, direction: String,
+        suspend fun getRecentEditsCall(wikiSite: WikiSite, count: Int, startTimeStamp: Instant, direction: String,
             continueStr: String? = null, userInfoCache: MutableList<UserInfo>): Triple<List<MwQueryResult.RecentChange>, List<MwQueryResult.RecentChange>, String?> {
 
             val response = ServiceFactory.get(wikiSite)
-                .getRecentEdits(count, startTimeStamp, direction, latestRevisions(), showCriteriaString(), continueStr)
+                .getRecentEdits(count, startTimeStamp.toString(), direction, latestRevisions(), showCriteriaString(), continueStr)
 
             val allRecentChanges = response.query?.recentChanges.orEmpty()
 
@@ -219,7 +211,7 @@ class SuggestedEditsRecentEditsViewModel : ViewModel() {
                     var qualifiedUser = false
                     userInfo?.let {
                         val editsCount = userInfo.editCount
-                        val diffDays = diffDays(userInfo.registrationDate)
+                        val diffDays = userInfo.registrationDate.until(LocalDate.now(), ChronoUnit.DAYS)
                         findUserExperienceFilters.forEach { type ->
                             val userExperienceArray = type.value.split("|")
                             val requiredEdits = userExperienceArray.first().split(",")
@@ -293,11 +285,5 @@ class SuggestedEditsRecentEditsViewModel : ViewModel() {
             }
             return recentChanges
         }
-
-        private fun diffDays(date: Date): Long {
-            val nowDate = Calendar.getInstance().toInstant()
-            val beginDate = date.toInstant()
-            return Duration.between(beginDate, nowDate).toDays()
-        }
     }
 }

app/src/main/java/org/wikipedia/suggestededits/provider/EditingSuggestionsProvider.kt

@@ -13,7 +13,7 @@ import org.wikipedia.dataclient.mwapi.MwQueryResult
 import org.wikipedia.dataclient.page.PageSummary
 import org.wikipedia.page.PageTitle
 import org.wikipedia.suggestededits.SuggestedEditsRecentEditsViewModel
-import java.util.Date
+import java.time.Instant
 import java.util.Stack
 import java.util.concurrent.Semaphore
 import kotlin.math.abs
@@ -43,7 +43,7 @@ object EditingSuggestionsProvider {
     private var revertCandidateLang: String = ""
     private val revertCandidateCache: ArrayDeque<MwQueryResult.RecentChange> = ArrayDeque()
     private var revertCandidateLastRevId = 0L
-    private var revertCandidateLastTimeStamp = Date().toInstant().toString()
+    private var revertCandidateLastTimeStamp = Instant.now()
 
     private const val MAX_RETRY_LIMIT: Long = 50
 
@@ -355,7 +355,7 @@ object EditingSuggestionsProvider {
             revertCandidateCache.addFirst(it)
             if (it.curRev > revertCandidateLastRevId) {
                 revertCandidateLastRevId = it.curRev
-                revertCandidateLastTimeStamp = it.timestamp
+                revertCandidateLastTimeStamp = it.parsedInstant
             }
         }
     }
@@ -385,7 +385,7 @@ object EditingSuggestionsProvider {
                             // starting from the last recorded timestamp.
                             val triple = if (revertCandidateLastRevId == 0L)
                                 SuggestedEditsRecentEditsViewModel.getRecentEditsCall(wikiSite,
-                                10, Date().toInstant().toString(), "older", null, mutableListOf())
+                                10, Instant.now(), "older", null, mutableListOf())
                             else SuggestedEditsRecentEditsViewModel.getRecentEditsCall(wikiSite,
                                 10, revertCandidateLastTimeStamp, "newer", null, mutableListOf())
 
@@ -400,8 +400,8 @@ object EditingSuggestionsProvider {
                                 if (candidate.curRev > maxRevId) {
                                     maxRevId = candidate.curRev
                                 }
-                                if (candidate.timestamp > revertCandidateLastTimeStamp) {
-                                    revertCandidateLastTimeStamp = candidate.timestamp
+                                if (candidate.parsedInstant > revertCandidateLastTimeStamp) {
+                                    revertCandidateLastTimeStamp = candidate.parsedInstant
                                 }
                             }
                             for (candidate in filteredChanges) {

app/src/main/java/org/wikipedia/usercontrib/UserContribListViewModel.kt

@@ -21,7 +21,7 @@ import org.wikipedia.util.Resource
 import org.wikipedia.util.log.L
 import retrofit2.HttpException
 import java.io.IOException
-import java.util.*
+import java.time.LocalDate
 
 class UserContribListViewModel(bundle: Bundle) : ViewModel() {
 
@@ -128,7 +128,7 @@ class UserContribListViewModel(bundle: Bundle) : ViewModel() {
     open class UserContribItemModel
     class UserContribItem(val item: UserContribution) : UserContribItemModel()
     class UserContribSeparator(val date: String) : UserContribItemModel()
-    class UserContribStats(val totalEdits: Int, val registrationDate: Date, val projectName: String) : UserContribItemModel()
+    class UserContribStats(val totalEdits: Int, val registrationDate: LocalDate, val projectName: String) : UserContribItemModel()
 
     class Factory(private val bundle: Bundle) : ViewModelProvider.Factory {
         @Suppress("unchecked_cast")

app/src/main/java/org/wikipedia/usercontrib/UserInformationDialog.kt

@@ -19,9 +19,7 @@ import org.wikipedia.suggestededits.SuggestedEditsRecentEditsActivity
 import org.wikipedia.suggestededits.SuggestionsActivity
 import org.wikipedia.util.DateUtil
 import org.wikipedia.util.StringUtil
-import java.time.LocalDateTime
-import java.time.ZoneId
-import java.util.Date
+import java.time.LocalDate
 
 class UserInformationDialog : DialogFragment() {
 
@@ -74,13 +72,12 @@ class UserInformationDialog : DialogFragment() {
         binding.dialogErrorView.isVisible = false
     }
 
-    private fun onSuccess(editCount: String, registrationDate: Date) {
+    private fun onSuccess(editCount: String, registrationDate: LocalDate) {
         sendPatrollerExperienceEvent()
         binding.userInformationContainer.isVisible = true
         binding.dialogProgressBar.isVisible = false
         binding.dialogErrorView.isVisible = false
-        val localDate = LocalDateTime.ofInstant(registrationDate.toInstant(), ZoneId.systemDefault()).toLocalDate()
-        val dateStr = DateUtil.getShortDateString(localDate)
+        val dateStr = DateUtil.getShortDateString(registrationDate)
         binding.userTenure.text = StringUtil.fromHtml(getString(R.string.patroller_tasks_edits_list_user_information_dialog_joined_date_text, dateStr))
         binding.editCount.text = StringUtil.fromHtml(getString(R.string.patroller_tasks_edits_list_user_information_dialog_edit_count_text, editCount))
     }

app/src/main/java/org/wikipedia/usercontrib/UserInformationDialogViewModel.kt

@@ -10,7 +10,7 @@ import kotlinx.coroutines.flow.asStateFlow
 import org.wikipedia.WikipediaApp
 import org.wikipedia.dataclient.ServiceFactory
 import org.wikipedia.dataclient.WikiSite
-import java.util.*
+import java.time.LocalDate
 
 class UserInformationDialogViewModel(bundle: Bundle) : ViewModel() {
 
@@ -44,7 +44,7 @@ class UserInformationDialogViewModel(bundle: Bundle) : ViewModel() {
 
     open class UiState {
         class Loading : UiState()
-        class Success(val editCount: String, val registrationDate: Date) : UiState()
+        class Success(val editCount: String, val registrationDate: LocalDate) : UiState()
         class Error(val throwable: Throwable) : UiState()
     }
 

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

@@ -8,19 +8,11 @@ import org.wikipedia.R
 import org.wikipedia.WikipediaApp
 import org.wikipedia.feed.model.UtcDate
 import java.text.SimpleDateFormat
-import java.time.Instant
-import java.time.LocalDate
-import java.time.LocalDateTime
-import java.time.ZoneId
-import java.time.ZoneOffset
+import java.time.*
 import java.time.format.DateTimeFormatter
 import java.time.format.FormatStyle
 import java.time.temporal.TemporalAccessor
-import java.util.Calendar
-import java.util.Date
-import java.util.GregorianCalendar
-import java.util.Locale
-import java.util.TimeZone
+import java.util.*
 import java.util.concurrent.ConcurrentHashMap
 
 object DateUtil {
@@ -36,6 +28,10 @@ object DateUtil {
         return LocalDateTime.ofInstant(Instant.parse(timestamp), ZoneId.systemDefault())
     }
 
+    fun iso8601LocalDateParse(timestamp: String): LocalDate {
+        return LocalDate.ofInstant(Instant.parse(timestamp), ZoneId.systemDefault())
+    }
+
     fun dbDateFormat(date: Date): String {
         return getCachedDateFormat("yyyyMMddHHmmss", Locale.ROOT, true).format(date)
     }
@@ -64,7 +60,7 @@ object DateUtil {
         return getDateStringWithSkeletonPattern(date, "MMMM")
     }
 
-    fun getYearOnlyDateString(date: Date): String {
+    fun getYearOnlyDateString(date: LocalDate): String {
         return getDateStringWithSkeletonPattern(date, "yyyy")
     }
 

app/src/main/java/org/wikipedia/views/EditHistoryStatsView.kt

@@ -16,7 +16,7 @@ import org.wikipedia.util.DateUtil
 import org.wikipedia.util.DimenUtil
 import org.wikipedia.util.FeedbackUtil
 import org.wikipedia.util.StringUtil
-import java.util.*
+import java.time.LocalDate
 
 class EditHistoryStatsView constructor(context: Context, attrs: AttributeSet? = null) : ConstraintLayout(context, attrs) {
 
@@ -34,11 +34,10 @@ class EditHistoryStatsView constructor(context: Context, attrs: AttributeSet? =
         editHistoryStats?.let { stats ->
             val timestamp = stats.revision.timeStamp
             if (timestamp.isNotBlank()) {
-                val createdYear = DateUtil.getYearOnlyDateString(DateUtil.iso8601DateParse(timestamp))
-                val calendar = Calendar.getInstance()
-                val today = DateUtil.getShortDateString(calendar.time)
-                calendar.add(Calendar.YEAR, -1)
-                val lastYear = DateUtil.getShortDateString(calendar.time)
+                val createdYear = DateUtil.getYearOnlyDateString(DateUtil.iso8601LocalDateParse(timestamp))
+                val now = LocalDate.now()
+                val today = DateUtil.getShortDateString(now)
+                val lastYear = DateUtil.getShortDateString(now.minusYears(1))
                 binding.editCountsView.text = context.resources.getQuantityString(R.plurals.page_edit_history_article_edits_since_year,
                     stats.allEdits.count, stats.allEdits.count, createdYear)
                 binding.statsGraphView.setData(stats.metrics.map { it.edits.toFloat() })