Merge pull request #7117 from FineFindus/feat/upcoming-video-caught-up

fix(SubscriptionsFragment): skip upcoming videos when adding caught-up
This commit is contained in:
Bnyro 2025-02-27 13:03:55 +01:00 committed by GitHub
commit 69c5bbeffa
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 2 deletions

View File

@ -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)

View File

@ -358,7 +358,7 @@
<string name="captions_size">Captions size</string>
<string name="double_tap_seek">Double tap to seek</string>
<string name="double_tap_seek_summary">Tap twice at the left or right to rewind or forward the player position</string>
<string name="all_caught_up">You\'re all caught up</string>
<string name="all_caught_up">All caught up</string>
<string name="all_caught_up_summary">You\'ve seen all new videos</string>
<string name="import_playlists">Import playlists</string>
<string name="export_playlists">Export playlists</string>