Merge pull request #7009 from FineFindus/fix/all-caught-up-local

fix(SubscriptionsFragment): update lastFeedWatchedTime to latest video upload in feed
libre-tube · Jan 29, 2025 · d34d34e · d34d34e
2 parents a5ef88a + 54835c9
commit d34d34e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/app/src/main/java/com/github/libretube/helpers/PreferenceHelper.kt b/app/src/main/java/com/github/libretube/helpers/PreferenceHelper.kt
@@ -5,7 +5,6 @@ import android.content.SharedPreferences
 import androidx.core.content.edit
 import androidx.preference.PreferenceManager
 import com.github.libretube.constants.PreferenceKeys
-import java.time.Instant
 
 object PreferenceHelper {
     /**
@@ -105,8 +104,8 @@ object PreferenceHelper {
         return getString(PreferenceKeys.LAST_STREAM_VIDEO_ID, "")
     }
 
-    fun updateLastFeedWatchedTime() {
-        putLong(PreferenceKeys.LAST_WATCHED_FEED_TIME, Instant.now().epochSecond)
+    fun setLastFeedWatchedTime(time: Long) {
+        putLong(PreferenceKeys.LAST_WATCHED_FEED_TIME, time)
     }
 
     fun getLastCheckedFeedTime(): Long {

diff --git a/app/src/main/java/com/github/libretube/ui/fragments/SubscriptionsFragment.kt b/app/src/main/java/com/github/libretube/ui/fragments/SubscriptionsFragment.kt
@@ -379,7 +379,7 @@ class SubscriptionsFragment : DynamicLayoutManagerFragment(R.layout.fragment_sub
         // add an "all caught up item"
         if (selectedSortOrder == 0) {
             val lastCheckedFeedTime = PreferenceHelper.getLastCheckedFeedTime()
-            val caughtUpIndex = feed.indexOfFirst { it.uploaded / 1000 < lastCheckedFeedTime && !it.isUpcoming }
+            val caughtUpIndex = feed.indexOfFirst { it.uploaded <= lastCheckedFeedTime && !it.isUpcoming }
             if (caughtUpIndex > 0) {
                 sortedFeed.add(
                     caughtUpIndex,
@@ -398,7 +398,9 @@ class SubscriptionsFragment : DynamicLayoutManagerFragment(R.layout.fragment_sub
 
         binding.toggleSubs.text = getString(R.string.subscriptions)
 
-        PreferenceHelper.updateLastFeedWatchedTime()
+        feed.firstOrNull { !it.isUpcoming }?.uploaded?.let {
+            PreferenceHelper.setLastFeedWatchedTime(it)
+        };
     }
 
     @SuppressLint("SetTextI18n")