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

Merge pull request #6571 from Bnyro/master

Browse Source 
fix: crash when importing private videos in watch history
This commit is contained in:
Bnyro 2024-10-02 11:54:33 +02:00 committed by GitHub
commit 54ca323bbe
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/github/libretube/helpers/ImportHelper.kt
View File

@ -269,7 +269,7 @@ object ImportHelper {
JsonHelper.json.decodeFromStream<List<YouTubeWatchHistoryFileItem>>(it) JsonHelper.json.decodeFromStream<List<YouTubeWatchHistoryFileItem>>(it)
} }
.orEmpty() .orEmpty()
.filter { it.activityControls.contains("YouTube watch history") } .filter { it.activityControls.contains("YouTube watch history") && it.subtitles.isNotEmpty() }
.reversed() .reversed()
.map { .map {
val videoId = it.titleUrl.substring(it.titleUrl.length - 11) val videoId = it.titleUrl.substring(it.titleUrl.length - 11)

8
app/src/main/java/com/github/libretube/obj/YouTubeWatchHistoryFileItem.kt
View File

@ -4,11 +4,11 @@ import kotlinx.serialization.Serializable
@Serializable @Serializable
data class YouTubeWatchHistoryFileItem( data class YouTubeWatchHistoryFileItem(
val activityControls: List<String>,
val header: String, val header: String,
val products: List<String>,
val subtitles: List<YouTubeWatchHistoryChannelInfo>,
val time: String, val time: String,
val title: String, val title: String,
val titleUrl: String val titleUrl: String,
val activityControls: List<String> = emptyList(),
val products: List<String> = emptyList(),
val subtitles: List<YouTubeWatchHistoryChannelInfo> = emptyList()
) )