Convert page last shown time to an Instant

wikimedia · Dec 1, 2023 · e88d321 · e88d321
1 parent 4e2a853
commit e88d321
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 13 deletions.
diff --git a/app/src/main/java/org/wikipedia/main/MainFragment.kt b/app/src/main/java/org/wikipedia/main/MainFragment.kt
@@ -77,7 +77,8 @@ import org.wikipedia.views.NotificationButtonView
 import org.wikipedia.views.TabCountsView
 import org.wikipedia.watchlist.WatchlistActivity
 import java.io.File
-import java.util.concurrent.TimeUnit
+import java.time.Instant
+import java.time.temporal.ChronoUnit
 
 class MainFragment : Fragment(), BackPressedHandler, MenuProvider, FeedFragment.Callback, HistoryFragment.Callback, LinkPreviewDialog.Callback, MenuNavTabDialog.Callback {
     interface Callback {
@@ -163,7 +164,7 @@ class MainFragment : Fragment(), BackPressedHandler, MenuProvider, FeedFragment.
         super.onResume()
         downloadReceiver.register(requireContext(), downloadReceiverCallback)
         // reset the last-page-viewed timer
-        Prefs.pageLastShown = 0
+        Prefs.pageLastShown = Instant.EPOCH
         maybeShowWatchlistTooltip()
     }
 
@@ -304,7 +305,8 @@ class MainFragment : Fragment(), BackPressedHandler, MenuProvider, FeedFragment.
             goToTab(NavTab.of(intent.getIntExtra(Constants.INTENT_EXTRA_GO_TO_SE_TAB, NavTab.EDITS.code())))
         } else if (intent.hasExtra(Constants.INTENT_EXTRA_PREVIEW_SAVED_READING_LISTS)) {
             goToTab(NavTab.READING_LISTS)
-        } else if (lastPageViewedWithin(1) && !intent.hasExtra(Constants.INTENT_RETURN_TO_MAIN) && WikipediaApp.instance.tabCount > 0) {
+        } else if (Prefs.pageLastShown.until(Instant.now(), ChronoUnit.DAYS) < 1 &&
+                    !intent.hasExtra(Constants.INTENT_RETURN_TO_MAIN) && WikipediaApp.instance.tabCount > 0) {
             startActivity(PageActivity.newIntent(requireContext()))
         }
     }
@@ -512,11 +514,6 @@ class MainFragment : Fragment(), BackPressedHandler, MenuProvider, FeedFragment.
         FeedbackUtil.showMessage(this, R.string.address_copied)
     }
 
-    @Suppress("SameParameterValue")
-    private fun lastPageViewedWithin(days: Int): Boolean {
-        return TimeUnit.MILLISECONDS.toDays(System.currentTimeMillis() - Prefs.pageLastShown) < days
-    }
-
     private fun download(image: FeaturedImage) {
         pendingDownloadImage = null
         downloadReceiver.download(requireContext(), image)

diff --git a/app/src/main/java/org/wikipedia/page/PageFragment.kt b/app/src/main/java/org/wikipedia/page/PageFragment.kt
@@ -283,8 +283,7 @@ class PageFragment : Fragment(), BackPressedHandler, CommunicationBridge.Communi
         addTimeSpentReading(activeTimer.elapsedSec)
         pageFragmentLoadState.updateCurrentBackStackItem()
         app.commitTabState()
-        val time = if (app.tabList.size >= 1 && !pageFragmentLoadState.backStackEmpty()) System.currentTimeMillis() else 0
-        Prefs.pageLastShown = time
+        Prefs.pageLastShown = if (app.tabList.size >= 1 && !pageFragmentLoadState.backStackEmpty()) Instant.now() else Instant.EPOCH
         articleInteractionEvent?.pause()
         metricsPlatformArticleEventToolbarInteraction.pause()
     }

diff --git a/app/src/main/java/org/wikipedia/settings/Prefs.kt b/app/src/main/java/org/wikipedia/settings/Prefs.kt
@@ -183,9 +183,9 @@ object Prefs {
         return PrefsIoUtil.getKey(R.string.preference_key_last_run_time_format, task)
     }
 
-    var pageLastShown
-        get() = PrefsIoUtil.getLong(R.string.preference_key_page_last_shown, 0)
-        set(value) = PrefsIoUtil.setLong(R.string.preference_key_page_last_shown, value)
+    var pageLastShown: Instant
+        get() = Instant.ofEpochMilli(PrefsIoUtil.getLong(R.string.preference_key_page_last_shown, 0))
+        set(instant) = PrefsIoUtil.setLong(R.string.preference_key_page_last_shown, instant.toEpochMilli())
 
     val isImageDownloadEnabled
         get() = PrefsIoUtil.getBoolean(R.string.preference_key_show_images, true)