Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

G

Grayjay
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

48b2c68e

Commit 48b2c68e authored 1 year ago by Koen

Downloads
- Plain Diff

Merge branch 'master' of gitlab.futo.org:videostreaming/grayjay

parents 689766a6 9306024d

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

app/src/main/java/com/futo/platformplayer/engine/packages/PackageDOMParser.kt 26 additions, 1 deletion

...m/futo/platformplayer/engine/packages/PackageDOMParser.kt
app/src/main/java/com/futo/platformplayer/fragment/channel/tab/ChannelContentsFragment.kt 5 additions, 1 deletion

...ormplayer/fragment/channel/tab/ChannelContentsFragment.kt
app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/SubscriptionsFeedFragment.kt 10 additions, 2 deletions

...r/fragment/mainactivity/main/SubscriptionsFeedFragment.kt
app/src/main/java/com/futo/platformplayer/states/StatePlaylists.kt 11 additions, 2 deletions

...ain/java/com/futo/platformplayer/states/StatePlaylists.kt
app/src/main/java/com/futo/platformplayer/subscription/SubscriptionsTaskFetchAlgorithm.kt 2 additions, 2 deletions

...ormplayer/subscription/SubscriptionsTaskFetchAlgorithm.kt

with 54 additions and 8 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment