From 911fb5d3587b41d03e4d46c725141c832b4cd96a Mon Sep 17 00:00:00 2001 From: FineFindus Date: Sun, 23 Feb 2025 14:27:26 +0100 Subject: [PATCH] fix(SubscriptionsFragment): skip upcoming videos when adding caught-up Fixes a regression introduced in https://github.com/libre-tube/LibreTube/commit/d34d34e9e6bad1e9e2f32da8bb9ea9aeebb63589, which caused the original fix (https://github.com/libre-tube/LibreTube/commit/111cd1b3507da4240cb339382b63aef622e3bfff) to no longer function correctly. --- .../com/github/libretube/ui/fragments/SubscriptionsFragment.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index 573e205b5..d5a7d877d 100644 --- a/app/src/main/java/com/github/libretube/ui/fragments/SubscriptionsFragment.kt +++ b/app/src/main/java/com/github/libretube/ui/fragments/SubscriptionsFragment.kt @@ -378,7 +378,7 @@ class SubscriptionsFragment : DynamicLayoutManagerFragment(R.layout.fragment_sub if (selectedSortOrder == 0) { val lastCheckedFeedTime = PreferenceHelper.getLastCheckedFeedTime() val caughtUpIndex = feed.indexOfFirst { it.uploaded <= lastCheckedFeedTime && !it.isUpcoming } - if (caughtUpIndex > 0) { + if (caughtUpIndex > 0 && !feed[caughtUpIndex-1].isUpcoming) { sorted.add( caughtUpIndex, StreamItem(type = VideosAdapter.CAUGHT_UP_STREAM_TYPE)