Pass LocalDate directly to the game view model

Author: Isira-Seneviratne

app/src/main/java/org/wikipedia/games/onthisday/OnThisDayGameActivity.kt

@@ -32,9 +32,6 @@ import org.wikipedia.util.DimenUtil
 import org.wikipedia.util.FeedbackUtil
 import org.wikipedia.util.Resource
 import org.wikipedia.util.UriUtil
-import java.time.LocalDate
-import java.time.ZoneOffset
-import java.time.format.DateTimeFormatter
 
 class OnThisDayGameActivity : BaseActivity(), BaseActivity.Callback {
 
@@ -219,18 +216,10 @@ class OnThisDayGameActivity : BaseActivity(), BaseActivity.Callback {
 
     companion object {
         fun newIntent(context: Context, invokeSource: Constants.InvokeSource, wikiSite: WikiSite): Intent {
-            val intent = Intent(context, OnThisDayGameActivity::class.java)
+            return Intent(context, OnThisDayGameActivity::class.java)
                 .putExtra(Constants.ARG_WIKISITE, wikiSite)
                 .putExtra(Constants.INTENT_EXTRA_INVOKE_SOURCE, invokeSource)
-            if (Prefs.lastOtdGameDateOverride.isNotEmpty()) {
-                val date = try {
-                    LocalDate.parse(Prefs.lastOtdGameDateOverride, DateTimeFormatter.ISO_LOCAL_DATE)
-                } catch (_: Exception) {
-                    LocalDate.now()
-                }
-                intent.putExtra(OnThisDayGameViewModel.EXTRA_DATE, date.atStartOfDay().toInstant(ZoneOffset.UTC).epochSecond)
-            }
-            return intent
+                .putExtra(OnThisDayGameViewModel.EXTRA_DATE, Prefs.lastOtdGameDateOverride)
         }
     }
 }

app/src/main/java/org/wikipedia/games/onthisday/OnThisDayGameViewModel.kt

@@ -27,9 +27,7 @@ import org.wikipedia.settings.Prefs
 import org.wikipedia.util.ReleaseUtil
 import org.wikipedia.util.Resource
 import org.wikipedia.util.log.L
-import java.time.Instant
 import java.time.LocalDate
-import java.time.ZoneOffset
 import java.time.format.DateTimeFormatter
 import kotlin.math.abs
 import kotlin.math.max
@@ -49,7 +47,7 @@ class OnThisDayGameViewModel(savedStateHandle: SavedStateHandle) : ViewModel() {
     private lateinit var currentState: GameState
 
     private val overrideDate = savedStateHandle.contains(EXTRA_DATE)
-    var currentDate = if (overrideDate) LocalDate.ofInstant(Instant.ofEpochSecond(savedStateHandle.get<Long>(EXTRA_DATE)!!), ZoneOffset.UTC) else LocalDate.now()
+    var currentDate: LocalDate = savedStateHandle.get<LocalDate>(EXTRA_DATE) ?: LocalDate.now()
     val currentMonth get() = currentDate.monthValue
     val currentDay get() = currentDate.dayOfMonth
     var isArchiveGame = false

app/src/main/java/org/wikipedia/settings/Prefs.kt

@@ -31,6 +31,8 @@ import org.wikipedia.util.StringUtil
 import org.wikipedia.watchlist.WatchlistFilterTypes
 import org.wikipedia.yearinreview.YearInReviewModel
 import org.wikipedia.yearinreview.YearInReviewSurveyState
+import java.time.LocalDate
+import java.time.format.DateTimeParseException
 import java.util.Date
 
 /** Shared preferences utility for convenient POJO access.  */
@@ -743,9 +745,13 @@ object Prefs {
         get() = JsonUtil.decodeFromString<List<DonationResult>>(PrefsIoUtil.getString(R.string.preference_key_donation_results, null)).orEmpty()
         set(value) = PrefsIoUtil.setString(R.string.preference_key_donation_results, JsonUtil.encodeToString(value))
 
-    var lastOtdGameDateOverride
-        get() = PrefsIoUtil.getString(R.string.preference_key_otd_game_date_override, null).orEmpty()
-        set(value) = PrefsIoUtil.setString(R.string.preference_key_otd_game_date_override, value)
+    var lastOtdGameDateOverride: LocalDate?
+        get() = try {
+            LocalDate.parse(PrefsIoUtil.getString(R.string.preference_key_otd_game_date_override, null).orEmpty())
+        } catch (_: DateTimeParseException) {
+            null
+        }
+        set(value) = PrefsIoUtil.setString(R.string.preference_key_otd_game_date_override, value?.toString())
 
     var otdGameState
         get() = PrefsIoUtil.getString(R.string.preference_key_otd_game_state, null).orEmpty()