Repository navigation
Conversation
Conflict resolution done 2026-06-14, committed as-is without further changes. Does not build yet: see follow-up commit for build fixes.
Drop duplicate ApplicationExtension import, use Kotlin property access for VideoDetailFragment.url, remove obsolete kotlin-dsl resolution strategy.
Brings in upstream's KMP restructuring (shared/, desktopApp/, iosApp/), the Stream/Playlist item model and the paging-based history. Fork-side resolutions: - settings.gradle.kts: keep the NewPipeExtractor submodule substitution on top of upstream's new module includes - app/build.gradle.kts: keep the Ufonirpt id/name and the version override handling, adopt upstream's minSdk/targetSdk DSL and ProjectConfig constants - Stream.kt: carry tournesolScore/UnsafeReasons/Best/WorstCriteria through upstream's new item model - StreamListItem/ItemList/StreamThumbnail: keep the Tournesol badge, score cache and duration alignment/text style on the new model - Tab.java: keep the fork's tab set, adopt HistoryFragment - StreamHistoryDAO/HistoryRecordManager: keep getLatestHistoryEntry, drop getStreamStatistics (replaced upstream by paged history) - Theme.kt: keep the fork's near-black scheme Does not build yet: upstream's comment UI needs CommentsInfoItem.isEdited, which the NewPipeExtractor submodule does not have yet.
Upstream's comment UI needs CommentsInfoItem.isEdited, which only exists from v0.26.4 on. Upstream extractor renamed settings.gradle to settings.gradle.kts, so the composite-build guard has to accept either name — otherwise the Tournesol substitution silently switches off and the app resolves the stock extractor from JitPack instead.
…NewPipeExtractor pointer - Clean 3-way merge of upstream/refactor at commit 455b6f0 - Incorporate Description record migration and client removals - Update NewPipeExtractor submodule pointer to resolved commit dc711f5bd
Contributor
|
Please link this PR to an existing issue you are assigned to. Assignees are expected to discuss the details of the PR beforehand. This PR will be closed if it is not linked to an issue. |
|
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
| fetchPoolThen( | ||
| action = { pool -> | ||
| if (pool.size >= 2) { | ||
| val first = pool.removeAt((Math.random() * pool.size).toInt()) |
| action = { pool -> | ||
| if (pool.size >= 2) { | ||
| val first = pool.removeAt((Math.random() * pool.size).toInt()) | ||
| val second = pool.removeAt((Math.random() * pool.size).toInt()) |
| suggestionPool.toList() | ||
| } | ||
| if (candidates.isNotEmpty()) { | ||
| val picked = candidates[(Math.random() * candidates.size).toInt()] |
| pool.toList() | ||
| } | ||
| if (filtered.isNotEmpty()) { | ||
| val picked = filtered[(Math.random() * filtered.size).toInt()] |
| if (candidates.isEmpty()) { | ||
| return null | ||
| } | ||
| val picked = candidates[(Math.random() * candidates.size).toInt()] |
| leftEntries.indices.filter { it != leftHistoryIndex } | ||
| } | ||
| if (pool.isNotEmpty()) { | ||
| leftHistoryIndex = pool[(Math.random() * pool.size).toInt()] |
| rightEntries.indices.filter { it != rightHistoryIndex } | ||
| } | ||
| if (pool.isNotEmpty()) { | ||
| rightHistoryIndex = pool[(Math.random() * pool.size).toInt()] |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
.