KillerDogeEmpire
/
AquaStream
mirror of https://github.com/KillerDogeEmpire/AquaStream.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'recloudstream:master' into master

This commit is contained in:
KillerDogeEmpire 2022-09-11 08:32:47 -08:00 committed by GitHub
parent baa5c06378 6f60298fc9
commit e833585b15
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 5 deletions
Show Stats 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,
m3u8,
"",
ref,
Qualities.Unknown.value,
headers = mapOf("accept" to "*/*"),
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) {
return@launchSafe
}
// If the plugin isn't loaded yet. (Does not set the key)
if (api == null) {
loadAndCancel(noneApi)
} else if (preferredApiName == noneApi.name) {
if (preferredApiName == noneApi.name) {
setKey(USER_SELECTED_HOMEPAGE_API, noneApi.name)
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) {
val validAPIs = context?.filterProviderByPreferredMedia()
if (validAPIs.isNullOrEmpty()) {