recloudstream/cloudstream
2
2
Fork 1
mirror of https://github.com/recloudstream/cloudstream.git synced 2024-08-15 01:53:11 +00:00
Code Issues Releases Wiki Activity

Merge branch 'recloudstream:master' into master

Browse source
This commit is contained in:
SANCTI-afk 2022-09-11 22:31:58 +02:00 • committed by GitHub
commit 923bc053cb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/com/lagradost/cloudstream3/extractors/GMPlayer.kt
View file

@ -31,7 +31,7 @@ class GMPlayer : ExtractorApi() {
this.name, this.name,
this.name, this.name,
m3u8, m3u8,
"", ref,
Qualities.Unknown.value, Qualities.Unknown.value,
headers = mapOf("accept" to "*/*"), headers = mapOf("accept" to "*/*"),
isM3u8 = true isM3u8 = true

9
app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeViewModel.kt
View file

@ -272,12 +272,13 @@ class HomeViewModel : ViewModel() {
if (!forceReload && api?.let { expandable[it.name]?.list?.list?.isNotEmpty() } == true) { if (!forceReload && api?.let { expandable[it.name]?.list?.list?.isNotEmpty() } == true) {
return@launchSafe return@launchSafe
} }
// If the plugin isn't loaded yet. (Does not set the key)
if (api == null) { if (preferredApiName == noneApi.name) {
loadAndCancel(noneApi)
} else if (preferredApiName == noneApi.name) {
setKey(USER_SELECTED_HOMEPAGE_API, noneApi.name) setKey(USER_SELECTED_HOMEPAGE_API, noneApi.name)
loadAndCancel(noneApi) loadAndCancel(noneApi)
// If the plugin isn't loaded yet. (Does not set the key)
} else if (api == null) {
loadAndCancel(noneApi)
} else if (preferredApiName == randomApi.name) { } else if (preferredApiName == randomApi.name) {
val validAPIs = context?.filterProviderByPreferredMedia() val validAPIs = context?.filterProviderByPreferredMedia()
if (validAPIs.isNullOrEmpty()) { if (validAPIs.isNullOrEmpty()) {