kavin/LibreTube
1
0
Fork 0
mirror of https://github.com/libre-tube/LibreTube.git synced 2025-04-28 07:50:31 +05:30
Code Issues Projects Releases Wiki Activity

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

Browse Source 
fix(SubscriptionsFragment): update lastFeedWatchedTime to latest video upload in feed
This commit is contained in:
Bnyro 2025-01-29 16:33:57 +01:00 committed by GitHub
commit d34d34e9e6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/com/github/libretube/helpers/PreferenceHelper.kt
View File

@ -5,7 +5,6 @@ import android.content.SharedPreferences
import androidx.core.content.edit import androidx.core.content.edit
import androidx.preference.PreferenceManager import androidx.preference.PreferenceManager
import com.github.libretube.constants.PreferenceKeys import com.github.libretube.constants.PreferenceKeys
import java.time.Instant
object PreferenceHelper { object PreferenceHelper {
/** /**
@ -105,8 +104,8 @@ object PreferenceHelper {
return getString(PreferenceKeys.LAST_STREAM_VIDEO_ID, "") return getString(PreferenceKeys.LAST_STREAM_VIDEO_ID, "")
} }
fun updateLastFeedWatchedTime() { fun setLastFeedWatchedTime(time: Long) {
putLong(PreferenceKeys.LAST_WATCHED_FEED_TIME, Instant.now().epochSecond) putLong(PreferenceKeys.LAST_WATCHED_FEED_TIME, time)
} }
fun getLastCheckedFeedTime(): Long { fun getLastCheckedFeedTime(): Long {

6
app/src/main/java/com/github/libretube/ui/fragments/SubscriptionsFragment.kt
View File

@ -379,7 +379,7 @@ class SubscriptionsFragment : DynamicLayoutManagerFragment(R.layout.fragment_sub
// add an "all caught up item" // add an "all caught up item"
if (selectedSortOrder == 0) { if (selectedSortOrder == 0) {
val lastCheckedFeedTime = PreferenceHelper.getLastCheckedFeedTime() 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) { if (caughtUpIndex > 0) {
sortedFeed.add( sortedFeed.add(
caughtUpIndex, caughtUpIndex,
@ -398,7 +398,9 @@ class SubscriptionsFragment : DynamicLayoutManagerFragment(R.layout.fragment_sub
binding.toggleSubs.text = getString(R.string.subscriptions) binding.toggleSubs.text = getString(R.string.subscriptions)
PreferenceHelper.updateLastFeedWatchedTime() feed.firstOrNull { !it.isUpcoming }?.uploaded?.let {
PreferenceHelper.setLastFeedWatchedTime(it)
};
} }
@SuppressLint("SetTextI18n") @SuppressLint("SetTextI18n")