large server change

enhance Home page with provider selection and improved data loading
create Play page for media playback
enhance PluginManager with provider overrides
improve Search page with provider selection
persist active provider in local storage
update theme options

.github/workflows/build_to_archive.yml

@@ -9,9 +9,6 @@ on:
       - '**/wcokey.txt'
   workflow_dispatch:
 
-permissions:
-  contents: read
-
 concurrency:
   group: "Archive-build"
   cancel-in-progress: true
@@ -64,15 +61,13 @@ jobs:
         cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
 
     - name: Run Gradle
-      run: ./gradlew assemblePrereleaseRelease
+      run: ./gradlew assemblePrerelease
       env:
         SIGNING_KEY_ALIAS: "key0"
         SIGNING_KEY_PASSWORD: ${{ steps.fetch_keystore.outputs.key_pwd }}
         SIGNING_STORE_PASSWORD: ${{ steps.fetch_keystore.outputs.key_pwd }}
         SIMKL_CLIENT_ID: ${{ secrets.SIMKL_CLIENT_ID }}
         SIMKL_CLIENT_SECRET: ${{ secrets.SIMKL_CLIENT_SECRET }}
-        TRAKT_CLIENT_ID: ${{ secrets.TRAKT_CLIENT_ID }}
-        MDL_API_KEY: ${{ secrets.MDL_API_KEY }}
 
     - uses: actions/checkout@v6
       with:

.github/workflows/generate_dokka.yml

@@ -6,9 +6,6 @@ on:
     paths-ignore:
       - '*.md'
 
-permissions:
-  contents: read
-
 concurrency:
   group: "dokka"
   cancel-in-progress: true
@@ -54,6 +51,9 @@ jobs:
         with:
           cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
 
+      - name: Set up Android SDK
+        uses: android-actions/setup-android@v3
+
       - name: Generate Dokka
         run: |
           cd $GITHUB_WORKSPACE/src/

.github/workflows/issue_action.yml

@@ -0,0 +1,94 @@
+name: Issue automatic actions
+
+on:
+  issues:
+    types: [opened]
+
+jobs:
+  issue-moderator:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Generate access token
+        id: generate_token
+        uses: tibdex/github-app-token@v2
+        with:
+          app_id: ${{ secrets.GH_APP_ID }}
+          private_key: ${{ secrets.GH_APP_KEY }}
+
+      - name: Similarity analysis
+        id: similarity
+        uses: actions-cool/issues-similarity-analysis@v1
+        with:
+          token: ${{ steps.generate_token.outputs.token }}
+          filter-threshold: 0.60
+          title-excludes: ''
+          comment-title: |
+            ### Your issue looks similar to these issues:
+            Please close if duplicate.
+          comment-body: '${index}. ${similarity} #${number}'
+
+      - name: Label if possible duplicate
+        if: steps.similarity.outputs.similar-issues-found =='true'
+        uses: actions/github-script@v8
+        with:
+          github-token: ${{ steps.generate_token.outputs.token }}
+          script: |
+            github.rest.issues.addLabels({
+              issue_number: context.issue.number,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              labels: ["possible duplicate"]
+            })
+
+      - uses: actions/checkout@v6
+
+      - name: Automatically close issues that dont follow the issue template
+        uses: lucasbento/auto-close-issues@v1.0.2
+        with:
+          github-token: ${{ steps.generate_token.outputs.token }}
+          issue-close-message: |
+            @${issue.user.login}: hello! :wave:
+            This issue is being automatically closed because it does not follow the issue template." 
+          closed-issues-label: "invalid"
+
+      - name: Check if issue mentions a provider
+        id: provider_check
+        env:
+          GH_TEXT: "${{ github.event.issue.title }} ${{ github.event.issue.body }}"
+        run: |
+          wget --output-document check_issue.py "https://raw.githubusercontent.com/recloudstream/.github/master/.github/check_issue.py"
+          pip3 install httpx
+          RES="$(python3 ./check_issue.py)"
+          echo "name=${RES}" >> $GITHUB_OUTPUT
+
+      - name: Comment if issue mentions a provider
+        if: steps.provider_check.outputs.name != 'none'
+        uses: actions-cool/issues-helper@v3
+        with:
+          actions: 'create-comment'
+          token: ${{ steps.generate_token.outputs.token }}
+          body: |
+            Hello ${{ github.event.issue.user.login }}. 
+            Please do not report any provider bugs here. This repository does not contain any providers. Please find the appropriate repository and report your issue there or join the [discord](https://discord.gg/5Hus6fM).
+            
+            Found provider name: `${{ steps.provider_check.outputs.name }}`
+
+      - name: Label if mentions provider
+        if: steps.provider_check.outputs.name != 'none'
+        uses: actions/github-script@v8
+        with:
+          github-token: ${{ steps.generate_token.outputs.token }}
+          script: |
+            github.rest.issues.addLabels({
+              issue_number: context.issue.number,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              labels: ["possible provider issue"]
+            })
+
+      - name: Add eyes reaction to all issues
+        uses: actions-cool/emoji-helper@v1.0.0
+        with:
+          type: 'issue'
+          token: ${{ steps.generate_token.outputs.token }}
+          emoji: 'eyes'

.github/workflows/prerelease.yml

@@ -12,9 +12,6 @@ concurrency:
   group: "pre-release"
   cancel-in-progress: true
 
-permissions:
-  contents: write
-
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -55,14 +52,13 @@ jobs:
         cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
 
     - name: Run Gradle
-      run: ./gradlew assemblePrereleaseRelease androidSourcesJar makeJar
+      run: ./gradlew assemblePrerelease build androidSourcesJar makeJar
       env:
         SIGNING_KEY_ALIAS: "key0"
         SIGNING_KEY_PASSWORD: ${{ steps.fetch_keystore.outputs.key_pwd }}
         SIGNING_STORE_PASSWORD: ${{ steps.fetch_keystore.outputs.key_pwd }}
         SIMKL_CLIENT_ID: ${{ secrets.SIMKL_CLIENT_ID }}
         SIMKL_CLIENT_SECRET: ${{ secrets.SIMKL_CLIENT_SECRET }}
-        TRAKT_CLIENT_ID: ${{ secrets.TRAKT_CLIENT_ID }}
         MDL_API_KEY: ${{ secrets.MDL_API_KEY }}
 
     - name: Create pre-release

.github/workflows/pull_request.yml

@@ -2,9 +2,6 @@ name: Artifact Build
 
 on: [pull_request]
 
-permissions:
-  contents: read
-
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -27,10 +24,10 @@ jobs:
         cache-read-only: false
 
     - name: Run Gradle
-      run: ./gradlew assemblePrereleaseDebug lint check
+      run: ./gradlew assemblePrereleaseDebug
 
     - name: Upload Artifact
-      uses: actions/upload-artifact@v7
+      uses: actions/upload-artifact@v6
       with:
         name: pull-request-build
         path: "app/build/outputs/apk/prerelease/debug/*.apk"

.github/workflows/update_locales.yml

@@ -11,9 +11,6 @@ concurrency:
   group: "locale"
   cancel-in-progress: true
 
-permissions:
-  contents: read
-
 jobs:
   create:
     runs-on: ubuntu-latest

app/build.gradle.kts

@@ -8,89 +8,47 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
 plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.dokka)
-    alias(libs.plugins.kotlin.serialization)
+    alias(libs.plugins.kotlin.android)
 }
 
 val javaTarget = JvmTarget.fromTarget(libs.versions.jvmTarget.get())
+val tmpFilePath = System.getProperty("user.home") + "/work/_temp/keystore/"
+val prereleaseStoreFile: File? = File(tmpFilePath).listFiles()?.first()
 
-abstract class GenerateGitHashTask : DefaultTask() {
+fun getGitCommitHash(): String {
+    return try {
+        val headFile = file("${project.rootDir}/.git/HEAD")
 
-    @get:InputFile
-    @get:PathSensitive(PathSensitivity.RELATIVE)
-    abstract val headFile: RegularFileProperty
-
-    @get:InputDirectory
-    @get:PathSensitive(PathSensitivity.RELATIVE)
-    abstract val headsDir: DirectoryProperty
-
-    @get:OutputDirectory
-    abstract val outputDir: DirectoryProperty
-
-    @TaskAction
-    fun generate() {
-        val head = headFile.get().asFile
-
-        val hash = try {
-            if (head.exists()) {
-                // Read the commit hash from .git/HEAD
-                val headContent = head.readText().trim()
-                if (headContent.startsWith("ref:")) {
-                    val refPath = headContent.substring(5) // e.g., refs/heads/main
-                    val commitFile = File(head.parentFile, refPath)
-                    if (commitFile.exists()) commitFile.readText().trim() else ""
-                } else headContent // If it's a detached HEAD (commit hash directly)
-            } else "" // If .git/HEAD doesn't exist
-        } catch (_: Throwable) {
-            "" // Just set to an empty string if any exception occurs
-        }.take(7) // Get the short commit hash
-
-        val outFile = outputDir.file("git-hash.txt").get().asFile
-        outFile.parentFile.mkdirs()
-        outFile.writeText(hash)
+        // Read the commit hash from .git/HEAD
+        if (headFile.exists()) {
+            val headContent = headFile.readText().trim()
+            if (headContent.startsWith("ref:")) {
+                val refPath = headContent.substring(5) // e.g., refs/heads/main
+                val commitFile = file("${project.rootDir}/.git/$refPath")
+                if (commitFile.exists()) commitFile.readText().trim() else ""
+            } else headContent // If it's a detached HEAD (commit hash directly)
+        } else {
+            "" // If .git/HEAD doesn't exist
+        }.take(7) // Return the short commit hash
+    } catch (_: Throwable) {
+        "" // Just return an empty string if any exception occurs
     }
 }
 
-val generateGitHash = tasks.register<GenerateGitHashTask>("generateGitHash") {
-    val gitDir = layout.projectDirectory.dir("../.git")
-
-    headFile.set(gitDir.file("HEAD"))
-    headsDir.set(gitDir.dir("refs/heads"))
-
-    outputDir.set(layout.buildDirectory.dir("generated/git"))
-}
-
 android {
     @Suppress("UnstableApiUsage")
     testOptions {
         unitTests.isReturnDefaultValues = true
     }
 
-    // Looks like google likes to add metadata only they can read https://gitlab.com/IzzyOnDroid/repo/-/work_items/491
-    dependenciesInfo {
-        // Disables dependency metadata when building APKs.
-        includeInApk = false
-        // Disables dependency metadata when building Android App Bundles.
-        includeInBundle = false
-    }
-
-    androidComponents {
-        onVariants { variant ->
-            variant.sources.assets?.addGeneratedSourceDirectory(
-                generateGitHash,
-                GenerateGitHashTask::outputDir
-            )
-        }
+    viewBinding {
+        enable = true
     }
 
     signingConfigs {
-        // We just use SIGNING_KEY_ALIAS here since it won't change
-        // so won't kill the configuration cache.
-        if (System.getenv("SIGNING_KEY_ALIAS") != null) {
+        if (prereleaseStoreFile != null) {
             create("prerelease") {
-                val tmpFilePath = System.getProperty("user.home") + "/work/_temp/keystore/"
-                val prereleaseStoreFile: File? = File(tmpFilePath).listFiles()?.first()
-
-                storeFile = prereleaseStoreFile?.let { file(it) }
+                storeFile = file(prereleaseStoreFile)
                 storePassword = System.getenv("SIGNING_STORE_PASSWORD")
                 keyAlias = System.getenv("SIGNING_KEY_ALIAS")
                 keyPassword = System.getenv("SIGNING_KEY_PASSWORD")
@@ -104,8 +62,10 @@ android {
         applicationId = "com.lagradost.cloudstream3"
         minSdk = libs.versions.minSdk.get().toInt()
         targetSdk = libs.versions.targetSdk.get().toInt()
-        versionCode = libs.versions.versionCode.get().toInt()
-        versionName = libs.versions.versionName.get()
+        versionCode = 67
+        versionName = "4.6.1"
+
+        resValue("string", "commit_hash", getGitCommitHash())
 
         manifestPlaceholders["target_sdk_version"] = libs.versions.targetSdk.get()
 
@@ -175,28 +135,21 @@ android {
     }
 
     java {
-        // Use Java 17 toolchain even if a higher JDK runs the build.
+	    // Use Java 17 toolchain even if a higher JDK runs the build.
         // We still use Java 8 for now which higher JDKs have deprecated.
-        toolchain {
-            languageVersion.set(JavaLanguageVersion.of(libs.versions.jdkToolchain.get()))
-        }
+	    toolchain {
+		    languageVersion.set(JavaLanguageVersion.of(libs.versions.jdkToolchain.get()))
+    	}
     }
 
     lint {
+        abortOnError = false
         checkReleaseBuilds = false
     }
 
     buildFeatures {
         buildConfig = true
-        viewBinding = true
-    }
-
-    packaging {
-        jniLibs {
-            // Enables legacy JNI packaging to reduce APK size (similar to builds before minSdk 23).
-            // Note: This may increase app startup time slightly.
-            useLegacyPackaging = true
-        }
+        resValues = true
     }
 
     namespace = "com.lagradost.cloudstream3"
@@ -207,22 +160,17 @@ dependencies {
     testImplementation(libs.junit)
     testImplementation(libs.json)
     androidTestImplementation(libs.core)
-    androidTestImplementation(libs.espresso.core)
+    implementation(libs.junit.ktx)
     androidTestImplementation(libs.ext.junit)
-    androidTestImplementation(libs.instancio.core)
-    androidTestImplementation(libs.junit.ktx)
-    androidTestImplementation(libs.kotlin.test)
+    androidTestImplementation(libs.espresso.core)
 
     // Android Core & Lifecycle
     implementation(libs.core.ktx)
     implementation(libs.activity.ktx)
-    implementation(libs.annotation)
     implementation(libs.appcompat)
     implementation(libs.fragment.ktx)
     implementation(libs.bundles.lifecycle)
     implementation(libs.bundles.navigation)
-    implementation(libs.kotlinx.collections.immutable)
-    implementation(libs.kotlinx.serialization.json) // JSON Parser
 
     // Design & UI
     implementation(libs.preference.ktx)
@@ -239,9 +187,6 @@ dependencies {
     // FFmpeg Decoding
     implementation(libs.bundles.nextlib)
 
-    // Anime-db for filler
-    implementation(libs.anime.db)
-
     // PlayBack
     implementation(libs.colorpicker) // Subtitle Color Picker
     implementation(libs.newpipeextractor) // For Trailers
@@ -259,15 +204,13 @@ dependencies {
     // Extensions & Other Libs
     implementation(libs.jsoup) // HTML Parser
     implementation(libs.rhino) // Run JavaScript
+    implementation(libs.fuzzywuzzy) // Library/Ext Searching with Levenshtein Distance
     implementation(libs.safefile) // To Prevent the URI File Fu*kery
     coreLibraryDesugaring(libs.desugar.jdk.libs.nio) // NIO Flavor Needed for NewPipeExtractor
     implementation(libs.conscrypt.android) // To Fix SSL Fu*kery on Android 9
     implementation(libs.jackson.module.kotlin) // JSON Parser
     implementation(libs.zipline)
 
-    // Deprecated; will be removed once extensions have time to migrate from using it
-    implementation("me.xdrop:fuzzywuzzy:1.4.0")
-
     // Torrent Support
     implementation(libs.torrentserver)
 
@@ -275,7 +218,18 @@ dependencies {
     implementation(libs.work.runtime.ktx)
     implementation(libs.nicehttp) // HTTP Lib
 
-    implementation(project(":library"))
+    implementation(project(":library") {
+        // There does not seem to be a good way of getting the android flavor.
+        val isDebug = gradle.startParameter.taskRequests.any { task ->
+            task.args.any { arg ->
+                arg.contains("debug", true)
+            }
+        }
+
+        this.extra.set("isDebug", isDebug)
+    })
+    // Extra brightness video filters
+    implementation(libs.gpuv)
 }
 
 tasks.register<Jar>("androidSourcesJar") {
@@ -312,22 +266,16 @@ tasks.withType<KotlinJvmCompile> {
     compilerOptions {
         jvmTarget.set(javaTarget)
         jvmDefault.set(JvmDefaultMode.ENABLE)
+        optIn.add("com.lagradost.cloudstream3.Prerelease")
         freeCompilerArgs.add("-Xannotation-default-target=param-property")
-        optIn.addAll(
-            "com.lagradost.cloudstream3.InternalAPI",
-            "com.lagradost.cloudstream3.Prerelease",
-            "kotlin.uuid.ExperimentalUuidApi",
-        )
     }
 }
 
 dokka {
     moduleName = "App"
     dokkaSourceSets {
-        configureEach {
-            suppress = name != "prereleaseDebug"
+        main {
             analysisPlatform = KotlinPlatform.JVM
-            displayName = "JVM"
             documentedVisibilities(
                 VisibilityModifier.Public,
                 VisibilityModifier.Protected

app/lint.xml

@@ -5,9 +5,4 @@
 
     <!-- We don't care about MissingTranslation since it's handled by weblate. -->
     <issue id="MissingTranslation" severity="ignore" />
-
-    <!-- We only care about the source language here. -->
-    <issue id="StringFormatInvalid">
-        <ignore path="**/res/values-*/**" />
-    </issue>
 </lint>

app/src/androidTest/java/com/lagradost/cloudstream3/SerializationClassTester.kt

@@ -1,134 +0,0 @@
-package com.lagradost.cloudstream3
-
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.platform.app.InstrumentationRegistry
-import com.lagradost.cloudstream3.utils.AppUtils.toJson
-import dalvik.system.DexFile
-import kotlinx.serialization.ExperimentalSerializationApi
-import kotlinx.serialization.InternalSerializationApi
-import kotlinx.serialization.KSerializer
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.serializer
-import kotlinx.serialization.serializerOrNull
-import org.instancio.Instancio
-import org.junit.Test
-import org.junit.runner.RunWith
-import kotlin.reflect.KClass
-import kotlin.reflect.jvm.jvmName
-import kotlin.test.assertEquals
-import kotlin.test.assertNotNull
-
-@RunWith(AndroidJUnit4::class)
-class SerializationClassTester {
-    // Same as app, or using app reference
-    val jacksonMapper = mapper
-    val kotlinxMapper = json
-
-    @Test
-    fun isIdenticalSerialization() {
-        val serializableClasses = findSerializableClasses("com.lagradost")
-        println("Number of serializable classes: ${serializableClasses.size}")
-
-        serializableClasses.forEach { kClass ->
-            val instance = Instancio.create(kClass.java)
-
-            val jacksonJson = jacksonMapper.writeValueAsString(instance)
-            val kotlinxJson = serializeWithKotlinx(kClass, instance)
-
-            assertEquals(
-                jacksonJson,
-                kotlinxJson,
-                """
-                    Serialization mismatch for:
-                    ${kClass.qualifiedName}
-
-                    Jackson:
-                    $jacksonJson
-
-                    Kotlinx:
-                    $kotlinxJson
-                    
-                    """.trimIndent()
-            )
-            println("Identical serialization for: ${kClass.jvmName}")
-        }
-    }
-
-    @OptIn(InternalSerializationApi::class, ExperimentalSerializationApi::class)
-    @Test
-    fun isIdenticalDeserialization() {
-        val serializableClasses = findSerializableClasses("com.lagradost")
-        println("Number of serializable classes: ${serializableClasses.size}")
-
-        serializableClasses.forEach { kClass ->
-            val instance = Instancio.create(kClass.java)
-            // Convert to JSON to get example JSON object
-            // We prefer jackson here because the app may have many jackson JSON strings in local storage
-            val originalJson = jacksonMapper.writeValueAsString(instance)
-
-            // Create an object from the JSON using kotlinx
-            val serializer =
-                kClass.serializerOrNull() ?: kotlinxMapper.serializersModule.getContextual(kClass)
-            assertNotNull(serializer, "The class: ${kClass.jvmName} must be serializable!")
-            val kotlinxDecoded = kotlinxMapper.decodeFromString(serializer, originalJson)
-
-            // Create an object from the JSON using jackson
-            val mapperDecoded = jacksonMapper.readValue(originalJson, kClass.java)
-
-
-            // Deep inspect both object using the mapper toJson function.
-            // This deep equality check can be performed using other methods, but this just works.
-            val jacksonJson = mapperDecoded.toJson()
-            val kotlinxJson = kotlinxDecoded.toJson()
-
-            assertEquals(
-                jacksonJson,
-                kotlinxJson,
-                """
-                    Serialization mismatch for:
-                    ${kClass.qualifiedName}
-
-                    Jackson:
-                    $jacksonJson
-
-                    Kotlinx:
-                    $kotlinxJson
-                    
-                    """.trimIndent()
-            )
-            println("Identical deserialization for: ${kClass.jvmName}")
-        }
-    }
-
-    // DEX files are the best solution to read all our classes dynamically.
-    // classgraph could be used instead, but it only gives results on the JVM, not Android.
-    @Suppress("DEPRECATION")
-    private fun findSerializableClasses(packageName: String): List<KClass<*>> {
-        val context = InstrumentationRegistry
-            .getInstrumentation()
-            .targetContext
-
-        val dexFile = DexFile(context.packageCodePath)
-        return dexFile.entries()
-            .toList()
-            .filter { it.startsWith(packageName) }
-            .mapNotNull {
-                runCatching { Class.forName(it).kotlin }.getOrNull()
-            }.filter { kClass ->
-                // Not possible to use .hasAnnotation() on newer Android versions.
-                kClass.java.annotations.any {
-                    it is Serializable
-                }
-            }
-    }
-
-    @OptIn(InternalSerializationApi::class)
-    @Suppress("UNCHECKED_CAST")
-    private fun serializeWithKotlinx(
-        kClass: KClass<*>,
-        value: Any
-    ): String {
-        val serializer = kClass.serializer() as KSerializer<Any>
-        return kotlinxMapper.encodeToString(serializer, value)
-    }
-}

app/src/androidTest/java/com/lagradost/cloudstream3/utils/serializers/SerializerTest.kt

@@ -1,157 +0,0 @@
-package com.lagradost.cloudstream3.utils.serializers
-
-import android.net.Uri
-import com.lagradost.cloudstream3.utils.AppUtils.parseJson
-import com.lagradost.cloudstream3.utils.AppUtils.toJson
-import kotlinx.serialization.ExperimentalSerializationApi
-import kotlinx.serialization.KeepGeneratedSerializer
-import kotlinx.serialization.Serializable
-import org.junit.Assert.assertEquals
-import org.junit.Assert.assertFalse
-import org.junit.Assert.assertNull
-import org.junit.Assert.assertTrue
-import org.junit.Test
-
-@OptIn(ExperimentalSerializationApi::class)
-@KeepGeneratedSerializer
-@Serializable(with = NonEmptyData.Serializer::class)
-data class NonEmptyData(
-    val title: String = "",
-    val tags: List<String> = emptyList(),
-    val meta: Map<String, String> = emptyMap(),
-    val name: String = "hello",
-) {
-    object Serializer : NonEmptySerializer<NonEmptyData>(NonEmptyData.generatedSerializer())
-}
-
-@OptIn(ExperimentalSerializationApi::class)
-@KeepGeneratedSerializer
-@Serializable(with = WriteOnlyData.Serializer::class)
-data class WriteOnlyData(
-    val fieldA: String = "",
-    val fieldB: String = "",
-) {
-    object Serializer : WriteOnlySerializer<WriteOnlyData>(
-        WriteOnlyData.generatedSerializer(),
-        setOf("fieldB"),
-    )
-}
-
-@OptIn(ExperimentalSerializationApi::class)
-@KeepGeneratedSerializer
-@Serializable(with = MultiWriteOnly.Serializer::class)
-data class MultiWriteOnly(
-    val fieldA: String = "",
-    val fieldB: String = "",
-    val fieldC: String = "",
-) {
-    object Serializer : WriteOnlySerializer<MultiWriteOnly>(
-        MultiWriteOnly.generatedSerializer(),
-        setOf("fieldB", "fieldC"),
-    )
-}
-
-@Serializable
-data class UriData(
-    @Serializable(with = UriSerializer::class)
-    val uri: Uri = Uri.EMPTY,
-)
-
-class SerializerTest {
-
-    @Test
-    fun nonEmptySerializerOmitsEmptyStrings() {
-        val data = NonEmptyData(title = "", name = "hello")
-        val result = data.toJson()
-        assertFalse(result.contains("title"))
-        assertTrue(result.contains("name"))
-    }
-
-    @Test
-    fun nonEmptySerializerOmitsEmptyLists() {
-        val data = NonEmptyData(tags = emptyList(), name = "hello")
-        val result = data.toJson()
-        assertFalse(result.contains("tags"))
-    }
-
-    @Test
-    fun nonEmptySerializerOmitsEmptyMaps() {
-        val data = NonEmptyData(meta = emptyMap(), name = "hello")
-        val result = data.toJson()
-        assertFalse(result.contains("meta"))
-    }
-
-    @Test
-    fun nonEmptySerializerKeepsNonEmptyFields() {
-        val data = NonEmptyData(title = "hello", tags = listOf("a"), meta = mapOf("k" to "v"))
-        val result = data.toJson()
-        assertTrue(result.contains("title"))
-        assertTrue(result.contains("tags"))
-        assertTrue(result.contains("meta"))
-    }
-
-    @Test
-    fun nonEmptySerializerDoesNotAffectDeserialization() {
-        val input = """{"title":"hello","tags":["a"],"meta":{"k":"v"},"name":"world"}"""
-        val result = parseJson<NonEmptyData>(input)
-        assertEquals("hello", result.title)
-        assertEquals(listOf("a"), result.tags)
-        assertEquals(mapOf("k" to "v"), result.meta)
-        assertEquals("world", result.name)
-    }
-
-    @Test
-    fun writeOnlySerializerOmitsFieldOnSerialize() {
-        val data = WriteOnlyData(fieldA = "hello", fieldB = "secret")
-        val result = data.toJson()
-        assertTrue(result.contains("fieldA"))
-        assertFalse(result.contains("fieldB"))
-    }
-
-    @Test
-    fun writeOnlySerializerDeserializesNormally() {
-        val input = """{"fieldA":"hello","fieldB":"secret"}"""
-        val result = parseJson<WriteOnlyData>(input)
-        assertEquals("hello", result.fieldA)
-        assertEquals("secret", result.fieldB)
-    }
-
-    @Test
-    fun writeOnlySerializerDeserializesMissingAsDefault() {
-        val input = """{"fieldA":"hello"}"""
-        val result = parseJson<WriteOnlyData>(input)
-        assertEquals("hello", result.fieldA)
-        assertEquals("", result.fieldB)
-    }
-
-    @Test
-    fun writeOnlySerializerHandlesMultipleKeys() {
-        val data = MultiWriteOnly(fieldA = "hello", fieldB = "secret1", fieldC = "secret2")
-        val result = data.toJson()
-        assertTrue(result.contains("fieldA"))
-        assertFalse(result.contains("fieldB"))
-        assertFalse(result.contains("fieldC"))
-    }
-
-    @Test
-    fun uriSerializerSerializesUriToString() {
-        val data = UriData(uri = Uri.parse("https://example.com/path?query=1"))
-        val result = data.toJson()
-        assertTrue(result.contains("https://example.com/path?query=1"))
-    }
-
-    @Test
-    fun uriSerializerDeserializesStringToUri() {
-        val input = """{"uri":"https://example.com/path?query=1"}"""
-        val result = parseJson<UriData>(input)
-        assertEquals(Uri.parse("https://example.com/path?query=1"), result.uri)
-    }
-
-    @Test
-    fun uriSerializerRoundtripsCorrectly() {
-        val data = UriData(uri = Uri.parse("https://example.com/path?query=1"))
-        val encoded = data.toJson()
-        val decoded = parseJson<UriData>(encoded)
-        assertEquals(data.uri, decoded.uri)
-    }
-}

app/src/main/AndroidManifest.xml

@@ -22,47 +22,6 @@
         android:name="android.permission.QUERY_ALL_PACKAGES"
         tools:ignore="QueryAllPackagesPermission" />
 
-    <queries>
-        <!-- 
-            QUERY_ALL_PACKAGES does not work on some devices running Android 11+ (like Google TV 14), 
-            so we must explicitly specify the packages and intent patterns we query to ensure visibility.
-        -->
-        <!-- For external video players -->
-        <intent>
-            <action android:name="android.intent.action.VIEW" />
-            <data android:mimeType="video/*" />
-        </intent>
-        <intent>
-            <action android:name="android.intent.action.VIEW" />
-            <data android:mimeType="application/x-mpegURL" />
-        </intent>
-        <intent>
-            <action android:name="android.intent.action.VIEW" />
-            <data android:mimeType="application/vnd.apple.mpegurl" />
-        </intent>
-        <intent>
-            <action android:name="android.intent.action.VIEW" />
-            <data android:scheme="magnet" />
-        </intent>
-
-        <!-- Common players supported in actions/temp -->
-        <package android:name="org.videolan.vlc" />
-        <package android:name="org.videolan.vlc.debug" />
-        <package android:name="is.xyz.mpv" />
-        <package android:name="is.xyz.mpv.ytdl" />
-        <package android:name="app.marlboroadvance.mpvex" />
-        <package android:name="live.mehiz.mpvkt" />
-        <package android:name="live.mehiz.mpvkt.preview" />
-        <package android:name="com.brouken.player" />
-        <package android:name="dev.anilbeesetti.nextplayer" />
-        <package android:name="com.instantbits.cast.webvideo" />
-        <package android:name="com.gianlu.aria2android" />
-        
-        <!-- Torrent clients -->
-        <package android:name="org.proninyaroslav.libretorrent" />
-        <package android:name="com.biglybt.android.client" />
-    </queries>
-
     <!-- Fixes android tv fuckery -->
     <uses-feature
         android:name="android.hardware.touchscreen"
@@ -149,31 +108,14 @@
         android:launchMode="singleTask"
         is a bit experimental, it makes loading repositories from browser still stay on the same page
         no idea about side effects
-
-        Not exported to prevent bypassing the AccountSelectActivity
         -->
         <activity
             android:name=".MainActivity"
             android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout|keyboard|keyboardHidden|navigation|uiMode"
-            android:exported="false"
+            android:exported="true"
             android:launchMode="singleTask"
             android:resizeableActivity="true"
-            android:supportsPictureInPicture="true" />
-
-        <activity
-            android:name=".ui.account.AccountSelectActivity"
-            android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout|keyboard|keyboardHidden"
-            android:exported="true">
-            <intent-filter android:exported="true">
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-                <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
+            android:supportsPictureInPicture="true">
 
             <!-- cloudstreamplayer://encodedUrl?name=Dune -->
             <intent-filter>
@@ -231,7 +173,7 @@
                 <data android:scheme="cloudstreamcontinuewatching" />
             </intent-filter>
 
-            <intent-filter android:autoVerify="false">
+            <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
                 <category android:name="android.intent.category.DEFAULT" />
@@ -244,6 +186,21 @@
             </intent-filter>
         </activity>
 
+        <activity
+            android:name=".ui.account.AccountSelectActivity"
+            android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout|keyboard|keyboardHidden"
+            android:exported="true">
+            <intent-filter android:exported="true">
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+                <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
         <receiver
             android:name=".receivers.VideoDownloadRestartReceiver"
             android:enabled="false"
@@ -259,12 +216,6 @@
             android:foregroundServiceType="dataSync"
             android:exported="false" />
 
-        <service
-            android:name=".services.DownloadQueueService"
-            android:enabled="true"
-            android:foregroundServiceType="dataSync"
-            android:exported="false" />
-
         <!-- Necessary for WorkManager services: https://stackoverflow.com/a/77186316 -->
         <service
             android:name="androidx.work.impl.foreground.SystemForegroundService"

app/src/main/java/com/lagradost/cloudstream3/AcraApplication.kt

@@ -1,78 +1,103 @@
 package com.lagradost.cloudstream3
 
+import android.content.Context
+import com.lagradost.api.setContext
+import com.lagradost.cloudstream3.utils.DataStore.getKey
+import com.lagradost.cloudstream3.utils.DataStore.removeKeys
+import com.lagradost.cloudstream3.utils.DataStore.setKey
+import java.lang.ref.WeakReference
+
 /**
  * Deprecated alias for CloudStreamApp for backwards compatibility with plugins.
  * Use CloudStreamApp instead.
  */
-@Deprecated(
+// Deprecate after next stable
+/*@Deprecated(
     message = "AcraApplication is deprecated, use CloudStreamApp instead",
     replaceWith = ReplaceWith("com.lagradost.cloudstream3.CloudStreamApp"),
     level = DeprecationLevel.WARNING
-)
+)*/
 class AcraApplication {
+	// All methods here can be changed to be a wrapper around CloudStream app
+	// without a seperate deprecation after next stable. All methods should
+	// also be deprecated at that time.
 	companion object {
 
-		@Deprecated(
+		// This can be removed without deprecation after next stable
+		private var _context: WeakReference<Context>? = null
+		/*@Deprecated(
 		    message = "AcraApplication is deprecated, use CloudStreamApp instead",
 		    replaceWith = ReplaceWith("com.lagradost.cloudstream3.CloudStreamApp.context"),
 		    level = DeprecationLevel.WARNING
-		)
-		val context get() = CloudStreamApp.context
+		)*/
+		var context
+		get() = _context?.get()
+		internal set(value) {
+			_context = WeakReference(value)
+			setContext(WeakReference(value))
+		}
 
-		@Deprecated(
+		/*@Deprecated(
 		    message = "AcraApplication is deprecated, use CloudStreamApp instead",
 		    replaceWith = ReplaceWith("com.lagradost.cloudstream3.CloudStreamApp.removeKeys(folder)"),
 		    level = DeprecationLevel.WARNING
-		)
-		fun removeKeys(folder: String): Int? =
-		    CloudStreamApp.removeKeys(folder)
+		)*/
+		fun removeKeys(folder: String): Int? {
+            return context?.removeKeys(folder)
+        }
 
-		@Deprecated(
+		/*@Deprecated(
 		    message = "AcraApplication is deprecated, use CloudStreamApp instead",
 		    replaceWith = ReplaceWith("com.lagradost.cloudstream3.CloudStreamApp.setKey(path, value)"),
 		    level = DeprecationLevel.WARNING
-		)
-		fun <T> setKey(path: String, value: T) =
-			CloudStreamApp.setKey(path, value)
+		)*/
+		fun <T> setKey(path: String, value: T) {
+			context?.setKey(path, value)
+		}
 
-		@Deprecated(
+		/*@Deprecated(
 		    message = "AcraApplication is deprecated, use CloudStreamApp instead",
 		    replaceWith = ReplaceWith("com.lagradost.cloudstream3.CloudStreamApp.setKey(folder, path, value)"),
 		    level = DeprecationLevel.WARNING
-		)
-		fun <T> setKey(folder: String, path: String, value: T) =
-			CloudStreamApp.setKey(folder, path, value)
+		)*/
+		fun <T> setKey(folder: String, path: String, value: T) {
+			context?.setKey(folder, path, value)
+		}
 
-		@Deprecated(
+		/*@Deprecated(
 		    message = "AcraApplication is deprecated, use CloudStreamApp instead",
 		    replaceWith = ReplaceWith("com.lagradost.cloudstream3.CloudStreamApp.getKey(path, defVal)"),
 		    level = DeprecationLevel.WARNING
-		)
-		inline fun <reified T : Any> getKey(path: String, defVal: T?): T? =
-			CloudStreamApp.getKey(path, defVal)
+		)*/
+		inline fun <reified T : Any> getKey(path: String, defVal: T?): T? {
+			return context?.getKey(path, defVal)
+		}
 
-		@Deprecated(
+		/*@Deprecated(
 		    message = "AcraApplication is deprecated, use CloudStreamApp instead",
 		    replaceWith = ReplaceWith("com.lagradost.cloudstream3.CloudStreamApp.getKey(path)"),
 		    level = DeprecationLevel.WARNING
-		)
-		inline fun <reified T : Any> getKey(path: String): T? =
-			CloudStreamApp.getKey(path)
+		)*/
+		inline fun <reified T : Any> getKey(path: String): T? {
+			return context?.getKey(path)
+		}
 
-		@Deprecated(
+		/*@Deprecated(
 		    message = "AcraApplication is deprecated, use CloudStreamApp instead",
 		    replaceWith = ReplaceWith("com.lagradost.cloudstream3.CloudStreamApp.getKey(folder, path)"),
 		    level = DeprecationLevel.WARNING
-		)
-		inline fun <reified T : Any> getKey(folder: String, path: String): T? =
-		    CloudStreamApp.getKey(folder, path)
+		)*/
+		inline fun <reified T : Any> getKey(folder: String, path: String): T? {
+			return context?.getKey(folder, path)
+		}
 
-		@Deprecated(
+		/*@Deprecated(
 		    message = "AcraApplication is deprecated, use CloudStreamApp instead",
 		    replaceWith = ReplaceWith("com.lagradost.cloudstream3.CloudStreamApp.getKey(folder, path, defVal)"),
 		    level = DeprecationLevel.WARNING
-		)
-		inline fun <reified T : Any> getKey(folder: String, path: String, defVal: T?): T? =
-			CloudStreamApp.getKey(folder, path, defVal)
+		)*/
+		inline fun <reified T : Any> getKey(folder: String, path: String, defVal: T?): T? {
+			return context?.getKey(folder, path, defVal)
+		}
 	}
 }

app/src/main/java/com/lagradost/cloudstream3/CloudStreamApp.kt

@@ -13,7 +13,6 @@ import coil3.ImageLoader
 import coil3.PlatformContext
 import coil3.SingletonImageLoader
 import com.lagradost.api.setContext
-import com.lagradost.cloudstream3.BuildConfig
 import com.lagradost.cloudstream3.mvvm.safe
 import com.lagradost.cloudstream3.mvvm.safeAsync
 import com.lagradost.cloudstream3.plugins.PluginManager
@@ -21,7 +20,6 @@ import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR
 import com.lagradost.cloudstream3.ui.settings.Globals.TV
 import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
 import com.lagradost.cloudstream3.utils.AppContextUtils.openBrowser
-import com.lagradost.cloudstream3.utils.AppDebug
 import com.lagradost.cloudstream3.utils.Coroutines.runOnMainThread
 import com.lagradost.cloudstream3.utils.DataStore.getKey
 import com.lagradost.cloudstream3.utils.DataStore.getKeys
@@ -67,6 +65,7 @@ class ExceptionHandler(
     }
 }
 
+@Prerelease
 class CloudStreamApp : Application(), SingletonImageLoader.Factory {
 
     override fun onCreate() {
@@ -82,13 +81,13 @@ class CloudStreamApp : Application(), SingletonImageLoader.Factory {
             exceptionHandler = it
             Thread.setDefaultUncaughtExceptionHandler(it)
         }
-
-        AppDebug.isDebug = BuildConfig.DEBUG
     }
 
     override fun attachBaseContext(base: Context?) {
         super.attachBaseContext(base)
         context = base
+        // This can be removed without deprecation after next stable
+        AcraApplication.context = context
     }
 
     override fun newImageLoader(context: PlatformContext): ImageLoader {

app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt

@@ -9,8 +9,6 @@ import android.content.res.Configuration
 import android.content.res.Resources
 import android.Manifest
 import android.os.Build
-import android.os.Handler
-import android.os.Looper
 import android.util.DisplayMetrics
 import android.util.Log
 import android.view.Gravity
@@ -41,6 +39,7 @@ import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.syncproviders.AccountManager
 import com.lagradost.cloudstream3.ui.home.HomeChildItemAdapter
 import com.lagradost.cloudstream3.ui.home.ParentItemAdapter
+import com.lagradost.cloudstream3.ui.player.PlayerEventType
 import com.lagradost.cloudstream3.ui.player.PlayerPipHelper.isPIPPossible
 import com.lagradost.cloudstream3.ui.player.Torrent
 import com.lagradost.cloudstream3.ui.result.ActorAdaptor
@@ -116,6 +115,7 @@ object CommonActivity {
     val onColorSelectedEvent = Event<Pair<Int, Int>>()
     val onDialogDismissedEvent = Event<Int>()
 
+    var playerEventListener: ((PlayerEventType) -> Unit)? = null
     var keyEventListener: ((Pair<KeyEvent?, Boolean>) -> Boolean)? = null
     var appliedTheme: Int = 0
     var appliedColor: Int = 0
@@ -191,16 +191,6 @@ object CommonActivity {
             currentToast = toast
             toast.show()
 
-            val handler = Handler(Looper.getMainLooper())
-            val ref = WeakReference(toast)
-
-            /* Clean up activity leak */
-            handler.postDelayed({
-                if (ref.get() == currentToast) {
-                    currentToast = null
-                }
-            }, 10_000)
-
         } catch (e: Exception) {
             logError(e)
         }
@@ -244,8 +234,19 @@ object CommonActivity {
     fun init(act: Activity) {
         setActivityInstance(act)
         ioSafe { Torrent.deleteAllFiles() }
+
+        // Clear all pools to apply the correct theme
+        for (pool in arrayOf(
+            PluginAdapter.sharedPool, HomeChildItemAdapter.sharedPool,
+            ParentItemAdapter.sharedPool, ActorAdaptor.sharedPool, EpisodeAdapter.sharedPool,
+            SearchAdapter.sharedPool, ImageAdapter.sharedPool
+        )) {
+            pool.clear()
+        }
+
         val componentActivity = activity as? ComponentActivity ?: return
 
+
         componentActivity.updateLocale()
         componentActivity.updateTv()
         AccountManager.initMainAPI()
@@ -532,7 +533,87 @@ object CommonActivity {
 
 
     fun onKeyDown(act: Activity?, keyCode: Int, event: KeyEvent?): Boolean? {
+
+        // 149 keycode_numpad 5
+        val playerEvent = when (keyCode) {
+            KeyEvent.KEYCODE_FORWARD, KeyEvent.KEYCODE_D, KeyEvent.KEYCODE_MEDIA_SKIP_FORWARD, KeyEvent.KEYCODE_MEDIA_FAST_FORWARD -> {
+                PlayerEventType.SeekForward
+            }
+
+            KeyEvent.KEYCODE_A, KeyEvent.KEYCODE_MEDIA_SKIP_BACKWARD, KeyEvent.KEYCODE_MEDIA_REWIND -> {
+                PlayerEventType.SeekBack
+            }
+
+            KeyEvent.KEYCODE_MEDIA_NEXT, KeyEvent.KEYCODE_BUTTON_R1, KeyEvent.KEYCODE_N, KeyEvent.KEYCODE_NUMPAD_2, KeyEvent.KEYCODE_CHANNEL_UP -> {
+                PlayerEventType.NextEpisode
+            }
+
+            KeyEvent.KEYCODE_MEDIA_PREVIOUS, KeyEvent.KEYCODE_BUTTON_L1, KeyEvent.KEYCODE_B, KeyEvent.KEYCODE_NUMPAD_1, KeyEvent.KEYCODE_CHANNEL_DOWN -> {
+                PlayerEventType.PrevEpisode
+            }
+
+            KeyEvent.KEYCODE_MEDIA_PAUSE -> {
+                PlayerEventType.Pause
+            }
+
+            KeyEvent.KEYCODE_MEDIA_PLAY, KeyEvent.KEYCODE_BUTTON_START -> {
+                PlayerEventType.Play
+            }
+
+            KeyEvent.KEYCODE_L, KeyEvent.KEYCODE_NUMPAD_7, KeyEvent.KEYCODE_7 -> {
+                PlayerEventType.Lock
+            }
+
+            KeyEvent.KEYCODE_H, KeyEvent.KEYCODE_MENU -> {
+                PlayerEventType.ToggleHide
+            }
+
+            KeyEvent.KEYCODE_M, KeyEvent.KEYCODE_VOLUME_MUTE -> {
+                PlayerEventType.ToggleMute
+            }
+
+            KeyEvent.KEYCODE_S, KeyEvent.KEYCODE_NUMPAD_9, KeyEvent.KEYCODE_9 -> {
+                PlayerEventType.ShowMirrors
+            }
+            // OpenSubtitles shortcut
+            KeyEvent.KEYCODE_O, KeyEvent.KEYCODE_NUMPAD_8, KeyEvent.KEYCODE_8 -> {
+                PlayerEventType.SearchSubtitlesOnline
+            }
+
+            KeyEvent.KEYCODE_E, KeyEvent.KEYCODE_NUMPAD_3, KeyEvent.KEYCODE_3 -> {
+                PlayerEventType.ShowSpeed
+            }
+
+            KeyEvent.KEYCODE_R, KeyEvent.KEYCODE_NUMPAD_0, KeyEvent.KEYCODE_0 -> {
+                PlayerEventType.Resize
+            }
+
+            KeyEvent.KEYCODE_C, KeyEvent.KEYCODE_NUMPAD_4, KeyEvent.KEYCODE_4 -> {
+                PlayerEventType.SkipOp
+            }
+
+            KeyEvent.KEYCODE_V, KeyEvent.KEYCODE_NUMPAD_5, KeyEvent.KEYCODE_5 -> {
+                PlayerEventType.SkipCurrentChapter
+            }
+
+            KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE, KeyEvent.KEYCODE_P, KeyEvent.KEYCODE_SPACE, KeyEvent.KEYCODE_NUMPAD_ENTER, KeyEvent.KEYCODE_ENTER -> { // space is not captured due to navigation
+                PlayerEventType.PlayPauseToggle
+            }
+
+            else -> return null
+        }
+        val listener = playerEventListener
+        if (listener != null) {
+            listener.invoke(playerEvent)
+            return true
+        }
         return null
+
+        //when (keyCode) {
+        //    KeyEvent.KEYCODE_DPAD_CENTER -> {
+        //        println("DPAD PRESSED")
+        //    }
+        //}
     }
 
     /** overrides focus and custom key events */
@@ -579,10 +660,8 @@ object CommonActivity {
 
             // TODO: Figure out why removing the check for SearchAutoComplete seems
             // to break focus on TV as it shouldn't need to be used.
-            // Also handle KEYCODE_ENTER here because some remotes (e.g. LG Magic Remote)
-            // send KEYCODE_ENTER instead of KEYCODE_DPAD_CENTER when clicking the OK button.
             @SuppressLint("RestrictedApi")
-            if ((keyCode == KeyEvent.KEYCODE_DPAD_CENTER || keyCode == KeyEvent.KEYCODE_ENTER) &&
+            if (keyCode == KeyEvent.KEYCODE_DPAD_CENTER &&
                 (act.currentFocus is SearchView || act.currentFocus is SearchView.SearchAutoComplete)
             ) {
                 showInputMethod(act.currentFocus?.findFocus())
@@ -603,4 +682,4 @@ object CommonActivity {
         }
         return null
     }
-}
+}

app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt

@@ -29,6 +29,7 @@ import androidx.annotation.MainThread
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import androidx.cardview.widget.CardView
+import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.content.edit
 import androidx.core.net.toUri
 import androidx.core.view.children
@@ -105,6 +106,7 @@ import com.lagradost.cloudstream3.ui.SyncWatchType
 import com.lagradost.cloudstream3.ui.WatchType
 import com.lagradost.cloudstream3.ui.account.AccountHelper.showAccountSelectLinear
 import com.lagradost.cloudstream3.ui.download.DOWNLOAD_NAVIGATE_TO
+import com.lagradost.cloudstream3.ui.home.HomeFragment
 import com.lagradost.cloudstream3.ui.home.HomeViewModel
 import com.lagradost.cloudstream3.ui.library.LibraryViewModel
 import com.lagradost.cloudstream3.ui.player.BasicLink
@@ -188,9 +190,11 @@ import java.nio.charset.Charset
 import kotlin.math.abs
 import kotlin.math.absoluteValue
 import kotlin.system.exitProcess
-import com.lagradost.cloudstream3.utils.downloader.DownloadQueueManager
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.cancel
+import androidx.core.net.toUri
+import androidx.tvprovider.media.tv.Channel
+import androidx.tvprovider.media.tv.TvContractCompat
+import android.content.ComponentName
+import android.content.ContentUris
 
 class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCallback {
     companion object {
@@ -200,21 +204,6 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
         const val ANIMATED_OUTLINE: Boolean = false
         var lastError: String? = null
 
-        /** Update lastError variable based on error file, to check if app crashed.
-         * Can be called multiple times without changing the lastError variable changing.
-         **/
-        fun setLastError(context: Context) {
-            if (lastError != null) return
-
-            val errorFile = context.filesDir.resolve("last_error")
-            if (errorFile.exists() && errorFile.isFile) {
-                lastError = errorFile.readText(Charset.defaultCharset())
-                errorFile.delete()
-            } else {
-                lastError = null
-            }
-        }
-
         private const val FILE_DELETE_KEY = "FILES_TO_DELETE_KEY"
         const val API_NAME_EXTRA_KEY = "API_NAME_EXTRA_KEY"
 
@@ -276,6 +265,7 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
          * @return true if the str has launched an app task (be it successful or not)
          * @param isWebview does not handle providers and opening download page if true. Can still add repos and login.
          * */
+        @Suppress("DEPRECATION_ERROR")
         fun handleAppIntentUrl(
             activity: FragmentActivity?,
             str: String?,
@@ -362,8 +352,7 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
                                 LinkGenerator(
                                     listOf(BasicLink(url, name)),
                                     extract = true,
-                                    id = url.hashCode()
-                                ), 0
+                                )
                             )
                         )
                     } else if (safeURI(str)?.scheme == APP_STRING_RESUME_WATCHING) {
@@ -408,10 +397,13 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
                                 return true
                             }
 
-                            val matchedApi = apis.filter { str.startsWith(it.mainUrl) }.firstOrNull()
-                            if (matchedApi != null) {
-                                loadResult(str, matchedApi.name, "")
-                                return true
+                            synchronized(apis) {
+                                for (api in apis) {
+                                    if (str.startsWith(api.mainUrl)) {
+                                        loadResult(str, api.name, "")
+                                        return true
+                                    }
+                                }
                             }
                         }
                     }
@@ -440,7 +432,6 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
 
 
     var lastPopup: SearchResponse? = null
-    var lastPopupJob: Job? = null
     fun loadPopup(result: SearchResponse, load: Boolean = true) {
         lastPopup = result
         val syncName = syncViewModel.syncName(result.apiName)
@@ -456,8 +447,7 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
             syncViewModel.clear()
         }
 
-        lastPopupJob?.cancel()
-        lastPopupJob = if (load) {
+        if (load) {
             viewModel.load(
                 this, result.url, result.apiName, false, if (getApiDubstatusSettings()
                         .contains(DubStatus.Dubbed)
@@ -504,7 +494,6 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
             R.id.navigation_downloads,
             R.id.navigation_settings,
             R.id.navigation_download_child,
-            R.id.navigation_download_queue,
             R.id.navigation_subtitles,
             R.id.navigation_chrome_subtitles,
             R.id.navigation_settings_player,
@@ -557,11 +546,9 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
             navView.isVisible = isNavVisible && !isLandscape()
             navHostFragment.apply {
                 val marginPx = resources.getDimensionPixelSize(R.dimen.nav_rail_view_width)
-                layoutParams =
-                    (navHostFragment.layoutParams as ViewGroup.MarginLayoutParams).apply {
-                        marginStart =
-                            if (isNavVisible && isLandscape() && isLayout(TV or EMULATOR)) marginPx else 0
-                    }
+                layoutParams = (navHostFragment.layoutParams as ViewGroup.MarginLayoutParams).apply {
+                    marginStart = if (isNavVisible && isLandscape() && isLayout(TV or EMULATOR)) marginPx else 0
+                }
             }
 
             /**
@@ -570,11 +557,7 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
              * highlight the wrong one in UI.
              */
             when (destination.id) {
-                in listOf(
-                    R.id.navigation_downloads,
-                    R.id.navigation_download_child,
-                    R.id.navigation_download_queue
-                ) -> {
+                in listOf(R.id.navigation_downloads, R.id.navigation_download_child) -> {
                     navRailView.menu.findItem(R.id.navigation_downloads).isChecked = true
                     navView.menu.findItem(R.id.navigation_downloads).isChecked = true
                 }
@@ -806,11 +789,12 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
         }
     }
 
+
     private val pluginsLock = Mutex()
     private fun onAllPluginsLoaded(success: Boolean = false) {
         ioSafe {
             pluginsLock.withLock {
-                allProviders.withLock {
+                synchronized(allProviders) {
                     // Load cloned sites after plugins have been loaded since clones depend on plugins.
                     try {
                         getKey<Array<SettingsGeneral.CustomSite>>(USER_PROVIDER_API)?.let { list ->
@@ -856,8 +840,6 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
 
     private fun hidePreviewPopupDialog() {
         bottomPreviewPopup.dismissSafe(this)
-        lastPopupJob?.cancel()
-        lastPopupJob = null
         bottomPreviewPopup = null
         bottomPreviewBinding = null
     }
@@ -1177,14 +1159,18 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
         }
     }
 
+    @Suppress("DEPRECATION_ERROR")
     override fun onCreate(savedInstanceState: Bundle?) {
-        app.initClient(this, ignoreSSL = false)
-        @OptIn(UnsafeSSL::class)
-        insecureApp.initClient(this, ignoreSSL = true)
-
+        app.initClient(this)
         val settingsManager = PreferenceManager.getDefaultSharedPreferences(this)
 
-        setLastError(this)
+        val errorFile = filesDir.resolve("last_error")
+        if (errorFile.exists() && errorFile.isFile) {
+            lastError = errorFile.readText(Charset.defaultCharset())
+            errorFile.delete()
+        } else {
+            lastError = null
+        }
 
         val settingsForProvider = SettingsJson()
         settingsForProvider.enableAdult =
@@ -1653,7 +1639,9 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
         ioSafe {
             initAll()
             // No duplicates (which can happen by registerMainAPI)
-            apis = allProviders.distinctBy { it }
+            apis = synchronized(allProviders) {
+                allProviders.distinctBy { it }
+            }
         }
 
         //  val navView: BottomNavigationView = findViewById(R.id.nav_view)
@@ -1961,7 +1949,7 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
 
         if (BuildConfig.DEBUG) {
             var providersAndroidManifestString = "Current androidmanifest should be:\n"
-            allProviders.withLock {
+            synchronized(allProviders) {
                 for (api in allProviders) {
                     providersAndroidManifestString += "<data android:scheme=\"https\" android:host=\"${
                         api.mainUrl.removePrefix(
@@ -2044,9 +2032,6 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
             updateLocale()
             runDefault()
         }
-
-        // Start the download queue
-        DownloadQueueManager.init(this)
     }
 
     /** Biometric stuff **/
@@ -2069,4 +2054,4 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
             false
         }
     }
-}
+}

app/src/main/java/com/lagradost/cloudstream3/actions/VideoClickAction.kt

@@ -20,10 +20,8 @@ import com.lagradost.cloudstream3.actions.temp.MpvExPackage
 import com.lagradost.cloudstream3.actions.temp.MpvKtPackage
 import com.lagradost.cloudstream3.actions.temp.MpvKtPreviewPackage
 import com.lagradost.cloudstream3.actions.temp.MpvPackage
-import com.lagradost.cloudstream3.actions.temp.MpvRxPackage
 import com.lagradost.cloudstream3.actions.temp.MpvYTDLPackage
 import com.lagradost.cloudstream3.actions.temp.NextPlayerPackage
-import com.lagradost.cloudstream3.actions.temp.OnlyPlayer
 import com.lagradost.cloudstream3.actions.temp.PlayInBrowserAction
 import com.lagradost.cloudstream3.actions.temp.PlayMirrorAction
 import com.lagradost.cloudstream3.actions.temp.ViewM3U8Action
@@ -34,8 +32,8 @@ import com.lagradost.cloudstream3.actions.temp.fcast.FcastAction
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.ui.result.LinkLoadingResult
 import com.lagradost.cloudstream3.ui.result.ResultEpisode
-import com.lagradost.cloudstream3.utils.Coroutines.atomicListOf
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
+import com.lagradost.cloudstream3.utils.Coroutines.threadSafeListOf
 import com.lagradost.cloudstream3.utils.ExtractorLinkType
 import com.lagradost.cloudstream3.utils.UiText
 import kotlinx.coroutines.Dispatchers
@@ -45,7 +43,7 @@ import java.util.concurrent.FutureTask
 import kotlin.reflect.jvm.jvmName
 
 object VideoClickActionHolder {
-    val allVideoClickActions = atomicListOf(
+    val allVideoClickActions = threadSafeListOf(
         // Default
         PlayInBrowserAction(),
         CopyClipboardAction(),
@@ -66,8 +64,6 @@ object VideoClickActionHolder {
         MpvYTDLPackage(),
         MpvKtPackage(),
         MpvKtPreviewPackage(),
-        OnlyPlayer(),
-        MpvRxPackage(),
         // Always Ask option
         AlwaysAskAction(),
         // added by plugins

app/src/main/java/com/lagradost/cloudstream3/actions/temp/MpvRxPackage.kt

@@ -1,75 +0,0 @@
-package com.lagradost.cloudstream3.actions.temp
-
-import android.app.Activity
-import android.content.Context
-import android.content.Intent
-import androidx.core.net.toUri
-import com.lagradost.api.Log
-import com.lagradost.cloudstream3.actions.OpenInAppAction
-import com.lagradost.cloudstream3.actions.updateDurationAndPosition
-import com.lagradost.cloudstream3.isEpisodeBased
-import com.lagradost.cloudstream3.ui.result.LinkLoadingResult
-import com.lagradost.cloudstream3.ui.result.ResultEpisode
-import com.lagradost.cloudstream3.utils.DataStoreHelper.getViewPos
-import com.lagradost.cloudstream3.utils.txt
-
-/** https://github.com/Riteshp2001/mpvRx
- *
- * https://github.com/Riteshp2001/mpvRx/blob/00e0c5e803ab53e5757426cbf2248448ba1f49bf/app/src/main/java/app/gyrolet/mpvrx/utils/media/MediaUtils.kt#L132
- * https://github.com/Riteshp2001/mpvRx/blob/00e0c5e803ab53e5757426cbf2248448ba1f49bf/app/src/main/java/app/gyrolet/mpvrx/utils/media/MediaUtils.kt#L56
- * */
-class MpvRxPackage : OpenInAppAction(
-    appName = txt("mpvRx"),
-    packageName = "app.gyrolet.mpvrx",
-    intentClass = "app.gyrolet.mpvrx.ui.player.PlayerActivity"
-) {
-    override val oneSource = true
-    override suspend fun putExtra(
-        context: Context,
-        intent: Intent,
-        video: ResultEpisode,
-        result: LinkLoadingResult,
-        index: Int?
-    ) {
-        intent.apply {
-            putExtra("title", video.name)
-            val link = result.links[index!!]
-            val headers = link.headers
-
-            setData(link.url.toUri())
-            if (headers.isNotEmpty()) {
-                // PlayerActivity expects a flat array: [key1, value1, key2, value2, ...]
-                val flat = headers.entries.flatMap { listOf(it.key, it.value) }.toTypedArray()
-                intent.putExtra("headers", flat)
-            }
-            /*val subs = result.subs // disabled due to https://github.com/Riteshp2001/mpvRx/issues/146
-            intent.putExtra("subs", subs.map { it.url.toUri() }.toTypedArray())
-            intent.putExtra(
-                "subs.titles",
-                subs.map { it.name }.toTypedArray(),
-            )
-            intent.putExtra(
-                "subs.langs",
-                subs.map { it.languageCode }.toTypedArray(),
-            )
-            val selected = subs.firstOrNull { it.matchesLanguageCode("en") }?.url?.toUri()
-            intent.putExtra("subs.enable", selected?.let { arrayOf(it) } ?: arrayOf<Uri>() )*/
-
-            if (video.tvType.isEpisodeBased()) {
-                video.season?.let { intent.putExtra("introdb_season", it) }
-                video.episode.let { intent.putExtra("introdb_episode", it) }
-            }
-
-            val position = getViewPos(video.id)?.position
-            if (position != null)
-                putExtra("position", position.toInt())
-        }
-    }
-
-    override fun onResult(activity: Activity, intent: Intent?) {
-        val position = intent?.getIntExtra("position", -1) ?: -1
-        val duration = intent?.getIntExtra("duration", -1) ?: -1
-        Log.d("MPV", "Position: $position, Duration: $duration")
-        updateDurationAndPosition(position.toLong(), duration.toLong())
-    }
-}

app/src/main/java/com/lagradost/cloudstream3/actions/temp/OnlyPlayer.kt

@@ -1,44 +0,0 @@
-package com.lagradost.cloudstream3.actions.temp
-
-import android.app.Activity
-import android.content.Context
-import android.content.Intent
-import android.os.Bundle
-import androidx.core.net.toUri
-import com.lagradost.cloudstream3.actions.OpenInAppAction
-import com.lagradost.cloudstream3.ui.result.LinkLoadingResult
-import com.lagradost.cloudstream3.ui.result.ResultEpisode
-import com.lagradost.cloudstream3.utils.txt
-
-/** https://github.com/Kindness-Kismet/only_player/tree/main
- * https://github.com/Kindness-Kismet/only_player/blob/main/feature/player/src/main/java/one/only/player/feature/player/PlayerActivity.kt */
-class OnlyPlayer : OpenInAppAction(
-    txt("Only Player"),
-    "one.only.player",
-    intentClass = "one.only.player.feature.player.PlayerActivity"
-) {
-    override val oneSource = true
-    override suspend fun putExtra(
-        context: Context,
-        intent: Intent,
-        video: ResultEpisode,
-        result: LinkLoadingResult,
-        index: Int?
-    ) {
-        /** https://github.com/Kindness-Kismet/only_player/blob/d3f55049a2913fa762d31b311146073cc2da46cb/app/src/main/java/one/only/player/navigation/CloudNavGraph.kt#L39 */
-        intent.apply {
-            val link = result.links[index!!]
-            setData(link.url.toUri())
-
-            putExtra("headers", Bundle().apply {
-                for ((key, value) in link.headers) {
-                    putExtra(key, value)
-                }
-            })
-        }
-    }
-
-    override fun onResult(activity: Activity, intent: Intent?) {
-        /* onResult does not get called */
-    }
-}

app/src/main/java/com/lagradost/cloudstream3/actions/temp/PlayMirrorAction.kt

@@ -35,11 +35,9 @@ class PlayMirrorAction : VideoClickAction() {
     ) {
         //Implemented a generator to handle the single
         val activity = context as? Activity ?: return
-        val link = index?.let { result.links[it] }
         val generatorMirror = object : VideoGenerator<ResultEpisode>(listOf(video)) {
             override val hasCache: Boolean = false
             override val canSkipLoading: Boolean = false
-            override fun getId(index: Int): Int = video.id
 
             override suspend fun generateLinks(
                 clearCache: Boolean,
@@ -49,7 +47,7 @@ class PlayMirrorAction : VideoClickAction() {
                 offset: Int,
                 isCasting: Boolean
             ): Boolean {
-                index?.let { callback(link to null) }
+                index?.let { callback(result.links[it] to null) }
                 result.subs.forEach { subtitle -> subtitleCallback(subtitle) }
                 return true
             }
@@ -58,7 +56,7 @@ class PlayMirrorAction : VideoClickAction() {
         activity.navigate(
             R.id.global_to_navigation_player,
             GeneratorPlayer.newInstance(
-                generatorMirror, 0, result.syncData
+                generatorMirror, result.syncData
             )
         )
     }

app/src/main/java/com/lagradost/cloudstream3/mvvm/Lifecycle.kt

@@ -1,68 +1,16 @@
 package com.lagradost.cloudstream3.mvvm
 
-import android.view.View
-import androidx.activity.ComponentActivity
-import androidx.core.view.doOnAttach
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.LiveData
-import androidx.lifecycle.findViewTreeLifecycleOwner
-import androidx.viewbinding.ViewBinding
-import com.lagradost.cloudstream3.ui.BaseFragment
 
 /** NOTE: Only one observer at a time per value */
-fun <T> ComponentActivity.observe(liveData: LiveData<T>, action: (T) -> Unit) {
-    observeNullable(liveData) { t -> t?.run(action) }
-}
-
-/** NOTE: Only one observer at a time per value */
-fun <T> ComponentActivity.observeNullable(liveData: LiveData<T>, action: (T?) -> Unit) {
+fun <T> LifecycleOwner.observe(liveData: LiveData<T>, action: (t: T) -> Unit) {
     liveData.removeObservers(this)
-    liveData.observe(this, action)
+    liveData.observe(this) { it?.let { t -> action(t) } }
 }
 
 /** NOTE: Only one observer at a time per value */
-fun <T, V : ViewBinding> BaseFragment<V>.observe(liveData: LiveData<T>, action: (T) -> Unit) {
-    observeNullable(liveData) { t -> t?.run(action) }
+fun <T> LifecycleOwner.observeNullable(liveData: LiveData<T>, action: (t: T) -> Unit) {
+    liveData.removeObservers(this)
+    liveData.observe(this) { action(it) }
 }
-
-/**
- * Attaches an observable to the root binding, instead of the fragment. This is more efficient as
- * it will not call observe if the view is in the background.
- *
- * NOTE: Only one observer at a time per value
- * */
-fun <T, V : ViewBinding> BaseFragment<V>.observeNullable(
-    liveData: LiveData<T>, action: (T?) -> Unit
-) {
-    val root = this.binding?.root
-    if (root == null) {
-        liveData.removeObservers(this)
-        liveData.observe(this, action)
-    } else {
-        root.doOnAttach { view ->
-            // On attach should make findViewTreeLifecycleOwner non-null, but use "this" just in case
-            val owner: LifecycleOwner = view.findViewTreeLifecycleOwner() ?: this@observeNullable
-            liveData.removeObservers(owner)
-            liveData.observe(owner, action)
-        }
-    }
-}
-
-/** NOTE: Only one observer at a time per value */
-fun <T> View.observe(liveData: LiveData<T>, action: (T) -> Unit) {
-    observeNullable(liveData) { t -> t?.run(action) }
-}
-
-/** NOTE: Only one observer at a time per value */
-fun <T> View.observeNullable(liveData: LiveData<T>, action: (T?) -> Unit) {
-    doOnAttach { view ->
-        // On attach should make findViewTreeLifecycleOwner non-null
-        val owner: LifecycleOwner? = view.findViewTreeLifecycleOwner()
-        if(owner == null) {
-            debugException { "Expected non-null findViewTreeLifecycleOwner" }
-            return@doOnAttach
-        }
-        liveData.removeObservers(owner)
-        liveData.observe(owner, action)
-    }
-}

app/src/main/java/com/lagradost/cloudstream3/network/RequestsHelper.kt

@@ -2,7 +2,6 @@ package com.lagradost.cloudstream3.network
 
 import android.content.Context
 import androidx.preference.PreferenceManager
-import com.lagradost.cloudstream3.Prerelease
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.USER_AGENT
 import com.lagradost.cloudstream3.mvvm.safe
@@ -16,26 +15,11 @@ import org.conscrypt.Conscrypt
 import java.io.File
 import java.security.Security
 
-// Backwards compatible constructor, mark as deprecated later
 fun Requests.initClient(context: Context) {
     this.baseClient = buildDefaultClient(context)
 }
 
-/** Only use ignoreSSL if you know what you are doing*/
-@Prerelease
-fun Requests.initClient(context: Context, ignoreSSL: Boolean = false) {
-    this.baseClient = buildDefaultClient(context, ignoreSSL)
-}
-
-
-// Backwards compatible constructor, mark as deprecated later
 fun buildDefaultClient(context: Context): OkHttpClient {
-    return buildDefaultClient(context, false)
-}
-
-/** Only use ignoreSSL if you know what you are doing*/
-@Prerelease
-fun buildDefaultClient(context: Context, ignoreSSL: Boolean = false): OkHttpClient {
     safe { Security.insertProviderAt(Conscrypt.newProvider(), 1) }
     
     val settingsManager = PreferenceManager.getDefaultSharedPreferences(context)
@@ -43,11 +27,7 @@ fun buildDefaultClient(context: Context, ignoreSSL: Boolean = false): OkHttpClie
     val baseClient = OkHttpClient.Builder()
         .followRedirects(true)
         .followSslRedirects(true)
-        .apply {
-            if (ignoreSSL) {
-                ignoreAllSSLErrors()
-            }
-        }
+        .ignoreAllSSLErrors()
         .cache(
             // Note that you need to add a ResponseInterceptor to make this 100% active.
             // The server response dictates if and when stuff should be cached.
@@ -72,6 +52,11 @@ fun buildDefaultClient(context: Context, ignoreSSL: Boolean = false): OkHttpClie
     return baseClient
 }
 
+//val Request.cookies: Map<String, String>
+//    get() {
+//        return this.headers.getCookies("Cookie")
+//    }
+
 private val DEFAULT_HEADERS = mapOf("user-agent" to USER_AGENT)
 
 /**

app/src/main/java/com/lagradost/cloudstream3/plugins/Plugin.kt

@@ -7,6 +7,7 @@ import com.lagradost.cloudstream3.actions.VideoClickAction
 import com.lagradost.cloudstream3.actions.VideoClickActionHolder
 import kotlin.Throws
 
+
 abstract class Plugin : BasePlugin() {
     /**
      * Called when your Plugin is loaded
@@ -25,7 +26,9 @@ abstract class Plugin : BasePlugin() {
     fun registerVideoClickAction(element: VideoClickAction) {
         Log.i(PLUGIN_TAG, "Adding ${element.name} VideoClickAction")
         element.sourcePlugin = this.filename
-        VideoClickActionHolder.allVideoClickActions.add(element)
+        synchronized(VideoClickActionHolder.allVideoClickActions) {
+            VideoClickActionHolder.allVideoClickActions.add(element)
+        }
     }
 
     /**
@@ -37,4 +40,4 @@ abstract class Plugin : BasePlugin() {
      * This will add a button in the settings allowing you to add custom settings
      */
     var openSettings: ((context: Context) -> Unit)? = null
-}
+}

app/src/main/java/com/lagradost/cloudstream3/plugins/PluginManager.kt

@@ -13,7 +13,6 @@ import android.os.Build
 import android.os.Environment
 import android.util.Log
 import android.widget.Toast
-import androidx.annotation.WorkerThread
 import androidx.core.app.ActivityCompat
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
@@ -27,11 +26,9 @@ import com.lagradost.cloudstream3.CloudStreamApp.Companion.getKey
 import com.lagradost.cloudstream3.CloudStreamApp.Companion.removeKey
 import com.lagradost.cloudstream3.CloudStreamApp.Companion.setKey
 import com.lagradost.cloudstream3.CommonActivity.showToast
-import com.lagradost.cloudstream3.InternalAPI
 import com.lagradost.cloudstream3.MainAPI
 import com.lagradost.cloudstream3.MainAPI.Companion.settingsForProvider
 import com.lagradost.cloudstream3.MainActivity.Companion.afterPluginsLoadedEvent
-import com.lagradost.cloudstream3.MainActivity.Companion.lastError
 import com.lagradost.cloudstream3.PROVIDER_STATUS_DOWN
 import com.lagradost.cloudstream3.PROVIDER_STATUS_OK
 import com.lagradost.cloudstream3.R
@@ -46,7 +43,6 @@ import com.lagradost.cloudstream3.plugins.RepositoryManager.ONLINE_PLUGINS_FOLDE
 import com.lagradost.cloudstream3.plugins.RepositoryManager.PREBUILT_REPOSITORIES
 import com.lagradost.cloudstream3.plugins.RepositoryManager.downloadPluginToFile
 import com.lagradost.cloudstream3.plugins.RepositoryManager.getRepoPlugins
-import com.lagradost.cloudstream3.plugins.RepositoryManager.sha256
 import com.lagradost.cloudstream3.ui.settings.extensions.REPOSITORIES_KEY
 import com.lagradost.cloudstream3.ui.settings.extensions.RepositoryData
 import com.lagradost.cloudstream3.utils.AppContextUtils.getApiProviderLangSettings
@@ -55,7 +51,7 @@ import com.lagradost.cloudstream3.utils.Coroutines.main
 import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.UIHelper.colorFromAttribute
 import com.lagradost.cloudstream3.utils.UiText
-import com.lagradost.cloudstream3.utils.downloader.DownloadFileManagement.sanitizeFilename
+import com.lagradost.cloudstream3.utils.VideoDownloadManager.sanitizeFilename
 import com.lagradost.cloudstream3.utils.extractorApis
 import com.lagradost.cloudstream3.utils.txt
 import dalvik.system.PathClassLoader
@@ -80,7 +76,6 @@ data class PluginData(
     @JsonProperty("filePath") val filePath: String,
     @JsonProperty("version") val version: Int,
 ) {
-    @WorkerThread
     fun toSitePlugin(): SitePlugin {
         return SitePlugin(
             this.filePath,
@@ -95,9 +90,7 @@ data class PluginData(
             null,
             null,
             null,
-            File(this.filePath).length(),
-            // No file hash for local plugins. Local plugins have no use for the hash, and it's expensive to compute.
-            null
+            File(this.filePath).length()
         )
     }
 }
@@ -265,8 +258,12 @@ object PluginManager {
      * DO NOT USE THIS IN A PLUGIN! It may case an infinite recursive loop lagging or crashing everyone's devices.
      * If you use it from a plugin, do not expect a stable jvmName, SO DO NOT USE IT!
      */
-    @Suppress("FunctionName")
-    @InternalAPI
+    @Suppress("FunctionName", "DEPRECATION_ERROR")
+    @Deprecated(
+        "Calling this function from a plugin will lead to crashes, use loadPlugin and unloadPlugin",
+        replaceWith = ReplaceWith("loadPlugin"),
+        level = DeprecationLevel.ERROR
+    )
     @Throws
     suspend fun ___DO_NOT_CALL_FROM_A_PLUGIN_updateAllOnlinePluginsAndLoadThem(activity: Activity) {
         assertNonRecursiveCallstack()
@@ -307,7 +304,6 @@ object PluginManager {
                 downloadPlugin(
                     activity,
                     pluginData.onlineData.second.url,
-                    pluginData.onlineData.second.fileHash,
                     pluginData.savedData.internalName,
                     File(pluginData.savedData.filePath),
                     true
@@ -343,8 +339,12 @@ object PluginManager {
      * DO NOT USE THIS IN A PLUGIN! It may case an infinite recursive loop lagging or crashing everyone's devices.
      * If you use it from a plugin, do not expect a stable jvmName, SO DO NOT USE IT!
      */
-    @Suppress("FunctionName")
-    @InternalAPI
+    @Suppress("FunctionName", "DEPRECATION_ERROR")
+    @Deprecated(
+        "Calling this function from a plugin will lead to crashes, use loadPlugin and unloadPlugin",
+        replaceWith = ReplaceWith("loadPlugin"),
+        level = DeprecationLevel.ERROR
+    )
     @Throws
     suspend fun ___DO_NOT_CALL_FROM_A_PLUGIN_downloadNotExistingPluginsAndLoad(
         activity: Activity,
@@ -419,7 +419,6 @@ object PluginManager {
             downloadPlugin(
                 activity,
                 pluginData.onlineData.second.url,
-                pluginData.onlineData.second.fileHash,
                 pluginData.savedData.internalName,
                 pluginData.onlineData.first,
                 !pluginData.isDisabled
@@ -454,8 +453,12 @@ object PluginManager {
      * DO NOT USE THIS IN A PLUGIN! It may case an infinite recursive loop lagging or crashing everyone's devices.
      * If you use it from a plugin, do not expect a stable jvmName, SO DO NOT USE IT!
      */
-    @Suppress("FunctionName")
-    @InternalAPI
+    @Suppress("FunctionName", "DEPRECATION_ERROR")
+    @Deprecated(
+        "Calling this function from a plugin will lead to crashes, use loadPlugin and unloadPlugin",
+        replaceWith = ReplaceWith("loadPlugin"),
+        level = DeprecationLevel.ERROR
+    )
     @Throws
     suspend fun ___DO_NOT_CALL_FROM_A_PLUGIN_loadAllOnlinePlugins(context: Context) {
         assertNonRecursiveCallstack()
@@ -476,9 +479,13 @@ object PluginManager {
      * DO NOT USE THIS IN A PLUGIN! It may case an infinite recursive loop lagging or crashing everyone's devices.
      * If you use it from a plugin, do not expect a stable jvmName, SO DO NOT USE IT!
      */
-    @Suppress("FunctionName")
-    @InternalAPI
+    @Suppress("FunctionName", "DEPRECATION_ERROR")
     @Throws
+    @Deprecated(
+        "Calling this function from a plugin will lead to crashes, use loadPlugin and unloadPlugin",
+        replaceWith = ReplaceWith("loadPlugin"),
+        level = DeprecationLevel.ERROR
+    )
     suspend fun ___DO_NOT_CALL_FROM_A_PLUGIN_hotReloadAllLocalPlugins(activity: FragmentActivity?) {
         assertNonRecursiveCallstack()
 
@@ -497,8 +504,12 @@ object PluginManager {
      * DO NOT USE THIS IN A PLUGIN! It may case an infinite recursive loop lagging or crashing everyone's devices.
      * If you use it from a plugin, do not expect a stable jvmName, SO DO NOT USE IT!
      */
-    @Suppress("FunctionName")
-    @InternalAPI
+    @Suppress("FunctionName", "DEPRECATION_ERROR")
+    @Deprecated(
+        "Calling this function from a plugin will lead to crashes, use loadPlugin and unloadPlugin",
+        replaceWith = ReplaceWith("loadPlugin"),
+        level = DeprecationLevel.ERROR
+    )
     @Throws
     suspend fun ___DO_NOT_CALL_FROM_A_PLUGIN_loadAllLocalPlugins(context: Context, forceReload: Boolean) {
         assertNonRecursiveCallstack()
@@ -561,11 +572,6 @@ object PluginManager {
         afterPluginsLoadedEvent.invoke(forceReload)
     }
 
-    /** @return true if safe mode is enabled in any possible way. */
-    fun isSafeMode(): Boolean {
-        return checkSafeModeFile() || lastError != null
-    }
-
     /**
      * This can be used to override any extension loading to fix crashes!
      * @return true if safe mode file is present
@@ -610,7 +616,7 @@ object PluginManager {
                     return false
                 }
                 InputStreamReader(stream).use { reader ->
-                    manifest = parseJson<BasePlugin.Manifest>(reader.readText())
+                    manifest = parseJson(reader, BasePlugin.Manifest::class.java)
                 }
             }
 
@@ -651,15 +657,9 @@ object PluginManager {
                     context.resources.configuration
                 )
             }
-            synchronized(plugins) {
-                plugins[filePath] = pluginInstance
-            }
-            synchronized(classLoaders) {
-                classLoaders[loader] = pluginInstance
-            }
-            synchronized(urlPlugins) {
-                urlPlugins[data.url ?: filePath] = pluginInstance
-            }
+            plugins[filePath] = pluginInstance
+            classLoaders[loader] = pluginInstance
+            urlPlugins[data.url ?: filePath] = pluginInstance
             if (pluginInstance is Plugin) {
                 pluginInstance.load(context)
             } else {
@@ -695,33 +695,25 @@ object PluginManager {
         }
 
         // remove all registered apis
-        APIHolder.apis.filter { api -> api.sourcePlugin == plugin.filename }.forEach {
-            removePluginMapping(it)
+        synchronized(APIHolder.apis) {
+            APIHolder.apis.filter { api -> api.sourcePlugin == plugin.filename }.forEach {
+                removePluginMapping(it)
+            }
+        }
+        synchronized(APIHolder.allProviders) {
+            APIHolder.allProviders.removeIf { provider: MainAPI -> provider.sourcePlugin == plugin.filename }
         }
 
-        APIHolder.allProviders.withLock {
-            APIHolder.allProviders.removeAll { provider -> provider.sourcePlugin == plugin.filename }
+        extractorApis.removeIf { provider: ExtractorApi -> provider.sourcePlugin == plugin.filename }
+
+        synchronized(VideoClickActionHolder.allVideoClickActions) {
+            VideoClickActionHolder.allVideoClickActions.removeIf { action: VideoClickAction -> action.sourcePlugin == plugin.filename }
         }
 
-        extractorApis.withLock {
-            extractorApis.removeAll { provider -> provider.sourcePlugin == plugin.filename }
-        }
+        classLoaders.values.removeIf { v -> v == plugin }
 
-        VideoClickActionHolder.allVideoClickActions.withLock {
-            VideoClickActionHolder.allVideoClickActions.removeAll { action -> action.sourcePlugin == plugin.filename }
-        }
-
-        synchronized(classLoaders) {
-            classLoaders.values.removeIf { v -> v == plugin }
-        }
-
-        synchronized(plugins) {
-            plugins.remove(absolutePath)
-        }
-
-        synchronized(urlPlugins) {
-            urlPlugins.values.removeIf { v -> v == plugin }
-        }
+        plugins.remove(absolutePath)
+        urlPlugins.values.removeIf { v -> v == plugin }
     }
 
     /**
@@ -751,27 +743,25 @@ object PluginManager {
     suspend fun downloadPlugin(
         activity: Activity,
         pluginUrl: String,
-        pluginHash: String?,
         internalName: String,
         repositoryUrl: String,
         loadPlugin: Boolean
     ): Boolean {
         val file = getPluginPath(activity, internalName, repositoryUrl)
-        return downloadPlugin(activity, pluginUrl, pluginHash, internalName, file, loadPlugin)
+        return downloadPlugin(activity, pluginUrl, internalName, file, loadPlugin)
     }
 
     suspend fun downloadPlugin(
         activity: Activity,
         pluginUrl: String,
-        pluginHash: String?,
         internalName: String,
         file: File,
-        loadPlugin: Boolean,
+        loadPlugin: Boolean
     ): Boolean {
         try {
             Log.d(TAG, "Downloading plugin: $pluginUrl to ${file.absolutePath}")
             // The plugin file needs to be salted with the repository url hash as to allow multiple repositories with the same internal plugin names
-            val newFile = downloadPluginToFile(activity, pluginUrl, file, pluginHash) ?: return false
+            val newFile = downloadPluginToFile(pluginUrl, file) ?: return false
 
             val data = PluginData(
                 internalName,
@@ -818,9 +808,13 @@ object PluginManager {
      * DO NOT USE THIS IN A PLUGIN! It may case an infinite recursive loop lagging or crashing everyone's devices.
      * If you use it from a plugin, do not expect a stable jvmName, SO DO NOT USE IT!
      */
-    @Suppress("FunctionName")
-    @InternalAPI
+    @Suppress("FunctionName", "DEPRECATION_ERROR")
     @Throws
+    @Deprecated(
+        "Calling this function from a plugin will lead to crashes, use loadPlugin and unloadPlugin",
+        replaceWith = ReplaceWith("loadPlugin"),
+        level = DeprecationLevel.ERROR
+    )
     suspend fun ___DO_NOT_CALL_FROM_A_PLUGIN_manuallyReloadAndUpdatePlugins(activity: Activity) {
         assertNonRecursiveCallstack()
 
@@ -859,7 +853,6 @@ object PluginManager {
                 if (downloadPlugin(
                         activity,
                         pluginData.onlineData.second.url,
-                        pluginData.onlineData.second.fileHash,
                         pluginData.savedData.internalName,
                         existingFile,
                         true
@@ -958,4 +951,4 @@ object PluginManager {
             return null
         }
     }
-}
+}

app/src/main/java/com/lagradost/cloudstream3/plugins/RepositoryManager.kt

@@ -1,7 +1,6 @@
 package com.lagradost.cloudstream3.plugins
 
 import android.content.Context
-import androidx.annotation.WorkerThread
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.cloudstream3.CloudStreamApp.Companion.context
 import com.lagradost.cloudstream3.CloudStreamApp.Companion.getKey
@@ -19,12 +18,10 @@ import com.lagradost.cloudstream3.ui.settings.extensions.RepositoryData
 import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
+import java.io.BufferedInputStream
 import java.io.File
-import java.nio.file.AtomicMoveNotSupportedException
-import java.nio.file.Files
-import java.nio.file.StandardCopyOption
-import java.security.MessageDigest
-import java.util.concurrent.atomic.AtomicInteger
+import java.io.InputStream
+import java.io.OutputStream
 
 /**
  * Comes with the app, always available in the app, non removable.
@@ -70,7 +67,6 @@ data class SitePlugin(
     @JsonProperty("iconUrl") val iconUrl: String?,
     // Automatically generated by the gradle plugin
     @JsonProperty("fileSize") val fileSize: Long?,
-    @JsonProperty("fileHash") val fileHash: String?,
 )
 
 
@@ -79,26 +75,7 @@ object RepositoryManager {
     val PREBUILT_REPOSITORIES: Array<RepositoryData> by lazy {
         getKey("PREBUILT_REPOSITORIES") ?: emptyArray()
     }
-    private val GH_REGEX =
-        Regex("^https://raw.githubusercontent.com/([A-Za-z0-9-]+)/([A-Za-z0-9_.-]+)/(.*)$")
-
-
-    /** Returns a SHA-256 string of the file content.
-     * Example: "sha256-b70462c264cb7f90fc2860a8e58d7544ce747ff347d1d11fa093623901853573" **/
-    @WorkerThread
-    fun sha256(file: File): String {
-        val digest = MessageDigest.getInstance("SHA-256")
-
-        file.inputStream().use { fis ->
-            val buffer = ByteArray(8192)
-            var read = fis.read(buffer)
-            while (read != -1) {
-                digest.update(buffer, 0, read)
-                read = fis.read(buffer)
-            }
-        }
-        return "sha256-" + digest.digest().joinToString("") { "%02x".format(it) }
-    }
+    private val GH_REGEX = Regex("^https://raw.githubusercontent.com/([A-Za-z0-9-]+)/([A-Za-z0-9_.-]+)/(.*)$")
 
     /* Convert raw.githubusercontent.com urls to cdn.jsdelivr.net if enabled in settings */
     fun convertRawGitUrl(url: String): String {
@@ -163,52 +140,21 @@ object RepositoryManager {
         }.flatten()
     }
 
-
     suspend fun downloadPluginToFile(
-        context: Context,
         pluginUrl: String,
-        file: File,
-        expectedFileHash: String?
+        file: File
     ): File? {
         return safeAsync {
-            val parentDir = file.parentFile ?: return@safeAsync null
-            parentDir.mkdirs()
+            file.mkdirs()
 
-            // Prevent corrupting the plugin file if the operation fails
-            val tempFile = File.createTempFile(file.name, ".tmp", context.cacheDir)
+            // Overwrite if exists
+            if (file.exists()) {
+                file.delete()
+            }
+            file.createNewFile()
 
             val body = app.get(convertRawGitUrl(pluginUrl)).okhttpResponse.body
-
-            body.byteStream().use { body ->
-                tempFile.outputStream().use { fileSteam ->
-                    body.copyTo(fileSteam)
-                }
-            }
-
-            if (expectedFileHash != null) {
-                val downloadHash = sha256(tempFile)
-                if (expectedFileHash != downloadHash) {
-                    tempFile.delete()
-                    throw IllegalStateException("Extension hash mismatch when validating '${file.name}'! Expected: '$expectedFileHash', got: '$downloadHash'.")
-                }
-            }
-
-            // We prefer the operation to be atomic
-            try {
-                Files.move(
-                    tempFile.toPath(),
-                    file.toPath(),
-                    StandardCopyOption.REPLACE_EXISTING,
-                    StandardCopyOption.ATOMIC_MOVE
-                )
-            } catch (_: AtomicMoveNotSupportedException) {
-                Files.move(
-                    tempFile.toPath(),
-                    file.toPath(),
-                    StandardCopyOption.REPLACE_EXISTING
-                )
-            }
-
+            write(body.byteStream(), file.outputStream())
             file
         }
     }
@@ -256,4 +202,13 @@ object RepositoryManager {
 
         PluginManager.deleteRepositoryData(file.absolutePath)
     }
+
+    private fun write(stream: InputStream, output: OutputStream) {
+        val input = BufferedInputStream(stream)
+        val dataBuffer = ByteArray(512)
+        var readBytes: Int
+        while (input.read(dataBuffer).also { readBytes = it } != -1) {
+            output.write(dataBuffer, 0, readBytes)
+        }
+    }
 }

app/src/main/java/com/lagradost/cloudstream3/plugins/VotingApi.kt

@@ -12,76 +12,87 @@ import com.lagradost.cloudstream3.utils.Coroutines.main
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 
-object VotingApi {
-
+object VotingApi { // please do not cheat the votes lol
     private const val LOGKEY = "VotingApi"
-    private const val API_DOMAIN = "https://api.countify.xyz"
 
-    private fun transformUrl(url: String): String =
+    private const val API_DOMAIN = "https://counterapi.com/api"
+
+    private fun transformUrl(url: String): String = // dont touch or all votes get reset
         MessageDigest
             .getInstance("SHA-256")
             .digest("${url}#funny-salt".toByteArray())
             .fold("") { str, it -> str + "%02x".format(it) }
 
-    suspend fun SitePlugin.getVotes(): Int = getVotes(url)
-    fun SitePlugin.hasVoted(): Boolean = hasVoted(url)
-    suspend fun SitePlugin.vote(): Int = vote(url)
-    fun SitePlugin.canVote(): Boolean = canVote(this.url)
+    suspend fun SitePlugin.getVotes(): Int {
+        return getVotes(url)
+    }
 
+    fun SitePlugin.hasVoted(): Boolean {
+        return hasVoted(url)
+    }
+
+    suspend fun SitePlugin.vote(): Int {
+        return vote(url)
+    }
+
+    fun SitePlugin.canVote(): Boolean {
+        return canVote(this.url)
+    }
+
+    // Plugin url to Int
     private val votesCache = mutableMapOf<String, Int>()
 
+    private fun getRepository(pluginUrl: String) = pluginUrl
+        .split("/")
+        .drop(2)
+        .take(3)
+        .joinToString("-")
+
     private suspend fun readVote(pluginUrl: String): Int {
-        val id = transformUrl(pluginUrl)
-        val url = "$API_DOMAIN/get-total/$id"
-        Log.d(LOGKEY, "Requesting GET: $url")
-        return app.get(url).parsedSafe<CountifyResult>()?.count ?: 0
+        val url = "${API_DOMAIN}/cs-${getRepository(pluginUrl)}/vote/${transformUrl(pluginUrl)}?readOnly=true"
+        Log.d(LOGKEY, "Requesting: $url")
+        return app.get(url).parsedSafe<Result>()?.value ?: 0
     }
 
     private suspend fun writeVote(pluginUrl: String): Boolean {
-        val id = transformUrl(pluginUrl)
-        val url = "$API_DOMAIN/increment/$id"
-        Log.d(LOGKEY, "Requesting POST: $url")
-        return app.post(url, emptyMap<String, String>())
-            .parsedSafe<CountifyResult>()?.count != null
+        val url = "${API_DOMAIN}/cs-${getRepository(pluginUrl)}/vote/${transformUrl(pluginUrl)}"
+        Log.d(LOGKEY, "Requesting: $url")
+        return app.get(url).parsedSafe<Result>()?.value != null
     }
 
     suspend fun getVotes(pluginUrl: String): Int =
-        votesCache[pluginUrl] ?: readVote(pluginUrl).also {
-            votesCache[pluginUrl] = it
-        }
+            votesCache[pluginUrl] ?: readVote(pluginUrl).also {
+                votesCache[pluginUrl] = it
+            }
 
     fun hasVoted(pluginUrl: String) =
         getKey("cs3-votes/${transformUrl(pluginUrl)}") ?: false
 
-    fun canVote(pluginUrl: String): Boolean =
-        PluginManager.urlPlugins.contains(pluginUrl)
+    fun canVote(pluginUrl: String): Boolean {
+        return PluginManager.urlPlugins.contains(pluginUrl)
+    }
 
     private val voteLock = Mutex()
-
     suspend fun vote(pluginUrl: String): Int {
+        // Prevent multiple requests at the same time.
         voteLock.withLock {
             if (!canVote(pluginUrl)) {
                 main {
-                    Toast.makeText(
-                        context,
-                        R.string.extension_install_first,
-                        Toast.LENGTH_SHORT
-                    ).show()
+                    Toast.makeText(context, R.string.extension_install_first, Toast.LENGTH_SHORT)
+                        .show()
                 }
                 return getVotes(pluginUrl)
             }
 
             if (hasVoted(pluginUrl)) {
                 main {
-                    Toast.makeText(
-                        context,
-                        R.string.already_voted,
-                        Toast.LENGTH_SHORT
-                    ).show()
+                    Toast.makeText(context, R.string.already_voted, Toast.LENGTH_SHORT)
+                        .show()
                 }
                 return getVotes(pluginUrl)
             }
 
+
             if (writeVote(pluginUrl)) {
                 setKey("cs3-votes/${transformUrl(pluginUrl)}", true)
                 votesCache[pluginUrl] = votesCache[pluginUrl]?.plus(1) ?: 1
@@ -91,8 +102,7 @@ object VotingApi {
         }
     }
 
-    private data class CountifyResult(
-        val id: String? = null,
-        val count: Int? = null
+    private data class Result(
+        val value: Int?
     )
-}
+}

app/src/main/java/com/lagradost/cloudstream3/services/DownloadQueueService.kt

@@ -1,279 +0,0 @@
-package com.lagradost.cloudstream3.services
-
-import android.Manifest
-import android.app.Service
-import android.content.Context
-import android.content.Intent
-import android.content.pm.PackageManager
-import android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC
-import android.os.Build.VERSION.SDK_INT
-import android.os.IBinder
-import android.util.Log
-import androidx.core.app.NotificationCompat
-import androidx.core.app.NotificationManagerCompat
-import androidx.core.app.PendingIntentCompat
-import com.lagradost.cloudstream3.CloudStreamApp.Companion.removeKey
-import com.lagradost.cloudstream3.MainActivity
-import com.lagradost.cloudstream3.MainActivity.Companion.lastError
-import com.lagradost.cloudstream3.MainActivity.Companion.setLastError
-import com.lagradost.cloudstream3.R
-import com.lagradost.cloudstream3.mvvm.debugAssert
-import com.lagradost.cloudstream3.mvvm.debugWarning
-import com.lagradost.cloudstream3.mvvm.logError
-import com.lagradost.cloudstream3.mvvm.safe
-import com.lagradost.cloudstream3.plugins.PluginManager
-import com.lagradost.cloudstream3.utils.AppContextUtils.createNotificationChannel
-import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
-import com.lagradost.cloudstream3.utils.UIHelper.colorFromAttribute
-import com.lagradost.cloudstream3.utils.downloader.DownloadQueueManager
-import com.lagradost.cloudstream3.utils.downloader.VideoDownloadManager
-import com.lagradost.cloudstream3.utils.downloader.VideoDownloadManager.KEY_RESUME_IN_QUEUE
-import com.lagradost.cloudstream3.utils.downloader.VideoDownloadManager.KEY_RESUME_PACKAGES
-import com.lagradost.cloudstream3.utils.downloader.VideoDownloadManager.downloadEvent
-import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.FlowPreview
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.debounce
-import kotlinx.coroutines.flow.takeWhile
-import kotlinx.coroutines.flow.update
-import kotlinx.coroutines.flow.updateAndGet
-import kotlinx.coroutines.withTimeoutOrNull
-import kotlin.system.measureTimeMillis
-import kotlin.time.Duration.Companion.milliseconds
-import kotlin.time.Duration.Companion.seconds
-
-class DownloadQueueService : Service() {
-    companion object {
-        const val TAG = "DownloadQueueService"
-        const val DOWNLOAD_QUEUE_CHANNEL_ID = "cloudstream3.download.queue"
-        const val DOWNLOAD_QUEUE_CHANNEL_NAME = "Download queue service"
-        const val DOWNLOAD_QUEUE_CHANNEL_DESCRIPTION = "App download queue notification."
-        const val DOWNLOAD_QUEUE_NOTIFICATION_ID = 917194232 // Random unique
-        @Volatile
-        var isRunning = false
-
-        fun getIntent(
-            context: Context,
-        ): Intent {
-            return Intent(context, DownloadQueueService::class.java)
-        }
-
-        private val _downloadInstances: MutableStateFlow<List<VideoDownloadManager.EpisodeDownloadInstance>> =
-            MutableStateFlow(emptyList())
-
-        /** Flow of all active downloads, not queued. May temporarily contain completed or failed EpisodeDownloadInstances.
-         * Completed or failed instances are automatically removed by the download queue service.
-         *
-         */
-        val downloadInstances: StateFlow<List<VideoDownloadManager.EpisodeDownloadInstance>> =
-            _downloadInstances
-
-        private val totalDownloadFlow =
-            downloadInstances.combine(DownloadQueueManager.queue) { instances, queue ->
-                instances to queue
-            }
-                .combine(VideoDownloadManager.currentDownloads) { (instances, queue), currentDownloads ->
-                    Triple(instances, queue, currentDownloads)
-                }
-    }
-
-
-    private val baseNotification by lazy {
-        val intent = Intent(this, MainActivity::class.java)
-        val pendingIntent =
-            PendingIntentCompat.getActivity(this, 0, intent, 0, false)
-
-        val activeDownloads = resources.getQuantityString(R.plurals.downloads_active, 0).format(0)
-        val activeQueue = resources.getQuantityString(R.plurals.downloads_queued, 0).format(0)
-
-        NotificationCompat.Builder(this, DOWNLOAD_QUEUE_CHANNEL_ID)
-            .setOngoing(true) // Make it persistent
-            .setAutoCancel(false)
-            .setColorized(false)
-            .setOnlyAlertOnce(true)
-            .setSilent(true)
-            .setShowWhen(false)
-            // If low priority then the notification might not show :(
-            .setPriority(NotificationCompat.PRIORITY_DEFAULT)
-            .setColor(this.colorFromAttribute(R.attr.colorPrimary))
-            .setContentText(activeDownloads)
-            .setSubText(activeQueue)
-            .setContentIntent(pendingIntent)
-            .setSmallIcon(R.drawable.download_icon_load)
-    }
-
-
-    private fun updateNotification(context: Context, downloads: Int, queued: Int) {
-        if (context.checkSelfPermission(Manifest.permission.POST_NOTIFICATIONS)
-            != PackageManager.PERMISSION_GRANTED
-        ) return
-
-        val activeDownloads =
-            resources.getQuantityString(R.plurals.downloads_active, downloads).format(downloads)
-        val activeQueue =
-            resources.getQuantityString(R.plurals.downloads_queued, queued).format(queued)
-
-        val newNotification = baseNotification
-            .setContentText(activeDownloads)
-            .setSubText(activeQueue)
-            .build()
-
-        safe {
-            NotificationManagerCompat.from(context)
-                .notify(DOWNLOAD_QUEUE_NOTIFICATION_ID, newNotification)
-        }
-    }
-
-    // We always need to listen to events, even before the download is launched.
-    // Stopping link loading is an event which can trigger before downloading.
-    val downloadEventListener = { event: Pair<Int, VideoDownloadManager.DownloadActionType> ->
-        when (event.second) {
-            VideoDownloadManager.DownloadActionType.Stop -> {
-                removeKey(KEY_RESUME_PACKAGES, event.first.toString())
-                removeKey(KEY_RESUME_IN_QUEUE, event.first.toString())
-                DownloadQueueManager.cancelDownload(event.first)
-            }
-
-            else -> {}
-        }
-    }
-
-    @OptIn(ExperimentalCoroutinesApi::class, FlowPreview::class)
-    override fun onCreate() {
-        isRunning = true
-        val context: Context = this // To make code more readable
-
-        Log.d(TAG, "Download queue service started.")
-        this.createNotificationChannel(
-            DOWNLOAD_QUEUE_CHANNEL_ID,
-            DOWNLOAD_QUEUE_CHANNEL_NAME,
-            DOWNLOAD_QUEUE_CHANNEL_DESCRIPTION
-        )
-        if (SDK_INT >= 29) {
-            startForeground(
-                DOWNLOAD_QUEUE_NOTIFICATION_ID,
-                baseNotification.build(),
-                FOREGROUND_SERVICE_TYPE_DATA_SYNC
-            )
-        } else {
-            startForeground(DOWNLOAD_QUEUE_NOTIFICATION_ID, baseNotification.build())
-        }
-
-        downloadEvent += downloadEventListener
-
-        val queueJob = ioSafe {
-            // Ensure this is up to date to prevent race conditions with MainActivity launches
-            setLastError(context)
-            // Early return, to prevent waiting for plugins in safe mode
-            if (lastError != null) return@ioSafe
-
-            // Try to ensure all plugins are loaded before starting the downloader.
-            // To prevent infinite stalls we use a timeout of 15 seconds, it is judged as long enough
-            val timeout = 15.seconds
-            val timeTaken = withTimeoutOrNull(timeout) {
-                measureTimeMillis {
-                    while (!(PluginManager.loadedOnlinePlugins && PluginManager.loadedLocalPlugins)) {
-                        delay(100.milliseconds)
-                    }
-                }
-            }
-
-            debugWarning({ timeTaken == null || timeTaken > 3_000 }, {
-                "Abnormally long downloader startup time of: ${timeTaken ?: timeout.inWholeMilliseconds}ms"
-            })
-            debugAssert({ timeTaken == null }, { "Downloader startup should not time out" })
-
-            totalDownloadFlow
-                .debounce { (instances, queue) ->
-                    // Filter away incorrect transient queue states.
-                    // For example when we pop the queue and add a download instance there exists a transient state where
-                    // there is no queue and no download instances (leading to an early exit)
-                    if (instances.isEmpty() && queue.isEmpty()) {
-                        500.milliseconds
-                    } else {
-                        0.milliseconds
-                    }
-                }
-                .takeWhile { (instances, queue) ->
-                    // Stop if destroyed
-                    isRunning
-                            // Run as long as there is a queue to process
-                            && (instances.isNotEmpty() || queue.isNotEmpty())
-                            // Run as long as there are no app crashes
-                            && lastError == null
-                }
-                .collect { (_, queue, currentDownloads) ->
-                    // Remove completed or failed
-                    val newInstances = _downloadInstances.updateAndGet { currentInstances ->
-                        currentInstances.filterNot { it.isCompleted || it.isFailed || it.isCancelled }
-                    }
-
-                    val maxDownloads = VideoDownloadManager.maxConcurrentDownloads(context)
-                    val currentInstanceCount = newInstances.size
-
-                    val newDownloads = minOf(
-                        // Cannot exceed the max downloads
-                        maxOf(0, maxDownloads - currentInstanceCount),
-                        // Cannot start more downloads than the queue size
-                        queue.size
-                    )
-
-                    // Cant start multiple downloads at once. If this is rerun it may start too many downloads.
-                    if (newDownloads > 0) {
-                        _downloadInstances.update { instances ->
-                            val downloadInstance = DownloadQueueManager.popQueue(context)
-                            if (downloadInstance != null) {
-                                downloadInstance.startDownload()
-                                instances + downloadInstance
-                            } else {
-                                instances
-                            }
-                        }
-                    }
-
-                    // The downloads actually displayed to the user with a notification
-                    val currentVisualDownloads =
-                        currentDownloads.size + newInstances.count {
-                            currentDownloads.contains(it.downloadQueueWrapper.id)
-                                .not()
-                        }
-                    // Just the queue
-                    val currentVisualQueue = queue.size
-
-                    updateNotification(context, currentVisualDownloads, currentVisualQueue)
-                }
-        }
-
-        // Stop self regardless of job outcome
-        queueJob.invokeOnCompletion { throwable ->
-            if (throwable != null) {
-                logError(throwable)
-            }
-            safe {
-                stopSelf()
-            }
-        }
-    }
-
-    override fun onDestroy() {
-        Log.d(TAG, "Download queue service stopped.")
-        downloadEvent -= downloadEventListener
-        isRunning = false
-        super.onDestroy()
-    }
-
-    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
-        return START_STICKY // We want the service restarted if its killed
-    }
-
-    override fun onBind(intent: Intent?): IBinder? = null
-
-    override fun onTimeout(reason: Int) {
-        stopSelf()
-        Log.e(TAG, "Service stopped due to timeout: $reason")
-    }
-
-}

app/src/main/java/com/lagradost/cloudstream3/services/SubscriptionWorkManager.kt

@@ -22,7 +22,7 @@ import com.lagradost.cloudstream3.utils.DataStoreHelper
 import com.lagradost.cloudstream3.utils.DataStoreHelper.getAllSubscriptions
 import com.lagradost.cloudstream3.utils.DataStoreHelper.getDub
 import com.lagradost.cloudstream3.utils.UIHelper.colorFromAttribute
-import com.lagradost.cloudstream3.utils.downloader.DownloadUtils.getImageBitmapFromUrl
+import com.lagradost.cloudstream3.utils.VideoDownloadManager.getImageBitmapFromUrl
 import kotlinx.coroutines.withTimeoutOrNull
 import java.util.concurrent.TimeUnit
 
@@ -97,7 +97,7 @@ class SubscriptionWorkManager(val context: Context, workerParams: WorkerParamete
                 .build()
         )
     }
-
+    @Suppress("DEPRECATION_ERROR")
     override suspend fun doWork(): Result {
         try {
 //        println("Update subscriptions!")

app/src/main/java/com/lagradost/cloudstream3/services/VideoDownloadService.kt

@@ -2,13 +2,12 @@ package com.lagradost.cloudstream3.services
 import android.app.Service
 import android.content.Intent
 import android.os.IBinder
-import com.lagradost.cloudstream3.utils.downloader.VideoDownloadManager
+import com.lagradost.cloudstream3.utils.VideoDownloadManager
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.launch
 
-/** Handle notification actions such as pause/resume downloads */
 class VideoDownloadService : Service() {
 
     private val downloadScope = CoroutineScope(Dispatchers.Default)
@@ -43,3 +42,19 @@ class VideoDownloadService : Service() {
         super.onDestroy()
     }
 }
+//    override fun onHandleIntent(intent: Intent?) {
+//        if (intent != null) {
+//            val id = intent.getIntExtra("id", -1)
+//            val type = intent.getStringExtra("type")
+//            if (id != -1 && type != null) {
+//                val state = when (type) {
+//                    "resume" -> VideoDownloadManager.DownloadActionType.Resume
+//                    "pause" -> VideoDownloadManager.DownloadActionType.Pause
+//                    "stop" -> VideoDownloadManager.DownloadActionType.Stop
+//                    else -> return
+//                }
+//                VideoDownloadManager.downloadEvent.invoke(Pair(id, state))
+//            }
+//        }
+//    }
+//}

app/src/main/java/com/lagradost/cloudstream3/syncproviders/AccountManager.kt

@@ -5,7 +5,6 @@ import com.lagradost.cloudstream3.CloudStreamApp.Companion.setKey
 import com.lagradost.cloudstream3.LoadResponse
 import com.lagradost.cloudstream3.syncproviders.providers.Addic7ed
 import com.lagradost.cloudstream3.syncproviders.providers.AniListApi
-import com.lagradost.cloudstream3.syncproviders.providers.KitsuApi
 import com.lagradost.cloudstream3.syncproviders.providers.LocalList
 import com.lagradost.cloudstream3.syncproviders.providers.MALApi
 import com.lagradost.cloudstream3.syncproviders.providers.OpenSubtitlesApi
@@ -13,14 +12,12 @@ import com.lagradost.cloudstream3.syncproviders.providers.SimklApi
 import com.lagradost.cloudstream3.syncproviders.providers.SubDlApi
 import com.lagradost.cloudstream3.syncproviders.providers.SubSourceApi
 import com.lagradost.cloudstream3.utils.DataStoreHelper
-import com.lagradost.cloudstream3.utils.videoskip.AnimeSkipAuth
 import java.util.concurrent.TimeUnit
 
 abstract class AccountManager {
     companion object {
         const val NONE_ID: Int = -1
         val malApi = MALApi()
-        val kitsuApi = KitsuApi()
         val aniListApi = AniListApi()
         val simklApi = SimklApi()
         val localListApi = LocalList()
@@ -29,7 +26,6 @@ abstract class AccountManager {
         val addic7ed = Addic7ed()
         val subDlApi = SubDlApi()
         val subSourceApi = SubSourceApi()
-        val animeSkipApi = AnimeSkipAuth()
 
         var cachedAccounts: MutableMap<String, Array<AuthData>>
         var cachedAccountIds: MutableMap<String, Int>
@@ -63,14 +59,13 @@ abstract class AccountManager {
 
         val allApis = arrayOf(
             SyncRepo(malApi),
-            SyncRepo(kitsuApi),
             SyncRepo(aniListApi),
             SyncRepo(simklApi),
             SyncRepo(localListApi),
+
             SubtitleRepo(openSubtitlesApi),
             SubtitleRepo(addic7ed),
-            SubtitleRepo(subDlApi),
-            PlainAuthRepo(animeSkipApi)
+            SubtitleRepo(subDlApi)
         )
 
         fun updateAccountIds() {
@@ -112,7 +107,6 @@ abstract class AccountManager {
         // accessing other classes
         fun initMainAPI() {
             LoadResponse.malIdPrefix = malApi.idPrefix
-            LoadResponse.kitsuIdPrefix = kitsuApi.idPrefix
             LoadResponse.aniListIdPrefix = aniListApi.idPrefix
             LoadResponse.simklIdPrefix = simklApi.idPrefix
         }
@@ -124,7 +118,6 @@ abstract class AccountManager {
         )
         val syncApis = arrayOf(
             SyncRepo(malApi),
-            SyncRepo(kitsuApi),
             SyncRepo(aniListApi),
             SyncRepo(simklApi),
             SyncRepo(localListApi)

app/src/main/java/com/lagradost/cloudstream3/syncproviders/AuthAPI.kt

@@ -28,7 +28,6 @@ import com.lagradost.cloudstream3.syncproviders.providers.Addic7ed
 import com.lagradost.cloudstream3.syncproviders.providers.AniListApi
 import com.lagradost.cloudstream3.syncproviders.providers.LocalList
 import com.lagradost.cloudstream3.syncproviders.providers.MALApi
-import com.lagradost.cloudstream3.syncproviders.providers.KitsuApi
 import com.lagradost.cloudstream3.syncproviders.providers.OpenSubtitlesApi
 import com.lagradost.cloudstream3.syncproviders.providers.SimklApi
 import com.lagradost.cloudstream3.syncproviders.providers.SubDlApi
@@ -36,9 +35,11 @@ import com.lagradost.cloudstream3.syncproviders.providers.SubSourceApi
 import com.lagradost.cloudstream3.ui.SyncWatchType
 import com.lagradost.cloudstream3.ui.library.ListSorting
 import com.lagradost.cloudstream3.utils.AppContextUtils.splitQuery
+import com.lagradost.cloudstream3.utils.Coroutines.threadSafeListOf
 import com.lagradost.cloudstream3.utils.DataStoreHelper
 import com.lagradost.cloudstream3.utils.UiText
 import com.lagradost.cloudstream3.utils.txt
+import me.xdrop.fuzzywuzzy.FuzzySearch
 import java.net.URL
 import java.security.SecureRandom
 import java.util.Date

app/src/main/java/com/lagradost/cloudstream3/syncproviders/AuthRepo.kt

@@ -9,9 +9,6 @@ import com.lagradost.cloudstream3.mvvm.safe
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.NONE_ID
 import com.lagradost.cloudstream3.utils.txt
 
-/** General-purpose repo */
-class PlainAuthRepo(api: AuthAPI) : AuthRepo(api)
-
 /** Safe abstraction for AuthAPI that provides both a catching interface, and automatic token management. */
 abstract class AuthRepo(open val api: AuthAPI) {
     fun isValidRedirectUrl(url: String) = safe { api.isValidRedirectUrl(url) } ?: false

app/src/main/java/com/lagradost/cloudstream3/syncproviders/SubtitleRepo.kt

@@ -6,7 +6,7 @@ import com.lagradost.cloudstream3.ErrorLoadingException
 import com.lagradost.cloudstream3.subtitles.AbstractSubtitleEntities.SubtitleEntity
 import com.lagradost.cloudstream3.subtitles.AbstractSubtitleEntities.SubtitleSearch
 import com.lagradost.cloudstream3.subtitles.SubtitleResource
-import com.lagradost.cloudstream3.utils.Coroutines.atomicListOf
+import com.lagradost.cloudstream3.utils.Coroutines.threadSafeListOf
 
 /** Stateless safe abstraction of SubtitleAPI */
 class SubtitleRepo(override val api: SubtitleAPI) : AuthRepo(api) {
@@ -24,30 +24,26 @@ class SubtitleRepo(override val api: SubtitleAPI) : AuthRepo(api) {
         )
 
         // maybe make this a generic struct? right now there is a lot of boilerplate
-        private val searchCache = atomicListOf<SavedSearchResponse>()
+        private val searchCache = threadSafeListOf<SavedSearchResponse>()
         private var searchCacheIndex: Int = 0
-        private val resourceCache = atomicListOf<SavedResourceResponse>()
+        private val resourceCache = threadSafeListOf<SavedResourceResponse>()
         private var resourceCacheIndex: Int = 0
         const val CACHE_SIZE = 20
     }
 
     @WorkerThread
     suspend fun resource(data: SubtitleEntity): Result<SubtitleResource> = runCatching {
-        val cached = resourceCache.withLock {
-            var found: SubtitleResource? = null
+        synchronized(resourceCache) {
             for (item in resourceCache) {
                 // 20 min save
                 if (item.query == data && (unixTime - item.unixTime) < 60 * 20) {
-                    found = item.response
-                    break
+                    return@runCatching item.response
                 }
             }
-            found
         }
-        if (cached != null) return@runCatching cached
 
         val returnValue = api.resource(freshAuth(), data)
-        resourceCache.withLock {
+        synchronized(resourceCache) {
             val add = SavedResourceResponse(unixTime, returnValue, data)
             if (resourceCache.size > CACHE_SIZE) {
                 resourceCache[resourceCacheIndex] = add // rolling cache
@@ -62,25 +58,22 @@ class SubtitleRepo(override val api: SubtitleAPI) : AuthRepo(api) {
     @WorkerThread
     suspend fun search(query: SubtitleSearch): Result<List<SubtitleEntity>> {
         return runCatching {
-            val cached = searchCache.withLock {
-                var found: List<SubtitleEntity>? = null
+            synchronized(searchCache) {
                 for (item in searchCache) {
                     // 120 min save
                     if (item.query == query && (unixTime - item.unixTime) < 60 * 120) {
-                        found = item.response
-                        break
+                        return@runCatching item.response
                     }
                 }
-                found
             }
 
-            if (cached != null) return@runCatching cached
-            val returnValue = api.search(freshAuth(), query) ?: emptyList()
+            val returnValue =
+                api.search(freshAuth(), query) ?: emptyList()
 
             // only cache valid return values
             if (returnValue.isNotEmpty()) {
                 val add = SavedSearchResponse(unixTime, returnValue, query)
-                searchCache.withLock {
+                synchronized(searchCache) {
                     if (searchCache.size > CACHE_SIZE) {
                         searchCache[searchCacheIndex] = add // rolling cache
                         searchCacheIndex = (searchCacheIndex + 1) % CACHE_SIZE
@@ -93,3 +86,4 @@ class SubtitleRepo(override val api: SubtitleAPI) : AuthRepo(api) {
         }
     }
 }
+

app/src/main/java/com/lagradost/cloudstream3/syncproviders/SyncAPI.kt

@@ -10,8 +10,8 @@ import com.lagradost.cloudstream3.ShowStatus
 import com.lagradost.cloudstream3.TvType
 import com.lagradost.cloudstream3.ui.SyncWatchType
 import com.lagradost.cloudstream3.ui.library.ListSorting
-import com.lagradost.cloudstream3.utils.Levenshtein
 import com.lagradost.cloudstream3.utils.UiText
+import me.xdrop.fuzzywuzzy.FuzzySearch
 import java.util.Date
 
 /**
@@ -138,7 +138,7 @@ abstract class SyncAPI : AuthAPI() {
                 ListSorting.Query ->
                     if (query != null) {
                         items.sortedBy {
-                            -Levenshtein.partialRatio(
+                            -FuzzySearch.partialRatio(
                                 query.lowercase(), it.name.lowercase()
                             )
                         }
@@ -191,4 +191,4 @@ abstract class SyncAPI : AuthAPI() {
         override var score: Score? = null,
         val tags: List<String>? = null
     ) : SearchResponse
-}
+}

app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/AniListApi.kt

@@ -50,8 +50,7 @@ class AniListApi : SyncAPI() {
     override suspend fun login(redirectUrl: String, payload: String?): AuthToken? {
         val sanitizer = splitRedirectUrl(redirectUrl)
         val token = AuthToken(
-            accessToken = sanitizer["access_token"]
-                ?: throw ErrorLoadingException("No access token"),
+            accessToken = sanitizer["access_token"] ?: throw ErrorLoadingException("No access token"),
             //refreshToken = sanitizer["refresh_token"],
             accessTokenLifetime = unixTime + sanitizer["expires_in"]!!.toLong(),
         )
@@ -84,8 +83,8 @@ class AniListApi : SyncAPI() {
         return "$mainUrl/anime/$id"
     }
 
-    override suspend fun search(auth: AuthData?, query: String): List<SyncAPI.SyncSearchResult>? {
-        val data = searchShows(query) ?: return null
+    override suspend fun search(auth : AuthData?, query: String): List<SyncAPI.SyncSearchResult>? {
+        val data = searchShows(name) ?: return null
         return data.data?.page?.media?.map {
             SyncAPI.SyncSearchResult(
                 it.title.romaji ?: return null,
@@ -97,7 +96,7 @@ class AniListApi : SyncAPI() {
         }
     }
 
-    override suspend fun load(auth: AuthData?, id: String): SyncAPI.SyncResult? {
+    override suspend fun load(auth : AuthData?, id: String): SyncAPI.SyncResult? {
         val internalId = (Regex("anilist\\.co/anime/(\\d*)").find(id)?.groupValues?.getOrNull(1)
             ?: id).toIntOrNull() ?: throw ErrorLoadingException("Invalid internalId")
         val season = getSeason(internalId).data.media
@@ -159,7 +158,7 @@ class AniListApi : SyncAPI() {
         )
     }
 
-    override suspend fun status(auth: AuthData?, id: String): SyncAPI.AbstractSyncStatus? {
+    override suspend fun status(auth : AuthData?, id: String): SyncAPI.AbstractSyncStatus? {
         val internalId = id.toIntOrNull() ?: return null
         val data = getDataAboutId(auth ?: return null, internalId) ?: return null
 
@@ -460,7 +459,7 @@ class AniListApi : SyncAPI() {
         }
     }
 
-    private suspend fun getDataAboutId(auth: AuthData, id: Int): AniListTitleHolder? {
+    private suspend fun getDataAboutId(auth : AuthData, id: Int): AniListTitleHolder? {
         val q =
             """query (${'$'}id: Int = $id) { # Define which variables will be used in the query (id)
                 Media (id: ${'$'}id, type: ANIME) { # Insert our variables into the query arguments (id) (type: ANIME is hard-coded in the query)
@@ -507,7 +506,7 @@ class AniListApi : SyncAPI() {
 
     }
 
-    private suspend fun postApi(token: AuthToken, q: String, cache: Boolean = false): String? {
+    private suspend fun postApi(token : AuthToken, q: String, cache: Boolean = false): String? {
         return app.post(
             "https://graphql.anilist.co/",
             headers = mapOf(
@@ -639,7 +638,7 @@ class AniListApi : SyncAPI() {
         }
     }
 
-    override suspend fun library(auth: AuthData?): SyncAPI.LibraryMetadata? {
+    override suspend fun library(auth : AuthData?): SyncAPI.LibraryMetadata? {
         val list = getAniListAnimeListSmart(auth ?: return null)?.groupBy {
             convertAniListStringToStatus(it.status ?: "").stringRes
         }?.mapValues { group ->
@@ -667,7 +666,7 @@ class AniListApi : SyncAPI() {
         )
     }
 
-    private suspend fun getFullAniListList(auth: AuthData): FullAnilistList? {
+    private suspend fun getFullAniListList(auth : AuthData): FullAnilistList? {
         val userID = auth.user.id
         val mediaType = "ANIME"
 
@@ -715,7 +714,7 @@ class AniListApi : SyncAPI() {
         return text?.toKotlinObject()
     }
 
-    suspend fun toggleLike(auth: AuthData, id: Int): Boolean {
+    suspend fun toggleLike(auth : AuthData, id: Int): Boolean {
         val q = """mutation (${'$'}animeId: Int = $id) {
 				ToggleFavourite (animeId: ${'$'}animeId) {
 					anime {
@@ -738,7 +737,7 @@ class AniListApi : SyncAPI() {
     data class MediaListId(@JsonProperty("id") val id: Long? = null)
 
     private suspend fun postDataAboutId(
-        auth: AuthData,
+        auth : AuthData,
         id: Int,
         type: AniListStatusType,
         score: Score?,
@@ -787,7 +786,7 @@ class AniListApi : SyncAPI() {
         return data != ""
     }
 
-    private suspend fun getUser(token: AuthToken): AniListUser? {
+    private suspend fun getUser(token : AuthToken): AniListUser? {
         val q = """
 				{
   					Viewer {

app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/KitsuApi.kt

@@ -1,676 +1,8 @@
 package com.lagradost.cloudstream3.syncproviders.providers
 
-
-import androidx.annotation.StringRes
 import com.fasterxml.jackson.annotation.JsonProperty
-import com.lagradost.cloudstream3.CloudStreamApp.Companion.getKey
-import com.lagradost.cloudstream3.CloudStreamApp.Companion.setKey
-import com.lagradost.cloudstream3.R
-import com.lagradost.cloudstream3.Score
-import com.lagradost.cloudstream3.ShowStatus
-import com.lagradost.cloudstream3.TvType
 import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.mvvm.logError
-import com.lagradost.cloudstream3.syncproviders.AuthData
-import com.lagradost.cloudstream3.syncproviders.AuthLoginRequirement
-import com.lagradost.cloudstream3.syncproviders.AuthLoginResponse
-import com.lagradost.cloudstream3.syncproviders.AuthToken
-import com.lagradost.cloudstream3.syncproviders.AuthUser
-import com.lagradost.cloudstream3.syncproviders.SyncAPI
-import com.lagradost.cloudstream3.syncproviders.SyncIdName
-import com.lagradost.cloudstream3.ui.SyncWatchType
-import com.lagradost.cloudstream3.ui.library.ListSorting
-import com.lagradost.cloudstream3.utils.AppUtils.toJson
-import com.lagradost.cloudstream3.utils.txt
-import okhttp3.Interceptor
-import okhttp3.Request
-import okhttp3.RequestBody.Companion.toRequestBody
-import okhttp3.Response
-import java.text.SimpleDateFormat
-import java.time.LocalDate
-import java.time.ZoneId
-import java.util.Date
-import java.util.Locale
-
-const val KITSU_MAX_SEARCH_LIMIT = 20
-
-class KitsuApi: SyncAPI() {
-    override var name = "Kitsu"
-    override val idPrefix = "kitsu"
-
-    private val apiUrl = "https://kitsu.io/api/edge"
-    private val fallbackApiUrl = "https://kitsu.app/api/edge"
-    private val oauthUrl = "https://kitsu.io/api/oauth"
-    private val fallbackOauthUrl = "https://kitsu.app/api/oauth"
-    override val hasInApp = true
-    override val mainUrl = "https://kitsu.app"
-    override val icon = R.drawable.kitsu_icon
-    override val syncIdName = SyncIdName.Kitsu
-    override val createAccountUrl = mainUrl
-
-    override val supportedWatchTypes = setOf(
-        SyncWatchType.WATCHING,
-        SyncWatchType.COMPLETED,
-        SyncWatchType.PLANTOWATCH,
-        SyncWatchType.DROPPED,
-        SyncWatchType.ONHOLD,
-        SyncWatchType.NONE
-    )
-
-    override val inAppLoginRequirement = AuthLoginRequirement(
-        password = true,
-        email = true
-    )
-
-    private class FallbackInterceptor(private val apiUrl: String, private val fallbackApiUrl: String) : Interceptor {
-        override fun intercept(chain: Interceptor.Chain): Response {
-            val request: Request = chain.request()
-
-            try {
-
-                val response = chain.proceed(request);
-
-                if (response.isSuccessful) return response
-
-                response.close()
-
-            } catch (_: Exception) {
-            }
-
-            val fallbackRequest: Request = request.newBuilder()
-                .url(request.url.toString().replaceFirst(apiUrl, fallbackApiUrl))
-                .build()
-
-            return chain.proceed(fallbackRequest)
-
-        }
-    }
-
-    private val apiFallbackInterceptor = FallbackInterceptor(apiUrl, fallbackApiUrl)
-    private val oauthFallbackInterceptor = FallbackInterceptor(oauthUrl, fallbackOauthUrl)
-
-    override suspend fun login(form: AuthLoginResponse): AuthToken? {
-        val username = form.email ?: return null
-        val password = form.password ?: return null
-
-        val grantType = "password"
-
-        val token = app.post(
-            "$oauthUrl/token",
-            data = mapOf(
-                "grant_type" to grantType,
-                "username" to username,
-                "password" to password
-            ),
-            interceptor = oauthFallbackInterceptor
-        ).parsed<ResponseToken>()
-
-        return AuthToken(
-            accessTokenLifetime = unixTime + token.expiresIn.toLong(),
-            refreshToken = token.refreshToken,
-            accessToken = token.accessToken,
-        )
-    }
-
-    override suspend fun refreshToken(token: AuthToken): AuthToken {
-        val res = app.post(
-            "$oauthUrl/token",
-            data = mapOf(
-                "grant_type" to "refresh_token",
-                "refresh_token" to token.refreshToken!!
-            ),
-            interceptor = oauthFallbackInterceptor
-        ).parsed<ResponseToken>()
-
-        return AuthToken(
-            accessToken = res.accessToken,
-            refreshToken = res.refreshToken,
-            accessTokenLifetime = unixTime + res.expiresIn.toLong()
-        )
-    }
-
-    override suspend fun user(token: AuthToken?): AuthUser? {
-        val user = app.get(
-            "$apiUrl/users?filter[self]=true",
-            headers = mapOf(
-                "Authorization" to "Bearer ${token?.accessToken ?: return null}"
-            ), cacheTime = 0,
-            interceptor = apiFallbackInterceptor
-        ).parsed<KitsuResponse>()
-
-        if (user.data.isEmpty()) {
-           return null
-        }
-
-        return AuthUser(
-            id = user.data[0].id.toInt(),
-            name = user.data[0].attributes.name,
-            profilePicture = user.data[0].attributes.avatar?.original
-        )
-    }
-
-    override suspend fun search(auth: AuthData?, query: String): List<SyncSearchResult>? {
-        val auth = auth?.token?.accessToken ?: return null
-        val animeSelectedFields = arrayOf("titles","canonicalTitle","posterImage","episodeCount")
-        val url = "$apiUrl/anime?filter[text]=$query&page[limit]=$KITSU_MAX_SEARCH_LIMIT&fields[anime]=${animeSelectedFields.joinToString(",")}"
-
-        val res = app.get(
-            url, headers = mapOf(
-                "Authorization" to "Bearer $auth",
-            ), cacheTime = 0,
-            interceptor = apiFallbackInterceptor
-        ).parsed<KitsuResponse>()
-
-        return res.data.map {
-            val attributes = it.attributes
-
-            val title = attributes.canonicalTitle ?: attributes.titles?.enJp ?: attributes.titles?.jaJp ?: "No title"
-
-            SyncSearchResult(
-                title,
-                this.name,
-                it.id,
-                "$mainUrl/anime/${it.id}/",
-                attributes.posterImage?.large ?: attributes.posterImage?.medium
-            )
-        }
-    }
-
-    override suspend fun load(auth : AuthData?, id: String): SyncResult? {
-        val auth = auth?.token?.accessToken ?: return null
-        if (id.toIntOrNull() == null) {
-            return null
-        }
-
-        data class KitsuResponse(
-            @field:JsonProperty(value = "data")
-            val data: KitsuNode,
-        )
-
-        val url =
-            "$apiUrl/anime/$id"
-
-        val anime = app.get(
-            url, headers = mapOf(
-                "Authorization" to "Bearer $auth"
-            ),
-            interceptor = apiFallbackInterceptor
-        ).parsed<KitsuResponse>().data.attributes
-
-        return SyncResult(
-            id = id,
-            totalEpisodes = anime.episodeCount,
-            title = anime.canonicalTitle ?: anime.titles?.enJp ?: anime.titles?.jaJp.orEmpty(),
-            publicScore =  Score.from(anime.ratingTwenty, 20),
-            duration = anime.episodeLength,
-            synopsis = anime.synopsis,
-            airStatus = when(anime.status) {
-                "finished" -> ShowStatus.Completed
-                "current" -> ShowStatus.Ongoing
-                else -> null
-            },
-            nextAiring = null,
-            studio = null,
-            genres = null,
-            trailers = null,
-            startDate = LocalDate.parse(anime.startDate).toEpochDay(),
-            endDate = LocalDate.parse(anime.endDate).toEpochDay(),
-            recommendations = null,
-            nextSeason =null,
-            prevSeason = null,
-            actors = null,
-        )
-
-    }
-
-    override suspend fun status(auth : AuthData?, id: String): AbstractSyncStatus? {
-        val accessToken = auth?.token?.accessToken ?: return null
-        val userId = auth.user.id
-
-        val selectedFields = arrayOf("status","ratingTwenty", "progress")
-
-        val url =
-            "$apiUrl/library-entries?filter[userId]=$userId&filter[animeId]=$id&fields[libraryEntries]=${selectedFields.joinToString(",")}"
-
-        val anime = app.get(
-            url, headers = mapOf(
-                "Authorization" to "Bearer $accessToken"
-            ),
-            interceptor = apiFallbackInterceptor
-        ).parsed<KitsuResponse>().data.firstOrNull()?.attributes
-
-        if (anime == null) {
-            return SyncStatus(
-                score = null,
-                status = SyncWatchType.NONE,
-                isFavorite = null,
-                watchedEpisodes = null
-            )
-        }
-
-        return SyncStatus(
-            score = Score.from(anime.ratingTwenty, 20),
-            status = SyncWatchType.fromInternalId(kitsuStatusAsString.indexOf(anime.status)),
-            isFavorite = null,
-            watchedEpisodes = anime.progress,
-        )
-    }
-    suspend fun getAnimeIdByTitle(title: String): String? {
-
-        val animeSelectedFields = arrayOf("titles","canonicalTitle")
-        val url = "$apiUrl/anime?filter[text]=$title&page[limit]=$KITSU_MAX_SEARCH_LIMIT&fields[anime]=${animeSelectedFields.joinToString(",")}"
-
-        val res = app.get(url, interceptor = apiFallbackInterceptor).parsed<KitsuResponse>()
-
-        return res.data.firstOrNull()?.id
-
-    }
-
-    override fun urlToId(url: String): String? =
-        Regex("""/anime/((.*)/|(.*))""").find(url)?.groupValues?.first()
-
-    override suspend fun updateStatus(
-        auth : AuthData?,
-        id: String,
-        newStatus: AbstractSyncStatus
-    ): Boolean {
-
-        return setScoreRequest(
-            auth ?: return false,
-            id.toIntOrNull() ?: return false,
-            fromIntToAnimeStatus(newStatus.status),
-            newStatus.score?.toInt(20),
-            newStatus.watchedEpisodes
-        )
-    }
-
-    private suspend fun setScoreRequest(
-        auth : AuthData,
-        id: Int,
-        status: KitsuStatusType? = null,
-        score: Int? = null,
-        numWatchedEpisodes: Int? = null,
-    ): Boolean {
-
-        val libraryEntryId = getAnimeLibraryEntryId(auth, id)
-
-        // Exists entry for anime in library
-        if (libraryEntryId != null) {
-
-            // Delete anime from library
-            if (status == null || status == KitsuStatusType.None) {
-
-                val res = app.delete(
-                    "$apiUrl/library-entries/$libraryEntryId",
-                    headers = mapOf(
-                        "Authorization" to "Bearer ${auth.token.accessToken}"
-                    ),
-                    interceptor = apiFallbackInterceptor
-                )
-
-
-                return res.isSuccessful
-
-            }
-
-            return setScoreRequest(
-                auth,
-                libraryEntryId,
-                kitsuStatusAsString[maxOf(0, status.value)],
-                score,
-                numWatchedEpisodes
-            )
-
-        }
-
-        val data = mapOf(
-            "data" to mapOf(
-                "type" to "libraryEntries",
-                "attributes" to mapOf(
-                    "ratingTwenty" to score,
-                    "progress" to numWatchedEpisodes,
-                    "status" to if (status == null) null else kitsuStatusAsString[maxOf(0, status.value)],
-                ),
-                "relationships" to mapOf(
-                    "anime" to mapOf(
-                        "data" to mapOf(
-                            "type" to "anime",
-                            "id" to id.toString()
-                        )
-                    ),
-                    "user" to mapOf(
-                        "data" to mapOf(
-                            "type" to "users",
-                            "id" to auth.user.id
-                        )
-                    )
-                )
-            )
-        )
-
-        val res = app.post(
-            "$apiUrl/library-entries",
-            headers = mapOf(
-                "content-type" to "application/vnd.api+json",
-                "Authorization" to "Bearer ${auth.token.accessToken}"
-            ),
-            requestBody = data.toJson().toRequestBody(),
-            interceptor = apiFallbackInterceptor
-        )
-
-        return res.isSuccessful
-
-    }
-
-    @Suppress("UNCHECKED_CAST")
-    private suspend fun setScoreRequest(
-        auth : AuthData,
-        id: Int,
-        status: String? = null,
-        score: Int? = null,
-        numWatchedEpisodes: Int? = null,
-    ):  Boolean {
-        val data = mapOf(
-            "data" to mapOf(
-                "type" to "libraryEntries",
-                "id" to id.toString(),
-                "attributes" to mapOf(
-                    "ratingTwenty" to score,
-                    "progress" to numWatchedEpisodes,
-                    "status" to status
-                )
-            )
-        )
-
-        val res = app.patch(
-            "$apiUrl/library-entries/$id",
-            headers = mapOf(
-                "content-type" to "application/vnd.api+json",
-                "Authorization" to "Bearer ${auth.token.accessToken}"
-            ),
-            requestBody = data.toJson().toRequestBody(),
-            interceptor = apiFallbackInterceptor
-        )
-
-
-        return res.isSuccessful
-
-    }
-
-    private suspend fun getAnimeLibraryEntryId(auth: AuthData, id: Int): Int? {
-
-        val userId = auth.user.id
-
-        val res = app.get(
-            "$apiUrl/library-entries?filter[userId]=$userId&filter[animeId]=$id",
-            headers = mapOf(
-                "Authorization" to "Bearer ${auth.token.accessToken}"
-            ),
-            interceptor = apiFallbackInterceptor
-        ).parsed<KitsuResponse>().data.firstOrNull() ?: return null
-
-        return res.id.toInt()
-
-    }
-
-    override suspend fun library(auth : AuthData?): LibraryMetadata? {
-        val list = getKitsuAnimeListSmart(auth ?: return null)?.groupBy {
-            convertToStatus(it.attributes.status ?: "").stringRes
-        }?.mapValues { group ->
-            group.value.map { it.toLibraryItem() }
-        } ?: emptyMap()
-
-        // To fill empty lists when Kitsu does not return them
-        val baseMap =
-            KitsuStatusType.entries.filter { it.value >= 0 }.associate {
-                it.stringRes to emptyList<LibraryItem>()
-            }
-
-        return LibraryMetadata(
-            (baseMap + list).map { LibraryList(txt(it.key), it.value) },
-            setOf(
-                ListSorting.AlphabeticalA,
-                ListSorting.AlphabeticalZ,
-                ListSorting.UpdatedNew,
-                ListSorting.UpdatedOld,
-                ListSorting.ReleaseDateNew,
-                ListSorting.ReleaseDateOld,
-                ListSorting.RatingHigh,
-                ListSorting.RatingLow,
-            )
-        )
-    }
-
-    private suspend fun getKitsuAnimeListSmart(auth : AuthData): Array<KitsuNode>? {
-        return if (requireLibraryRefresh) {
-            val list = getKitsuAnimeList(auth.token, auth.user.id)
-            setKey(KITSU_CACHED_LIST, auth.user.id.toString(), list)
-            list
-        } else {
-            getKey<Array<KitsuNode>>(KITSU_CACHED_LIST, auth.user.id.toString()) as? Array<KitsuNode>
-        }
-    }
-
-    private suspend fun getKitsuAnimeList(token: AuthToken, userId: Int): Array<KitsuNode> {
-
-        val animeSelectedFields = arrayOf("titles","canonicalTitle","posterImage","synopsis","startDate","endDate","episodeCount")
-        val libraryEntriesSelectedFields = arrayOf("progress","ratingTwenty","updatedAt", "status")
-        val limit = 500
-        var url = "$apiUrl/library-entries?filter[userId]=$userId&filter[kind]=anime&include=anime&page[limit]=$limit&page[offset]=0&fields[anime]=${animeSelectedFields.joinToString(",")}&fields[libraryEntries]=${libraryEntriesSelectedFields.joinToString(",")}"
-
-        val fullList = mutableListOf<KitsuNode>()
-
-        while (true) {
-
-            val data: KitsuResponse = getKitsuAnimeListSlice(token, url)
-
-            data.data.forEachIndexed { index, value ->
-                value.anime = data.included?.get(index)
-            }
-
-            fullList.addAll(data.data)
-
-            url = data.links?.next ?: break
-        }
-
-
-        return fullList.toTypedArray()
-    }
-
-    private suspend fun getKitsuAnimeListSlice(token: AuthToken, url: String): KitsuResponse {
-        val res = app.get(
-            url, headers = mapOf(
-                "Authorization" to "Bearer ${token.accessToken}",
-            ),
-            interceptor = apiFallbackInterceptor
-        ).parsed<KitsuResponse>()
-        return res
-    }
-
-
-    data class ResponseToken(
-        @JsonProperty("token_type") val tokenType: String,
-        @JsonProperty("expires_in") val expiresIn: Int,
-        @JsonProperty("access_token") val accessToken: String,
-        @JsonProperty("refresh_token") val refreshToken: String,
-    )
-
-    data class KitsuNode(
-        @JsonProperty("id") val id: String,
-        @JsonProperty("attributes") val attributes: KitsuNodeAttributes,
-        /* User list anime node */
-        @JsonProperty("relationships") val relationships: KitsuRelationships?,
-        var anime: KitsuAnimeData?
-    ) {
-        fun toLibraryItem(): LibraryItem {
-
-            val animeItem = this.anime
-
-            val numEpisodes = animeItem?.attributes?.episodeCount
-
-            val startDate = animeItem?.attributes?.startDate
-
-            val posterImage = animeItem?.attributes?.posterImage
-
-            val canonicalTitle = animeItem?.attributes?.canonicalTitle
-            val titles = animeItem?.attributes?.titles
-
-            val animeId = animeItem?.id
-
-            val synopsis: String? = animeItem?.attributes?.synopsis
-
-            return LibraryItem(
-                canonicalTitle ?: titles?.enJp ?: titles?.jaJp.orEmpty(),
-                "https://kitsu.app/anime/${animeId}/",
-                this.id,
-                this.attributes.progress,
-                numEpisodes,
-                Score.from(this.attributes.ratingTwenty, 20),
-                parseDateLong(this.attributes.updatedAt),
-                "Kitsu",
-                TvType.Anime,
-                posterImage?.large ?: posterImage?.medium,
-                null,
-                null,
-                plot = synopsis,
-                releaseDate = if (startDate == null) null else try {
-                    Date.from(LocalDate.parse(startDate).atStartOfDay()
-                        .atZone(ZoneId.systemDefault())
-                        .toInstant())
-                } catch (_: RuntimeException) {
-                    null
-                }
-            )
-        }
-
-    }
-
-    data class KitsuAnimeAttributes(
-        @JsonProperty("titles") val titles: KitsuTitles?,
-        @JsonProperty("canonicalTitle") val canonicalTitle: String?,
-        @JsonProperty("posterImage") val posterImage: KitsuPosterImage?,
-        @JsonProperty("synopsis") val synopsis: String?,
-        @JsonProperty("startDate") val startDate: String?,
-        @JsonProperty("endDate") val endDate: String?,
-        @JsonProperty("episodeCount") val episodeCount: Int?,
-        @JsonProperty("episodeLength") val episodeLength: Int?,
-    )
-
-    data class KitsuAnimeData(
-        @JsonProperty("id") val id: String,
-        @JsonProperty("attributes") val attributes: KitsuAnimeAttributes,
-    )
-
-
-    data class KitsuNodeAttributes(
-        /* General attributes */
-        @JsonProperty("titles") val titles: KitsuTitles?,
-        @JsonProperty("canonicalTitle") val canonicalTitle: String?,
-        @JsonProperty("posterImage") val posterImage: KitsuPosterImage?,
-        @JsonProperty("synopsis") val synopsis: String?,
-        @JsonProperty("startDate") val startDate: String?,
-        @JsonProperty("endDate") val endDate: String?,
-        @JsonProperty("episodeCount") val episodeCount: Int?,
-        @JsonProperty("episodeLength") val episodeLength: Int?,
-        /* User attributes */
-        @JsonProperty("name") val name: String?,
-        @JsonProperty("location") val location: String?,
-        @JsonProperty("createdAt") val createdAt: String?,
-        @JsonProperty("avatar") val avatar: KitsuUserAvatar?,
-        /* User list anime attributes */
-        @JsonProperty("progress") val progress: Int?,
-        @JsonProperty("ratingTwenty") val ratingTwenty: Int?,
-        @JsonProperty("updatedAt") val updatedAt: String?,
-        @JsonProperty("status") val status: String?,
-    )
-
-    data class KitsuRelationships(
-        @JsonProperty("anime") val anime: KitsuRelationshipsAnime?
-    )
-
-    data class KitsuRelationshipsAnime(
-        @JsonProperty("links") val links: KitsuLinks?
-    )
-
-    data class KitsuPosterImage(
-        @JsonProperty("large") val large: String?,
-        @JsonProperty("medium") val medium: String?,
-    )
-
-    data class KitsuTitles(
-        @JsonProperty("en_jp") val enJp: String?,
-        @JsonProperty("ja_jp") val jaJp: String?
-    )
-
-    data class KitsuUserAvatar(
-        @JsonProperty("original") val original: String?
-    )
-
-    data class KitsuLinks(
-        /* Pagination */
-        @JsonProperty("first") val first: String?,
-        @JsonProperty("next") val next: String?,
-        @JsonProperty("last") val last: String?,
-        /* Relationships */
-        @JsonProperty("related") val related: String?
-    )
-
-    data class KitsuResponse(
-        @JsonProperty("links") val links: KitsuLinks?,
-        @JsonProperty("data") val data: List<KitsuNode>,
-        /* When requesting related info (User library entry -> anime) */
-        @JsonProperty("included") val included: List<KitsuAnimeData>?,
-    )
-
-
-    companion object {
-
-        const val KITSU_CACHED_LIST: String = "kitsu_cached_list"
-        private fun parseDateLong(string: String?): Long? {
-            return try {
-                SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", Locale.getDefault()).parse(
-                    string ?: return null
-                )?.time?.div(1000)
-            } catch (e: Exception) {
-                null
-            }
-        }
-
-        private val kitsuStatusAsString =
-            arrayOf("current", "completed", "on_hold", "dropped", "planned")
-        private fun fromIntToAnimeStatus(inp: SyncWatchType): KitsuStatusType {
-            return when (inp) {
-                SyncWatchType.NONE ->  KitsuStatusType.None
-                SyncWatchType.WATCHING ->  KitsuStatusType.Watching
-                SyncWatchType.COMPLETED ->  KitsuStatusType.Completed
-                SyncWatchType.ONHOLD ->  KitsuStatusType.OnHold
-                SyncWatchType.DROPPED ->  KitsuStatusType.Dropped
-                SyncWatchType.PLANTOWATCH ->  KitsuStatusType.PlanToWatch
-                SyncWatchType.REWATCHING ->  KitsuStatusType.Watching
-            }
-        }
-
-        enum class KitsuStatusType(var value: Int, @StringRes val stringRes: Int) {
-            Watching(0, R.string.type_watching),
-            Completed(1, R.string.type_completed),
-            OnHold(2, R.string.type_on_hold),
-            Dropped(3, R.string.type_dropped),
-            PlanToWatch(4, R.string.type_plan_to_watch),
-            None(-1, R.string.type_none)
-        }
-
-        private fun convertToStatus(string: String): KitsuStatusType {
-            return when (string) {
-                "current" ->  KitsuStatusType.Watching
-                "completed" ->  KitsuStatusType.Completed
-                "on_hold" ->  KitsuStatusType.OnHold
-                "dropped" ->  KitsuStatusType.Dropped
-                "planned" ->  KitsuStatusType.PlanToWatch
-                else ->  KitsuStatusType.None
-            }
-        }
-    }
-}
 
 // modified code from from https://github.com/saikou-app/saikou/blob/main/app/src/main/java/ani/saikou/others/Kitsu.kt
 // GNU General Public License v3.0 https://github.com/saikou-app/saikou/blob/main/LICENSE.md
@@ -810,4 +142,4 @@ query {
             val canonical: String? = null
         )
     }
-}
+}

app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/MALApi.kt

@@ -98,9 +98,9 @@ class MALApi : SyncAPI() {
         )
     }
 
-    override suspend fun search(auth: AuthData?, query: String): List<SyncAPI.SyncSearchResult>? {
+    override suspend fun search(auth : AuthData?, query: String): List<SyncAPI.SyncSearchResult>? {
         val auth = auth?.token?.accessToken ?: return null
-        val url = "$apiUrl/v2/anime?q=$query&limit=$MAL_MAX_SEARCH_LIMIT"
+        val url = "$apiUrl/v2/anime?q=$name&limit=$MAL_MAX_SEARCH_LIMIT"
         val res = app.get(
             url, headers = mapOf(
                 "Authorization" to "Bearer $auth",
@@ -122,7 +122,7 @@ class MALApi : SyncAPI() {
         Regex("""/anime/((.*)/|(.*))""").find(url)!!.groupValues.first()
 
     override suspend fun updateStatus(
-        auth: AuthData?,
+        auth : AuthData?,
         id: String,
         newStatus: SyncAPI.AbstractSyncStatus
     ): Boolean {
@@ -225,7 +225,7 @@ class MALApi : SyncAPI() {
         )
     }
 
-    override suspend fun load(auth: AuthData?, id: String): SyncAPI.SyncResult? {
+    override suspend fun load(auth : AuthData?, id: String): SyncAPI.SyncResult? {
         val auth = auth?.token?.accessToken ?: return null
         val internalId = id.toIntOrNull() ?: return null
         val url =
@@ -271,7 +271,7 @@ class MALApi : SyncAPI() {
         }
     }
 
-    override suspend fun status(auth: AuthData?, id: String): SyncAPI.AbstractSyncStatus? {
+    override suspend fun status(auth : AuthData?, id: String): SyncAPI.AbstractSyncStatus? {
         val auth = auth?.token?.accessToken ?: return null
 
         // https://myanimelist.net/apiconfig/references/api/v2#operation/anime_anime_id_get
@@ -477,7 +477,7 @@ class MALApi : SyncAPI() {
         @JsonProperty("start_time") val startTime: String?
     )
 
-    override suspend fun library(auth: AuthData?): LibraryMetadata? {
+    override suspend fun library(auth : AuthData?): LibraryMetadata? {
         val list = getMalAnimeListSmart(auth ?: return null)?.groupBy {
             convertToStatus(it.listStatus?.status ?: "").stringRes
         }?.mapValues { group ->
@@ -505,7 +505,7 @@ class MALApi : SyncAPI() {
         )
     }
 
-    private suspend fun getMalAnimeListSmart(auth: AuthData): Array<Data>? {
+    private suspend fun getMalAnimeListSmart(auth : AuthData): Array<Data>? {
         return if (requireLibraryRefresh) {
             val list = getMalAnimeList(auth.token)
             setKey(MAL_CACHED_LIST, auth.user.id.toString(), list)

app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/SimklApi.kt

@@ -16,6 +16,7 @@ import com.lagradost.cloudstream3.Score
 import com.lagradost.cloudstream3.SimklSyncServices
 import com.lagradost.cloudstream3.TvType
 import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.mapper
 import com.lagradost.cloudstream3.mvvm.debugPrint
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.APP_STRING
@@ -29,7 +30,6 @@ import com.lagradost.cloudstream3.syncproviders.SyncIdName
 import com.lagradost.cloudstream3.ui.SyncWatchType
 import com.lagradost.cloudstream3.ui.library.ListSorting
 import com.lagradost.cloudstream3.utils.AppUtils.toJson
-import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
 import com.lagradost.cloudstream3.utils.DataStoreHelper.toYear
 import com.lagradost.cloudstream3.utils.txt
 import java.math.BigInteger
@@ -117,8 +117,13 @@ class SimklApi : SyncAPI() {
          * Gets cached object, if object is not fresh returns null and removes it from cache
          */
         inline fun <reified T : Any> getKey(path: String): T? {
+            // Required for generic otherwise "LinkedHashMap cannot be cast to MediaObject"
+            val type = mapper.typeFactory.constructParametricType(
+                SimklCacheWrapper::class.java,
+                T::class.java
+            )
             val cache = getKey<String>(SIMKL_CACHE_KEY, path)?.let {
-                tryParseJson<SimklCacheWrapper<T>>(it)
+                mapper.readValue<SimklCacheWrapper<T>>(it, type)
             }
 
             return if (cache?.isFresh() == true) {
@@ -911,7 +916,7 @@ class SimklApi : SyncAPI() {
 
     override suspend fun search(auth: AuthData?, query: String): List<SyncAPI.SyncSearchResult>? {
         return app.get(
-            "$mainUrl/search/", params = mapOf("client_id" to CLIENT_ID, "q" to query)
+            "$mainUrl/search/", params = mapOf("client_id" to CLIENT_ID, "q" to name)
         ).parsedSafe<Array<MediaObject>>()?.mapNotNull { it.toSyncSearchResult() }
     }
 

app/src/main/java/com/lagradost/cloudstream3/ui/APIRepository.kt

@@ -17,7 +17,7 @@ import com.lagradost.cloudstream3.mvvm.Resource
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.mvvm.safeApiCall
 import com.lagradost.cloudstream3.newSearchResponseList
-import com.lagradost.cloudstream3.utils.Coroutines.atomicListOf
+import com.lagradost.cloudstream3.utils.Coroutines.threadSafeListOf
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.async
@@ -55,7 +55,7 @@ class APIRepository(val api: MainAPI) {
             val hash: Pair<String, String>
         )
 
-        private val cache = atomicListOf<SavedLoadResponse>()
+        private val cache = threadSafeListOf<SavedLoadResponse>()
         private var cacheIndex: Int = 0
         const val CACHE_SIZE = 20
 
@@ -66,7 +66,9 @@ class APIRepository(val api: MainAPI) {
 
     private fun afterPluginsLoaded(forceReload: Boolean) {
         if (forceReload) {
-            cache.clear()
+            synchronized(cache) {
+                cache.clear()
+            }
         }
     }
 
@@ -89,25 +91,21 @@ class APIRepository(val api: MainAPI) {
                 val fixedUrl = api.fixUrl(url)
                 val lookingForHash = Pair(api.name, fixedUrl)
 
-                val cached = cache.withLock {
-                    var found: LoadResponse? = null
+                synchronized(cache) {
                     for (item in cache) {
                         // 10 min save
                         if (item.hash == lookingForHash && (unixTime - item.unixTime) < 60 * 10) {
-                            found = item.response
-                            break
+                            return@withTimeout item.response
                         }
                     }
-                    found
                 }
 
-                if (cached != null) return@withTimeout cached
                 api.load(fixedUrl)?.also { response ->
                     // Remove all blank tags as early as possible
                     response.tags = response.tags?.filter { it.isNotBlank() }
                     val add = SavedLoadResponse(unixTime, response, lookingForHash)
 
-                    cache.withLock {
+                    synchronized(cache) {
                         if (cache.size > CACHE_SIZE) {
                             cache[cacheIndex] = add // rolling cache
                             cacheIndex = (cacheIndex + 1) % CACHE_SIZE
@@ -217,4 +215,4 @@ class APIRepository(val api: MainAPI) {
             return false
         }
     }
-}
+}

app/src/main/java/com/lagradost/cloudstream3/ui/BaseAdapter.kt

@@ -1,6 +1,5 @@
 package com.lagradost.cloudstream3.ui
 
-import android.content.Context
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
@@ -12,7 +11,6 @@ import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.RecyclerView.ViewHolder
 import androidx.viewbinding.ViewBinding
 import coil3.dispose
-import java.util.WeakHashMap
 import java.util.concurrent.CopyOnWriteArrayList
 
 open class ViewHolderState<T>(val view: ViewBinding) : ViewHolder(view.root) {
@@ -24,33 +22,6 @@ abstract class NoStateAdapter<T : Any>(
     diffCallback: DiffUtil.ItemCallback<T> = BaseDiffCallback()
 ) : BaseAdapter<T, Any>(0, diffCallback)
 
-/** Creates a new shared pool, using the supplied lambda as a constructor.
- *
- * The reason for this complicated structure is that a pool should not be shared between contexts
- * as it makes coil fuck up, and theming.
- * */
-fun newSharedPool(lambda: RecyclerView.RecycledViewPool.() -> Unit = { }): Pair<WeakHashMap<Context, RecyclerView.RecycledViewPool>, RecyclerView.RecycledViewPool.() -> Unit> =
-    WeakHashMap<Context, RecyclerView.RecycledViewPool>() to lambda
-
-/** Sets the shared pool of the recyclerview */
-fun RecyclerView.setRecycledViewPool(pool: Pair<WeakHashMap<Context, RecyclerView.RecycledViewPool>, RecyclerView.RecycledViewPool.() -> Unit>) {
-    val ctx = context ?: return
-    synchronized(pool.first) {
-        this.setRecycledViewPool(pool.first.getOrPut(ctx) {
-            RecyclerView.RecycledViewPool().apply(pool.second)
-        })
-    }
-}
-
-/** Clears the shared pool of views */
-fun Pair<WeakHashMap<Context, RecyclerView.RecycledViewPool>, RecyclerView.RecycledViewPool.() -> Unit>.clear() {
-    synchronized(this.first) {
-        for (pool in this.first.values) {
-            pool?.clear()
-        }
-    }
-}
-
 /**
  * BaseAdapter is a persistent state stored adapter that supports headers and footers.
  * This should be used for restoring eg scroll or focus related to a view when it is recreated.

app/src/main/java/com/lagradost/cloudstream3/ui/ControllerActivity.kt

@@ -12,6 +12,9 @@ import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.ListView
 import androidx.appcompat.app.AlertDialog
+import com.fasterxml.jackson.databind.DeserializationFeature
+import com.fasterxml.jackson.databind.json.JsonMapper
+import com.fasterxml.jackson.module.kotlin.kotlinModule
 import com.google.android.gms.cast.MediaLoadOptions
 import com.google.android.gms.cast.MediaQueueItem
 import com.google.android.gms.cast.MediaSeekOptions
@@ -102,6 +105,9 @@ data class MetadataHolder(
 
 class SelectSourceController(val view: ImageView, val activity: ControllerActivity) :
     UIController() {
+    private val mapper: JsonMapper = JsonMapper.builder().addModule(kotlinModule())
+        .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false).build()
+
     init {
         view.setImageResource(R.drawable.ic_baseline_playlist_play_24)
         view.setOnClickListener {
@@ -328,7 +334,6 @@ class SelectSourceController(val view: ImageView, val activity: ControllerActivi
                                 }, subtitleCallback = {
                                     currentSubs.add(it)
                                 },
-                                offset = 0,
                                 isCasting = true
                             )
                         }
@@ -443,4 +448,4 @@ class ControllerActivity : ExpandedControllerActivity() {
             SkipNextEpisodeController(skipOpButton)
         )
     }
-}
+}

app/src/main/java/com/lagradost/cloudstream3/ui/CustomRecyclerViews.kt

@@ -3,7 +3,6 @@ package com.lagradost.cloudstream3.ui
 import android.content.Context
 import android.util.AttributeSet
 import android.view.View
-import androidx.core.content.withStyledAttributes
 import androidx.core.view.children
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.RecyclerView
@@ -155,9 +154,10 @@ class AutofitRecyclerView @JvmOverloads constructor(context: Context, attrs: Att
 
     init {
         if (attrs != null) {
-            context.withStyledAttributes(attrs, intArrayOf(android.R.attr.columnWidth)) {
-                columnWidth = getDimensionPixelSize(0, -1)
-            }
+            val attrsArray = intArrayOf(android.R.attr.columnWidth)
+            val array = context.obtainStyledAttributes(attrs, attrsArray)
+            columnWidth = array.getDimensionPixelSize(0, -1)
+            array.recycle()
         }
 
         layoutManager = manager

app/src/main/java/com/lagradost/cloudstream3/ui/MiniControllerFragment.kt

@@ -7,12 +7,12 @@ import android.view.View
 import android.widget.LinearLayout
 import android.widget.ProgressBar
 import android.widget.RelativeLayout
-import androidx.core.content.withStyledAttributes
 import com.google.android.gms.cast.framework.media.widget.MiniControllerFragment
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.utils.UIHelper.adjustAlpha
 import com.lagradost.cloudstream3.utils.UIHelper.colorFromAttribute
 import com.lagradost.cloudstream3.utils.UIHelper.toPx
+import java.lang.ref.WeakReference
 
 
 class MyMiniControllerFragment : MiniControllerFragment() {
@@ -25,15 +25,26 @@ class MyMiniControllerFragment : MiniControllerFragment() {
 
     // I KNOW, KINDA SPAGHETTI SOLUTION, BUT IT WORKS
     override fun onInflate(context: Context, attributeSet: AttributeSet, bundle: Bundle?) {
-        if (currentColor == 0) {
-            context.withStyledAttributes(attributeSet, R.styleable.CustomCast, 0, 0) {
-                if (hasValue(R.styleable.CustomCast_customCastBackgroundColor)) {
-                    currentColor = getColor(R.styleable.CustomCast_customCastBackgroundColor, 0)
-                }
-            }
-        }
-
         super.onInflate(context, attributeSet, bundle)
+
+        // somehow this leaks and I really dont know why, it seams like if you go back to a fragment with this, it leaks????
+        if (currentColor == 0) {
+            WeakReference(
+                context.obtainStyledAttributes(
+                    attributeSet,
+                    R.styleable.CustomCast
+                )
+            ).apply {
+                if (get()
+                        ?.hasValue(R.styleable.CustomCast_customCastBackgroundColor) == true
+                ) {
+                    currentColor =
+                        get()
+                            ?.getColor(R.styleable.CustomCast_customCastBackgroundColor, 0) ?: 0
+                }
+                get()?.recycle()
+            }.clear()
+        }
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {

app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountSelectActivity.kt

@@ -38,15 +38,15 @@ import com.lagradost.cloudstream3.utils.UIHelper.setNavigationBarColorCompat
 
 class AccountSelectActivity : FragmentActivity(), BiometricCallback {
 
-    companion object {
-        var hasLoggedIn: Boolean = false
-    }
-
     val accountViewModel: AccountViewModel by viewModels()
 
     @SuppressLint("NotifyDataSetChanged")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        loadThemes(this)
+
+        enableEdgeToEdgeCompat()
+        setNavigationBarColorCompat(R.attr.primaryBlackBackground)
 
         // Are we editing and coming from MainActivity?
         val isEditingFromMainActivity = intent.getBooleanExtra(
@@ -54,19 +54,6 @@ class AccountSelectActivity : FragmentActivity(), BiometricCallback {
             false
         )
 
-        // Sometimes we start this activity when we have already logged in
-        // For example when using cloudstreamsearch://
-        // In those cases we want to just go to the main activity instantly
-        if (hasLoggedIn && !isEditingFromMainActivity) {
-            navigateToMainActivity()
-            return
-        }
-
-        loadThemes(this)
-
-        enableEdgeToEdgeCompat()
-        setNavigationBarColorCompat(R.attr.primaryBlackBackground)
-
         val settingsManager = PreferenceManager.getDefaultSharedPreferences(this)
         val skipStartup = settingsManager.getBoolean(
             getString(R.string.skip_startup_account_select_key), false
@@ -201,11 +188,8 @@ class AccountSelectActivity : FragmentActivity(), BiometricCallback {
         askBiometricAuth()
     }
 
-    @SuppressLint("UnsafeIntentLaunch")
     private fun navigateToMainActivity() {
-        hasLoggedIn = true
-        // We want to propagate any intent we get here to MainActivity since this is just an intermediary
-        openActivity(MainActivity::class.java, baseIntent = intent)
+        openActivity(MainActivity::class.java)
         finish() // Finish the account selection activity
     }
 
@@ -216,4 +200,4 @@ class AccountSelectActivity : FragmentActivity(), BiometricCallback {
     override fun onAuthenticationError() {
         finish()
     }
-}
+}

app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadAdapter.kt

@@ -19,7 +19,7 @@ import com.lagradost.cloudstream3.ui.download.button.DownloadStatusTell
 import com.lagradost.cloudstream3.utils.AppContextUtils.getNameFull
 import com.lagradost.cloudstream3.utils.DataStoreHelper.getViewPos
 import com.lagradost.cloudstream3.utils.ImageLoader.loadImage
-import com.lagradost.cloudstream3.utils.downloader.DownloadObjects
+import com.lagradost.cloudstream3.utils.VideoDownloadHelper
 
 const val DOWNLOAD_ACTION_PLAY_FILE = 0
 const val DOWNLOAD_ACTION_DELETE_FILE = 1
@@ -27,7 +27,6 @@ const val DOWNLOAD_ACTION_RESUME_DOWNLOAD = 2
 const val DOWNLOAD_ACTION_PAUSE_DOWNLOAD = 3
 const val DOWNLOAD_ACTION_DOWNLOAD = 4
 const val DOWNLOAD_ACTION_LONG_CLICK = 5
-const val DOWNLOAD_ACTION_CANCEL_PENDING = 6
 
 const val DOWNLOAD_ACTION_GO_TO_CHILD = 0
 const val DOWNLOAD_ACTION_LOAD_RESULT = 1
@@ -35,22 +34,22 @@ const val DOWNLOAD_ACTION_LOAD_RESULT = 1
 sealed class VisualDownloadCached {
     abstract val currentBytes: Long
     abstract val totalBytes: Long
-    abstract val data: DownloadObjects.DownloadCached
+    abstract val data: VideoDownloadHelper.DownloadCached
     abstract var isSelected: Boolean
 
     data class Child(
         override val currentBytes: Long,
         override val totalBytes: Long,
-        override val data: DownloadObjects.DownloadEpisodeCached,
+        override val data: VideoDownloadHelper.DownloadEpisodeCached,
         override var isSelected: Boolean,
     ) : VisualDownloadCached()
 
     data class Header(
         override val currentBytes: Long,
         override val totalBytes: Long,
-        override val data: DownloadObjects.DownloadHeaderCached,
+        override val data: VideoDownloadHelper.DownloadHeaderCached,
         override var isSelected: Boolean,
-        val child: DownloadObjects.DownloadEpisodeCached?,
+        val child: VideoDownloadHelper.DownloadEpisodeCached?,
         val currentOngoingDownloads: Int,
         val totalDownloads: Int,
     ) : VisualDownloadCached()
@@ -58,12 +57,12 @@ sealed class VisualDownloadCached {
 
 data class DownloadClickEvent(
     val action: Int,
-    val data: DownloadObjects.DownloadEpisodeCached
+    val data: VideoDownloadHelper.DownloadEpisodeCached
 )
 
 data class DownloadHeaderClickEvent(
     val action: Int,
-    val data: DownloadObjects.DownloadHeaderCached
+    val data: VideoDownloadHelper.DownloadHeaderCached
 )
 
 class DownloadAdapter(
@@ -171,7 +170,6 @@ class DownloadAdapter(
             }
         }
 
-        downloadButton.resetView()
         val status = downloadButton.getStatus(card.child.id, card.currentBytes, card.totalBytes)
         if (status == DownloadStatusTell.IsDone) {
             // We do this here instead if we are finished downloading
@@ -189,6 +187,7 @@ class DownloadAdapter(
         } else {
             // We need to make sure we restore the correct progress
             // when we refresh data in the adapter.
+            downloadButton.resetView()
             val drawable = downloadButton.getDrawableFromStatus(status)?.let {
                 ContextCompat.getDrawable(downloadButton.context, it)
             }
@@ -278,7 +277,6 @@ class DownloadAdapter(
                 }
             }
 
-            downloadButton.resetView()
             val status = downloadButton.getStatus(data.id, card.currentBytes, card.totalBytes)
             if (status == DownloadStatusTell.IsDone) {
                 // We do this here instead if we are finished downloading
@@ -297,6 +295,7 @@ class DownloadAdapter(
             } else {
                 // We need to make sure we restore the correct progress
                 // when we refresh data in the adapter.
+                downloadButton.resetView()
                 val drawable = downloadButton.getDrawableFromStatus(status)?.let {
                     ContextCompat.getDrawable(downloadButton.context, it)
                 }

app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadButtonSetup.kt

@@ -18,9 +18,8 @@ import com.lagradost.cloudstream3.utils.DOWNLOAD_EPISODE_CACHE
 import com.lagradost.cloudstream3.utils.DOWNLOAD_HEADER_CACHE
 import com.lagradost.cloudstream3.utils.SnackbarHelper.showSnackbar
 import com.lagradost.cloudstream3.utils.UIHelper.navigate
-import com.lagradost.cloudstream3.utils.downloader.DownloadObjects
-import com.lagradost.cloudstream3.utils.downloader.DownloadQueueManager
-import com.lagradost.cloudstream3.utils.downloader.VideoDownloadManager
+import com.lagradost.cloudstream3.utils.VideoDownloadHelper
+import com.lagradost.cloudstream3.utils.VideoDownloadManager
 import kotlinx.coroutines.MainScope
 
 object DownloadButtonSetup {
@@ -83,7 +82,7 @@ object DownloadButtonSetup {
                     } else {
                         val pkg = VideoDownloadManager.getDownloadResumePackage(ctx, id)
                         if (pkg != null) {
-                            DownloadQueueManager.addToQueue(pkg.toWrapper())
+                            VideoDownloadManager.downloadFromResumeUsingWorker(ctx, pkg)
                         } else {
                             VideoDownloadManager.downloadEvent.invoke(
                                 Pair(click.data.id, VideoDownloadManager.DownloadActionType.Resume)
@@ -96,7 +95,7 @@ object DownloadButtonSetup {
             DOWNLOAD_ACTION_LONG_CLICK -> {
                 activity?.let { act ->
                     val length =
-                        VideoDownloadManager.getDownloadFileInfo(
+                        VideoDownloadManager.getDownloadFileInfoAndUpdateSettings(
                             act,
                             click.data.id
                         )?.fileLength
@@ -111,31 +110,24 @@ object DownloadButtonSetup {
                 }
             }
 
-            DOWNLOAD_ACTION_CANCEL_PENDING -> {
-                DownloadQueueManager.cancelDownload(id)
-            }
-
             DOWNLOAD_ACTION_PLAY_FILE -> {
                 activity?.let { act ->
-                    val parent = getKey<DownloadObjects.DownloadHeaderCached>(
+                    val parent = getKey<VideoDownloadHelper.DownloadHeaderCached>(
                         DOWNLOAD_HEADER_CACHE,
                         click.data.parentId.toString()
                     ) ?: return
 
                     val episodes = getKeys(DOWNLOAD_EPISODE_CACHE)
                         ?.mapNotNull {
-                            getKey<DownloadObjects.DownloadEpisodeCached>(it)
+                            getKey<VideoDownloadHelper.DownloadEpisodeCached>(it)
                         }
                         ?.filter { it.parentId == click.data.parentId }
 
                     val items = mutableListOf<ExtractorUri>()
-                    val allRelevantEpisodes =
-                        episodes?.sortedWith(compareBy<DownloadObjects.DownloadEpisodeCached> {
-                            it.season ?: 0
-                        }.thenBy { it.episode })
+                    val allRelevantEpisodes = episodes?.sortedWith(compareBy<VideoDownloadHelper.DownloadEpisodeCached> { it.season ?: 0 }.thenBy { it.episode })
 
                     allRelevantEpisodes?.forEach {
-                        val keyInfo = getKey<DownloadObjects.DownloadedFileInfo>(
+                        val keyInfo = getKey<VideoDownloadManager.DownloadedFileInfo>(
                             VideoDownloadManager.KEY_DOWNLOAD_INFO,
                             it.id.toString()
                         ) ?: return@forEach
@@ -162,8 +154,7 @@ object DownloadButtonSetup {
                     }
                     act.navigate(
                         R.id.global_to_navigation_player, GeneratorPlayer.newInstance(
-                            DownloadFileGenerator(items),
-                            items.indexOfFirst { it.id == click.data.id }
+                            DownloadFileGenerator(items).apply { goto(items.indexOfFirst { it.id == click.data.id }) }
                         )
                     )
                 }

app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadFragment.kt

@@ -29,7 +29,6 @@ import com.lagradost.cloudstream3.mvvm.observe
 import com.lagradost.cloudstream3.mvvm.observeNullable
 import com.lagradost.cloudstream3.ui.BaseFragment
 import com.lagradost.cloudstream3.ui.download.DownloadButtonSetup.handleDownloadClick
-import com.lagradost.cloudstream3.ui.download.queue.DownloadQueueViewModel
 import com.lagradost.cloudstream3.ui.player.BasicLink
 import com.lagradost.cloudstream3.ui.player.GeneratorPlayer
 import com.lagradost.cloudstream3.ui.player.LinkGenerator
@@ -59,7 +58,6 @@ class DownloadFragment : BaseFragment<FragmentDownloadsBinding>(
 ) {
 
     private val downloadViewModel: DownloadViewModel by activityViewModels()
-    private val downloadQueueViewModel: DownloadQueueViewModel by activityViewModels()
 
     private fun View.setLayoutWidth(weight: Long) {
         val param = LinearLayout.LayoutParams(
@@ -144,17 +142,6 @@ class DownloadFragment : BaseFragment<FragmentDownloadsBinding>(
                 binding.downloadApp
             )
         }
-        observe(downloadQueueViewModel.childCards) { cards ->
-            val size = cards.currentDownloads.size + cards.queue.size
-            val context = binding.root.context
-            val baseText = context.getString(R.string.download_queue)
-            binding.downloadQueueText.text = if (size > 0) {
-                "$baseText (${cards.currentDownloads.size}/$size)"
-            } else {
-                baseText
-            }
-        }
-
         observe(downloadViewModel.selectedBytes) {
             updateDeleteButton(downloadViewModel.selectedItemIds.value?.count() ?: 0, it)
         }
@@ -226,7 +213,7 @@ class DownloadFragment : BaseFragment<FragmentDownloadsBinding>(
             setLinearListLayout(
                 isHorizontal = false,
                 nextRight = FOCUS_SELF,
-                nextDown = R.id.download_queue_button,
+                nextDown = FOCUS_SELF,
             )
         }
 
@@ -240,10 +227,6 @@ class DownloadFragment : BaseFragment<FragmentDownloadsBinding>(
                 setOnClickListener { showStreamInputDialog(it.context) }
             }
 
-            downloadQueueButton.setOnClickListener {
-                activity?.navigate(R.id.action_navigation_global_to_navigation_download_queue)
-            }
-
             downloadStreamButtonTv.isFocusableInTouchMode = isLayout(TV)
             downloadAppbar.isFocusableInTouchMode = isLayout(TV)
 
@@ -349,8 +332,7 @@ class DownloadFragment : BaseFragment<FragmentDownloadsBinding>(
                             listOf(BasicLink(url)),
                             extract = true,
                             refererUrl = referer,
-                            id = url.hashCode()
-                        ), 0
+                        )
                     )
                 )
                 dialog.dismissSafe(activity)

app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadViewModel.kt

@@ -5,46 +5,30 @@ import android.content.DialogInterface
 import android.os.Environment
 import android.os.StatFs
 import androidx.appcompat.app.AlertDialog
-import androidx.core.content.edit
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.lagradost.api.Log
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.isEpisodeBased
 import com.lagradost.cloudstream3.mvvm.Resource
 import com.lagradost.cloudstream3.mvvm.launchSafe
 import com.lagradost.cloudstream3.mvvm.logError
-import com.lagradost.cloudstream3.services.DownloadQueueService
-import com.lagradost.cloudstream3.services.DownloadQueueService.Companion.downloadInstances
 import com.lagradost.cloudstream3.utils.AppContextUtils.getNameFull
 import com.lagradost.cloudstream3.utils.AppContextUtils.setDefaultFocus
 import com.lagradost.cloudstream3.utils.ConsistentLiveData
-import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
-import com.lagradost.cloudstream3.utils.Coroutines.ioWork
 import com.lagradost.cloudstream3.utils.DOWNLOAD_EPISODE_CACHE
-import com.lagradost.cloudstream3.utils.DOWNLOAD_EPISODE_CACHE_BACKUP
 import com.lagradost.cloudstream3.utils.DOWNLOAD_HEADER_CACHE
-import com.lagradost.cloudstream3.utils.DOWNLOAD_HEADER_CACHE_BACKUP
 import com.lagradost.cloudstream3.utils.DataStore.getFolderName
 import com.lagradost.cloudstream3.utils.DataStore.getKey
 import com.lagradost.cloudstream3.utils.DataStore.getKeys
-import com.lagradost.cloudstream3.utils.DataStore.getSharedPrefs
-import com.lagradost.cloudstream3.utils.DataStoreHelper.getAllResumeStateIds
-import com.lagradost.cloudstream3.utils.DataStoreHelper.getLastWatched
 import com.lagradost.cloudstream3.utils.ResourceLiveData
-import com.lagradost.cloudstream3.utils.downloader.DownloadObjects
-import com.lagradost.cloudstream3.utils.downloader.DownloadQueueManager
-import com.lagradost.cloudstream3.utils.downloader.VideoDownloadManager.deleteFilesAndUpdateSettings
-import com.lagradost.cloudstream3.utils.downloader.VideoDownloadManager.getDownloadFileInfo
+import com.lagradost.cloudstream3.utils.VideoDownloadHelper
+import com.lagradost.cloudstream3.utils.VideoDownloadManager.deleteFilesAndUpdateSettings
+import com.lagradost.cloudstream3.utils.VideoDownloadManager.getDownloadFileInfoAndUpdateSettings
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 
 class DownloadViewModel : ViewModel() {
-    companion object {
-        const val TAG = "DownloadViewModel"
-    }
-
     private val _headerCards =
         ResourceLiveData<List<VisualDownloadCached.Header>>(Resource.Loading())
     val headerCards: LiveData<Resource<List<VisualDownloadCached.Header>>> = _headerCards
@@ -127,109 +111,23 @@ class DownloadViewModel : ViewModel() {
     }
 
 
-    fun removeRedundantEpisodeKeys(context: Context, keys: List<Pair<Int, Int>>) {
-        val settingsManager = context.getSharedPrefs()
-        ioSafe {
-            settingsManager.edit {
-                keys.forEach { (parentId, childId) ->
-                    Log.i(TAG, "Removing download episode key: ${parentId}/${childId}")
-                    val oldPath = getFolderName(
-                        getFolderName(
-                            DOWNLOAD_EPISODE_CACHE,
-                            parentId.toString()
-                        ),
-                        childId.toString()
-                    )
-                    val newPath = getFolderName(
-                        getFolderName(
-                            DOWNLOAD_EPISODE_CACHE_BACKUP,
-                            parentId.toString()
-                        ),
-                        childId.toString()
-                    )
-
-                    val oldPref = settingsManager.getString(oldPath, null)
-                    // Cowardly future backup solution in case the key removal fails in some edge case.
-                    // This and all backup keys may be removed in a future update if the key removal is proven to be robust.
-                    this.putString(newPath, oldPref)
-                    this.remove(oldPath)
-                }
-            }
-        }
-    }
-
-    fun removeRedundantHeaderKeys(
-        context: Context,
-        cached: List<DownloadObjects.DownloadHeaderCached>,
-        totalBytesUsedByChild: Map<Int, Long>,
-        totalDownloads: Map<Int, Int>
-    ) {
-        val settingsManager = context.getSharedPrefs()
-        ioSafe {
-           // Do not remove headers used by resume watching
-            val resumeWatchingIds =
-                getAllResumeStateIds()?.mapNotNull { id ->
-                    getLastWatched(id)?.parentId
-                }?.toSet() ?: emptySet()
-
-            settingsManager.edit {
-                cached.forEach { header ->
-                    val downloads = totalDownloads[header.id] ?: 0
-                    val bytes = totalBytesUsedByChild[header.id] ?: 0
-
-                    if ( (downloads <= 0 || bytes <= 0) && !resumeWatchingIds.contains(header.id) ) {
-                        Log.i(TAG, "Removing download header key: ${header.id}")
-                        val oldPAth = getFolderName(DOWNLOAD_HEADER_CACHE, header.id.toString())
-                        val newPath =
-                            getFolderName(DOWNLOAD_HEADER_CACHE_BACKUP, header.id.toString())
-                        val oldPref = settingsManager.getString(oldPAth, null)
-                        // Cowardly future backup solution in case the key removal fails in some edge case.
-                        // This and all backup keys may be removed in a future update if the key removal is proven to be robust.
-                        this.putString(newPath, oldPref)
-                        this.remove(oldPAth)
-                    }
-                }
-            }
-        }
-    }
-
     fun updateHeaderList(context: Context) = viewModelScope.launchSafe {
         // Do not push loading as it interrupts the UI
         //_headerCards.postValue(Resource.Loading())
 
-        val visual = ioWork {
+        val visual = withContext(Dispatchers.IO) {
             val children = context.getKeys(DOWNLOAD_EPISODE_CACHE)
-                .mapNotNull { context.getKey<DownloadObjects.DownloadEpisodeCached>(it) }
+                .mapNotNull { context.getKey<VideoDownloadHelper.DownloadEpisodeCached>(it) }
                 .distinctBy { it.id } // Remove duplicates
 
-            val isCurrentlyDownloading =
-                DownloadQueueService.isRunning || downloadInstances.value.isNotEmpty() || DownloadQueueManager.queue.value.isNotEmpty()
-
-            val downloadStats =
+            val (totalBytesUsedByChild, currentBytesUsedByChild, totalDownloads) =
                 calculateDownloadStats(context, children)
 
             val cached = context.getKeys(DOWNLOAD_HEADER_CACHE)
-                .mapNotNull { context.getKey<DownloadObjects.DownloadHeaderCached>(it) }
-
-            // Download stats and header keys may change when downloading.
-            // To prevent the downloader and key removal from colliding, simply do not prune keys when downloading.
-            if (!isCurrentlyDownloading) {
-                removeRedundantHeaderKeys(
-                    context,
-                    cached,
-                    downloadStats.totalBytesUsedByChild,
-                    downloadStats.totalDownloads
-                )
-            }
-            // calculateDownloadStats already performed checks when creating redundantDownloads, no extra check required
-            removeRedundantEpisodeKeys(context, downloadStats.redundantDownloads)
+                .mapNotNull { context.getKey<VideoDownloadHelper.DownloadHeaderCached>(it) }
 
             createVisualDownloadList(
-                context,
-                cached,
-                downloadStats.totalBytesUsedByChild,
-                downloadStats.currentBytesUsedByChild,
-                downloadStats.totalDownloads
+                context, cached, totalBytesUsedByChild, currentBytesUsedByChild, totalDownloads
             )
         }
 
@@ -261,38 +159,20 @@ class DownloadViewModel : ViewModel() {
         }))
     }
 
-    private data class DownloadStats(
-        val totalBytesUsedByChild: Map<Int, Long>,
-        val currentBytesUsedByChild: Map<Int, Long>,
-        val totalDownloads: Map<Int, Int>,
-        /** Parent ID to child ID. Keys to be removed. */
-        val redundantDownloads: List<Pair<Int, Int>>
-    )
-
     private fun calculateDownloadStats(
         context: Context,
-        children: List<DownloadObjects.DownloadEpisodeCached>
-    ): DownloadStats {
+        children: List<VideoDownloadHelper.DownloadEpisodeCached>
+    ): Triple<Map<Int, Long>, Map<Int, Long>, Map<Int, Int>> {
         // parentId : bytes
         val totalBytesUsedByChild = mutableMapOf<Int, Long>()
         // parentId : bytes
         val currentBytesUsedByChild = mutableMapOf<Int, Long>()
         // parentId : downloadsCount
         val totalDownloads = mutableMapOf<Int, Int>()
-        val redundantDownloads = mutableListOf<Pair<Int, Int>>()
 
         children.forEach { child ->
-            val childFile = getDownloadFileInfo(context, child.id)
-
-            if (childFile == null) {
-                // It may not be a redundant child if something is currently downloading.
-                // DOWNLOAD_EPISODE_CACHE gets created before KEY_DOWNLOAD_INFO in the downloader
-                // leading to valid situations where getDownloadFileInfo is null, but we do not want to remove DOWNLOAD_EPISODE_CACHE
-                if (!DownloadQueueService.isRunning && downloadInstances.value.isEmpty() && DownloadQueueManager.queue.value.isEmpty()) {
-                    redundantDownloads.add(child.parentId to child.id)
-                }
-                return@forEach
-            }
+            val childFile =
+                getDownloadFileInfoAndUpdateSettings(context, child.id) ?: return@forEach
             if (childFile.fileLength <= 1) return@forEach
 
             val len = childFile.totalBytes
@@ -302,17 +182,12 @@ class DownloadViewModel : ViewModel() {
             currentBytesUsedByChild.merge(child.parentId, flen, Long::plus)
             totalDownloads.merge(child.parentId, 1, Int::plus)
         }
-        return DownloadStats(
-            totalBytesUsedByChild,
-            currentBytesUsedByChild,
-            totalDownloads,
-            redundantDownloads
-        )
+        return Triple(totalBytesUsedByChild, currentBytesUsedByChild, totalDownloads)
     }
 
     private fun createVisualDownloadList(
         context: Context,
-        cached: List<DownloadObjects.DownloadHeaderCached>,
+        cached: List<VideoDownloadHelper.DownloadHeaderCached>,
         totalBytesUsedByChild: Map<Int, Long>,
         currentBytesUsedByChild: Map<Int, Long>,
         totalDownloads: Map<Int, Int>
@@ -321,14 +196,11 @@ class DownloadViewModel : ViewModel() {
             val downloads = totalDownloads[it.id] ?: 0
             val bytes = totalBytesUsedByChild[it.id] ?: 0
             val currentBytes = currentBytesUsedByChild[it.id] ?: 0
-
-            if (bytes <= 0 || downloads <= 0) {
-                return@mapNotNull null
-            }
+            if (bytes <= 0 || downloads <= 0) return@mapNotNull null
 
             val isSelected = selectedItemIds.value?.contains(it.id) ?: false
             val movieEpisode =
-                if (it.type.isEpisodeBased()) null else context.getKey<DownloadObjects.DownloadEpisodeCached>(
+                if (it.type.isEpisodeBased()) null else context.getKey<VideoDownloadHelper.DownloadEpisodeCached>(
                     DOWNLOAD_EPISODE_CACHE,
                     getFolderName(it.id.toString(), it.id.toString())
                 )
@@ -361,10 +233,11 @@ class DownloadViewModel : ViewModel() {
 
         val visual = withContext(Dispatchers.IO) {
             context.getKeys(folder).mapNotNull { key ->
-                context.getKey<DownloadObjects.DownloadEpisodeCached>(key)
+                context.getKey<VideoDownloadHelper.DownloadEpisodeCached>(key)
             }.mapNotNull {
                 val isSelected = selectedItemIds.value?.contains(it.id) ?: false
-                val info = getDownloadFileInfo(context, it.id) ?: return@mapNotNull null
+                val info =
+                    getDownloadFileInfoAndUpdateSettings(context, it.id) ?: return@mapNotNull null
                 VisualDownloadCached.Child(
                     currentBytes = info.fileLength,
                     totalBytes = info.totalBytes,
@@ -440,7 +313,7 @@ class DownloadViewModel : ViewModel() {
                     if (item.data.type.isEpisodeBased()) {
                         val episodes = context.getKeys(DOWNLOAD_EPISODE_CACHE)
                             .mapNotNull {
-                                context.getKey<DownloadObjects.DownloadEpisodeCached>(
+                                context.getKey<VideoDownloadHelper.DownloadEpisodeCached>(
                                     it
                                 )
                             }
@@ -464,7 +337,7 @@ class DownloadViewModel : ViewModel() {
 
                 is VisualDownloadCached.Child -> {
                     ids.add(item.data.id)
-                    val parent = context.getKey<DownloadObjects.DownloadHeaderCached>(
+                    val parent = context.getKey<VideoDownloadHelper.DownloadHeaderCached>(
                         DOWNLOAD_HEADER_CACHE,
                         item.data.parentId.toString()
                     )

app/src/main/java/com/lagradost/cloudstream3/ui/download/button/BaseFetchButton.kt

@@ -11,7 +11,7 @@ import androidx.core.widget.ContentLoadingProgressBar
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
 import com.lagradost.cloudstream3.utils.Coroutines.mainWork
-import com.lagradost.cloudstream3.utils.downloader.VideoDownloadManager
+import com.lagradost.cloudstream3.utils.VideoDownloadManager
 
 typealias DownloadStatusTell = VideoDownloadManager.DownloadType
 
@@ -76,10 +76,10 @@ abstract class BaseFetchButton(context: Context, attributeSet: AttributeSet) :
         currentMetaData.id = id
 
         if (!doSetProgress) return
-        val appContext = context.applicationContext
 
         ioSafe {
-            val savedData = VideoDownloadManager.getDownloadFileInfo(appContext, id)
+            val savedData = VideoDownloadManager.getDownloadFileInfoAndUpdateSettings(context, id)
+
             mainWork {
                 if (savedData != null) {
                     val downloadedBytes = savedData.fileLength
@@ -87,7 +87,7 @@ abstract class BaseFetchButton(context: Context, attributeSet: AttributeSet) :
 
                     setProgress(downloadedBytes, totalBytes)
                     applyMetaData(id, downloadedBytes, totalBytes)
-                }
+                } else run { resetView() }
             }
         }
     }
@@ -216,4 +216,4 @@ abstract class BaseFetchButton(context: Context, attributeSet: AttributeSet) :
      * Get a clean slate again, might be useful in recyclerview?
      * */
     abstract fun resetView()
-}
+}

app/src/main/java/com/lagradost/cloudstream3/ui/download/button/DownloadButton.kt

@@ -8,7 +8,7 @@ import androidx.core.view.isVisible
 import com.google.android.material.button.MaterialButton
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.ui.download.DownloadClickEvent
-import com.lagradost.cloudstream3.utils.downloader.DownloadObjects
+import com.lagradost.cloudstream3.utils.VideoDownloadHelper
 
 class DownloadButton(context: Context, attributeSet: AttributeSet) :
     PieFetchButton(context, attributeSet) {
@@ -18,7 +18,6 @@ class DownloadButton(context: Context, attributeSet: AttributeSet) :
         super.onAttachedToWindow()
         progressText = findViewById(R.id.result_movie_download_text_precentage)
         mainText = findViewById(R.id.result_movie_download_text)
-        setStatus(null)
     }
 
     override fun setStatus(status: DownloadStatusTell?) {
@@ -36,7 +35,7 @@ class DownloadButton(context: Context, attributeSet: AttributeSet) :
     }
 
     override fun setDefaultClickListener(
-        card: DownloadObjects.DownloadEpisodeCached,
+        card: VideoDownloadHelper.DownloadEpisodeCached,
         textView: TextView?,
         callback: (DownloadClickEvent) -> Unit
     ) {

app/src/main/java/com/lagradost/cloudstream3/ui/download/button/PieFetchButton.kt

@@ -10,14 +10,11 @@ import android.widget.ImageView
 import android.widget.TextView
 import androidx.annotation.MainThread
 import androidx.core.content.ContextCompat
-import androidx.core.content.withStyledAttributes
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import com.lagradost.cloudstream3.CloudStreamApp.Companion.removeKey
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.mvvm.logError
-import com.lagradost.cloudstream3.services.DownloadQueueService.Companion.downloadInstances
-import com.lagradost.cloudstream3.ui.download.DOWNLOAD_ACTION_CANCEL_PENDING
 import com.lagradost.cloudstream3.ui.download.DOWNLOAD_ACTION_DELETE_FILE
 import com.lagradost.cloudstream3.ui.download.DOWNLOAD_ACTION_DOWNLOAD
 import com.lagradost.cloudstream3.ui.download.DOWNLOAD_ACTION_LONG_CLICK
@@ -26,10 +23,9 @@ import com.lagradost.cloudstream3.ui.download.DOWNLOAD_ACTION_PLAY_FILE
 import com.lagradost.cloudstream3.ui.download.DOWNLOAD_ACTION_RESUME_DOWNLOAD
 import com.lagradost.cloudstream3.ui.download.DownloadClickEvent
 import com.lagradost.cloudstream3.utils.UIHelper.popupMenuNoIcons
-import com.lagradost.cloudstream3.utils.downloader.DownloadObjects
-import com.lagradost.cloudstream3.utils.downloader.DownloadQueueManager.queue
-import com.lagradost.cloudstream3.utils.downloader.VideoDownloadManager
-import com.lagradost.cloudstream3.utils.downloader.VideoDownloadManager.KEY_RESUME_PACKAGES
+import com.lagradost.cloudstream3.utils.VideoDownloadHelper
+import com.lagradost.cloudstream3.utils.VideoDownloadManager
+import com.lagradost.cloudstream3.utils.VideoDownloadManager.KEY_RESUME_PACKAGES
 
 open class PieFetchButton(context: Context, attributeSet: AttributeSet) :
     BaseFetchButton(context, attributeSet) {
@@ -67,7 +63,7 @@ open class PieFetchButton(context: Context, attributeSet: AttributeSet) :
     open fun onInflate() {}
 
     init {
-        context.withStyledAttributes(attributeSet, R.styleable.PieFetchButton, 0, 0) {
+        context.obtainStyledAttributes(attributeSet, R.styleable.PieFetchButton, 0, 0).apply {
             try {
                 inflate(
                     overrideLayout ?: getResourceId(
@@ -76,7 +72,6 @@ open class PieFetchButton(context: Context, attributeSet: AttributeSet) :
                     )
                 )
             } catch (e: Exception) {
-                recycle() // Manually call recycle first to avoid memory leaks
                 Log.e(
                     "PieFetchButton", "Error inflating PieFetchButton, " +
                             "check that you have declared the required aria2c attrs: aria2c_icon_scale aria2c_icon_color aria2c_outline_color aria2c_fill_color"
@@ -84,6 +79,11 @@ open class PieFetchButton(context: Context, attributeSet: AttributeSet) :
                 throw e
             }
 
+
+            progressBar = findViewById(R.id.progress_downloaded)
+            progressBarBackground = findViewById(R.id.progress_downloaded_background)
+            statusView = findViewById(R.id.image_download_status)
+
             animateWaiting = getBoolean(
                 R.styleable.PieFetchButton_download_animate_waiting,
                 true
@@ -92,13 +92,16 @@ open class PieFetchButton(context: Context, attributeSet: AttributeSet) :
                 R.styleable.PieFetchButton_download_hide_when_icon,
                 true
             )
+
             waitingAnimation = getResourceId(
                 R.styleable.PieFetchButton_download_waiting_animation,
                 R.anim.rotate_around_center_point
             )
+
             activeOutline = getResourceId(
                 R.styleable.PieFetchButton_download_outline_active, R.drawable.circle_shape
             )
+
             nonActiveOutline = getResourceId(
                 R.styleable.PieFetchButton_download_outline_non_active,
                 R.drawable.circle_shape_dotted
@@ -126,29 +129,19 @@ open class PieFetchButton(context: Context, attributeSet: AttributeSet) :
             )
 
             val fillIndex = getInt(R.styleable.PieFetchButton_download_fill, 0)
+
             progressDrawable = getResourceId(
                 R.styleable.PieFetchButton_download_fill_override, fillArray[fillIndex]
             )
+
+            progressBar.progressDrawable = ContextCompat.getDrawable(context, progressDrawable)
+
+            recycle()
         }
-        
-        progressBar = findViewById(R.id.progress_downloaded)
-        progressBarBackground = findViewById(R.id.progress_downloaded_background)
-        statusView = findViewById(R.id.image_download_status)
-        
-        progressBar.progressDrawable = ContextCompat.getDrawable(context, progressDrawable)
-
-        // resetView()
+        resetView()
         onInflate()
     }
 
-
-    override fun onAttachedToWindow() {
-        super.onAttachedToWindow()
-        // Re-run all animations when the view gets visible.
-        // Otherwise views may run without animations after recycled
-        setStatusInternal(currentStatus)
-    }
-
     private var currentStatus: DownloadStatusTell? = null
     /*private fun getActivity(): Activity? {
         var context = context
@@ -169,31 +162,16 @@ open class PieFetchButton(context: Context, attributeSet: AttributeSet) :
     }*/
 
     protected fun setDefaultClickListener(
-        view: View, textView: TextView?, card: DownloadObjects.DownloadEpisodeCached,
+        view: View, textView: TextView?, card: VideoDownloadHelper.DownloadEpisodeCached,
         callback: (DownloadClickEvent) -> Unit
     ) {
         this.progressText = textView
         this.setPersistentId(card.id)
         view.setOnClickListener {
             if (isZeroBytes) {
-                val localQueue = queue.value
-                val localInstances = downloadInstances.value
-                val id = card.id
-
-                // If the download is already in queue or active downloads, provide an option to cancel it
-                if (localQueue.any { q -> q.id == id } || localInstances.any { i -> i.downloadQueueWrapper.id == id }) {
-                    it.popupMenuNoIcons(
-                        arrayListOf(
-                            Pair(DOWNLOAD_ACTION_CANCEL_PENDING, R.string.cancel),
-                        )
-                    ) {
-                        callback(DownloadClickEvent(itemId, card))
-                    }
-                } else {
-                    // Otherwise just start a download instantly
-                    removeKey(KEY_RESUME_PACKAGES, card.id.toString())
-                    callback(DownloadClickEvent(DOWNLOAD_ACTION_DOWNLOAD, card))
-                }
+                removeKey(KEY_RESUME_PACKAGES, card.id.toString())
+                callback(DownloadClickEvent(DOWNLOAD_ACTION_DOWNLOAD, card))
+                // callback.invoke(DownloadClickEvent(DOWNLOAD_ACTION_DOWNLOAD, data))
             } else {
                 val list = arrayListOf(
                     Pair(DOWNLOAD_ACTION_PLAY_FILE, R.string.popup_play_file),
@@ -234,7 +212,7 @@ open class PieFetchButton(context: Context, attributeSet: AttributeSet) :
     }
 
     open fun setDefaultClickListener(
-        card: DownloadObjects.DownloadEpisodeCached,
+        card: VideoDownloadHelper.DownloadEpisodeCached,
         textView: TextView?,
         callback: (DownloadClickEvent) -> Unit
     ) {
@@ -304,8 +282,8 @@ open class PieFetchButton(context: Context, attributeSet: AttributeSet) :
     override fun setStatus(status: DownloadStatusTell?) {
         currentStatus = status
 
-        // Runs on the main thread, but also instant if it already is.
-        if (Looper.getMainLooper().isCurrentThread) {
+        // Runs on the main thread, but also instant if it already is
+        if (Looper.myLooper() == Looper.getMainLooper()) {
             try {
                 setStatusInternal(status)
             } catch (t: Throwable) {

app/src/main/java/com/lagradost/cloudstream3/ui/download/queue/DownloadQueueAdapter.kt

@@ -1,274 +0,0 @@
-package com.lagradost.cloudstream3.ui.download.queue
-
-
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import androidx.core.view.isGone
-import androidx.fragment.app.Fragment
-import androidx.recyclerview.widget.ItemTouchHelper
-import androidx.recyclerview.widget.RecyclerView
-import com.lagradost.cloudstream3.CloudStreamApp.Companion.getKey
-import com.lagradost.cloudstream3.R
-import com.lagradost.cloudstream3.databinding.DownloadQueueItemBinding
-import com.lagradost.cloudstream3.ui.BaseAdapter
-import com.lagradost.cloudstream3.ui.BaseDiffCallback
-import com.lagradost.cloudstream3.ui.ViewHolderState
-import com.lagradost.cloudstream3.ui.download.DOWNLOAD_ACTION_CANCEL_PENDING
-import com.lagradost.cloudstream3.ui.download.DOWNLOAD_ACTION_DELETE_FILE
-import com.lagradost.cloudstream3.ui.download.DOWNLOAD_ACTION_PAUSE_DOWNLOAD
-import com.lagradost.cloudstream3.ui.download.DOWNLOAD_ACTION_RESUME_DOWNLOAD
-import com.lagradost.cloudstream3.ui.download.DownloadButtonSetup.handleDownloadClick
-import com.lagradost.cloudstream3.ui.download.DownloadClickEvent
-import com.lagradost.cloudstream3.ui.download.queue.DownloadQueueAdapter.Companion.DOWNLOAD_SEPARATOR_TAG
-import com.lagradost.cloudstream3.utils.AppContextUtils.getNameFull
-import com.lagradost.cloudstream3.utils.DOWNLOAD_EPISODE_CACHE
-import com.lagradost.cloudstream3.utils.DataStore.getFolderName
-import com.lagradost.cloudstream3.utils.DataStore.getKey
-import com.lagradost.cloudstream3.utils.UIHelper.popupMenuNoIcons
-import com.lagradost.cloudstream3.utils.downloader.DownloadObjects
-import com.lagradost.cloudstream3.utils.downloader.DownloadObjects.DownloadQueueWrapper
-import com.lagradost.cloudstream3.utils.downloader.DownloadQueueManager
-import com.lagradost.cloudstream3.utils.downloader.VideoDownloadManager
-import com.lagradost.cloudstream3.utils.downloader.VideoDownloadManager.KEY_DOWNLOAD_INFO
-
-/** An item in the adapter can either be a separator or a real item.
- * isCurrentlyDownloading is used to fully update items as opposed to just moving them. */
-class DownloadAdapterItem(val item: DownloadQueueWrapper?) {
-    val isSeparator = item == null
-}
-
-
-class DownloadQueueAdapter(val fragment: Fragment) : BaseAdapter<DownloadAdapterItem, Unit>(
-    diffCallback = BaseDiffCallback(
-        itemSame = { a, b -> a.item?.id == b.item?.id },
-        contentSame = { a, b ->
-            a.item == b.item
-        })
-) {
-    var currentDownloads = 0
-
-    companion object {
-        val DOWNLOAD_SEPARATOR_TAG = "DOWNLOAD_SEPARATOR_TAG"
-    }
-
-    override fun onCreateContent(parent: ViewGroup): ViewHolderState<Unit> {
-        val inflater = LayoutInflater.from(parent.context)
-        val binding = DownloadQueueItemBinding.inflate(inflater, parent, false)
-        return ViewHolderState(binding)
-    }
-
-    override fun onBindContent(
-        holder: ViewHolderState<Unit>,
-        item: DownloadAdapterItem,
-        position: Int
-    ) {
-        when (val binding = holder.view) {
-            is DownloadQueueItemBinding -> {
-                if (item.item == null) {
-                    holder.itemView.tag = DOWNLOAD_SEPARATOR_TAG
-                    bindSeparator(binding)
-                } else {
-                    holder.itemView.tag = null
-                    bind(binding, item.item)
-                }
-            }
-        }
-    }
-
-    fun submitQueue(newQueue: DownloadAdapterQueue) {
-        val index = newQueue.currentDownloads.size
-        val current = newQueue.currentDownloads
-        val queue = newQueue.queue
-        currentDownloads = current.size
-
-        val newList =
-            (current + queue).distinctBy { it.id }.map { DownloadAdapterItem(it) }.toMutableList()
-                .apply {
-                    // Only add the separator if it actually separates something
-                    if (index < this.size) {
-                        add(index, DownloadAdapterItem(null))
-                    }
-                }
-        submitList(newList)
-    }
-
-    fun bindSeparator(binding: DownloadQueueItemBinding) {
-        binding.apply {
-            separatorHolder.isGone = false
-            downloadChildEpisodeHolder.isGone = true
-        }
-    }
-
-    fun bind(
-        binding: DownloadQueueItemBinding,
-        queueWrapper: DownloadQueueWrapper,
-    ) {
-        val context = binding.root.context
-
-        binding.apply {
-            separatorHolder.isGone = true
-            downloadChildEpisodeHolder.isGone = false
-
-            // Only set the child-text if child and parent are not the same
-            // This prevents setting movie titles twice
-            if (queueWrapper.id != queueWrapper.parentId) {
-                val mainName = queueWrapper.downloadItem?.resultName ?: queueWrapper.resumePackage?.item?.ep?.mainName
-                downloadChildEpisodeTextExtra.text = mainName
-            } else {
-                downloadChildEpisodeTextExtra.text = null
-            }
-
-            downloadChildEpisodeTextExtra.isGone = downloadChildEpisodeTextExtra.text.isNullOrBlank()
-
-            val status = VideoDownloadManager.downloadStatus[queueWrapper.id]
-
-            downloadButton.setOnClickListener { view ->
-                val episodeCached =
-                    getKey<DownloadObjects.DownloadEpisodeCached>(
-                        DOWNLOAD_EPISODE_CACHE,
-                        getFolderName(queueWrapper.parentId.toString(), queueWrapper.id.toString())
-                    )
-
-                val downloadInfo = context.getKey<DownloadObjects.DownloadedFileInfo>(
-                    KEY_DOWNLOAD_INFO,
-                    queueWrapper.id.toString()
-                )
-
-                val isCurrentlyDownloading = queueWrapper.isCurrentlyDownloading()
-
-                val actionList = arrayListOf<Pair<Int,Int>>()
-
-                if (isCurrentlyDownloading && episodeCached != null) {
-                    // KEY_DOWNLOAD_INFO is used in the file deletion, and is required to exist to delete anything
-                    if (downloadInfo != null) {
-                        actionList.add(Pair(DOWNLOAD_ACTION_DELETE_FILE, R.string.popup_delete_file))
-                    } else {
-                        actionList.add(Pair(DOWNLOAD_ACTION_CANCEL_PENDING, R.string.cancel))
-                    }
-
-                    val currentStatus = VideoDownloadManager.downloadStatus[queueWrapper.id]
-
-                    when (currentStatus) {
-                        VideoDownloadManager.DownloadType.IsDownloading -> {
-                            actionList.add(
-                                Pair(
-                                    DOWNLOAD_ACTION_PAUSE_DOWNLOAD,
-                                    R.string.popup_pause_download
-                                )
-                            )
-                        }
-
-                        VideoDownloadManager.DownloadType.IsPaused -> {
-                            actionList.add(
-                                Pair(
-                                    DOWNLOAD_ACTION_RESUME_DOWNLOAD,
-                                    R.string.popup_resume_download
-                                )
-                            )
-                        }
-
-                        else -> {}
-                    }
-
-                    view.popupMenuNoIcons(
-                        actionList
-                    ) {
-                        handleDownloadClick(DownloadClickEvent(itemId, episodeCached))
-                    }
-                } else {
-                    actionList.add(Pair(DOWNLOAD_ACTION_CANCEL_PENDING, R.string.cancel))
-
-                    view.popupMenuNoIcons(
-                        actionList
-                    ) {
-                        when (itemId) {
-                            DOWNLOAD_ACTION_CANCEL_PENDING -> {
-                                DownloadQueueManager.cancelDownload(queueWrapper.id)
-                            }
-                        }
-                    }
-                }
-            }
-
-            downloadButton.resetView()
-            downloadButton.setStatus(status)
-            downloadButton.setPersistentId(queueWrapper.id)
-
-            downloadChildEpisodeText.apply {
-                val name = queueWrapper.downloadItem?.episode?.name
-                    ?: queueWrapper.resumePackage?.item?.ep?.name
-                val episode =
-                    queueWrapper.downloadItem?.episode?.episode
-                        ?: queueWrapper.resumePackage?.item?.ep?.episode
-                val season =
-                    queueWrapper.downloadItem?.episode?.season
-                        ?: queueWrapper.resumePackage?.item?.ep?.season
-                text = context.getNameFull(name, episode, season)
-                isSelected = true // Needed for text repeating
-            }
-        }
-    }
-}
-
-
-class DragAndDropTouchHelper(adapter: DownloadQueueAdapter) :
-    ItemTouchHelper(
-        DragAndDropTouchHelperCallback(adapter)
-    )
-
-private class DragAndDropTouchHelperCallback(private val adapter: DownloadQueueAdapter) :
-    ItemTouchHelper.Callback() {
-    override fun getMovementFlags(
-        recyclerView: RecyclerView,
-        viewHolder: RecyclerView.ViewHolder
-    ): Int {
-        val item = adapter.getItem(viewHolder.absoluteAdapterPosition)
-        val isDownloading = item.item?.isCurrentlyDownloading() == true
-        val dragFlags = if (item.isSeparator || isDownloading) {
-            0
-        } else {
-            ItemTouchHelper.UP or ItemTouchHelper.DOWN // Allow drag up/down
-        }
-
-        val swipeFlags = 0 // Disable swipe functionality
-        return makeMovementFlags(dragFlags, swipeFlags)
-    }
-
-    override fun onMove(
-        recyclerView: RecyclerView,
-        source: RecyclerView.ViewHolder,
-        target: RecyclerView.ViewHolder
-    ): Boolean {
-        val fromPosition = source.absoluteAdapterPosition
-        val toPosition = target.absoluteAdapterPosition
-        val separatorPosition = adapter.currentDownloads
-
-        val toPositionNoSeparator =
-            if (separatorPosition < toPosition) toPosition - separatorPosition else toPosition
-
-        if (source.itemView.tag == DOWNLOAD_SEPARATOR_TAG) {
-            return false
-        } else {
-            adapter.getItem(fromPosition).item?.let { downloadQueueInfo ->
-                DownloadQueueManager.reorderItem(
-                    downloadQueueInfo,
-                    toPositionNoSeparator - 1
-                )
-            }
-        }
-
-        return true
-    }
-
-    override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) {
-
-    }
-
-    override fun isLongPressDragEnabled(): Boolean {
-        return true // Enable drag with long press
-    }
-
-    override fun isItemViewSwipeEnabled(): Boolean {
-        return false // Disable swipe by default
-    }
-}

app/src/main/java/com/lagradost/cloudstream3/ui/download/queue/DownloadQueueFragment.kt

@@ -1,79 +0,0 @@
-package com.lagradost.cloudstream3.ui.download.queue
-
-import android.view.View
-import androidx.appcompat.app.AlertDialog
-import androidx.core.view.isGone
-import androidx.fragment.app.activityViewModels
-import com.lagradost.cloudstream3.R
-import com.lagradost.cloudstream3.databinding.FragmentDownloadQueueBinding
-import com.lagradost.cloudstream3.mvvm.observe
-import com.lagradost.cloudstream3.ui.BaseFragment
-import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR
-import com.lagradost.cloudstream3.ui.settings.Globals.PHONE
-import com.lagradost.cloudstream3.ui.settings.Globals.TV
-import com.lagradost.cloudstream3.ui.settings.Globals.isLandscape
-import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
-import com.lagradost.cloudstream3.utils.UIHelper.fixSystemBarsPadding
-import com.lagradost.cloudstream3.utils.UIHelper.setAppBarNoScrollFlagsOnTV
-import com.lagradost.cloudstream3.utils.downloader.DownloadQueueManager
-import com.lagradost.cloudstream3.utils.txt
-
-
-class DownloadQueueFragment :
-    BaseFragment<FragmentDownloadQueueBinding>(BindingCreator.Inflate(FragmentDownloadQueueBinding::inflate)) {
-    private val queueViewModel: DownloadQueueViewModel by activityViewModels()
-
-    override fun onBindingCreated(binding: FragmentDownloadQueueBinding) {
-        val adapter = DownloadQueueAdapter(this@DownloadQueueFragment)
-        val clearQueueItem = binding.downloadQueueToolbar.menu?.findItem(R.id.cancel_all)
-
-        observe(queueViewModel.childCards) { cards ->
-            val size = cards.queue.size + cards.currentDownloads.size
-            val isEmptyQueue = size == 0
-            binding.downloadQueueList.isGone = isEmptyQueue
-            binding.textNoQueue.isGone = !isEmptyQueue
-            clearQueueItem?.isVisible = !isEmptyQueue
-
-            adapter.submitQueue(cards)
-        }
-
-        binding.apply {
-            downloadQueueToolbar.apply {
-                title = txt(R.string.download_queue).asString(context)
-                if (isLayout(PHONE or EMULATOR)) {
-                    setNavigationIcon(R.drawable.ic_baseline_arrow_back_24)
-                    setNavigationOnClickListener {
-                        dispatchBackPressed()
-                    }
-                }
-                setAppBarNoScrollFlagsOnTV()
-                clearQueueItem?.setOnMenuItemClickListener {
-                        AlertDialog.Builder(context, R.style.AlertDialogCustom)
-                            .setTitle(R.string.cancel_all)
-                            .setMessage(R.string.cancel_queue_message)
-                            .setPositiveButton(R.string.yes) { _, _ ->
-                                DownloadQueueManager.removeAllFromQueue()
-                            }
-                            .setNegativeButton(R.string.no) { _, _ ->
-                            }.show()
-
-                    true
-                }
-            }
-
-            downloadQueueList.adapter = adapter
-
-            // Drag and drop
-            val helper = DragAndDropTouchHelper(adapter)
-            helper.attachToRecyclerView(downloadQueueList)
-        }
-    }
-    
-    override fun fixLayout(view: View) {
-        fixSystemBarsPadding(
-            view,
-            padBottom = isLandscape(),
-            padLeft = isLayout(TV or EMULATOR)
-        )
-    }
-}

app/src/main/java/com/lagradost/cloudstream3/ui/download/queue/DownloadQueueViewModel.kt

@@ -1,43 +0,0 @@
-package com.lagradost.cloudstream3.ui.download.queue
-
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
-import com.lagradost.cloudstream3.mvvm.launchSafe
-import com.lagradost.cloudstream3.services.DownloadQueueService.Companion.downloadInstances
-import com.lagradost.cloudstream3.utils.downloader.DownloadObjects
-import com.lagradost.cloudstream3.utils.downloader.DownloadQueueManager
-import com.lagradost.cloudstream3.utils.downloader.VideoDownloadManager
-import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.launch
-
-data class DownloadAdapterQueue(
-    val currentDownloads: List<DownloadObjects.DownloadQueueWrapper>,
-    val queue: List<DownloadObjects.DownloadQueueWrapper>,
-)
-
-class DownloadQueueViewModel : ViewModel() {
-    private val _childCards = MutableLiveData<DownloadAdapterQueue>()
-    val childCards: LiveData<DownloadAdapterQueue> = _childCards
-    private val totalDownloadFlow =
-        downloadInstances.combine(DownloadQueueManager.queue) { instances, queue ->
-            val current = instances.map { it.downloadQueueWrapper }
-            DownloadAdapterQueue(current, queue.toList())
-        }.combine(VideoDownloadManager.currentDownloads) { total, _ ->
-            // We want to update the flow when currentDownloads updates, but we do not care about its value
-            total
-        }
-
-    init {
-        viewModelScope.launch {
-            totalDownloadFlow.collect { queue ->
-                updateChildList(queue)
-            }
-        }
-    }
-
-    fun updateChildList(downloads: DownloadAdapterQueue) {
-        _childCards.postValue(downloads)
-    }
-}

app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeChildItemAdapter.kt

@@ -5,8 +5,12 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.FrameLayout
+import android.widget.ImageView
+import androidx.fragment.app.Fragment
 import androidx.preference.PreferenceManager
+import androidx.recyclerview.widget.RecyclerView
 import androidx.viewbinding.ViewBinding
+import coil3.load
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.SearchResponse
 import com.lagradost.cloudstream3.databinding.HomeRemoveGridBinding
@@ -16,7 +20,6 @@ import com.lagradost.cloudstream3.databinding.HomeResultGridExpandedBinding
 import com.lagradost.cloudstream3.ui.BaseAdapter
 import com.lagradost.cloudstream3.ui.BaseDiffCallback
 import com.lagradost.cloudstream3.ui.ViewHolderState
-import com.lagradost.cloudstream3.ui.newSharedPool
 import com.lagradost.cloudstream3.ui.search.SEARCH_ACTION_LOAD
 import com.lagradost.cloudstream3.ui.search.SearchClickCallback
 import com.lagradost.cloudstream3.ui.search.SearchResultBuilder
@@ -162,7 +165,7 @@ open class HomeChildItemAdapter(
         // The vast majority of the lag comes from creating the view
         // This simply shares the views between all HomeChildItemAdapter
         val sharedPool =
-            newSharedPool { setMaxRecycledViews(CONTENT, 20) }
+            RecyclerView.RecycledViewPool().apply { this.setMaxRecycledViews(CONTENT, 20) }
 
         var minPosterSize: Int = 0
         var maxPosterSize: Int = 0

app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt

@@ -15,7 +15,6 @@ import android.widget.ImageView
 import android.widget.ListView
 import android.widget.TextView
 import android.widget.Toast
-import androidx.activity.ComponentActivity
 import androidx.appcompat.app.AlertDialog
 import androidx.core.net.toUri
 import androidx.core.view.isGone
@@ -52,7 +51,6 @@ import com.lagradost.cloudstream3.ui.search.SEARCH_ACTION_LOAD
 import com.lagradost.cloudstream3.ui.search.SEARCH_ACTION_PLAY_FILE
 import com.lagradost.cloudstream3.ui.search.SearchAdapter
 import com.lagradost.cloudstream3.ui.search.SearchHelper.handleSearchClickCallback
-import com.lagradost.cloudstream3.ui.setRecycledViewPool
 import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR
 import com.lagradost.cloudstream3.ui.settings.Globals.PHONE
 import com.lagradost.cloudstream3.ui.settings.Globals.TV
@@ -66,9 +64,6 @@ import com.lagradost.cloudstream3.utils.AppContextUtils.loadSearchResult
 import com.lagradost.cloudstream3.utils.AppContextUtils.ownHide
 import com.lagradost.cloudstream3.utils.AppContextUtils.ownShow
 import com.lagradost.cloudstream3.utils.AppContextUtils.setDefaultFocus
-import com.lagradost.cloudstream3.utils.BackPressedCallbackHelper
-import com.lagradost.cloudstream3.utils.BackPressedCallbackHelper.attachBackPressedCallback
-import com.lagradost.cloudstream3.utils.BackPressedCallbackHelper.detachBackPressedCallback
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
 import com.lagradost.cloudstream3.utils.DataStoreHelper
 import com.lagradost.cloudstream3.utils.EmptyEvent
@@ -90,6 +85,7 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(
         // Used for configuration changed events to fix any popups that are not attached to a fragment
         val configEvent = EmptyEvent()
         var currentSpan = 1
+        val listHomepageItems = mutableListOf<SearchResponse>()
 
         private val errorProfilePics = listOf(
             R.drawable.monke_benene,
@@ -571,7 +567,6 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(
     }
 
     override fun onDestroyView() {
-        (activity as? ComponentActivity)?.detachBackPressedCallback("HomeFragment_BackPress")
         bottomSheetDialog?.ownHide()
         super.onDestroyView()
     }
@@ -632,9 +627,6 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(
     @SuppressLint("SetTextI18n")
     override fun onBindingCreated(binding: FragmentHomeBinding) {
         context?.let { HomeChildItemAdapter.updatePosterSize(it) }
-        (activity as? ComponentActivity)?.attachBackPressedCallback("HomeFragment_BackPress") {
-            handleTvBackPress(this)
-        }
         binding.apply {
             //homeChangeApiLoading.setOnClickListener(apiChangeClickListener)
             //homeChangeApiLoading.setOnClickListener(apiChangeClickListener)
@@ -650,7 +642,13 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(
                 activity?.showAccountSelectLinear()
             }
 
+            homeRandom.setOnClickListener {
+                if (listHomepageItems.isNotEmpty()) {
+                    activity.loadSearchResult(listHomepageItems.random())
+                }
+            }
             homeMasterAdapter = HomeParentItemAdapterPreview(
+                fragment = this@HomeFragment,
                 homeViewModel, accountViewModel
             )
             homeMasterRecycler.setRecycledViewPool(ParentItemAdapter.sharedPool)
@@ -727,9 +725,8 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(
                 settingsManager.getBoolean(
                     getString(R.string.random_button_key),
                     false
-                )
+                ) && isLayout(PHONE)
             binding.homeRandom.visibility = View.GONE
-            binding.homeRandomButtonTv.visibility = View.GONE
         }
 
         observe(homeViewModel.apiName) { apiName ->
@@ -755,28 +752,23 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(
 
                         saveHomepageToTV(d)
 
+                        listHomepageItems.clear()
                         homeLoading.isVisible = false
                         homeLoadingError.isVisible = false
                         homeMasterRecycler.isVisible = true
                         homeLoadingShimmer.stopShimmer()
                         //home_loaded?.isVisible = true
                         if (toggleRandomButton) {
-                            val distinct = d.values
-                                .flatMap { it.list.list }
-                                .distinctBy { it.url }
-                            val hasItems = distinct.isNotEmpty()
-                            val isPhone = isLayout(PHONE)
-                            val randomClickListener = View.OnClickListener {
-                                distinct.randomOrNull()?.let { activity.loadSearchResult(it) }
+                            //Flatten list
+                            val mutableListOfResponse = mutableListOf<SearchResponse>()
+                            d.values.forEach { dlist ->
+                                mutableListOfResponse.addAll(dlist.list.list)
                             }
+                            listHomepageItems.addAll(mutableListOfResponse.distinctBy { it.url })
 
-                            homeRandom.isVisible = isPhone && hasItems
-                            homeRandom.setOnClickListener(randomClickListener)
-                            homeRandomButtonTv.isVisible = !isPhone && hasItems
-                            homeRandomButtonTv.setOnClickListener(randomClickListener)
+                            homeRandom.isVisible = listHomepageItems.isNotEmpty()
                         } else {
                             homeRandom.isGone = true
-                            homeRandomButtonTv.isGone = true
                         }
                     }
 
@@ -892,44 +884,4 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(
             }
         }*/
     }
-
-    private fun handleTvBackPress(helper: BackPressedCallbackHelper.CallbackHelper) {
-        // Only apply custom behavior on TV interface
-        if (!isLayout(TV)) {
-            helper.runDefault()
-            return
-        }
-        val currentFocus = activity?.currentFocus ?: run {
-            helper.runDefault()
-            return
-        }
-        // isInsideRecycle is true when focus is inside home_master_recycler
-        var parent = currentFocus.parent
-        var isInsideRecycler = false
-        while (parent != null) {
-            if (parent is View && parent.id == R.id.home_master_recycler) {
-                isInsideRecycler = true
-                break
-            }
-            parent = parent.parent
-        }
-        when {
-            // Case 1: Focus is within plugin content -> Move to plugin selector
-            isInsideRecycler -> {
-                binding?.homeMasterRecycler?.scrollToPosition(0)
-                // Defer focus request until after scroll ends
-                binding?.homeChangeApi?.post {
-                    binding?.homeChangeApi?.requestFocus()
-                }
-            }
-            // Case 2: Focus is on plugin selector or nearby buttons -> Move to home navigation
-            currentFocus.id == R.id.home_change_api ||
-            currentFocus.id == R.id.home_preview_reload_provider ||
-            currentFocus.id == R.id.home_preview_search_button -> {
-                activity?.findViewById<View>(R.id.navigation_home)?.requestFocus()
-            }
-            // Case 3: Any other location -> Use default back behavior
-            else -> helper.runDefault()
-        }
-    }
 }

app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapter.kt

@@ -6,8 +6,10 @@ import android.os.Parcelable
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.RecyclerView
 import androidx.viewbinding.ViewBinding
+import com.lagradost.cloudstream3.HomePageList
 import com.lagradost.cloudstream3.LoadResponse
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.databinding.HomepageParentBinding
@@ -15,11 +17,9 @@ import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.ui.BaseAdapter
 import com.lagradost.cloudstream3.ui.BaseDiffCallback
 import com.lagradost.cloudstream3.ui.ViewHolderState
-import com.lagradost.cloudstream3.ui.newSharedPool
 import com.lagradost.cloudstream3.ui.result.FOCUS_SELF
 import com.lagradost.cloudstream3.ui.result.setLinearListLayout
 import com.lagradost.cloudstream3.ui.search.SearchClickCallback
-import com.lagradost.cloudstream3.ui.setRecycledViewPool
 import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR
 import com.lagradost.cloudstream3.ui.settings.Globals.PHONE
 import com.lagradost.cloudstream3.ui.settings.Globals.TV
@@ -48,7 +48,7 @@ open class ParentItemAdapter(
 ) {
     companion object {
         val sharedPool =
-            newSharedPool { setMaxRecycledViews(CONTENT, 4) }
+            RecyclerView.RecycledViewPool().apply { this.setMaxRecycledViews(CONTENT, 4) }
     }
 
     data class ParentItemHolder(val binding: ViewBinding) : ViewHolderState<Bundle>(binding) {

app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapterPreview.kt

@@ -60,9 +60,9 @@ import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbarMargin
 import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbarView
 import com.lagradost.cloudstream3.utils.UIHelper.populateChips
 import androidx.core.graphics.toColorInt
-import com.lagradost.cloudstream3.ui.setRecycledViewPool
 
 class HomeParentItemAdapterPreview(
+    val fragment: LifecycleOwner,
     private val viewModel: HomeViewModel,
     private val accountViewModel: AccountViewModel
 ) : ParentItemAdapter(
@@ -104,7 +104,7 @@ class HomeParentItemAdapterPreview(
             )
         }
 
-        return HeaderViewHolder(binding, viewModel, accountViewModel)
+        return HeaderViewHolder(binding, viewModel, accountViewModel, fragment)
     }
 
     override fun onBindHeader(holder: ViewHolderState<Bundle>) {
@@ -131,6 +131,7 @@ class HomeParentItemAdapterPreview(
         val binding: ViewBinding,
         val viewModel: HomeViewModel,
         accountViewModel: AccountViewModel,
+        fragment: LifecycleOwner,
     ) :
         ViewHolderState<Bundle>(binding) {
 
@@ -542,7 +543,7 @@ class HomeParentItemAdapterPreview(
             headProfilePicCard?.isGone = isLayout(TV or EMULATOR)
             alternateHeadProfilePicCard?.isGone = isLayout(TV or EMULATOR)
 
-            (headProfilePic ?: alternateHeadProfilePic)?.observe(viewModel.currentAccount) { currentAccount ->
+            fragment.observe(viewModel.currentAccount) { currentAccount ->
                 headProfilePic?.loadImage(currentAccount?.image)
                 alternateHeadProfilePic?.loadImage(currentAccount?.image)
             }
@@ -773,7 +774,7 @@ class HomeParentItemAdapterPreview(
         fun onViewAttachedToWindow() {
             previewViewpager.registerOnPageChangeCallback(previewCallback)
 
-            previewViewpager.apply {
+            binding.root.findViewTreeLifecycleOwner()?.apply {
                 observe(viewModel.preview) {
                     updatePreview(it)
                 }
@@ -798,7 +799,7 @@ class HomeParentItemAdapterPreview(
                     }
                     toggleListHolder?.isGone = visible.isEmpty()
                 }
-            }
+            } ?: debugException { "Expected findViewTreeLifecycleOwner" }
         }
     }
 }

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

@@ -9,12 +9,12 @@ import com.lagradost.cloudstream3.APIHolder.apis
 import com.lagradost.cloudstream3.APIHolder.getApiFromNameNull
 import com.lagradost.cloudstream3.CloudStreamApp.Companion.context
 import com.lagradost.cloudstream3.CloudStreamApp.Companion.getKey
-import com.lagradost.cloudstream3.CloudStreamApp.Companion.setKey
 import com.lagradost.cloudstream3.CommonActivity.activity
 import com.lagradost.cloudstream3.HomePageList
 import com.lagradost.cloudstream3.LoadResponse
 import com.lagradost.cloudstream3.MainAPI
 import com.lagradost.cloudstream3.MainActivity
+import com.lagradost.cloudstream3.MainActivity.Companion.lastError
 import com.lagradost.cloudstream3.SearchResponse
 import com.lagradost.cloudstream3.amap
 import com.lagradost.cloudstream3.mvvm.Resource
@@ -40,7 +40,6 @@ import com.lagradost.cloudstream3.utils.AppContextUtils.filterSearchResultByFilm
 import com.lagradost.cloudstream3.utils.AppContextUtils.loadResult
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
 import com.lagradost.cloudstream3.utils.DOWNLOAD_HEADER_CACHE
-import com.lagradost.cloudstream3.utils.DOWNLOAD_HEADER_CACHE_BACKUP
 import com.lagradost.cloudstream3.utils.DataStoreHelper
 import com.lagradost.cloudstream3.utils.DataStoreHelper.deleteAllResumeStateIds
 import com.lagradost.cloudstream3.utils.DataStoreHelper.getAllResumeStateIds
@@ -50,12 +49,13 @@ import com.lagradost.cloudstream3.utils.DataStoreHelper.getCurrentAccount
 import com.lagradost.cloudstream3.utils.DataStoreHelper.getLastWatched
 import com.lagradost.cloudstream3.utils.DataStoreHelper.getResultWatchState
 import com.lagradost.cloudstream3.utils.DataStoreHelper.getViewPos
-import com.lagradost.cloudstream3.utils.downloader.DownloadObjects
+import com.lagradost.cloudstream3.utils.VideoDownloadHelper
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.withContext
 import java.util.EnumSet
 import java.util.concurrent.CopyOnWriteArrayList
+import kotlin.collections.set
 
 class HomeViewModel : ViewModel() {
     companion object {
@@ -67,26 +67,11 @@ class HomeViewModel : ViewModel() {
             }
             val resumeWatchingResult = withContext(Dispatchers.IO) {
                 resumeWatching?.mapNotNull { resume ->
-                    val headerCache = getKey<DownloadObjects.DownloadHeaderCached>(
+
+                    val data = getKey<VideoDownloadHelper.DownloadHeaderCached>(
                         DOWNLOAD_HEADER_CACHE,
                         resume.parentId.toString()
-                    )
-
-                    val data = if (headerCache == null) {
-                        // We store resume watching data in download header cache
-                        // Because downloads automatically pruned outdated download headers we
-                        // removed resume watching data. We should restore the data for affected users.
-                        val oldData = getKey<DownloadObjects.DownloadHeaderCached>(
-                            DOWNLOAD_HEADER_CACHE_BACKUP,
-                            resume.parentId.toString()
-                        ) ?: return@mapNotNull null
-
-                        // Restore data
-                        setKey(DOWNLOAD_HEADER_CACHE, resume.parentId.toString(), oldData)
-                        oldData
-                    } else {
-                        headerCache
-                    }
+                    ) ?: return@mapNotNull null
 
                     val watchPos = getViewPos(resume.episodeId)
 
@@ -133,7 +118,7 @@ class HomeViewModel : ViewModel() {
     private var currentShuffledList: List<SearchResponse> = listOf()
 
     private fun autoloadRepo(): APIRepository {
-        return APIRepository(apis.withLock { apis.first { it.hasMainPage } })
+        return APIRepository(synchronized(apis) { apis.first { it.hasMainPage } })
     }
 
     private val _availableWatchStatusTypes =
@@ -516,6 +501,9 @@ class HomeViewModel : ViewModel() {
                 return@ioSafe
             }
 
+            HomeChildItemAdapter.sharedPool.clear()
+            ParentItemAdapter.sharedPool.clear()
+
             val api = getApiFromNameNull(preferredApiName)
             if (preferredApiName == noneApi.name) {
                 // just set to random
@@ -535,7 +523,7 @@ class HomeViewModel : ViewModel() {
             } else if (api == null) {
                 // API is not found aka not loaded or removed, post the loading
                 // progress if waiting for plugins, otherwise nothing
-                if (PluginManager.loadedOnlinePlugins || PluginManager.isSafeMode()) {
+                if (PluginManager.loadedOnlinePlugins || PluginManager.checkSafeModeFile() || lastError != null) {
                     loadAndCancel(noneApi)
                 } else {
                     _page.postValue(Resource.Loading())

app/src/main/java/com/lagradost/cloudstream3/ui/library/LibraryFragment.kt

@@ -80,6 +80,8 @@ class LibraryFragment : BaseFragment<FragmentLibraryBinding>(
     BaseFragment.BindingCreator.Bind(FragmentLibraryBinding::bind)
 ) {
     companion object {
+
+        val listLibraryItems = mutableListOf<SyncAPI.LibraryItem>()
         fun newInstance() = LibraryFragment()
 
         /**
@@ -102,19 +104,14 @@ class LibraryFragment : BaseFragment<FragmentLibraryBinding>(
         super.onSaveInstanceState(outState)
     }
 
-    private fun updateRandomVisibility(binding: FragmentLibraryBinding) {
-        if (!toggleRandomButton) {
-            binding.libraryRandom.isGone = true
-            binding.libraryRandomButtonTv.isGone = true
-            return
-        }
+    private fun updateRandom(binding: FragmentLibraryBinding) {
         val position = libraryViewModel.currentPage.value ?: 0
         val pages = (libraryViewModel.pages.value as? Resource.Success)?.value ?: return
-        val hasItems = pages[position].items.isNotEmpty()
-        val isPhone = isLayout(PHONE)
-
-        binding.libraryRandom.isVisible = isPhone && hasItems
-        binding.libraryRandomButtonTv.isVisible = !isPhone && hasItems
+        if (toggleRandomButton) {
+            listLibraryItems.clear()
+            listLibraryItems.addAll(pages[position].items)
+            binding.libraryRandom.isVisible = listLibraryItems.isNotEmpty()
+        } else binding.libraryRandom.isGone = true
     }
 
     override fun fixLayout(view: View) {
@@ -197,9 +194,17 @@ class LibraryFragment : BaseFragment<FragmentLibraryBinding>(
                 settingsManager.getBoolean(
                     getString(R.string.random_button_key),
                     false
-                )
+                ) && isLayout(PHONE)
             binding.libraryRandom.visibility = View.GONE
-            binding.libraryRandomButtonTv.visibility = View.GONE
+        }
+
+        binding.libraryRandom.setOnClickListener {
+            if (listLibraryItems.isNotEmpty()) {
+                val listLibraryItem = listLibraryItems.random()
+                libraryViewModel.currentSyncApi?.syncIdName?.let {
+                    loadLibraryItem(it, listLibraryItem.syncId, listLibraryItem)
+                }
+            }
         }
 
         /**
@@ -210,13 +215,14 @@ class LibraryFragment : BaseFragment<FragmentLibraryBinding>(
             syncId: SyncIdName,
             apiName: String? = null,
         ) {
-            val availableProviders = allProviders.filter {
-                it.supportedSyncNames.contains(syncId)
-            }.map { it.name } +
-                // Add the api if it exists
-                (APIHolder.getApiFromNameNull(apiName)?.let { listOf(it.name) }
-                    ?: emptyList())
-
+            val availableProviders = synchronized(allProviders) {
+                allProviders.filter {
+                    it.supportedSyncNames.contains(syncId)
+                }.map { it.name } +
+                        // Add the api if it exists
+                        (APIHolder.getApiFromNameNull(apiName)?.let { listOf(it.name) }
+                            ?: emptyList())
+            }
             val baseOptions = listOf(
                 LibraryOpenerType.Default,
                 LibraryOpenerType.None,
@@ -381,19 +387,7 @@ class LibraryFragment : BaseFragment<FragmentLibraryBinding>(
                             binding.searchBar.setExpanded(true)
                         }
 
-                        // Set up random button click listener
-                        if (toggleRandomButton) {
-                            val randomClickListener = View.OnClickListener {
-                                val position = libraryViewModel.currentPage.value ?: 0
-                                val syncIdName = libraryViewModel.currentSyncApi?.syncIdName ?: return@OnClickListener
-                                pages[position].items.randomOrNull()?.let { item ->
-                                    loadLibraryItem(syncIdName, item.syncId, item)
-                                }
-                            }
-                            libraryRandom.setOnClickListener(randomClickListener)
-                            libraryRandomButtonTv.setOnClickListener(randomClickListener)
-                        }
-                        updateRandomVisibility(binding)
+                        updateRandom(binding)
 
                         // Only stop loading after 300ms to hide the fade effect the viewpager produces when updating
                         // Without this there would be a flashing effect:
@@ -472,7 +466,7 @@ class LibraryFragment : BaseFragment<FragmentLibraryBinding>(
         }
 
         observe(libraryViewModel.currentPage) { position ->
-            updateRandomVisibility(binding)
+            updateRandom(binding)
             val all = binding.viewpager.allViews.toList()
                 .filterIsInstance<AutofitRecyclerView>()
 

app/src/main/java/com/lagradost/cloudstream3/ui/player/AbstractPlayerFragment.kt

@@ -1,16 +1,64 @@
 package com.lagradost.cloudstream3.ui.player
 
+import android.annotation.SuppressLint
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
+import android.graphics.drawable.AnimatedImageDrawable
+import android.graphics.drawable.AnimatedVectorDrawable
+import android.media.metrics.PlaybackErrorEvent
+import android.os.Build
 import android.os.Bundle
+import android.util.Log
+import android.view.LayoutInflater
 import android.view.View
+import android.view.ViewGroup
+import android.view.WindowManager
+import android.widget.FrameLayout
 import android.widget.ImageView
+import android.widget.ProgressBar
+import android.widget.Toast
+import androidx.annotation.LayoutRes
 import androidx.annotation.OptIn
 import androidx.annotation.StringRes
+import androidx.core.view.isGone
+import androidx.core.view.isVisible
+import androidx.fragment.app.Fragment
+import androidx.media3.common.PlaybackException
 import androidx.media3.common.util.UnstableApi
+import androidx.media3.exoplayer.ExoPlayer
 import androidx.media3.session.MediaSession
+import androidx.media3.ui.AspectRatioFrameLayout
+import androidx.media3.ui.DefaultTimeBar
+import androidx.media3.ui.PlayerView
 import androidx.media3.ui.SubtitleView
-import androidx.viewbinding.ViewBinding
+import androidx.media3.ui.TimeBar
+import androidx.preference.PreferenceManager
+import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat
+import com.github.rubensousa.previewseekbar.PreviewBar
+import com.github.rubensousa.previewseekbar.media3.PreviewTimeBar
+import com.lagradost.cloudstream3.CommonActivity.isInPIPMode
+import com.lagradost.cloudstream3.CommonActivity.keyEventListener
+import com.lagradost.cloudstream3.CommonActivity.playerEventListener
+import com.lagradost.cloudstream3.CommonActivity.screenWidth
+import com.lagradost.cloudstream3.CommonActivity.showToast
+import com.lagradost.cloudstream3.ErrorLoadingException
 import com.lagradost.cloudstream3.R
-import com.lagradost.cloudstream3.ui.BaseFragment
+import com.lagradost.cloudstream3.mvvm.logError
+import com.lagradost.cloudstream3.mvvm.safe
+import com.lagradost.cloudstream3.ui.settings.Globals.PHONE
+import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
+import com.lagradost.cloudstream3.ui.subtitles.SaveCaptionStyle
+import com.lagradost.cloudstream3.ui.subtitles.SubtitlesFragment
+import com.lagradost.cloudstream3.utils.AppContextUtils
+import com.lagradost.cloudstream3.utils.AppContextUtils.requestLocalAudioFocus
+import com.lagradost.cloudstream3.utils.DataStoreHelper
+import com.lagradost.cloudstream3.utils.EpisodeSkip
+import com.lagradost.cloudstream3.utils.UIHelper
+import com.lagradost.cloudstream3.utils.UIHelper.hideSystemUI
+import com.lagradost.cloudstream3.utils.UIHelper.popCurrentPage
+import java.net.SocketTimeoutException
 
 enum class PlayerResize(@StringRes val nameRes: Int) {
     Fit(R.string.resize_fit),
@@ -31,131 +79,677 @@ const val NEXT_WATCH_EPISODE_PERCENTAGE = 90
 const val UPDATE_SYNC_PROGRESS_PERCENTAGE = 80
 
 @OptIn(UnstableApi::class)
-abstract class AbstractPlayerFragment<T : ViewBinding>(
-    bindingCreator: BindingCreator<T>
-) : BaseFragment<T>(bindingCreator), PlayerView.Callbacks {
+abstract class AbstractPlayerFragment(
+    var player: IPlayer = CS3IPlayer()
+) : Fragment() {
+    var resizeMode: Int = 0
+    var subView: SubtitleView? = null
+    protected open var hasPipModeSupport = true
 
-    // Stored pre-initialization so subclasses can set them before onBindingCreated.
-    private var _player: IPlayer = CS3IPlayer()
+    var playerPausePlayHolderHolder: FrameLayout? = null
+    var playerPausePlay: ImageView? = null
+    var playerBuffering: ProgressBar? = null
+    var playerView: PlayerView? = null
+    var piphide: FrameLayout? = null
+    var subtitleHolder: FrameLayout? = null
+    var currentPlayerStatus = CSPlayerLoading.IsBuffering
 
-    /** The shared [PlayerView] host that owns all player state and view references. */
-    protected var playerHostView: PlayerView? = null
+    @LayoutRes
+    protected open var layout: Int = R.layout.fragment_player
 
-    var player: IPlayer
-        get() = playerHostView?.player ?: _player
-        set(value) {
-            _player = value
-            playerHostView?.player = value
+    open fun nextEpisode() {
+        throw NotImplementedError()
+    }
+
+    open fun prevEpisode() {
+        throw NotImplementedError()
+    }
+
+    open fun playerPositionChanged(position: Long, duration: Long) {
+        throw NotImplementedError()
+    }
+
+    open fun playerStatusChanged() {}
+
+    open fun playerDimensionsLoaded(width: Int, height: Int) {
+        throw NotImplementedError()
+    }
+
+    open fun subtitlesChanged() {
+        throw NotImplementedError()
+    }
+
+    open fun embeddedSubtitlesFetched(subtitles: List<SubtitleData>) {
+        throw NotImplementedError()
+    }
+
+    open fun onTracksInfoChanged() {
+        throw NotImplementedError()
+    }
+
+    open fun onTimestamp(timestamp: EpisodeSkip.SkipStamp?) {
+
+    }
+
+    open fun onTimestampSkipped(timestamp: EpisodeSkip.SkipStamp) {
+
+    }
+
+    open fun exitedPipMode() {
+        throw NotImplementedError()
+    }
+
+    private fun keepScreenOn(on: Boolean) {
+        if (on) {
+            activity?.window?.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
+        } else {
+            activity?.window?.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
+        }
+    }
+
+    private fun updateIsPlaying(
+        wasPlaying: CSPlayerLoading,
+        isPlaying: CSPlayerLoading
+    ) {
+        val isPlayingRightNow = CSPlayerLoading.IsPlaying == isPlaying
+        val isPausedRightNow = CSPlayerLoading.IsPaused == isPlaying
+        currentPlayerStatus = isPlaying
+
+        keepScreenOn(!isPausedRightNow)
+
+        val isBuffering = CSPlayerLoading.IsBuffering == isPlaying
+        if (isBuffering) {
+            playerPausePlayHolderHolder?.isVisible = false
+            playerBuffering?.isVisible = true
+        } else {
+            playerPausePlayHolderHolder?.isVisible = true
+            playerBuffering?.isVisible = false
+
+            if(isPlaying == CSPlayerLoading.IsEnded && isLayout(PHONE)){
+                playerPausePlay?.setImageResource(R.drawable.ic_baseline_replay_24)
+            } else if (wasPlaying != isPlaying) {
+                playerPausePlay?.setImageResource(if (isPlayingRightNow) R.drawable.play_to_pause else R.drawable.pause_to_play)
+                val drawable = playerPausePlay?.drawable
+
+                var startedAnimation = false
+                if (Build.VERSION.SDK_INT > Build.VERSION_CODES.P) {
+                    if (drawable is AnimatedImageDrawable) {
+                        drawable.start()
+                        startedAnimation = true
+                    }
+                }
+
+                if (drawable is AnimatedVectorDrawable) {
+                    drawable.start()
+                    startedAnimation = true
+                }
+
+                if (drawable is AnimatedVectorDrawableCompat) {
+                    drawable.start()
+                    startedAnimation = true
+                }
+
+                // somehow the phone is wacked
+                if (!startedAnimation) {
+                    playerPausePlay?.setImageResource(if (isPlayingRightNow) R.drawable.netflix_pause else R.drawable.netflix_play)
+                }
+            } else {
+                playerPausePlay?.setImageResource(if (isPlayingRightNow) R.drawable.netflix_pause else R.drawable.netflix_play)
+            }
         }
 
-    val subView: SubtitleView? get() = playerHostView?.subView
-    val playerPausePlay: ImageView? get() = playerHostView?.playerPausePlay
-
-    /** The underlying [androidx.media3.ui.PlayerView] widget (named to avoid conflict with our [PlayerView]). */
-    val playerView: androidx.media3.ui.PlayerView?
-        get() = playerHostView?.exoPlayerView
-
-    var currentPlayerStatus: CSPlayerLoading
-        get() = playerHostView?.currentPlayerStatus ?: CSPlayerLoading.IsBuffering
-        set(value) { playerHostView?.currentPlayerStatus = value }
-
-    protected var mMediaSession: MediaSession?
-        get() = playerHostView?.mMediaSession
-        set(value) { playerHostView?.mMediaSession = value }
-
-    // No-op callbacks (nextEpisode, prevEpisode, etc.) are intentionally left as
-    // open so subclasses can override only what they need.  The ones below throw
-    // to make it obvious when an implementation is missing.
-
-    override fun nextEpisode() {
-        throw NotImplementedError()
-    }
-
-    override fun prevEpisode() {
-        throw NotImplementedError()
-    }
-
-    override fun playerPositionChanged(position: Long, duration: Long) {
-        throw NotImplementedError()
-    }
-
-    override fun playerDimensionsLoaded(width: Int, height: Int) {
-        throw NotImplementedError()
-    }
-
-    override fun subtitlesChanged() {
-        throw NotImplementedError()
-    }
-
-    override fun embeddedSubtitlesFetched(subtitles: List<SubtitleData>) {
-        throw NotImplementedError()
-    }
-
-    override fun onTracksInfoChanged() {
-        throw NotImplementedError()
-    }
-
-    override fun exitedPipMode() {
-        throw NotImplementedError()
-    }
-
-    override fun hasNextMirror(): Boolean {
-        throw NotImplementedError()
-    }
-
-    override fun nextMirror() {
-        throw NotImplementedError()
-    }
-
-    /** Delegates to [PlayerView.playerError] by default; override to customize. */
-    override fun playerError(exception: Throwable) {
-        playerHostView?.playerError(exception)
-    }
-
-    /** Player fragments don't need system-bar padding adjustment by default. */
-    override fun fixLayout(view: View) = Unit
-
-    override fun onBindingCreated(binding: T, savedInstanceState: Bundle?) {
-        val ctx = context ?: return
-        playerHostView = PlayerView(ctx)
-        playerHostView?.player = _player
-        playerHostView?.callbacks = this
-        playerHostView?.bindViews(binding.root)
-        playerHostView?.initialize()
+        PlayerPipHelper.updatePIPModeActions(
+            activity,
+            isPlaying,
+            hasPipModeSupport,
+            player.getAspectRatio()
+        )
     }
 
+    private var pipReceiver: BroadcastReceiver? = null
     override fun onPictureInPictureModeChanged(isInPictureInPictureMode: Boolean) {
         super.onPictureInPictureModeChanged(isInPictureInPictureMode)
-        playerHostView?.onPictureInPictureModeChanged(isInPictureInPictureMode, activity)
+        try {
+            isInPIPMode = isInPictureInPictureMode
+            if (isInPictureInPictureMode) {
+                // Hide the full-screen UI (controls, etc.) while in picture-in-picture mode.
+                piphide?.isVisible = false
+                pipReceiver = object : BroadcastReceiver() {
+                    override fun onReceive(
+                        context: Context,
+                        intent: Intent,
+                    ) {
+                        if (ACTION_MEDIA_CONTROL != intent.action) {
+                            return
+                        }
+                        player.handleEvent(
+                            CSPlayerEvent.entries[intent.getIntExtra(
+                                EXTRA_CONTROL_TYPE,
+                                0
+                            )], source = PlayerEventSource.UI
+                        )
+                    }
+                }
+
+                val filter = IntentFilter()
+                filter.addAction(ACTION_MEDIA_CONTROL)
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                    activity?.registerReceiver(pipReceiver, filter, Context.RECEIVER_EXPORTED)
+                } else {
+                    @SuppressLint("UnspecifiedRegisterReceiverFlag")
+                    activity?.registerReceiver(pipReceiver, filter)
+                }
+
+                val isPlaying = player.getIsPlaying()
+                val isPlayingValue =
+                    if (isPlaying) CSPlayerLoading.IsPlaying else CSPlayerLoading.IsPaused
+                updateIsPlaying(isPlayingValue, isPlayingValue)
+            } else {
+                // Restore the full-screen UI.
+                piphide?.isVisible = true
+                exitedPipMode()
+                pipReceiver?.let {
+                    // Prevents java.lang.IllegalArgumentException: Receiver not registered
+                    safe {
+                        activity?.unregisterReceiver(it)
+                    }
+                }
+                activity?.hideSystemUI()
+                this.view?.let { UIHelper.hideKeyboard(it) }
+            }
+        } catch (e: Exception) {
+            logError(e)
+        }
+    }
+
+    open fun hasNextMirror(): Boolean {
+        throw NotImplementedError()
+    }
+
+    open fun nextMirror() {
+        throw NotImplementedError()
+    }
+
+    private fun requestAudioFocus() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            activity?.requestLocalAudioFocus(AppContextUtils.getFocusRequest())
+        }
+    }
+
+    open fun playerError(exception: Throwable) {
+        fun showToast(message: String, gotoNext: Boolean = false) {
+            if (gotoNext && hasNextMirror()) {
+                showToast(
+                    message,
+                    Toast.LENGTH_SHORT
+                )
+                nextMirror()
+            } else {
+                showToast(
+                    context?.getString(R.string.no_links_found_toast) + "\n" + message,
+                    Toast.LENGTH_LONG
+                )
+                activity?.popCurrentPage()
+            }
+        }
+
+        val ctx = context ?: return
+        when (exception) {
+            is PlaybackException -> {
+                val msg = exception.message ?: ""
+                val errorName = exception.errorCodeName
+                when (val code = exception.errorCode) {
+                    PlaybackException.ERROR_CODE_IO_FILE_NOT_FOUND,
+                    PlaybackException.ERROR_CODE_IO_NO_PERMISSION,
+                    PlaybackException.ERROR_CODE_IO_READ_POSITION_OUT_OF_RANGE,
+                    PlaybackException.ERROR_CODE_IO_UNSPECIFIED,
+                    PlaybackException.ERROR_CODE_PARSING_CONTAINER_UNSUPPORTED -> {
+                        showToast(
+                            "${ctx.getString(R.string.source_error)}\n$errorName ($code)\n$msg",
+                            gotoNext = true
+                        )
+                    }
+
+                    PlaybackException.ERROR_CODE_REMOTE_ERROR,
+                    PlaybackException.ERROR_CODE_IO_BAD_HTTP_STATUS,
+                    PlaybackException.ERROR_CODE_TIMEOUT,
+                    PlaybackException.ERROR_CODE_IO_NETWORK_CONNECTION_FAILED,
+                    PlaybackException.ERROR_CODE_IO_NETWORK_CONNECTION_TIMEOUT,
+                    PlaybackException.ERROR_CODE_IO_INVALID_HTTP_CONTENT_TYPE -> {
+                        showToast(
+                            "${ctx.getString(R.string.remote_error)}\n$errorName ($code)\n$msg",
+                            gotoNext = true
+                        )
+                    }
+
+                    PlaybackErrorEvent.ERROR_AUDIO_TRACK_INIT_FAILED,
+                    PlaybackErrorEvent.ERROR_AUDIO_TRACK_OTHER,
+                    PlaybackException.ERROR_CODE_DECODING_FAILED,
+                    PlaybackException.ERROR_CODE_AUDIO_TRACK_WRITE_FAILED,
+                    PlaybackException.ERROR_CODE_DECODER_INIT_FAILED,
+                    PlaybackException.ERROR_CODE_DECODER_QUERY_FAILED -> {
+                        showToast(
+                            "${ctx.getString(R.string.render_error)}\n$errorName ($code)\n$msg",
+                            gotoNext = true
+                        )
+                    }
+
+                    PlaybackException.ERROR_CODE_DECODING_FORMAT_UNSUPPORTED,
+                    PlaybackException.ERROR_CODE_DECODING_FORMAT_EXCEEDS_CAPABILITIES -> {
+                        showToast(
+                            "${ctx.getString(R.string.unsupported_error)}\n$errorName ($code)\n$msg",
+                            gotoNext = true
+                        )
+                    }
+
+                    PlaybackException.ERROR_CODE_PARSING_CONTAINER_MALFORMED,
+                    PlaybackException.ERROR_CODE_PARSING_MANIFEST_MALFORMED -> {
+                        showToast(
+                            "${ctx.getString(R.string.encoding_error)}\n$errorName ($code)\n$msg",
+                            gotoNext = true
+                        )
+                    }
+
+                    else -> {
+                        showToast(
+                            "${ctx.getString(R.string.unexpected_error)}\n$errorName ($code)\n$msg",
+                            gotoNext = false
+                        )
+                    }
+                }
+            }
+
+            is InvalidFileException -> {
+                showToast(
+                    "${ctx.getString(R.string.source_error)}\n${exception.message}",
+                    gotoNext = true
+                )
+            }
+
+            is SocketTimeoutException -> {
+                /**
+                 * Ensures this is run on the UI thread to prevent issues
+                 * caused by SocketTimeoutException in torrents. Running
+                 * on another thread can break player interactions or
+                 * prevent switching to the next source.
+                 */
+                activity?.runOnUiThread {
+                    showToast(
+                        "${ctx.getString(R.string.remote_error)}\n${exception.message}",
+                        gotoNext = true
+                    )
+                }
+            }
+
+            is ErrorLoadingException -> {
+                exception.message?.let {
+                    showToast(
+                        it,
+                        gotoNext = true
+                    )
+                } ?: showToast(
+                    exception.toString(),
+                    gotoNext = true
+                )
+            }
+
+            else -> {
+                exception.message?.let {
+                    showToast(
+                        it,
+                        gotoNext = false
+                    )
+                } ?: showToast(
+                    exception.toString(),
+                    gotoNext = false
+                )
+            }
+        }
+    }
+
+    private fun onSubStyleChanged(style: SaveCaptionStyle) {
+        player.updateSubtitleStyle(style)
+        // Forcefully update the subtitle encoding in case the edge size is changed
+        player.seekTime(-1)
+    }
+
+
+    @SuppressLint("UnsafeOptInUsageError")
+    open fun playerUpdated(player: Any?) {
+        if (player is ExoPlayer) {
+            context?.let { ctx ->
+                mMediaSession?.release()
+                mMediaSession = MediaSession.Builder(ctx, player)
+                    // Ensure unique ID for concurrent players
+                    .setId(System.currentTimeMillis().toString())
+                    .build()
+            }
+
+            // Necessary for multiple combined videos
+            @Suppress("DEPRECATION")
+            playerView?.setShowMultiWindowTimeBar(true)
+            playerView?.player = player
+            playerView?.performClick()
+        }
+    }
+
+    protected var mMediaSession: MediaSession? = null
+
+    // this can be used in the future for players other than exoplayer
+    //private val mMediaSessionCallback: MediaSessionCompat.Callback = object : MediaSessionCompat.Callback() {
+    //    override fun onMediaButtonEvent(mediaButtonEvent: Intent): Boolean {
+    //        val keyEvent = mediaButtonEvent.getParcelableExtra(Intent.EXTRA_KEY_EVENT) as KeyEvent?
+    //        if (keyEvent != null) {
+    //            if (keyEvent.action == KeyEvent.ACTION_DOWN) { // NO DOUBLE SKIP
+    //                val consumed = when (keyEvent.keyCode) {
+    //                    KeyEvent.KEYCODE_MEDIA_PAUSE -> callOnPause()
+    //                    KeyEvent.KEYCODE_MEDIA_PLAY -> callOnPlay()
+    //                    KeyEvent.KEYCODE_MEDIA_STOP -> callOnStop()
+    //                    KeyEvent.KEYCODE_MEDIA_NEXT -> callOnNext()
+    //                    else -> false
+    //                }
+    //                if (consumed) return true
+    //            }
+    //        }
+    //
+    //        return super.onMediaButtonEvent(mediaButtonEvent)
+    //    }
+    //}
+
+    open fun onDownload(event: DownloadEvent) = Unit
+
+    /** This receives the events from the player, if you want to append functionality you do it here,
+     * do note that this only receives events for UI changes,
+     * and returning early WONT stop it from changing in eg the player time or pause status */
+    open fun mainCallback(event: PlayerEvent) {
+        // we don't want to spam DownloadEvent
+        if (event !is DownloadEvent) {
+            Log.i(TAG, "Handle event: $event")
+        }
+        when (event) {
+            is DownloadEvent -> {
+                onDownload(event)
+            }
+
+            is ResizedEvent -> {
+                playerDimensionsLoaded(event.width, event.height)
+            }
+
+            is PlayerAttachedEvent -> {
+                playerUpdated(event.player)
+            }
+
+            is SubtitlesUpdatedEvent -> {
+                subtitlesChanged()
+            }
+
+            is TimestampSkippedEvent -> {
+                onTimestampSkipped(event.timestamp)
+            }
+
+            is TimestampInvokedEvent -> {
+                onTimestamp(event.timestamp)
+            }
+
+            is TracksChangedEvent -> {
+                onTracksInfoChanged()
+            }
+
+            is EmbeddedSubtitlesFetchedEvent -> {
+                embeddedSubtitlesFetched(event.tracks)
+            }
+
+            is ErrorEvent -> {
+                playerError(event.error)
+            }
+
+            is RequestAudioFocusEvent -> {
+                requestAudioFocus()
+            }
+
+            is EpisodeSeekEvent -> {
+                when (event.offset) {
+                    -1 -> prevEpisode()
+                    1 -> nextEpisode()
+                    else -> {}
+                }
+            }
+
+            is StatusEvent -> {
+                updateIsPlaying(wasPlaying = event.wasPlaying, isPlaying = event.isPlaying)
+                playerStatusChanged()
+            }
+
+            is PositionEvent -> {
+                playerPositionChanged(position = event.toMs, duration = event.durationMs)
+            }
+
+            is VideoEndedEvent -> {
+                context?.let { ctx ->
+                    // Only play next episode if autoplay is on (default)
+                    if (PreferenceManager.getDefaultSharedPreferences(ctx)
+                            ?.getBoolean(
+                                ctx.getString(R.string.autoplay_next_key),
+                                true
+                            ) == true
+                    ) {
+                        player.handleEvent(
+                            CSPlayerEvent.NextEpisode,
+                            source = PlayerEventSource.Player
+                        )
+                    }
+                }
+            }
+
+            is PauseEvent -> Unit
+            is PlayEvent -> Unit
+        }
+    }
+
+    @SuppressLint("SetTextI18n", "UnsafeOptInUsageError")
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        resizeMode = DataStoreHelper.resizeMode
+        resize(resizeMode, false)
+
+        player.releaseCallbacks()
+        player.initCallbacks(
+            eventHandler = ::mainCallback,
+            requestedListeningPercentages = listOf(
+                SKIP_OP_VIDEO_PERCENTAGE,
+                PRELOAD_NEXT_EPISODE_PERCENTAGE,
+                NEXT_WATCH_EPISODE_PERCENTAGE,
+                UPDATE_SYNC_PROGRESS_PERCENTAGE,
+            ),
+        )
+
+        val player = player
+        if (player is CS3IPlayer) {
+            // preview bar
+            val progressBar: PreviewTimeBar? = playerView?.findViewById(R.id.exo_progress)
+            val previewImageView: ImageView? = playerView?.findViewById(R.id.previewImageView)
+            val previewFrameLayout: FrameLayout? = playerView?.findViewById(R.id.previewFrameLayout)
+            if (progressBar != null && previewImageView != null && previewFrameLayout != null) {
+                var resume = false
+                progressBar.addOnScrubListener(object : PreviewBar.OnScrubListener {
+                    override fun onScrubStart(previewBar: PreviewBar?) {
+                        val hasPreview = player.hasPreview()
+                        progressBar.isPreviewEnabled = hasPreview
+                        resume = player.getIsPlaying()
+                        if (resume) player.handleEvent(
+                            CSPlayerEvent.Pause,
+                            PlayerEventSource.Player
+                        )
+
+                        // No clashing UI
+                        if (hasPreview) {
+                            subView?.isVisible = false
+                        }
+                    }
+
+                    override fun onScrubMove(
+                        previewBar: PreviewBar?,
+                        progress: Int,
+                        fromUser: Boolean
+                    ) {
+                    }
+
+                    override fun onScrubStop(previewBar: PreviewBar?) {
+                        if (resume) player.handleEvent(CSPlayerEvent.Play, PlayerEventSource.Player)
+                        // Delay to prevent the small flicker of subtitle before seeking
+                        subView?.postDelayed({
+                            // If we are not scrubbing then show subtitles again
+                            if (previewBar == null || !previewBar.isPreviewEnabled || !previewBar.isShowingPreview) {
+                                subView?.isVisible = true
+                            }
+                        }, 200)
+                    }
+                })
+                progressBar.attachPreviewView(previewFrameLayout)
+                progressBar.setPreviewLoader { currentPosition, max ->
+                    val bitmap = player.getPreview(currentPosition.toFloat().div(max.toFloat()))
+                    previewImageView.isGone = bitmap == null
+                    previewImageView.setImageBitmap(bitmap)
+                }
+            }
+
+            subView = playerView?.findViewById(androidx.media3.ui.R.id.exo_subtitles)
+            player.initSubtitles(subView, subtitleHolder, CustomDecoder.style)
+            (player.imageGenerator as? PreviewGenerator)?.params = ImageParams.new16by9(screenWidth)
+
+            /*previewImageView?.doOnLayout {
+                (player.imageGenerator as? PreviewGenerator)?.params = ImageParams(
+                    it.measuredWidth,
+                    it.measuredHeight
+                )
+            }*/
+            /** this might seam a bit fucky and that is because it is, the seek event is captured twice, once by the player
+             * and once by the UI even if it should only be registered once by the UI */
+            playerView?.findViewById<DefaultTimeBar>(R.id.exo_progress)
+                ?.addListener(object : TimeBar.OnScrubListener {
+                    override fun onScrubStart(timeBar: TimeBar, position: Long) = Unit
+                    override fun onScrubMove(timeBar: TimeBar, position: Long) = Unit
+                    override fun onScrubStop(timeBar: TimeBar, position: Long, canceled: Boolean) {
+                        if (canceled) return
+                        val playerDuration = player.getDuration() ?: return
+                        val playerPosition = player.getPosition() ?: return
+                        mainCallback(
+                            PositionEvent(
+                                source = PlayerEventSource.UI,
+                                durationMs = playerDuration,
+                                fromMs = playerPosition,
+                                toMs = position
+                            )
+                        )
+                    }
+                })
+
+            SubtitlesFragment.applyStyleEvent += ::onSubStyleChanged
+
+            try {
+                context?.let { ctx ->
+                    val settingsManager = PreferenceManager.getDefaultSharedPreferences(
+                        ctx
+                    )
+
+                    val currentPrefCacheSize =
+                        settingsManager.getInt(getString(R.string.video_buffer_size_key), 0)
+                    val currentPrefDiskSize =
+                        settingsManager.getInt(getString(R.string.video_buffer_disk_key), 0)
+                    val currentPrefBufferSec =
+                        settingsManager.getInt(getString(R.string.video_buffer_length_key), 0)
+
+                    player.cacheSize = currentPrefCacheSize * 1024L * 1024L
+                    player.simpleCacheSize = currentPrefDiskSize * 1024L * 1024L
+                    player.videoBufferMs = currentPrefBufferSec * 1000L
+                }
+            } catch (e: Exception) {
+                logError(e)
+            }
+        }
+
+        /*context?.let { ctx ->
+            player.loadPlayer(
+                ctx,
+                false,
+                ExtractorLink(
+                    "idk",
+                    "bunny",
+                    "http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4",
+                    "",
+                    Qualities.P720.value,
+                    false
+                ),
+            )
+        }*/
     }
 
     override fun onDestroy() {
-        playerHostView?.release()
+        player.release()
+        player.releaseCallbacks()
+        player = CS3IPlayer()
+
+        playerEventListener = null
+        keyEventListener = null
+
+        PlayerPipHelper.updatePIPModeActions(activity, CSPlayerLoading.IsPaused, false, null)
+
+        mMediaSession?.release()
+        mMediaSession = null
+        playerView?.player = null
+        SubtitlesFragment.applyStyleEvent -= ::onSubStyleChanged
+
+        keepScreenOn(false)
         super.onDestroy()
     }
 
-    override fun onPause() {
-        playerHostView?.releaseKeyEventListener()
-        super.onPause()
+    fun nextResize() {
+        resizeMode = (resizeMode + 1) % PlayerResize.entries.size
+        resize(resizeMode, true)
+    }
+
+    fun resize(resize: Int, showToast: Boolean) {
+        resize(PlayerResize.entries[resize], showToast)
+    }
+
+    @SuppressLint("UnsafeOptInUsageError")
+    open fun resize(resize: PlayerResize, showToast: Boolean) {
+        DataStoreHelper.resizeMode = resize.ordinal
+        val type = when (resize) {
+            PlayerResize.Fill -> AspectRatioFrameLayout.RESIZE_MODE_FILL
+            PlayerResize.Fit -> AspectRatioFrameLayout.RESIZE_MODE_FIT
+            PlayerResize.Zoom -> AspectRatioFrameLayout.RESIZE_MODE_ZOOM
+        }
+        playerView?.resizeMode = type
+
+        if (showToast)
+            showToast(resize.nameRes, Toast.LENGTH_SHORT)
     }
 
     override fun onStop() {
-        playerHostView?.onStop()
+        player.onStop()
         super.onStop()
     }
 
     override fun onResume() {
         context?.let { ctx ->
-            playerHostView?.onResume(ctx)
+            player.onResume(ctx)
         }
+
         super.onResume()
     }
 
-    fun nextResize() {
-        playerHostView?.nextResize()
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        val root = inflater.inflate(layout, container, false)
+        playerPausePlayHolderHolder = root.findViewById(R.id.player_pause_play_holder_holder)
+        playerPausePlay = root.findViewById(R.id.player_pause_play)
+        playerBuffering = root.findViewById(R.id.player_buffering)
+        playerView = root.findViewById(R.id.player_view)
+        piphide = root.findViewById(R.id.piphide)
+        subtitleHolder = root.findViewById(R.id.subtitle_holder)
+        return root
     }
-
-    open fun resize(resize: PlayerResize, showToast: Boolean) {
-        playerHostView?.resize(resize, showToast)
-    }
-}
+}

app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt

@@ -12,11 +12,9 @@ import android.os.Looper
 import android.util.Log
 import android.util.Rational
 import android.widget.FrameLayout
-import androidx.annotation.AnyThread
 import androidx.annotation.MainThread
 import androidx.annotation.OptIn
 import androidx.appcompat.app.AlertDialog
-import androidx.core.net.toUri
 import androidx.media3.common.C.TIME_UNSET
 import androidx.media3.common.C.TRACK_TYPE_AUDIO
 import androidx.media3.common.C.TRACK_TYPE_TEXT
@@ -30,7 +28,6 @@ import androidx.media3.common.TrackGroup
 import androidx.media3.common.TrackSelectionOverride
 import androidx.media3.common.Tracks
 import androidx.media3.common.VideoSize
-// import androidx.media3.common.util.ExperimentalApi
 import androidx.media3.common.util.UnstableApi
 import androidx.media3.database.StandaloneDatabaseProvider
 import androidx.media3.datasource.DataSource
@@ -42,28 +39,23 @@ import androidx.media3.datasource.cache.LeastRecentlyUsedCacheEvictor
 import androidx.media3.datasource.cache.SimpleCache
 import androidx.media3.datasource.cronet.CronetDataSource
 import androidx.media3.datasource.okhttp.OkHttpDataSource
-import androidx.media3.exoplayer.DecoderCounters
-import androidx.media3.exoplayer.DecoderReuseEvaluation
-import androidx.media3.exoplayer.DefaultLivePlaybackSpeedControl
 import androidx.media3.exoplayer.DefaultLoadControl
 import androidx.media3.exoplayer.DefaultRenderersFactory
 import androidx.media3.exoplayer.ExoPlayer
 import androidx.media3.exoplayer.Renderer.STATE_ENABLED
 import androidx.media3.exoplayer.Renderer.STATE_STARTED
 import androidx.media3.exoplayer.SeekParameters
-import androidx.media3.exoplayer.analytics.AnalyticsListener
 import androidx.media3.exoplayer.dash.DashMediaSource
 import androidx.media3.exoplayer.drm.DefaultDrmSessionManager
 import androidx.media3.exoplayer.drm.FrameworkMediaDrm
 import androidx.media3.exoplayer.drm.HttpMediaDrmCallback
 import androidx.media3.exoplayer.drm.LocalMediaDrmCallback
-import androidx.media3.exoplayer.hls.playlist.HlsPlaylistTracker
 import androidx.media3.exoplayer.source.ClippingMediaSource
 import androidx.media3.exoplayer.source.ConcatenatingMediaSource
 import androidx.media3.exoplayer.source.ConcatenatingMediaSource2
 import androidx.media3.exoplayer.source.DefaultMediaSourceFactory
-import androidx.media3.exoplayer.source.MediaSource
 import androidx.media3.exoplayer.source.MergingMediaSource
+import androidx.media3.exoplayer.source.MediaSource
 import androidx.media3.exoplayer.source.SingleSampleMediaSource
 import androidx.media3.exoplayer.text.TextOutput
 import androidx.media3.exoplayer.text.TextRenderer
@@ -73,7 +65,6 @@ import androidx.media3.extractor.mp4.FragmentedMp4Extractor
 import androidx.media3.ui.SubtitleView
 import androidx.preference.PreferenceManager
 import com.lagradost.cloudstream3.APIHolder.getApiFromNameNull
-import com.lagradost.cloudstream3.AudioFile
 import com.lagradost.cloudstream3.CloudStreamApp.Companion.getKey
 import com.lagradost.cloudstream3.CloudStreamApp.Companion.setKey
 import com.lagradost.cloudstream3.CommonActivity.activity
@@ -82,43 +73,43 @@ import com.lagradost.cloudstream3.MainActivity.Companion.deleteFileOnExit
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.TvType
 import com.lagradost.cloudstream3.USER_AGENT
+import com.lagradost.cloudstream3.AudioFile
 import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.mvvm.debugAssert
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.mvvm.safe
 import com.lagradost.cloudstream3.ui.player.CustomDecoder.Companion.fixSubtitleAlignment
-import com.lagradost.cloudstream3.ui.player.live.LiveHelper
-import com.lagradost.cloudstream3.ui.player.live.PREFERRED_LIVE_OFFSET
-import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR
-import com.lagradost.cloudstream3.ui.settings.Globals.PHONE
+import com.lagradost.cloudstream3.ui.settings.Globals.TV
 import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
 import com.lagradost.cloudstream3.ui.subtitles.SaveCaptionStyle
 import com.lagradost.cloudstream3.ui.subtitles.SubtitlesFragment.Companion.applyStyle
 import com.lagradost.cloudstream3.utils.AppContextUtils.isUsingMobileData
 import com.lagradost.cloudstream3.utils.AppContextUtils.setDefaultFocus
-import com.lagradost.cloudstream3.utils.CLEARKEY_DRM_UUID
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
 import com.lagradost.cloudstream3.utils.Coroutines.runOnMainThread
 import com.lagradost.cloudstream3.utils.DataStoreHelper.currentAccount
 import com.lagradost.cloudstream3.utils.DrmExtractorLink
+import com.lagradost.cloudstream3.utils.EpisodeSkip
 import com.lagradost.cloudstream3.utils.ExtractorLink
+import com.lagradost.cloudstream3.utils.CLEARKEY_UUID
+import com.lagradost.cloudstream3.utils.WIDEVINE_UUID
+import com.lagradost.cloudstream3.utils.PLAYREADY_UUID
 import com.lagradost.cloudstream3.utils.ExtractorLinkPlayList
 import com.lagradost.cloudstream3.utils.ExtractorLinkType
-import com.lagradost.cloudstream3.utils.PLAYREADY_DRM_UUID
 import com.lagradost.cloudstream3.utils.SubtitleHelper.fromTagToLanguageName
-import com.lagradost.cloudstream3.utils.WIDEVINE_DRM_UUID
-import com.lagradost.cloudstream3.utils.videoskip.VideoSkipStamp
+import io.github.anilbeesetti.nextlib.media3ext.ffdecoder.NextRenderersFactory
 import kotlinx.coroutines.delay
-import okhttp3.Interceptor
 import org.chromium.net.CronetEngine
 import java.io.File
-import java.security.SecureRandom
 import java.util.UUID
 import java.util.concurrent.Executors
 import javax.net.ssl.HttpsURLConnection
 import javax.net.ssl.SSLContext
 import javax.net.ssl.SSLSession
-import kotlin.uuid.toJavaUuid
+import kotlin.collections.HashSet
+import kotlin.text.StringBuilder
+import androidx.core.net.toUri
+import okhttp3.Interceptor
 
 const val TAG = "CS3ExoPlayer"
 const val PREFERRED_AUDIO_LANGUAGE_KEY = "preferred_audio_language"
@@ -208,14 +199,16 @@ class CS3IPlayer : IPlayer {
     private var requestedListeningPercentages: List<Int>? = null
 
     private var eventHandler: ((PlayerEvent) -> Unit)? = null
+    private val mainHandler = Handler(Looper.getMainLooper())
 
-    @AnyThread
     fun event(event: PlayerEvent) {
-        // Ensure that all work is done on the main thread.
-        if (Looper.getMainLooper().isCurrentThread) {
-            eventHandler?.invoke(event)
-        } else runOnMainThread {
+        // Ensure that all work is done on the main looper, aka main thread
+        if (Looper.myLooper() == mainHandler.looper) {
             eventHandler?.invoke(event)
+        } else {
+            mainHandler.post {
+                eventHandler?.invoke(event)
+            }
         }
     }
 
@@ -235,9 +228,8 @@ class CS3IPlayer : IPlayer {
         }
     }
 
-    @AnyThread
     override fun initCallbacks(
-        @MainThread eventHandler: ((PlayerEvent) -> Unit),
+        eventHandler: ((PlayerEvent) -> Unit),
         requestedListeningPercentages: List<Int>?,
     ) {
         this.requestedListeningPercentages = requestedListeningPercentages
@@ -248,6 +240,23 @@ class CS3IPlayer : IPlayer {
         }
     }
 
+    // I know, this is not a perfect solution, however it works for fixing subs
+    private fun reloadSubs() {
+        exoPlayer?.applicationLooper?.let {
+            try {
+                Handler(it).post {
+                    try {
+                        seekTime(1L, source = PlayerEventSource.Player)
+                    } catch (e: Exception) {
+                        logError(e)
+                    }
+                }
+            } catch (e: Exception) {
+                logError(e)
+            }
+        }
+    }
+
     fun String.stripTrackId(): String {
         return this.replace(Regex("""^\d+:"""), "")
     }
@@ -261,10 +270,6 @@ class CS3IPlayer : IPlayer {
     }
 
     override fun hasPreview(): Boolean {
-        // No previews on livestreams because the previews get outdated
-        if (exoPlayer?.isCurrentMediaItemDynamic == true) {
-            return false
-        }
         return imageGenerator.hasPreview()
     }
 
@@ -378,47 +383,44 @@ class CS3IPlayer : IPlayer {
             ?: return
     }
 
-    override fun setPreferredAudioTrack(trackLanguage: String?, id: String?, formatIndex: Int?) {
+    override fun setPreferredAudioTrack(trackLanguage: String?, id: String?) {
         preferredAudioTrackLanguage = trackLanguage
-        id?.let { trackId ->
-            val trackFormatIndex = formatIndex ?: 0
-            exoPlayer?.currentTracks?.groups
-                ?.filter { it.type == TRACK_TYPE_AUDIO }
-                ?.find { group ->
-                    group.getFormats().any { (format, _) ->
-                        format.id == trackId
-                    }
-                }
-                ?.let { group ->
-                    exoPlayer?.trackSelectionParameters
-                        ?.buildUpon()
-                        ?.setOverrideForType(
-                            TrackSelectionOverride(
-                                group.mediaTrackGroup,
-                                trackFormatIndex
-                            )
+
+        if (id != null) {
+            val audioTrack =
+                exoPlayer?.currentTracks?.groups?.filter { it.type == TRACK_TYPE_AUDIO }
+                    ?.getTrack(id)
+
+            if (audioTrack != null) {
+                exoPlayer?.trackSelectionParameters = exoPlayer?.trackSelectionParameters
+                    ?.buildUpon()
+                    ?.setOverrideForType(
+                        TrackSelectionOverride(
+                            audioTrack.first,
+                            audioTrack.second
                         )
-                        ?.build()
-                }
-                ?.let { newParams ->
-                    exoPlayer?.trackSelectionParameters = newParams
-                    return
-                }
+                    )
+                    ?.build()
+                    ?: return
+                return
+            }
         }
-        // Fallback to language-based selection
+
         exoPlayer?.trackSelectionParameters = exoPlayer?.trackSelectionParameters
             ?.buildUpon()
             ?.setPreferredAudioLanguage(trackLanguage)
-            ?.build() ?: return
+            ?.build()
+            ?: return
     }
 
+
     /**
      * Gets all supported formats in a list
      * */
     private fun List<Tracks.Group>.getFormats(): List<Pair<Format, Int>> {
-        return this.flatMap {
+        return this.map {
             it.getFormats()
-        }
+        }.flatten()
     }
 
     private fun Tracks.Group.getFormats(): List<Pair<Format, Int>> {
@@ -429,14 +431,11 @@ class CS3IPlayer : IPlayer {
         }
     }
 
-    private fun Format.toAudioTrack(formatIndex: Int?): AudioTrack {
+    private fun Format.toAudioTrack(): AudioTrack {
         return AudioTrack(
-            this.id,
+            this.id?.stripTrackId(),
             this.label,
-            this.language,
-            this.sampleMimeType,
-            this.channelCount,
-            formatIndex ?: 0,
+            this.language
         )
     }
 
@@ -445,7 +444,7 @@ class CS3IPlayer : IPlayer {
             this.id?.stripTrackId(),
             this.label,
             this.language,
-            this.sampleMimeType,
+            this.sampleMimeType
         )
     }
 
@@ -456,35 +455,27 @@ class CS3IPlayer : IPlayer {
             this.language,
             this.width,
             this.height,
-            this.sampleMimeType
         )
     }
 
     override fun getVideoTracks(): CurrentTracks {
-        val allTrackGroups = exoPlayer?.currentTracks?.groups ?: emptyList()
-        val videoTracks = allTrackGroups.filter { it.type == TRACK_TYPE_VIDEO }
+        val allTracks = exoPlayer?.currentTracks?.groups ?: emptyList()
+        val videoTracks = allTracks.filter { it.type == TRACK_TYPE_VIDEO }
             .getFormats()
             .map { it.first.toVideoTrack() }
-        var currentAudioTrack: AudioTrack? = null
-        val audioTracks = allTrackGroups.filter { it.type == TRACK_TYPE_AUDIO }
-            .flatMap { group ->
-                group.getFormats().map { (format, formatIndex) ->
-                    val audioTrack = format.toAudioTrack(formatIndex)
-                    if (group.isTrackSelected(formatIndex)) {
-                        currentAudioTrack = audioTrack
-                    }
-                    audioTrack
-                }
-            }
-        val textTracks = allTrackGroups.filter { it.type == TRACK_TYPE_TEXT }
-            .getFormats()
+        val audioTracks = allTracks.filter { it.type == TRACK_TYPE_AUDIO }.getFormats()
+            .map { it.first.toAudioTrack() }
+
+        val textTracks = allTracks.filter { it.type == TRACK_TYPE_TEXT }.getFormats()
             .map { it.first.toSubtitleTrack() }
+
         val currentTextTracks = textTracks.filter { track ->
             playerSelectedSubtitleTracks.any { it.second && it.first == track.id }
         }
+
         return CurrentTracks(
             exoPlayer?.videoFormat?.toVideoTrack(),
-            currentAudioTrack,
+            exoPlayer?.audioFormat?.toAudioTrack(),
             currentTextTracks,
             videoTracks,
             audioTracks,
@@ -498,43 +489,60 @@ class CS3IPlayer : IPlayer {
     override fun setPreferredSubtitles(subtitle: SubtitleData?): Boolean {
         Log.i(TAG, "setPreferredSubtitles init $subtitle")
         currentSubtitles = subtitle
-        val trackSelector = exoPlayer?.trackSelector as? DefaultTrackSelector ?: return false
-        // Disable subtitles if null
-        if (subtitle == null) {
-            trackSelector.setParameters(
-                trackSelector.buildUponParameters()
-                    .setTrackTypeDisabled(TRACK_TYPE_TEXT, true)
-                    .clearOverridesOfType(TRACK_TYPE_TEXT)
-            )
-            return false
-        }
-        // Handle subtitle based on status
-        when (subtitleHelper.subtitleStatus(subtitle)) {
-            SubtitleStatus.REQUIRES_RELOAD -> {
-                Log.i(TAG, "setPreferredSubtitles REQUIRES_RELOAD")
-                return true
-            }
 
-            SubtitleStatus.NOT_FOUND -> {
-                Log.i(TAG, "setPreferredSubtitles NOT_FOUND")
-                return true
-            }
+        fun getTextTrack(id: String) =
+            exoPlayer?.currentTracks?.groups?.filter { it.type == TRACK_TYPE_TEXT }
+                ?.getTrack(id)
+
+        return (exoPlayer?.trackSelector as? DefaultTrackSelector?)?.let { trackSelector ->
+            if (subtitle == null) {
+                trackSelector.setParameters(
+                    trackSelector.buildUponParameters()
+                        .setTrackTypeDisabled(TRACK_TYPE_TEXT, true)
+                        .clearOverridesOfType(TRACK_TYPE_TEXT)
+                )
+            } else {
+                when (subtitleHelper.subtitleStatus(subtitle)) {
+                    SubtitleStatus.REQUIRES_RELOAD -> {
+                        Log.i(TAG, "setPreferredSubtitles REQUIRES_RELOAD")
+                        return@let true
+                    }
+
+                    SubtitleStatus.IS_ACTIVE -> {
+                        Log.i(TAG, "setPreferredSubtitles IS_ACTIVE")
 
-            SubtitleStatus.IS_ACTIVE -> {
-                Log.i(TAG, "setPreferredSubtitles IS_ACTIVE")
-                exoPlayer?.currentTracks?.groups
-                    ?.filter { it.type == TRACK_TYPE_TEXT }
-                    ?.getTrack(subtitle.getId())
-                    ?.let { (trackGroup, trackIndex) ->
                         trackSelector.setParameters(
                             trackSelector.buildUponParameters()
-                                .setTrackTypeDisabled(TRACK_TYPE_TEXT, false)
-                                .setOverrideForType(TrackSelectionOverride(trackGroup, trackIndex))
+                                .apply {
+                                    val track = getTextTrack(subtitle.getId())
+                                    if (track != null) {
+                                        setTrackTypeDisabled(TRACK_TYPE_TEXT, false)
+                                        setOverrideForType(
+                                            TrackSelectionOverride(
+                                                track.first,
+                                                track.second
+                                            )
+                                        )
+                                    }
+                                }
                         )
+
+                        // ugliest code I have written, it seeks 1ms to *update* the subtitles
+                        //exoPlayer?.applicationLooper?.let {
+                        //    Handler(it).postDelayed({
+                        //        seekTime(1L)
+                        //    }, 1)
+                        //}
                     }
-                return false
+
+                    SubtitleStatus.NOT_FOUND -> {
+                        Log.i(TAG, "setPreferredSubtitles NOT_FOUND")
+                        return@let true
+                    }
+                }
             }
-        }
+            return false
+        } ?: false
     }
 
     private var currentSubtitleOffset: Long = 0
@@ -543,10 +551,10 @@ class CS3IPlayer : IPlayer {
         currentSubtitleOffset = offset
         CustomDecoder.subtitleOffset = offset
         if (currentTextRenderer?.state == STATE_ENABLED || currentTextRenderer?.state == STATE_STARTED) {
-            exoPlayer?.currentPosition?.also { pos ->
+            exoPlayer?.currentPosition?.let { pos ->
                 // This seems to properly refresh all subtitles
                 // It needs to be done as all subtitle cues with timings are pre-processed
-                currentTextRenderer?.resetPosition(pos, false)
+                currentTextRenderer?.resetPosition(pos)
             }
         }
     }
@@ -734,23 +742,13 @@ class CS3IPlayer : IPlayer {
         private var simpleCache: SimpleCache? = null
 
         /// Create a small factory for small things, no cache, no cronet
-        private fun createOnlineSource(
-            headers: Map<String, String>?,
-            interceptor: Interceptor?
-        ): HttpDataSource.Factory {
-            val client = if (interceptor == null) {
-                app.baseClient
-            } else {
-                app.baseClient.newBuilder()
-                    .addInterceptor(interceptor)
-                    .build()
+        private fun createOnlineSource(headers: Map<String, String>?): HttpDataSource.Factory {
+            val source = OkHttpDataSource.Factory(app.baseClient).setUserAgent(USER_AGENT)
+            return source.apply {
+                if (!headers.isNullOrEmpty()) {
+                    setDefaultRequestProperties(headers)
+                }
             }
-            val source = OkHttpDataSource.Factory(client).setUserAgent(USER_AGENT)
-
-            if (!headers.isNullOrEmpty()) {
-                source.setDefaultRequestProperties(headers)
-            }
-            return source
         }
 
         fun tryCreateEngine(context: Context, diskCacheSize: Long): CronetEngine? {
@@ -789,9 +787,10 @@ class CS3IPlayer : IPlayer {
 
         private fun createVideoSource(
             link: ExtractorLink,
-            engine: CronetEngine?,
-            interceptor: Interceptor?,
+            engine: CronetEngine?
         ): HttpDataSource.Factory {
+            val provider = getApiFromNameNull(link.source)
+            val interceptor: Interceptor? = provider?.getVideoInterceptor(link)
             val userAgent = link.headers.entries.find {
                 it.key.equals("User-Agent", ignoreCase = true)
             }?.value ?: USER_AGENT
@@ -823,7 +822,14 @@ class CS3IPlayer : IPlayer {
 
             // These are extra headers the browser like to insert, not sure if we want to include them
             // for WIDEVINE/drm as well? Do that if someone gets 404 and creates an issue.
-            val headers = refererMap + link.headers // Adds the headers from the provider, e.g Authorization
+            val headers = mapOf(
+                "accept" to "*/*",
+                "sec-ch-ua" to "\"Chromium\";v=\"91\", \" Not;A Brand\";v=\"99\"",
+                "sec-ch-ua-mobile" to "?0",
+                "sec-fetch-user" to "?1",
+                "sec-fetch-mode" to "navigate",
+                "sec-fetch-dest" to "video"
+            ) + refererMap + link.headers // Adds the headers from the provider, e.g Authorization
 
             return source.apply {
                 setDefaultRequestProperties(headers)
@@ -883,10 +889,10 @@ class CS3IPlayer : IPlayer {
         private var currentTextRenderer: TextRenderer? = null
     }
 
-    private fun getCurrentTimestamp(writePosition: Long? = null): VideoSkipStamp? {
+    private fun getCurrentTimestamp(writePosition: Long? = null): EpisodeSkip.SkipStamp? {
         val position = writePosition ?: this@CS3IPlayer.getPosition() ?: return null
         for (lastTimeStamp in lastTimeStamps) {
-            if (lastTimeStamp.timestamp.startMs <= position && (position + (toleranceBeforeUs / 1000L) + 1) < lastTimeStamp.timestamp.endMs) {
+            if (lastTimeStamp.startMs <= position && (position + (toleranceBeforeUs / 1000L) + 1) < lastTimeStamp.endMs) {
                 return lastTimeStamp
             }
         }
@@ -945,22 +951,6 @@ class CS3IPlayer : IPlayer {
                 when (event) {
                     CSPlayerEvent.Play -> {
                         event(PlayEvent(source))
-                        // If the player was stopped (e.g. notification dismissed) it lands in
-                        // STATE_IDLE. A bare play() call is a no-op in that state, re-prepare and
-                        // then resume to the current position once we are in STATE_READY again.
-                        if (playbackState == Player.STATE_IDLE) {
-                            val seekPosition = currentPosition
-                            exoPlayer?.addListener(object : Player.Listener {
-                                private var seekApplied = false
-                                override fun onPlaybackStateChanged(playbackState: Int) {
-                                    if (seekApplied || playbackState != Player.STATE_READY) return
-                                    seekApplied = true
-                                    exoPlayer?.seekTo(currentWindow, seekPosition)
-                                    exoPlayer?.removeListener(this)
-                                }
-                            })
-                            prepare()
-                        }
                         play()
                     }
 
@@ -1014,7 +1004,7 @@ class CS3IPlayer : IPlayer {
                             if (lastTimeStamp.skipToNextEpisode) {
                                 handleEvent(CSPlayerEvent.NextEpisode, source)
                             } else {
-                                seekTo(lastTimeStamp.timestamp.endMs + 1L)
+                                seekTo(lastTimeStamp.endMs + 1L)
                             }
                             event(TimestampSkippedEvent(timestamp = lastTimeStamp, source = source))
                         }
@@ -1083,44 +1073,28 @@ class CS3IPlayer : IPlayer {
     ): ExoPlayer {
         val exoPlayerBuilder =
             ExoPlayer.Builder(context)
-                .setMediaSourceFactory(
-                    DefaultMediaSourceFactory(context).setLiveTargetOffsetMs(
-                        PREFERRED_LIVE_OFFSET
-                    )
-                )
-                .setLivePlaybackSpeedControl(
-                    DefaultLivePlaybackSpeedControl.Builder()
-                        .setFallbackMaxPlaybackSpeed(1.03f)
-                        .setFallbackMinPlaybackSpeed(0.97f)
-                        .build()
-                )
-                .setRenderersFactory { eventHandler, videoRendererEventListener, audioRendererEventListener, _, metadataRendererOutput ->
+                .setRenderersFactory { eventHandler, videoRendererEventListener, audioRendererEventListener, textRendererOutput, metadataRendererOutput ->
                     val settingsManager = PreferenceManager.getDefaultSharedPreferences(context)
                     val current = settingsManager.getInt(
                         context.getString(R.string.software_decoding_key),
                         -1
                     )
-                    val (isSoftwareDecodingEnabled, isSoftwareDecodingPreferred) = when (current) {
-                        0 -> true to false // HW+SW, aka on but prefer hw
-                        2 -> true to true // SW+HW, aka on but prefer sw
-                        1 -> false to false // HW, aka off
+                    val softwareDecoding = when (current) {
+                        0 -> true // yes
+                        1 -> false // no
                         // -1 = automatic
-                        // We do not want tv to have software decoding, because of crashes
-                        else -> isLayout(PHONE or EMULATOR) to false
+                        else -> {
+                            // we do not want tv to have software decoding, because of crashes
+                            !isLayout(TV)
+                        }
                     }
 
-                    val factory = if (isSoftwareDecodingEnabled) {
-                        FixedNextRenderersFactory(context).apply {
+                    val factory = if (softwareDecoding) {
+                        NextRenderersFactory(context).apply {
                             setEnableDecoderFallback(true)
-                            setExtensionRendererMode(
-                                if (isSoftwareDecodingPreferred)
-                                    DefaultRenderersFactory.EXTENSION_RENDERER_MODE_PREFER
-                                else
-                                    DefaultRenderersFactory.EXTENSION_RENDERER_MODE_ON
-                            )
+                            setExtensionRendererMode(DefaultRenderersFactory.EXTENSION_RENDERER_MODE_ON)
                         }
                     } else {
-                        // no nextlib = EXTENSION_RENDERER_MODE_OFF
                         DefaultRenderersFactory(context)
                     }
 
@@ -1128,7 +1102,7 @@ class CS3IPlayer : IPlayer {
                     // Custom TextOutput to apply cue styling and rules to all subtitles
                     val customTextOutput = TextOutput { cue ->
                         // Do not remove filterNotNull as Java typesystem is fucked
-                        val (bitmapCues, textCues) = cue.cues.toList()
+                        val (bitmapCues, textCues) = cue.cues.filterNotNull()
                             .partition { it.bitmap != null }
 
                         val styledBitmapCues = bitmapCues.map { bitmapCue ->
@@ -1196,7 +1170,6 @@ class CS3IPlayer : IPlayer {
                             CustomDecoder.subtitleOffset = subtitleOffset
                             val decoder = CustomSubtitleDecoderFactory()
 
-                            // @OptIn(ExperimentalApi::class)
                             val currentTextRenderer = TextRenderer(
                                 customTextOutput,
                                 eventHandler.looper,
@@ -1279,7 +1252,7 @@ class CS3IPlayer : IPlayer {
 
             item.drm?.let { drm ->
                 when (drm.uuid) {
-                    CLEARKEY_DRM_UUID.toJavaUuid() -> {
+                    CLEARKEY_UUID -> {
                         // Use headers from DrmMetadata for media requests
                         val client = dataSourceFactory
                             ?: throw IllegalArgumentException("Must supply onlineSource")
@@ -1300,8 +1273,8 @@ class CS3IPlayer : IPlayer {
                             .createMediaSource(item.mediaItem)
                     }
 
-                    WIDEVINE_DRM_UUID.toJavaUuid(),
-                    PLAYREADY_DRM_UUID.toJavaUuid() -> {
+                    WIDEVINE_UUID,
+                    PLAYREADY_UUID -> {
                         // Use headers from DrmMetadata for media requests
                         val client = dataSourceFactory
                             ?: throw IllegalArgumentException("Must supply onlineSource")
@@ -1335,7 +1308,7 @@ class CS3IPlayer : IPlayer {
         } else {
             try {
                 val source = ConcatenatingMediaSource2.Builder()
-                mediaItemSlices.forEach { item ->
+                mediaItemSlices.map { item ->
                     source.add(
                         // The duration MUST be known for it to work properly, see https://github.com/google/ExoPlayer/issues/4727
                         ClippingMediaSource(
@@ -1349,7 +1322,7 @@ class CS3IPlayer : IPlayer {
                 @Suppress("DEPRECATION")
                 val source =
                     ConcatenatingMediaSource() // FIXME figure out why ConcatenatingMediaSource2 seems to fail with Torrents only
-                mediaItemSlices.forEach { item ->
+                mediaItemSlices.map { item ->
                     source.addMediaSource(
                         // The duration MUST be known for it to work properly, see https://github.com/google/ExoPlayer/issues/4727
                         ClippingMediaSource(
@@ -1372,7 +1345,6 @@ class CS3IPlayer : IPlayer {
             )
             setHandleAudioBecomingNoisy(true)
             setPlaybackSpeed(playBackSpeed)
-            this.addAnalyticsListener(tracksAnalyticsListener)
         }
     }
 
@@ -1414,23 +1386,6 @@ class CS3IPlayer : IPlayer {
             event(PlayerAttachedEvent(exoPlayer))
             exoPlayer?.prepare()
 
-            // For offline fragmented MP4s, FLAG_MERGE_FRAGMENTED_SIDX builds the SIDX seek map
-            // incrementally as data is buffered. The initial seek resolves to the nearest merged
-            // entry (~first fragment, 3 s). On STATE_READY, re-seek to the actual saved position.
-            // This may only be reproducible on large and fairly long fragmented MP4 files with
-            // multiple sidx boxes.
-            if (onlineSource == null && playbackPosition > (exoPlayer?.duration ?: 0L)) {
-                exoPlayer?.addListener(object : Player.Listener {
-                    private var seekApplied = false
-                    override fun onPlaybackStateChanged(playbackState: Int) {
-                        if (seekApplied || playbackState != Player.STATE_READY) return
-                        seekApplied = true
-                        exoPlayer?.seekTo(currentWindow, playbackPosition)
-                        exoPlayer?.removeListener(this)
-                    }
-                })
-            }
-
             exoPlayer?.let { exo ->
                 event(StatusEvent(CSPlayerLoading.IsBuffering, CSPlayerLoading.IsBuffering))
                 isPlaying = exo.isPlaying
@@ -1443,8 +1398,6 @@ class CS3IPlayer : IPlayer {
                 return
             }
 
-            LiveHelper.registerPlayer(exoPlayer)
-
             exoPlayer?.addListener(object : Player.Listener {
                 override fun onTracksChanged(tracks: Tracks) {
                     safe {
@@ -1553,23 +1506,6 @@ class CS3IPlayer : IPlayer {
                             exoPlayer?.prepare()
                         }
 
-                        // PlaylistStuckException usually happens when the player position is ahead of the live window.
-                        // Seek to the default location in that case
-                        error.cause is HlsPlaylistTracker.PlaylistStuckException -> {
-                            val position = exoPlayer?.currentPosition ?: exoPlayer?.duration ?: 0
-
-                            // Seek to live head
-                            val aheadOfLive = LiveHelper.getLiveManager(exoPlayer)?.getTimeAheadOfLive(position) ?: 0
-
-                            if (aheadOfLive > 100) {
-                                exoPlayer?.seekTo(position - aheadOfLive)
-                            } else {
-                                exoPlayer?.seekToDefaultPosition()
-                            }
-                            exoPlayer?.prepare()
-                        }
-
-
                         else -> {
                             event(ErrorEvent(error))
                         }
@@ -1641,9 +1577,9 @@ class CS3IPlayer : IPlayer {
         }
     }
 
-    private var lastTimeStamps: List<VideoSkipStamp> = emptyList()
+    private var lastTimeStamps: List<EpisodeSkip.SkipStamp> = emptyList()
 
-    override fun addTimeStamps(timeStamps: List<VideoSkipStamp>) {
+    override fun addTimeStamps(timeStamps: List<EpisodeSkip.SkipStamp>) {
         lastTimeStamps = timeStamps
         timeStamps.forEach { timestamp ->
             exoPlayer?.createMessage { _, _ ->
@@ -1652,7 +1588,7 @@ class CS3IPlayer : IPlayer {
                 //    onTimestampInvoked?.invoke(payload)
             }
                 ?.setLooper(Looper.getMainLooper())
-                ?.setPosition(timestamp.timestamp.startMs)
+                ?.setPosition(timestamp.startMs)
                 //?.setPayload(timestamp)
                 ?.setDeleteAfterDelivery(false)
                 ?.send()
@@ -1699,8 +1635,7 @@ class CS3IPlayer : IPlayer {
 
             val (subSources, activeSubtitles) = getSubSources(
                 offlineSourceFactory = offlineSourceFactory,
-                subHelper = subtitleHelper,
-                interceptor = null,
+                subtitleHelper,
             )
 
             subtitleHelper.setActiveSubtitles(activeSubtitles.toSet())
@@ -1714,7 +1649,6 @@ class CS3IPlayer : IPlayer {
     private fun getSubSources(
         offlineSourceFactory: DataSource.Factory?,
         subHelper: PlayerSubtitleHelper,
-        interceptor: Interceptor?,
     ): Pair<List<SingleSampleMediaSource>, List<SubtitleData>> {
         val activeSubtitles = ArrayList<SubtitleData>()
         val subSources = subHelper.getAllSubtitles().mapNotNull { sub ->
@@ -1736,9 +1670,8 @@ class CS3IPlayer : IPlayer {
                 }
 
                 SubtitleOrigin.URL -> {
-                    val dataSourceFactory = createOnlineSource(sub.headers, interceptor)
                     activeSubtitles.add(sub)
-                    SingleSampleMediaSource.Factory(dataSourceFactory)
+                    SingleSampleMediaSource.Factory(createOnlineSource(sub.headers))
                         .createMediaSource(subConfig, TIME_UNSET)
                 }
             }
@@ -1753,13 +1686,14 @@ class CS3IPlayer : IPlayer {
      */
     private fun getAudioSources(
         audioTracks: List<AudioFile>,
-        interceptor: Interceptor?,
     ): List<MediaSource> {
+        if (audioTracks.isEmpty()) return emptyList()
         return audioTracks.mapNotNull { audio ->
             try {
                 val mediaItem = getMediaItem(MimeTypes.AUDIO_UNKNOWN, audio.url)
-                val dataSourceFactory = createOnlineSource(audio.headers, interceptor)
-                DefaultMediaSourceFactory(dataSourceFactory).createMediaSource(mediaItem)
+                DefaultMediaSourceFactory(createOnlineSource(audio.headers)).createMediaSource(
+                    mediaItem
+                )
             } catch (e: Exception) {
                 Log.e(TAG, "Failed to create audio source for ${audio.url}: ${e.message}")
                 null
@@ -1771,6 +1705,7 @@ class CS3IPlayer : IPlayer {
         return exoPlayer != null
     }
 
+
     @MainThread
     private fun loadTorrent(context: Context, link: ExtractorLink) {
         ioSafe {
@@ -1820,7 +1755,7 @@ class CS3IPlayer : IPlayer {
                                 defaultSet
                             )
                             ?.mapNotNull { it.toIntOrNull() ?: return@mapNotNull null }
-                    } catch (_: Throwable) {
+                    } catch (e: Throwable) {
                         null
                     } ?: default
 
@@ -1893,7 +1828,7 @@ class CS3IPlayer : IPlayer {
             if (ignoreSSL) {
                 // Disables ssl check
                 val sslContext: SSLContext = SSLContext.getInstance("TLS")
-                sslContext.init(null, arrayOf(SSLTrustManager()), SecureRandom())
+                sslContext.init(null, arrayOf(SSLTrustManager()), java.security.SecureRandom())
                 sslContext.createSSLEngine()
                 HttpsURLConnection.setDefaultHostnameVerifier { _: String, _: SSLSession ->
                     true
@@ -1915,7 +1850,7 @@ class CS3IPlayer : IPlayer {
                             drm = DrmMetadata(
                                 kid = link.kid,
                                 key = link.key,
-                                uuid = link.uuid.toJavaUuid(),
+                                uuid = link.uuid,
                                 kty = link.kty,
                                 licenseUrl = link.licenseUrl,
                                 keyRequestParameters = link.keyRequestParameters,
@@ -1930,35 +1865,19 @@ class CS3IPlayer : IPlayer {
                 )
             }
 
-            // For DASH or HLS single streams (non-playlist), prefer the player's default
-            // live position instead of starting at 0. Use TIME_UNSET to let ExoPlayer pick
-            // the live/default position when no explicit start position was provided.
-            if (playbackPosition == 0L && (link.type == ExtractorLinkType.M3U8 || link.type == ExtractorLinkType.DASH)) {
-                playbackPosition = TIME_UNSET
-            }
-
-            val provider = getApiFromNameNull(link.source)
-            val interceptor: Interceptor? = provider?.getVideoInterceptor(link)
-
             val onlineSourceFactory =
-                createVideoSource(
-                    link = link,
-                    engine = tryCreateEngine(context, simpleCacheSize),
-                    interceptor = interceptor
-                )
+                createVideoSource(link, tryCreateEngine(context, simpleCacheSize))
 
             val offlineSourceFactory = context.createOfflineSource()
 
             val (subSources, activeSubtitles) = getSubSources(
                 offlineSourceFactory = offlineSourceFactory,
-                subHelper = subtitleHelper,
-                interceptor = interceptor, // Backwards compatibility, needs a new api to work properly
+                subtitleHelper
             )
 
             // Create audio sources from ExtractorLink's audioTracks
             val audioSources = getAudioSources(
                 audioTracks = link.audioTracks,
-                interceptor = interceptor, // Backwards compatibility, needs a new api to work properly
             )
 
             subtitleHelper.setActiveSubtitles(activeSubtitles.toSet())
@@ -1986,38 +1905,4 @@ class CS3IPlayer : IPlayer {
             loadOfflinePlayer(context, it)
         }
     }
-
-    private val tracksAnalyticsListener = object : AnalyticsListener {
-
-        override fun onVideoInputFormatChanged(
-            eventTime: AnalyticsListener.EventTime,
-            format: Format,
-            decoderReuseEvaluation: DecoderReuseEvaluation?
-        ) {
-            event(TracksChangedEvent())
-        }
-
-        override fun onAudioInputFormatChanged(
-            eventTime: AnalyticsListener.EventTime,
-            format: Format,
-            decoderReuseEvaluation: DecoderReuseEvaluation?
-        ) {
-            event(TracksChangedEvent())
-        }
-
-        override fun onVideoDisabled(
-            eventTime: AnalyticsListener.EventTime,
-            decoderCounters: DecoderCounters
-        ) {
-            event(TracksChangedEvent())
-        }
-
-        override fun onAudioDisabled(
-            eventTime: AnalyticsListener.EventTime,
-            decoderCounters: DecoderCounters
-        ) {
-            event(TracksChangedEvent())
-        }
-    }
-
 }

app/src/main/java/com/lagradost/cloudstream3/ui/player/CustomSubripParser.kt

@@ -1,296 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-/*
-* This is a fork of media3 subrip parses as the developers fear a flexible player, and open classes.
-*/
-package com.lagradost.cloudstream3.ui.player
-
-import android.text.Html
-import android.text.Spanned
-import android.text.TextUtils
-import androidx.annotation.VisibleForTesting
-import androidx.media3.common.C
-import androidx.media3.common.Format
-import androidx.media3.common.Format.CueReplacementBehavior
-import androidx.media3.common.text.Cue
-import androidx.media3.common.text.Cue.AnchorType
-import androidx.media3.common.util.Consumer
-import androidx.media3.common.util.Log
-import androidx.media3.common.util.ParsableByteArray
-import androidx.media3.common.util.UnstableApi
-import androidx.media3.extractor.text.CuesWithTiming
-import androidx.media3.extractor.text.SubtitleParser
-import androidx.media3.extractor.text.SubtitleParser.OutputOptions
-import com.google.common.base.Preconditions.checkNotNull
-import com.google.common.collect.ImmutableList
-import java.nio.charset.Charset
-import java.nio.charset.StandardCharsets
-import java.util.regex.Matcher
-import java.util.regex.Pattern
-
-/** A [SubtitleParser] for SubRip.  */
-@UnstableApi
-class CustomSubripParser : SubtitleParser {
-    private val textBuilder: StringBuilder = StringBuilder()
-    private val tags: ArrayList<String> = ArrayList()
-    private val parsableByteArray: ParsableByteArray = ParsableByteArray()
-
-    override fun getCueReplacementBehavior(): @CueReplacementBehavior Int {
-        return CUE_REPLACEMENT_BEHAVIOR
-    }
-
-    override fun parse(
-        data: ByteArray,
-        offset: Int,
-        length: Int,
-        outputOptions: OutputOptions,
-        output: Consumer<CuesWithTiming>
-    ) {
-        parsableByteArray.reset(data,  /* limit= */offset + length)
-        parsableByteArray.setPosition(offset)
-        val charset = detectUtfCharset(parsableByteArray)
-
-        val cuesWithTimingBeforeRequestedStartTimeUs: MutableList<CuesWithTiming>? =
-            if (outputOptions.startTimeUs != C.TIME_UNSET && outputOptions.outputAllCues)
-                ArrayList<CuesWithTiming>()
-            else
-                null
-        var currentLine: String?
-        while ((parsableByteArray.readLine(charset).also { currentLine = it }) != null) {
-            if (currentLine!!.isEmpty()) {
-                // Skip blank lines.
-                continue
-            }
-
-            // Parse and check the index line.
-            try {
-                currentLine.toInt()
-            } catch (_: NumberFormatException) {
-                Log.w(TAG, "Skipping invalid index: $currentLine")
-                continue
-            }
-
-            // Read and parse the timing line.
-            currentLine = parsableByteArray.readLine(charset)
-            if (currentLine == null) {
-                Log.w(TAG, "Unexpected end")
-                break
-            }
-
-            val startTimeUs: Long
-            val endTimeUs: Long
-            val matcher = SUBRIP_TIMING_LINE.matcher(currentLine)
-            if (matcher.matches()) {
-                startTimeUs = parseTimecode(matcher,  /* groupOffset= */1)
-                endTimeUs = parseTimecode(matcher,  /* groupOffset= */6)
-            } else {
-                Log.w(TAG, "Skipping invalid timing: $currentLine")
-                continue
-            }
-
-            // Read and parse the text and tags.
-            textBuilder.setLength(0)
-            tags.clear()
-            currentLine = parsableByteArray.readLine(charset)
-            while (!TextUtils.isEmpty(currentLine)) {
-                if (textBuilder.isNotEmpty()) {
-                    textBuilder.append("<br>")
-                }
-                textBuilder.append(processLine(currentLine!!, tags))
-                currentLine = parsableByteArray.readLine(charset)
-            }
-
-            @Suppress("DEPRECATION")
-            val text = Html.fromHtml(textBuilder.toString())
-
-            var alignmentTag: String? = null
-            for (i in tags.indices) {
-                val tag = tags[i]
-                if (tag.matches(SUBRIP_ALIGNMENT_TAG.toRegex())) {
-                    alignmentTag = tag
-                    // Subsequent alignment tags should be ignored.
-                    break
-                }
-            }
-            if (outputOptions.startTimeUs == C.TIME_UNSET || endTimeUs >= outputOptions.startTimeUs) {
-                output.accept(
-                    CuesWithTiming(
-                        ImmutableList.of<Cue>(buildCue(text, alignmentTag)),
-                        startTimeUs,  /* durationUs= */
-                        endTimeUs - startTimeUs
-                    )
-                )
-            } else cuesWithTimingBeforeRequestedStartTimeUs?.add(
-                CuesWithTiming(
-                    ImmutableList.of<Cue>(buildCue(text, alignmentTag)),
-                    startTimeUs,  /* durationUs= */
-                    endTimeUs - startTimeUs
-                )
-            )
-        }
-        if (cuesWithTimingBeforeRequestedStartTimeUs != null) {
-            for (cuesWithTiming in cuesWithTimingBeforeRequestedStartTimeUs) {
-                output.accept(cuesWithTiming)
-            }
-        }
-    }
-
-    /**
-     * Determine UTF encoding of the byte array from a byte order mark (BOM), defaulting to UTF-8 if
-     * no BOM is found.
-     */
-    private fun detectUtfCharset(data: ParsableByteArray): Charset {
-        val charset = data.readUtfCharsetFromBom()
-        return charset ?: StandardCharsets.UTF_8
-    }
-
-    /**
-     * Trims and removes tags from the given line. The removed tags are added to `tags`.
-     *
-     * @param line The line to process.
-     * @param tags A list to which removed tags will be added.
-     * @return The processed line.
-     */
-    private fun processLine(line: String, tags: ArrayList<String>): String {
-        var line = line
-        line = line.trim { it <= ' ' }
-
-        var removedCharacterCount = 0
-        val processedLine = StringBuilder(line)
-        val matcher = SUBRIP_TAG_PATTERN.matcher(line)
-        while (matcher.find()) {
-            val tag = matcher.group()
-            tags.add(tag)
-            val start = matcher.start() - removedCharacterCount
-            val tagLength = tag.length
-            processedLine.replace(start,  /* end= */start + tagLength,  /* str= */"")
-            removedCharacterCount += tagLength
-        }
-
-        return processedLine.toString()
-    }
-
-    /**
-     * Build a [Cue] based on the given text and alignment tag.
-     *
-     * @param text The text.
-     * @param alignmentTag The alignment tag, or `null` if no alignment tag is available.
-     * @return Built cue
-     */
-    private fun buildCue(text: Spanned, alignmentTag: String?): Cue {
-        val cue = Cue.Builder().setText(text)
-        if (alignmentTag == null) {
-            return cue.build()
-        }
-
-        // Horizontal alignment.
-        when (alignmentTag) {
-            ALIGN_BOTTOM_LEFT, ALIGN_MID_LEFT, ALIGN_TOP_LEFT -> cue.setPositionAnchor(Cue.ANCHOR_TYPE_START)
-            ALIGN_BOTTOM_RIGHT, ALIGN_MID_RIGHT, ALIGN_TOP_RIGHT -> cue.setPositionAnchor(Cue.ANCHOR_TYPE_END)
-            ALIGN_BOTTOM_MID, ALIGN_MID_MID, ALIGN_TOP_MID -> cue.setPositionAnchor(Cue.ANCHOR_TYPE_MIDDLE)
-            else -> cue.setPositionAnchor(Cue.ANCHOR_TYPE_MIDDLE)
-        }
-
-        // Vertical alignment.
-        when (alignmentTag) {
-            ALIGN_BOTTOM_LEFT, ALIGN_BOTTOM_MID, ALIGN_BOTTOM_RIGHT -> cue.setLineAnchor(Cue.ANCHOR_TYPE_END)
-            ALIGN_TOP_LEFT, ALIGN_TOP_MID, ALIGN_TOP_RIGHT -> cue.setLineAnchor(Cue.ANCHOR_TYPE_START)
-            ALIGN_MID_LEFT, ALIGN_MID_MID, ALIGN_MID_RIGHT -> cue.setLineAnchor(Cue.ANCHOR_TYPE_MIDDLE)
-            else -> cue.setLineAnchor(Cue.ANCHOR_TYPE_MIDDLE)
-        }
-
-        return cue.setPosition(getFractionalPositionForAnchorType(cue.getPositionAnchor()))
-            .setLine(
-                getFractionalPositionForAnchorType(cue.getLineAnchor()),
-                Cue.LINE_TYPE_FRACTION
-            )
-            .build()
-    }
-
-    companion object {
-        /**
-         * The [CueReplacementBehavior] for consecutive [CuesWithTiming] emitted by this
-         * implementation.
-         */
-        const val CUE_REPLACEMENT_BEHAVIOR: @CueReplacementBehavior Int =
-            Format.CUE_REPLACEMENT_BEHAVIOR_MERGE
-
-        // Fractional positions for use when alignment tags are present.
-        private const val START_FRACTION = 0.08f
-        private const val END_FRACTION = 1 - START_FRACTION
-        private const val MID_FRACTION = 0.5f
-
-        private const val TAG = "SubripParser"
-
-        // The google devs are useless, this entire class is just to override this
-        private const val SUBRIP_TIMECODE = "(?:(\\d+):)?(\\d+):(\\d+)(?:[,.](\\d+))?"
-        private val SUBRIP_TIMING_LINE: Pattern =
-            Pattern.compile("\\s*($SUBRIP_TIMECODE)\\s*-->\\s*($SUBRIP_TIMECODE)\\s*")
-
-        // NOTE: Android Studio's suggestion to simplify '\\}' is incorrect [internal: b/144480183].
-        private val SUBRIP_TAG_PATTERN: Pattern = Pattern.compile("\\{\\\\.*?\\}")
-        private const val SUBRIP_ALIGNMENT_TAG = "\\{\\\\an[1-9]\\}"
-
-        // Alignment tags for SSA V4+.
-        private const val ALIGN_BOTTOM_LEFT = "{\\an1}"
-        private const val ALIGN_BOTTOM_MID = "{\\an2}"
-        private const val ALIGN_BOTTOM_RIGHT = "{\\an3}"
-        private const val ALIGN_MID_LEFT = "{\\an4}"
-        private const val ALIGN_MID_MID = "{\\an5}"
-        private const val ALIGN_MID_RIGHT = "{\\an6}"
-        private const val ALIGN_TOP_LEFT = "{\\an7}"
-        private const val ALIGN_TOP_MID = "{\\an8}"
-        private const val ALIGN_TOP_RIGHT = "{\\an9}"
-
-        private fun parseTimecode(matcher: Matcher, groupOffset: Int): Long {
-            val hours = matcher.group(groupOffset + 1)
-            var timestampMs = if (hours != null) hours.toLong() * 60 * 60 * 1000 else 0
-            timestampMs += checkNotNull(matcher.group(groupOffset + 2))
-                .toLong() * 60 * 1000
-            timestampMs += checkNotNull(matcher.group(groupOffset + 3))
-                .toLong() * 1000
-            val millis = matcher.group(groupOffset + 4)
-
-            timestampMs += when (millis?.length) {
-                null -> 0L
-                1 -> millis.toLong() * 100L
-                2 -> millis.toLong() * 10L
-                3 -> millis.toLong() * 1L
-                else -> millis.substring(0, 3).toLong()
-            }
-
-            return timestampMs * 1000
-        }
-
-        // TODO(b/289983417): Make package-private again, once it is no longer needed in
-        // DelegatingSubtitleDecoderWithSubripParserTest.java (i.e. legacy subtitle flow is removed)
-        @VisibleForTesting(otherwise = VisibleForTesting.Companion.PRIVATE)
-        fun getFractionalPositionForAnchorType(anchorType: @AnchorType Int): Float {
-            return when (anchorType) {
-                Cue.ANCHOR_TYPE_START -> START_FRACTION
-                Cue.ANCHOR_TYPE_MIDDLE -> MID_FRACTION
-                Cue.ANCHOR_TYPE_END -> END_FRACTION
-                Cue.TYPE_UNSET ->         // Should never happen.
-                    throw IllegalArgumentException()
-
-                else ->
-                    throw IllegalArgumentException()
-            }
-        }
-    }
-}

app/src/main/java/com/lagradost/cloudstream3/ui/player/CustomSubtitleDecoderFactory.kt

@@ -18,6 +18,7 @@ import androidx.media3.extractor.text.SubtitleParser
 import androidx.media3.extractor.text.dvb.DvbParser
 import androidx.media3.extractor.text.pgs.PgsParser
 import androidx.media3.extractor.text.ssa.SsaParser
+import androidx.media3.extractor.text.subrip.SubripParser
 import androidx.media3.extractor.text.ttml.TtmlParser
 import androidx.media3.extractor.text.tx3g.Tx3gParser
 import androidx.media3.extractor.text.webvtt.Mp4WebvttParser
@@ -250,14 +251,14 @@ class CustomDecoder(private val fallbackFormat: Format?) : SubtitleParser {
                 ignoreCase = true
             )) -> SsaParser(fallbackFormat?.initializationData)
 
-            trimmedText.startsWith("1", ignoreCase = true) -> CustomSubripParser()
+            trimmedText.startsWith("1", ignoreCase = true) -> SubripParser()
             fallbackFormat != null -> {
-                when (fallbackFormat.sampleMimeType) {
+                when (val mimeType = fallbackFormat.sampleMimeType) {
                     MimeTypes.TEXT_VTT -> WebvttParser()
                     MimeTypes.TEXT_SSA -> SsaParser(fallbackFormat.initializationData)
                     MimeTypes.APPLICATION_MP4VTT -> Mp4WebvttParser()
                     MimeTypes.APPLICATION_TTML -> TtmlParser()
-                    MimeTypes.APPLICATION_SUBRIP -> CustomSubripParser()
+                    MimeTypes.APPLICATION_SUBRIP -> SubripParser()
                     MimeTypes.APPLICATION_TX3G -> Tx3gParser(fallbackFormat.initializationData)
                     // These decoders are not converted to parsers yet
                     // TODO

app/src/main/java/com/lagradost/cloudstream3/ui/player/DownloadFileGenerator.kt

@@ -10,17 +10,16 @@ import com.lagradost.cloudstream3.utils.ExtractorLinkType
 import com.lagradost.cloudstream3.utils.SubtitleHelper.fromLanguageToTagIETF
 import com.lagradost.cloudstream3.utils.SubtitleUtils.cleanDisplayName
 import com.lagradost.cloudstream3.utils.SubtitleUtils.isMatchingSubtitle
-import com.lagradost.cloudstream3.utils.downloader.DownloadFileManagement.getFolder
-import com.lagradost.cloudstream3.utils.downloader.VideoDownloadManager.getDownloadFileInfo
+import com.lagradost.cloudstream3.utils.VideoDownloadManager.getDownloadFileInfoAndUpdateSettings
+import com.lagradost.cloudstream3.utils.VideoDownloadManager.getFolder
 
 class DownloadFileGenerator(
-    episodes: List<ExtractorUri>
-) : VideoGenerator<ExtractorUri>(episodes) {
+    episodes: List<ExtractorUri>,
+    currentIndex: Int = 0
+) : VideoGenerator<ExtractorUri>(episodes, currentIndex) {
     override val hasCache = false
     override val canSkipLoading = false
 
-    override fun getId(index: Int): Int? = this.videos.getOrNull(index)?.id
-
     override suspend fun generateLinks(
         clearCache: Boolean,
         sourceTypes: Set<ExtractorLinkType>,
@@ -29,14 +28,14 @@ class DownloadFileGenerator(
         offset: Int,
         isCasting: Boolean
     ): Boolean {
-        val meta = videos.getOrNull(offset) ?: return false
+        val meta = getCurrent(offset) ?: return false
 
         if (meta.uri == Uri.EMPTY) {
             // We do this here so that we only load it when
             // we actually need it as it can be more expensive.
             val info = meta.id?.let { id ->
                 activity?.let { act ->
-                    getDownloadFileInfo(act, id)
+                    getDownloadFileInfoAndUpdateSettings(act, id)
                 }
             }
 

app/src/main/java/com/lagradost/cloudstream3/ui/player/DownloadedPlayerActivity.kt

@@ -14,9 +14,7 @@ import com.lagradost.cloudstream3.utils.BackPressedCallbackHelper.attachBackPres
 import com.lagradost.cloudstream3.utils.UIHelper.enableEdgeToEdgeCompat
 
 class DownloadedPlayerActivity : AppCompatActivity() {
-    companion object {
-        const val TAG = "DownloadedPlayerActivity"
-    }
+    private val dTAG = "DownloadedPlayerAct"
 
     override fun dispatchKeyEvent(event: KeyEvent): Boolean =
         CommonActivity.dispatchKeyEvent(this, event) ?: super.dispatchKeyEvent(event)
@@ -29,83 +27,53 @@ class DownloadedPlayerActivity : AppCompatActivity() {
         CommonActivity.onUserLeaveHint(this)
     }
 
-    override fun onNewIntent(intent: Intent) {
-        super.onNewIntent(intent)
-        // Ignore same intent so the player doesnt totally
-        // reload if you are playing the same thing.
-        if (isSameIntent(intent)) return
-        setIntent(intent)
-        Log.i(TAG, "onNewIntent")
-        handleIntent(intent)
-    }
-
-    private fun isSameIntent(newIntent: Intent): Boolean {
-        val old = intent ?: return false
-        // Compare URIs first
-        val oldUri = old.data ?: old.clipData?.getItemAt(0)?.uri
-        val newUri = newIntent.data ?: newIntent.clipData?.getItemAt(0)?.uri
-        if (oldUri != null && oldUri == newUri) return true
-        // Fall back to comparing EXTRA_TEXT links
-        val oldText = safe { old.getStringExtra(Intent.EXTRA_TEXT) }
-        val newText = safe { newIntent.getStringExtra(Intent.EXTRA_TEXT) }
-        return oldText != null && oldText == newText
-    }
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         CommonActivity.loadThemes(this)
         CommonActivity.init(this)
         enableEdgeToEdgeCompat()
         setContentView(R.layout.empty_layout)
-        Log.i(TAG, "onCreate")
-        handleIntent(intent)
+        Log.i(dTAG, "onCreate")
 
-        /**
-         * Use moveTaskToBack instead of finish() so there is always exactly one task
-         * entry in recents, always reflecting the current file.
-         *
-         * finish() destroys the Activity but may leave the task in recents. Each new file
-         * open can create a new task entry, so recents accumulates stale entries for old
-         * files. The user then taps a stale entry and gets the wrong file.
-         *
-         * moveTaskToBack keeps the Activity alive in the background. There is only ever
-         * one task entry in recents. New files opened from the file manager arrive via
-         * onNewIntent on the live instance, updating the player immediately. The single
-         * recents entry always reflects the current state, ensuring we load the
-         * correct file.
-         */
-        attachBackPressedCallback("DownloadedPlayerActivity") { moveTaskToBack(true) }
-    }
-
-    private fun handleIntent(intent: Intent) {
         val data = intent.data
+
         if (OfflinePlaybackHelper.playIntent(activity = this, intent = intent)) {
             return
         }
 
-        if (
-            intent.action == Intent.ACTION_SEND ||
-            intent.action == Intent.ACTION_OPEN_DOCUMENT ||
-            intent.action == Intent.ACTION_VIEW
-        ) {
-            val extraText = safe { intent.getStringExtra(Intent.EXTRA_TEXT) }
+        if (intent?.action == Intent.ACTION_SEND || intent?.action == Intent.ACTION_OPEN_DOCUMENT || intent?.action == Intent.ACTION_VIEW) {
+            val extraText = safe { // I dont trust android
+                intent.getStringExtra(Intent.EXTRA_TEXT)
+            }
             val cd = intent.clipData
             val item = if (cd != null && cd.itemCount > 0) cd.getItemAt(0) else null
             val url = item?.text?.toString()
-            when {
-                item?.uri != null -> playUri(this, item.uri)
-                url != null -> playLink(this, url)
-                data != null -> playUri(this, data)
-                extraText != null -> playLink(this, extraText)
-                else -> finishAndRemoveTask()
+
+            // idk what I am doing, just hope any of these work
+            if (item?.uri != null)
+                playUri(this, item.uri)
+            else if (url != null)
+                playLink(this, url)
+            else if (data != null)
+                playUri(this, data)
+            else if (extraText != null)
+                playLink(this, extraText)
+            else {
+                finish()
+                return
             }
         } else if (data?.scheme == "content") {
             playUri(this, data)
-        } else finishAndRemoveTask()
+        } else {
+            finish()
+            return
+        }
+
+        attachBackPressedCallback("DownloadedPlayerActivity") { finish() }
     }
 
     override fun onResume() {
         super.onResume()
         CommonActivity.setActivityInstance(this)
     }
-}
+}

app/src/main/java/com/lagradost/cloudstream3/ui/player/ExtractorLinkGenerator.kt

@@ -6,7 +6,7 @@ import com.lagradost.cloudstream3.utils.ExtractorLinkType
 class ExtractorLinkGenerator(
     private val links: List<ExtractorLink>,
     private val subtitles: List<SubtitleData>,
-) : NoVideoGenerator(null) {
+) : NoVideoGenerator() {
     override suspend fun generateLinks(
         clearCache: Boolean,
         sourceTypes: Set<ExtractorLinkType>,

app/src/main/java/com/lagradost/cloudstream3/ui/player/FixedNextRenderersFactory.kt

@@ -1,28 +0,0 @@
-package com.lagradost.cloudstream3.ui.player
-
-import android.content.Context
-import android.os.Looper
-import androidx.media3.common.util.UnstableApi
-import androidx.media3.exoplayer.Renderer
-import androidx.media3.exoplayer.text.TextOutput
-import androidx.media3.exoplayer.text.TextRenderer
-import io.github.anilbeesetti.nextlib.media3ext.ffdecoder.NextRenderersFactory
-
-@UnstableApi
-class FixedNextRenderersFactory(context: Context) : NextRenderersFactory(context) {
-    /** Somehow the nextlib authors decided that we need a text renderer that causes
-     * "ERROR_CODE_FAILED_RUNTIME_CHECK".
-     *
-     * Core issue: https://github.com/anilbeesetti/nextlib/pull/158
-     * Comment: https://github.com/recloudstream/cloudstream/pull/2342#issuecomment-3917751718
-     * */
-    override fun buildTextRenderers(
-        context: Context,
-        output: TextOutput,
-        outputLooper: Looper,
-        extensionRendererMode: Int,
-        out: ArrayList<Renderer>
-    ) {
-        out.add(TextRenderer(output, outputLooper))
-    }
-}

app/src/main/java/com/lagradost/cloudstream3/ui/player/IGenerator.kt

@@ -1,7 +1,10 @@
 package com.lagradost.cloudstream3.ui.player
 
+import com.lagradost.cloudstream3.ui.result.ResultEpisode
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.ExtractorLinkType
+import kotlin.math.max
+import kotlin.math.min
 
 val LOADTYPE_INAPP = setOf(
     ExtractorLinkType.VIDEO,
@@ -25,27 +28,71 @@ val LOADTYPE_CHROMECAST = setOf(
 val LOADTYPE_ALL = ExtractorLinkType.entries.toSet()
 
 
-abstract class NoVideoGenerator(val id : Int?) : VideoGenerator<Nothing>(emptyList()) {
+abstract class NoVideoGenerator : VideoGenerator<Nothing>(emptyList(), 0) {
     override val hasCache = false
     override val canSkipLoading = false
-    override fun getId(index: Int): Int? = id
 }
 
-abstract class VideoGenerator<T : Any>(val videos: List<T>) {
-    abstract val hasCache: Boolean
-    abstract val canSkipLoading: Boolean
-    abstract fun getId(index : Int) : Int?
+abstract class VideoGenerator<T : Any>(val videos: List<T>, var videoIndex: Int = 0) :
+    IGenerator {
 
-    fun hasNext(videoIndex : Int): Boolean = videoIndex < videos.lastIndex
-    fun hasPrev(videoIndex : Int): Boolean = videoIndex > 0
+    override fun hasNext(): Boolean = videoIndex < videos.lastIndex
+    override fun hasPrev(): Boolean = videoIndex > 0
+    override fun getAll(): List<T>? = videos
+    override fun getCurrent(offset: Int): T? = videos.getOrNull(videoIndex + offset)
+    override fun next() {
+        if (hasNext()) {
+            videoIndex += 1
+        }
+    }
 
-    @Throws
-    abstract suspend fun generateLinks(
+    override fun prev() {
+        if (hasPrev()) {
+            videoIndex -= 1
+        }
+    }
+
+    override fun goto(index: Int) {
+        videoIndex = min(videos.lastIndex, max(0, index))
+    }
+
+    override fun getCurrentId(): Int? {
+        return when (val current = getCurrent()) {
+            is ResultEpisode -> {
+                current.id
+            }
+
+            is ExtractorUri -> {
+                current.id
+            }
+
+            else -> null
+        }
+    }
+}
+
+// TODO deprecate/remove IGenerator in favor of a more ergonomic and correct implementation
+interface IGenerator {
+    val hasCache: Boolean
+    val canSkipLoading: Boolean
+
+    fun hasNext(): Boolean
+    fun hasPrev(): Boolean
+    fun next()
+    fun prev()
+    fun goto(index: Int)
+
+    fun getCurrentId(): Int?                    // this is used to save data or read data about this id
+    fun getCurrent(offset: Int = 0): Any?      // this is used to get metadata about the current playing, can return null
+    fun getAll(): List<Any>?                   // this us used to get the metadata about all entries, not needed
+
+    /* not safe, must use try catch */
+    suspend fun generateLinks(
         clearCache: Boolean,
         sourceTypes: Set<ExtractorLinkType>,
         callback: (Pair<ExtractorLink?, ExtractorUri?>) -> Unit,
         subtitleCallback: (SubtitleData) -> Unit,
-        offset: Int,
-        isCasting: Boolean
+        offset: Int = 0,
+        isCasting: Boolean = false
     ): Boolean
 }

app/src/main/java/com/lagradost/cloudstream3/ui/player/IPlayer.kt

@@ -3,11 +3,30 @@ package com.lagradost.cloudstream3.ui.player
 import android.content.Context
 import android.graphics.Bitmap
 import android.util.Rational
-import androidx.annotation.AnyThread
-import androidx.annotation.MainThread
 import com.lagradost.cloudstream3.ui.subtitles.SaveCaptionStyle
+import com.lagradost.cloudstream3.utils.EpisodeSkip
 import com.lagradost.cloudstream3.utils.ExtractorLink
-import com.lagradost.cloudstream3.utils.videoskip.VideoSkipStamp
+
+enum class PlayerEventType(val value: Int) {
+    Pause(0),
+    Play(1),
+    SeekForward(2),
+    SeekBack(3),
+
+    SkipCurrentChapter(4),
+    NextEpisode(5),
+    PrevEpisode(6),
+    PlayPauseToggle(7),
+    ToggleMute(8),
+    Lock(9),
+    ToggleHide(10),
+    ShowSpeed(11),
+    ShowMirrors(12),
+    Resize(13),
+    SearchSubtitlesOnline(14),
+    SkipOp(15),
+    Restart(16),
+}
 
 enum class CSPlayerEvent(val value: Int) {
     Pause(0),
@@ -67,13 +86,13 @@ data class ErrorEvent(
 
 /** Event when timestamps appear, null when it should disappear */
 data class TimestampInvokedEvent(
-    val timestamp: VideoSkipStamp,
+    val timestamp: EpisodeSkip.SkipStamp,
     override val source: PlayerEventSource = PlayerEventSource.Player,
 ) : PlayerEvent()
 
 /** Event for when a chapter is skipped, aka when event is handled (or for future use when skip automatically ads/sponsor) */
 data class TimestampSkippedEvent(
-    val timestamp: VideoSkipStamp,
+    val timestamp: EpisodeSkip.SkipStamp,
     override val source: PlayerEventSource = PlayerEventSource.Player,
 ) : PlayerEvent()
 
@@ -163,7 +182,6 @@ interface Track {
     val id: String?
     val label: String?
     val language: String?
-    val sampleMimeType : String?
 }
 
 data class VideoTrack(
@@ -172,23 +190,19 @@ data class VideoTrack(
     override val language: String?,
     val width: Int?,
     val height: Int?,
-    override val sampleMimeType: String?,
 ) : Track
 
 data class AudioTrack(
     override val id: String?,
     override val label: String?,
     override val language: String?,
-    override val sampleMimeType: String?,
-    val channelCount: Int?,
-    val formatIndex: Int?,
 ) : Track
 
 data class TextTrack(
     override val id: String?,
     override val label: String?,
     override val language: String?,
-    override val sampleMimeType: String?,
+    val mimeType: String?,
 ) : Track
 
 
@@ -201,6 +215,8 @@ data class CurrentTracks(
     val allTextTracks: List<TextTrack>,
 )
 
+class InvalidFileException(msg: String) : Exception(msg)
+
 //http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4
 const val ACTION_MEDIA_CONTROL = "media_control"
 const val EXTRA_CONTROL_TYPE = "control_type"
@@ -222,9 +238,8 @@ interface IPlayer {
     fun getSubtitleOffset(): Long // in ms
     fun setSubtitleOffset(offset: Long) // in ms
 
-    @AnyThread
     fun initCallbacks(
-        @MainThread eventHandler: ((PlayerEvent) -> Unit),
+        eventHandler: ((PlayerEvent) -> Unit),
         /** this is used to request when the player should report back view percentage */
         requestedListeningPercentages: List<Int>? = null,
     )
@@ -234,7 +249,7 @@ interface IPlayer {
     fun updateSubtitleStyle(style: SaveCaptionStyle)
     fun saveData()
 
-    fun addTimeStamps(timeStamps: List<VideoSkipStamp>)
+    fun addTimeStamps(timeStamps: List<EpisodeSkip.SkipStamp>)
 
     fun loadPlayer(
         context: Context,
@@ -287,8 +302,8 @@ interface IPlayer {
     fun setMaxVideoSize(width: Int = Int.MAX_VALUE, height: Int = Int.MAX_VALUE, id: String? = null)
 
     /** If no trackLanguage is set it'll default to first track. Specifying the id allows for track overrides as the language can be identical. */
-    fun setPreferredAudioTrack(trackLanguage: String?, id: String? = null, formatIndex: Int? = null)
+    fun setPreferredAudioTrack(trackLanguage: String?, id: String? = null)
 
     /** Get the current subtitle cues, for use with syncing */
     fun getSubtitleCues(): List<SubtitleCue>
-}
+}

app/src/main/java/com/lagradost/cloudstream3/ui/player/LinkGenerator.kt

@@ -40,8 +40,7 @@ class LinkGenerator(
     private val links: List<BasicLink>,
     private val extract: Boolean = true,
     private val refererUrl: String? = null,
-    id: Int?
-) : NoVideoGenerator(id) {
+) : NoVideoGenerator() {
     override suspend fun generateLinks(
         clearCache: Boolean,
         sourceTypes: Set<ExtractorLinkType>,
@@ -79,8 +78,10 @@ class LinkGenerator(
 class MinimalLinkGenerator(
     private val links: List<CloudStreamPackage.MinimalVideoLink>,
     private val subs: List<CloudStreamPackage.MinimalSubtitleLink>,
-    id: Int?
-) : NoVideoGenerator(id) {
+    private val id: Int? = null
+) : NoVideoGenerator() {
+    override fun getCurrentId(): Int? = id
+
     override suspend fun generateLinks(
         clearCache: Boolean,
         sourceTypes: Set<ExtractorLinkType>,

app/src/main/java/com/lagradost/cloudstream3/ui/player/OfflinePlaybackHelper.kt

@@ -1,10 +1,10 @@
 package com.lagradost.cloudstream3.ui.player
 
 import android.app.Activity
+import android.content.ContentUris
 import android.content.Intent
 import android.net.Uri
 import androidx.core.content.ContextCompat.getString
-import androidx.navigation.NavOptions
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.actions.temp.CloudStreamPackage
 import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
@@ -13,25 +13,15 @@ import com.lagradost.cloudstream3.utils.UIHelper.navigate
 import com.lagradost.safefile.SafeFile
 
 object OfflinePlaybackHelper {
-    /**
-     * Pop any existing player off the nav back stack before pushing the new one,
-     * keeping the stack flat (at most one player at a time). This prevents an
-     * OOM when many files are opened in sequence via DownloadedPlayerActivity.
-     */
-    private val replacePlayerNavOptions = NavOptions.Builder()
-        .setPopUpTo(R.id.navigation_player, inclusive = true, saveState = false)
-        .build()
-
     fun playLink(activity: Activity, url: String) {
         activity.navigate(
             R.id.global_to_navigation_player, GeneratorPlayer.newInstance(
                 LinkGenerator(
                     listOf(
                         BasicLink(url)
-                    ), id = url.hashCode()
-                ), 0
-            ),
-            replacePlayerNavOptions
+                    )
+                )
+            )
         )
     }
 
@@ -62,9 +52,8 @@ object OfflinePlaybackHelper {
                     links,
                     subs,
                     if (id != -1) id else null,
-                ), 0
-            ),
-            replacePlayerNavOptions
+                )
+            )
         )
         return true
     }
@@ -84,12 +73,12 @@ object OfflinePlaybackHelper {
                             name = name ?: getString(activity, R.string.downloaded_file),
                             // well not the same as a normal id, but we take it as users may want to
                             // play downloaded files and save the location
-                            id = uri.lastPathSegment?.toLongOrNull()?.hashCode() ?: uri.lastPathSegment?.hashCode()
+                            id = kotlin.runCatching { ContentUris.parseId(uri) }.getOrNull()
+                                ?.hashCode()
                         )
                     )
-                ), 0
-            ),
-            replacePlayerNavOptions
+                )
+            )
         )
     }
 }

app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerGeneratorViewModel.kt

@@ -9,188 +9,34 @@ import com.lagradost.cloudstream3.LoadResponse
 import com.lagradost.cloudstream3.mvvm.Resource
 import com.lagradost.cloudstream3.mvvm.launchSafe
 import com.lagradost.cloudstream3.mvvm.logError
+import com.lagradost.cloudstream3.mvvm.safe
 import com.lagradost.cloudstream3.mvvm.safeApiCall
-import com.lagradost.cloudstream3.ui.player.source_priority.QualityDataHelper.getLinkPriority
 import com.lagradost.cloudstream3.ui.result.ResultEpisode
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
+import com.lagradost.cloudstream3.utils.EpisodeSkip
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.ExtractorLinkType
-import com.lagradost.cloudstream3.utils.videoskip.SkipAPI
-import com.lagradost.cloudstream3.utils.videoskip.VideoSkipStamp
-import kotlinx.collections.immutable.PersistentList
-import kotlinx.collections.immutable.PersistentSet
-import kotlinx.collections.immutable.persistentListOf
-import kotlinx.collections.immutable.persistentSetOf
-import kotlinx.collections.immutable.toPersistentList
-import kotlinx.collections.immutable.toPersistentSet
 import kotlinx.coroutines.Job
-import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
-import org.jetbrains.annotations.Contract
-import java.util.concurrent.ConcurrentHashMap
-
-typealias VideoLink = Pair<ExtractorLink?, ExtractorUri?>
-
-data class GeneratorState(
-    val meta: Any?,
-    val nextMeta: Any?,
-    val allMeta: List<*>?,
-    val response: LoadResponse?,
-    val index: Int,
-    val id: Int?,
-)
-
-/** Immutable state of all current links relevant to displaying the video */
-// @MustUseReturnValues
-// @Immutable
-data class VideoState(
-    val subtitles: PersistentSet<SubtitleData> = persistentSetOf(),
-    val links: PersistentSet<VideoLink> = persistentSetOf(),
-    val stamps: PersistentList<VideoSkipStamp> = persistentListOf(),
-    val loading: Resource<Unit> = Resource.Loading(),
-    val generatorState: GeneratorState? = null,
-    val instance: Int,
-) {
-    /**
-     * This acts as a local cache for sorted links that are not copied over by the copy constructor.
-     *
-     * sortedBy is not exactly expensive, but each hasNextMirror does it again, so this alleviates unnecessary recomputation
-     * */
-    private val sortedLinks: ConcurrentHashMap<Int, List<VideoLink>> = ConcurrentHashMap()
-
-    fun clearSortedLinksCache() = sortedLinks.clear()
-
-    // Modifying sortedLinks is not considered a "visible" side effect, and rerunning it does not change the result
-    // It is by all standards, idempotent and by extension also pure as it has no "visible" side effect
-    /** Returns .links in the sorted order according to the qualityProfile.
-     * Use .links if order is not needed */
-    @Contract(pure = true)
-    fun sortLinks(qualityProfile: Int): List<VideoLink> {
-        return sortedLinks[qualityProfile] ?: links.sortedBy { link ->
-            // negative because we want to sort highest quality first
-            -getLinkPriority(qualityProfile, link.first)
-        }.also { value -> sortedLinks[qualityProfile] = value }
-    }
-
-    @Contract(pure = true)
-    fun add(item: SubtitleData): VideoState = copy(subtitles = subtitles.add(item))
-
-    @Contract(pure = true)
-    fun add(item: VideoLink): VideoState = copy(links = links.add(item))
-
-    @Contract(pure = true)
-    fun add(item: VideoSkipStamp): VideoState = copy(stamps = stamps.add(item))
-
-    @JvmName("addSubtitleData")
-    @Contract(pure = true)
-    fun add(items: Collection<SubtitleData>): VideoState = copy(subtitles = subtitles.addAll(items))
-
-    @JvmName("addVideoLink")
-    @Contract(pure = true)
-    fun add(items: Collection<VideoLink>): VideoState = copy(links = links.addAll(items))
-
-    @JvmName("addVideoSkipStamp")
-    @Contract(pure = true)
-    fun add(items: Collection<VideoSkipStamp>): VideoState = copy(stamps = stamps.addAll(items))
-
-    @Contract(pure = true)
-    fun set(item: SubtitleData): VideoState = copy(subtitles = persistentSetOf(item))
-
-    @Contract(pure = true)
-    fun set(item: VideoLink): VideoState = copy(links = persistentSetOf(item))
-
-    @Contract(pure = true)
-    fun set(item: VideoSkipStamp): VideoState = copy(stamps = persistentListOf(item))
-
-    @JvmName("setSubtitleData")
-    @Contract(pure = true)
-    fun set(items: Collection<SubtitleData>): VideoState = copy(subtitles = items.toPersistentSet())
-
-    @JvmName("setVideoLink")
-    @Contract(pure = true)
-    fun set(items: Collection<VideoLink>): VideoState = copy(links = items.toPersistentSet())
-
-    @JvmName("setVideoSkipStamp")
-    @Contract(pure = true)
-    fun set(items: Collection<VideoSkipStamp>): VideoState = copy(stamps = items.toPersistentList())
-}
-
-data class VideoLive<T>(
-    val value: T,
-    val instance: Int,
-)
 
 class PlayerGeneratorViewModel : ViewModel() {
     companion object {
         const val TAG = "PlayViewGen"
     }
 
-    @Volatile
-    var generator: VideoGenerator<*>? = null
+    private var generator: IGenerator? = null
 
-    @Volatile
-    var episodeIndex: Int = 0
+    private val _currentLinks = MutableLiveData<Set<Pair<ExtractorLink?, ExtractorUri?>>>(setOf())
+    val currentLinks: LiveData<Set<Pair<ExtractorLink?, ExtractorUri?>>> = _currentLinks
 
-    /**
-     * The state of the video player, only modify it by modifyState to make sure observe is called,
-     * and avoid concurrency issues.
-     *
-     * This value can be used without Synchronized or locking when reading, as all fields are immutable.
-     * */
-    @Volatile
-    var state = VideoState(instance = 0)
-        private set
+    private val _currentSubs = MutableLiveData<Set<SubtitleData>>(setOf())
+    val currentSubs: LiveData<Set<SubtitleData>> = _currentSubs
 
-    private val _currentLinks =
-        MutableLiveData<VideoLive<Set<Pair<ExtractorLink?, ExtractorUri?>>>>(null)
-    val currentLinks: LiveData<VideoLive<Set<Pair<ExtractorLink?, ExtractorUri?>>>> = _currentLinks
+    private val _loadingLinks = MutableLiveData<Resource<Boolean?>>()
+    val loadingLinks: LiveData<Resource<Boolean?>> = _loadingLinks
 
-    private val _currentSubtitles = MutableLiveData<VideoLive<Set<SubtitleData>>>(null)
-    val currentSubtitles: LiveData<VideoLive<Set<SubtitleData>>> = _currentSubtitles
-
-    private val _loadingLinks = MutableLiveData<VideoLive<Resource<Unit>>>()
-    val loadingLinks: LiveData<VideoLive<Resource<Unit>>> = _loadingLinks
-
-    private val _currentStamps = MutableLiveData<VideoLive<List<VideoSkipStamp>>>(null)
-    val currentStamps: LiveData<VideoLive<List<VideoSkipStamp>>> = _currentStamps
-
-    /**
-     * Modifies the `state` variable safely, and with the correct observe behavior.
-     *
-     * Synchronized to avoid concurrency issues, and make this operation atomic.
-     * Otherwise, one update may be lost if they are done in parallel.
-     * */
-    @Synchronized
-    fun modifyState(op: VideoState.() -> VideoState) {
-        val oldState = state
-        state = op.invoke(oldState)
-
-        /** New instance, always push state */
-        if (state.instance != oldState.instance) {
-            _currentSubtitles.postValue(VideoLive(state.subtitles, state.instance))
-            _currentStamps.postValue(VideoLive(state.stamps, state.instance))
-            _currentLinks.postValue(VideoLive(state.links, state.instance))
-            _loadingLinks.postValue(VideoLive(state.loading, state.instance))
-            return
-        }
-
-        /**
-         * Only post the changed values, this makes sure we do not invoke the "observe"
-         *
-         * We do this by "Referential equality" https://kotlinlang.org/docs/equality.html#referential-equality
-         * to avoid comparing the entire set or list as "Persistent" classes will hold the same reference if they are unchanged.
-         * */
-        if (state.links !== oldState.links)
-            _currentLinks.postValue(VideoLive(state.links, state.instance))
-        if (state.stamps !== oldState.stamps)
-            _currentStamps.postValue(VideoLive(state.stamps, state.instance))
-        if (state.subtitles !== oldState.subtitles)
-            _currentSubtitles.postValue(VideoLive(state.subtitles, state.instance))
-
-        /** Normal equality here as it is not a collection */
-        if (state.loading != oldState.loading)
-            _loadingLinks.postValue(VideoLive(state.loading, state.instance))
-    }
+    private val _currentStamps = MutableLiveData<List<EpisodeSkip.SkipStamp>>(emptyList())
+    val currentStamps: LiveData<List<EpisodeSkip.SkipStamp>> = _currentStamps
 
     private val _currentSubtitleYear = MutableLiveData<Int?>(null)
     val currentSubtitleYear: LiveData<Int?> = _currentSubtitleYear
@@ -206,32 +52,41 @@ class PlayerGeneratorViewModel : ViewModel() {
         _currentSubtitleYear.postValue(year)
     }
 
+    fun getId(): Int? {
+        return generator?.getCurrentId()
+    }
+
+    fun loadLinks(episode: Int) {
+        generator?.goto(episode)
+        loadLinks()
+    }
+
     fun loadLinksPrev() {
         Log.i(TAG, "loadLinksPrev")
-        if (generator?.hasPrev(episodeIndex) == true) {
-            episodeIndex += 1
+        if (generator?.hasPrev() == true) {
+            generator?.prev()
             loadLinks()
         }
     }
 
     fun loadLinksNext() {
         Log.i(TAG, "loadLinksNext")
-        if (generator?.hasNext(episodeIndex) == true) {
-            episodeIndex += 1
+        if (generator?.hasNext() == true) {
+            generator?.next()
             loadLinks()
         }
     }
 
     fun hasNextEpisode(): Boolean? {
-        return generator?.hasNext(episodeIndex)
+        return generator?.hasNext()
     }
 
     fun hasPrevEpisode(): Boolean? {
-        return generator?.hasPrev(episodeIndex)
+        return generator?.hasPrev()
     }
 
     fun preLoadNextLinks() {
-        val id = generator?.getId(episodeIndex)
+        val id = getId()
         // Do not preload if already loading
         if (id == currentLoadingEpisodeId) return
 
@@ -241,15 +96,14 @@ class PlayerGeneratorViewModel : ViewModel() {
 
         currentJob = viewModelScope.launch {
             try {
-                if (generator?.hasCache == true && generator?.hasNext(episodeIndex) == true) {
+                if (generator?.hasCache == true && generator?.hasNext() == true) {
                     safeApiCall {
                         generator?.generateLinks(
                             sourceTypes = LOADTYPE_INAPP,
                             clearCache = false,
-                            isCasting = false,
                             callback = {},
                             subtitleCallback = {},
-                            offset = episodeIndex + 1
+                            offset = 1
                         )
                     }
                 }
@@ -263,137 +117,129 @@ class PlayerGeneratorViewModel : ViewModel() {
         }
     }
 
-    fun loadThisEpisode(index: Int) {
-        episodeIndex = index
+    fun getLoadResponse(): LoadResponse? {
+        return safe { (generator as? RepoLinkGenerator?)?.page }
+    }
+
+    fun getMeta(): Any? {
+        return safe { generator?.getCurrent() }
+    }
+
+    fun getAllMeta(): List<Any>? {
+        return safe { generator?.getAll() }
+    }
+
+    fun getNextMeta(): Any? {
+        return safe {
+            if (generator?.hasNext() == false) return@safe null
+            generator?.getCurrent(offset = 1)
+        }
+    }
+
+    fun loadThisEpisode(index:Int) {
+        generator?.goto(index)
         loadLinks()
     }
 
-    fun attachGenerator(newGenerator: VideoGenerator<*>, index: Int) {
-        Log.i(TAG, "attachGenerator with generator=$newGenerator and index=$index")
-        generator = newGenerator
-        episodeIndex = index
+    fun getCurrentIndex():Int?{
+        val repoGen = generator as? RepoLinkGenerator ?: return null
+        return repoGen.videoIndex
     }
 
+    fun attachGenerator(newGenerator: IGenerator?) {
+        if (generator == null) {
+            generator = newGenerator
+        }
+    }
+
+    private var extraSubtitles : MutableSet<SubtitleData> = mutableSetOf()
+
     /**
      * If duplicate nothing will happen
      * */
-    fun addSubtitles(file: Set<SubtitleData>) {
-        val validFile = file.filter(::isValidSubtitle)
-        if (validFile.isNotEmpty())
-            modifyState {
-                add(validFile)
-            }
+    fun addSubtitles(file: Set<SubtitleData>) = synchronized(extraSubtitles) {
+        extraSubtitles += file
+        val current = _currentSubs.value ?: emptySet()
+        val next = extraSubtitles + current
+
+        // if it is of a different size then we have added distinct items
+        if (next.size != current.size) {
+            // Posting will refresh subtitles which will in turn
+            // make the subs to english if previously unselected
+            _currentSubs.postValue(next)
+        }
     }
 
     private var currentJob: Job? = null
     private var currentStampJob: Job? = null
 
     fun loadStamps(duration: Long) {
+        //currentStampJob?.cancel()
         currentStampJob = ioSafe {
-            val genState = state.generatorState ?: return@ioSafe
-            val meta = genState.meta
-            val page = genState.response
-            val id = genState.id
-            if (page == null || meta !is ResultEpisode) {
-                return@ioSafe
+            val meta = generator?.getCurrent()
+            val page = (generator as? RepoLinkGenerator?)?.page
+            if (page != null && meta is ResultEpisode) {
+                _currentStamps.postValue(listOf())
+                _currentStamps.postValue(
+                    EpisodeSkip.getStamps(
+                        page,
+                        meta,
+                        duration,
+                        hasNextEpisode() ?: false
+                    )
+                )
             }
-            val stamps = SkipAPI.videoStamps(
-                page,
-                meta,
-                duration,
-                hasNextEpisode() ?: false
-            )
-
-            /** Avoid adding stamps to the wrong video */
-            modifyState {
-                if (id != this.generatorState?.id) {
-                    this
-                } else {
-                    set(stamps)
-                }
-            }
-        }
-    }
-
-    var langFilterList = listOf<String>()
-    var filterSubByLang = false
-
-    fun isValidSubtitle(subtitle: SubtitleData): Boolean {
-        if (langFilterList.isEmpty() || !filterSubByLang) {
-            return true
-        }
-
-        /** Only filter out subtitles fetched online */
-        if (subtitle.origin != SubtitleOrigin.URL) {
-            return true
-        }
-
-        return langFilterList.any { lang ->
-            subtitle.originalName.contains(lang, ignoreCase = true)
         }
     }
 
     fun loadLinks(sourceTypes: Set<ExtractorLinkType> = LOADTYPE_INAPP) {
-        Log.i(TAG, "loadLinks with generator=$generator and index=$episodeIndex")
+        Log.i(TAG, "loadLinks")
         currentJob?.cancel()
-        val index = episodeIndex
-
-        // Clear old data and reset the state
-        modifyState {
-            VideoState(
-                loading = Resource.Loading(),
-                generatorState = generator?.let { gen ->
-                    GeneratorState(
-                        meta = gen.videos.getOrNull(index),
-                        nextMeta = gen.videos.getOrNull(index + 1),
-                        id = gen.getId(index),
-                        response = (gen as? RepoLinkGenerator)?.page,
-                        index = index,
-                        allMeta = gen.videos
-                    )
-                },
-                instance = instance + 1
-            )
-        }
 
         currentJob = viewModelScope.launchSafe {
-            // Load more data
+            // if we load links then we clear the prev loaded links
+            synchronized(extraSubtitles) {
+                extraSubtitles.clear()
+            }
+            val currentLinks = mutableSetOf<Pair<ExtractorLink?, ExtractorUri?>>()
+            val currentSubs = mutableSetOf<SubtitleData>()
+
+            // clear old data
+            _currentSubs.postValue(emptySet())
+            _currentLinks.postValue(emptySet())
+
+            // load more data
+            _loadingLinks.postValue(Resource.Loading())
             val loadingState = safeApiCall {
                 generator?.generateLinks(
                     sourceTypes = sourceTypes,
                     clearCache = forceClearCache,
-                    callback = { link ->
-                        if (isActive)
-                            modifyState {
-                                add(link)
+                    callback = {
+                        synchronized(currentLinks) {
+                            currentLinks.add(it)
+                            // Clone to prevent ConcurrentModificationException
+                            safe {
+                                // Extra safe since .toSet() iterates.
+                                _currentLinks.postValue(currentLinks.toSet())
                             }
+                        }
                     },
-                    isCasting = false,
-                    offset = index,
-                    subtitleCallback = { link ->
-                        if (isActive && isValidSubtitle(link))
-                            modifyState {
-                                add(link)
+                    subtitleCallback = {
+                        synchronized(extraSubtitles) {
+                            currentSubs.add(it)
+                            safe {
+                                _currentSubs.postValue(currentSubs + extraSubtitles)
                             }
+                        }
                     })
-                Unit
             }
 
-            if (!isActive) {
-                return@launchSafe
-            }
-
-            /** Only mark as success if we have not skipped loading */
-            modifyState {
-                if (!isActive) {
-                    this
-                } else {
-                    when (loading) {
-                        is Resource.Loading -> copy(loading = loadingState)
-                        else -> this
-                    }
-                }
+            _loadingLinks.postValue(loadingState)
+            _currentLinks.postValue(currentLinks)
+            synchronized(extraSubtitles) {
+                _currentSubs.postValue(currentSubs + extraSubtitles)
             }
         }
+
     }
 }

app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerPipHelper.kt

@@ -128,7 +128,7 @@ object PlayerPipHelper {
             getRemoteAction(
                 activity,
                 R.drawable.baseline_headphones_24,
-                R.string.audio_singular,
+                R.string.audio_singluar,
                 CSPlayerEvent.PlayAsAudio
             )
         )

app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerSubtitleHelper.kt

@@ -11,7 +11,6 @@ import androidx.media3.ui.SubtitleView
 import com.lagradost.cloudstream3.SubtitleFile
 import com.lagradost.cloudstream3.ui.subtitles.SaveCaptionStyle
 import com.lagradost.cloudstream3.ui.subtitles.SubtitlesFragment.Companion.setSubtitleViewStyle
-import com.lagradost.cloudstream3.utils.SubtitleHelper.fromLanguageToTagIETF
 import com.lagradost.cloudstream3.utils.UIHelper.toPx
 
 enum class SubtitleStatus {
@@ -48,16 +47,6 @@ data class SubtitleData(
         else "$url|$name"
     }
 
-    /** Returns true if langCode is the same as the IETF tag */
-    fun matchesLanguageCode(langCode: String): Boolean {
-        return getIETF_tag() == langCode
-    }
-
-    /** Tries hard to figure out a valid IETF tag based on language code and name. Will return null if not found. */
-    fun getIETF_tag(): String? {
-        return fromLanguageToTagIETF(this.languageCode) ?: fromLanguageToTagIETF(this.originalName, halfMatch = true)
-    }
-
     val name = "$originalName $nameSuffix"
 
     /**

app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerView.kt

@@ -1,842 +0,0 @@
-package com.lagradost.cloudstream3.ui.player
-
-import android.annotation.SuppressLint
-import android.app.Activity
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-import android.content.IntentFilter
-import android.content.pm.ActivityInfo
-import android.graphics.drawable.AnimatedImageDrawable
-import android.graphics.drawable.AnimatedVectorDrawable
-import android.media.metrics.PlaybackErrorEvent
-import android.os.Build
-import android.os.Handler
-import android.os.Looper
-import android.text.format.DateUtils
-import android.util.AttributeSet
-import android.util.Log
-import android.view.View
-import android.view.WindowManager
-import android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES
-import android.widget.FrameLayout
-import android.widget.ImageView
-import android.widget.ProgressBar
-import android.widget.RelativeLayout
-import android.widget.TextView
-import android.widget.Toast
-import androidx.annotation.MainThread
-import androidx.annotation.OptIn
-import androidx.core.view.isGone
-import androidx.core.view.isInvisible
-import androidx.core.view.isVisible
-import androidx.core.widget.doOnTextChanged
-import androidx.fragment.app.FragmentActivity
-import androidx.media3.common.PlaybackException
-import androidx.media3.common.util.UnstableApi
-import androidx.media3.exoplayer.ExoPlayer
-import androidx.media3.session.MediaSession
-import androidx.media3.ui.AspectRatioFrameLayout
-import androidx.media3.ui.DefaultTimeBar
-import androidx.media3.ui.SubtitleView
-import androidx.media3.ui.TimeBar
-import androidx.preference.PreferenceManager
-import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat
-import com.github.rubensousa.previewseekbar.PreviewBar
-import com.github.rubensousa.previewseekbar.media3.PreviewTimeBar
-import com.lagradost.cloudstream3.CommonActivity.isInPIPMode
-import com.lagradost.cloudstream3.CommonActivity.screenWidth
-import com.lagradost.cloudstream3.CommonActivity.showToast
-import com.lagradost.cloudstream3.ErrorLoadingException
-import com.lagradost.cloudstream3.R
-import com.lagradost.cloudstream3.mvvm.logError
-import com.lagradost.cloudstream3.mvvm.safe
-import com.lagradost.cloudstream3.ui.player.live.LivePreviewTimeBar
-import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR
-import com.lagradost.cloudstream3.ui.settings.Globals.PHONE
-import com.lagradost.cloudstream3.ui.settings.Globals.TV
-import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
-import com.lagradost.cloudstream3.ui.subtitles.SaveCaptionStyle
-import com.lagradost.cloudstream3.ui.subtitles.SubtitlesFragment
-import com.lagradost.cloudstream3.utils.AppContextUtils
-import com.lagradost.cloudstream3.utils.AppContextUtils.requestLocalAudioFocus
-import com.lagradost.cloudstream3.utils.DataStoreHelper
-import com.lagradost.cloudstream3.utils.UIHelper.hideKeyboard
-import com.lagradost.cloudstream3.utils.UIHelper.hideSystemUI
-import com.lagradost.cloudstream3.utils.UIHelper.popCurrentPage
-import com.lagradost.cloudstream3.utils.UIHelper.showSystemUI
-import com.lagradost.cloudstream3.utils.UserPreferenceDelegate
-import com.lagradost.cloudstream3.utils.videoskip.VideoSkipStamp
-import java.net.SocketTimeoutException
-
-/**
- * Shared player view - manages ExoPlayer setup, view binding, lifecycle, and event
- * dispatching.  Gesture/volume/brightness/key-event input is handled by [gestureHelper]
- * ([PlayerGestureHelper]), which is exposed via delegate properties for easier access.
- */
-@OptIn(UnstableApi::class)
-class PlayerView @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null
-) : FrameLayout(context, attrs) {
-
-    companion object {
-        private const val TAG = "PlayerView"
-    }
-
-    /** All gesture, volume, brightness and key-event logic lives here. */
-    val gestureHelper = PlayerGestureHelper(this)
-
-    /** Delegate properties (forwarded to gestureHelper for external callers to have easier access) */
-    var isFullScreen: Boolean
-        get() = gestureHelper.isFullScreen
-        set(value) { gestureHelper.isFullScreen = value }
-
-    var isLocked: Boolean
-        get() = gestureHelper.isLocked
-        set(value) { gestureHelper.isLocked = value }
-
-    var videoOutline: View?
-        get() = gestureHelper.videoOutline
-        set(value) { gestureHelper.videoOutline = value }
-
-    /** Delegate methods */
-    fun handleVolumeKey(keyCode: Int) = gestureHelper.handleVolumeKey(keyCode)
-    fun verifyVolume() = gestureHelper.verifyVolume()
-    fun setupKeyEventListener() = gestureHelper.setupKeyEventListener()
-    fun releaseKeyEventListener() = gestureHelper.releaseKeyEventListener()
-    fun requestUpdateBrightnessOverlayOnNextLayout() = gestureHelper.requestUpdateBrightnessOverlayOnNextLayout()
-    fun releaseOverlayLayoutListener() = gestureHelper.releaseOverlayLayoutListener()
-
-    /** Callbacks */
-
-    /** Host-fragment-level callbacks invoked by [mainCallback]. */
-    interface Callbacks {
-        fun nextEpisode() {}
-        fun prevEpisode() {}
-        fun playerPositionChanged(position: Long, duration: Long) {}
-        fun playerStatusChanged() {}
-        fun playerDimensionsLoaded(width: Int, height: Int) {}
-        fun subtitlesChanged() {}
-        fun embeddedSubtitlesFetched(subtitles: List<SubtitleData>) {}
-        fun onTracksInfoChanged() {}
-        fun onTimestamp(timestamp: VideoSkipStamp?) {}
-        fun onTimestampSkipped(timestamp: VideoSkipStamp) {}
-        fun exitedPipMode() {}
-        fun hasNextMirror(): Boolean = false
-        fun nextMirror() {}
-        fun onDownload(event: DownloadEvent) {}
-        fun playerError(exception: Throwable) {}
-        /** Called after [PlayerView] finishes its own player-attached setup (MediaSession, ExoPlayer view). */
-        fun playerUpdated(player: Any?) {}
-        /** Called on a short single-tap on empty player area (no swipe, no double-tap). */
-        fun onSingleTap() {}
-        /** Called when the hold-for-speedup gesture starts (show=true) or ends (show=false). */
-        fun onHoldSpeedUp(show: Boolean) {}
-        /** Called during brightness swipe with the current extra-brightness alpha (0–1). */
-        fun onBrightnessExtra(alpha: Float) {}
-
-        /** Touch event callbacks */
-
-        /** Returns whether the player UI (controls overlay) is currently visible. */
-        fun isUIShowing(): Boolean = false
-        /** Called on a valid ACTION_DOWN; use for e.g. dismissing an episode overlay. */
-        fun onTouchDown() {}
-        /** Called with seek-preview text during a horizontal-swipe, or null to clear it. */
-        fun onSeekPreviewText(text: String?) {}
-        /** Called when a swipe gesture begins; hide the player UI if desired. */
-        fun onHidePlayerUI() {}
-        /**
-         * Called at the end of each touch sequence.
-         *  @param hadSwipe   true if a swipe (brightness/volume/time) was in progress.
-         *  @param wasUiShowing true if the UI was visible when the swipe began.
-         */
-        fun onGestureEnd(hadSwipe: Boolean, wasUiShowing: Boolean) {}
-        /**
-         * Called when the auto-hide timer fires: UI is showing, no touch is active.
-         * Implement to hide the player controls.
-         */
-        fun onAutoHideUI() {}
-    }
-
-    var callbacks: Callbacks? = null
-
-    /** Player state */
-
-    var player: IPlayer = CS3IPlayer()
-    var resizeMode: Int = 0
-    var hasPipModeSupport: Boolean = true
-    var currentPlayerStatus: CSPlayerLoading = CSPlayerLoading.IsBuffering
-    var mMediaSession: MediaSession? = null
-    private var pipReceiver: BroadcastReceiver? = null
-
-    /** Auto-hide */
-    private var autoHideToken = 0
-    private val autoHideHandler = Handler(Looper.getMainLooper())
-
-    /** View references (populated by bindViews) */
-
-    var subView: SubtitleView? = null
-    var playerPausePlayHolderHolder: FrameLayout? = null
-    var playerPausePlay: ImageView? = null
-    var playerBuffering: ProgressBar? = null
-    /** The Media3/ExoPlayer [androidx.media3.ui.PlayerView] widget. */
-    var exoPlayerView: androidx.media3.ui.PlayerView? = null
-    var piphide: FrameLayout? = null
-    var subtitleHolder: FrameLayout? = null
-    internal var playerRew: View? = null
-    internal var playerFfwd: View? = null
-    internal var exoRewText: TextView? = null
-    internal var exoFfwdText: TextView? = null
-    internal var playerCenterMenu: View? = null
-    internal var playerRewHolder: View? = null
-    internal var playerFfwdHolder: View? = null
-    internal var playerVideoHolder: View? = null
-    var playerProgressbarLeftHolder: RelativeLayout? = null
-    var playerProgressbarLeftIcon: ImageView? = null
-    var playerProgressbarLeftLevel1: ProgressBar? = null
-    var playerProgressbarLeftLevel2: ProgressBar? = null
-    var playerProgressbarRightHolder: RelativeLayout? = null
-    var playerProgressbarRightIcon: ImageView? = null
-    var playerProgressbarRightLevel1: ProgressBar? = null
-    var playerProgressbarRightLevel2: ProgressBar? = null
-    /** Accessed by [PlayerGestureHelper.showOrHideSpeedUp]. */
-    internal var playerSpeedupButton: View? = null
-    var playerHolder: FrameLayout? = null
-    private var exoDuration: TextView? = null
-    private var timeLeft: TextView? = null
-    private var exoPosition: TextView? = null
-    private var timeLive: View? = null
-    private var exoProgress: LivePreviewTimeBar? = null
-
-    /** Seek delta used by the basic rew/ffwd click listeners. Read from settings in [initialize]. */
-    var seekTime: Long = 10_000L
-
-    /** True when the current video is taller than it is wide. Set by [mainCallback] on [ResizedEvent]. */
-    var isVerticalOrientation: Boolean = false
-
-    /** When true, [dynamicOrientation] returns portrait for portrait videos. Read from settings in [initialize]. */
-    var autoPlayerRotateEnabled: Boolean = false
-
-    var durationMode: Boolean by UserPreferenceDelegate("duration_mode", false)
-
-    // Kept so SubtitlesFragment can unsubscribe the exact same reference.
-    private val subStyleListener: (SaveCaptionStyle) -> Unit = ::onSubStyleChanged
-
-    /** View discovery */
-
-    /**
-     * Discovers player-related views from [root].  IDs absent in compact layouts (e.g. trailer) simply
-     * remain null, all usage is null-safe.
-     */
-    fun bindViews(root: View) {
-        exoDuration = root.findViewById(androidx.media3.ui.R.id.exo_duration)
-        exoFfwdText = root.findViewById(R.id.exo_ffwd_text)
-        exoPlayerView = root.findViewById(R.id.player_view)
-        exoPosition = root.findViewById(R.id.exo_position)
-        exoRewText = root.findViewById(R.id.exo_rew_text)
-        piphide = root.findViewById(R.id.piphide)
-        playerBuffering = root.findViewById(R.id.player_buffering)
-        playerCenterMenu = root.findViewById(R.id.player_center_menu)
-        playerFfwd = root.findViewById(R.id.player_ffwd)
-        playerFfwdHolder = root.findViewById(R.id.player_ffwd_holder)
-        playerHolder = root.findViewById(R.id.player_holder)
-        playerPausePlay = root.findViewById(R.id.player_pause_play)
-        playerPausePlayHolderHolder = root.findViewById(R.id.player_pause_play_holder_holder)
-        playerProgressbarLeftHolder = root.findViewById(R.id.player_progressbar_left_holder)
-        playerProgressbarLeftIcon = root.findViewById(R.id.player_progressbar_left_icon)
-        playerProgressbarLeftLevel1 = root.findViewById(R.id.player_progressbar_left_level1)
-        playerProgressbarLeftLevel2 = root.findViewById(R.id.player_progressbar_left_level2)
-        playerProgressbarRightHolder = root.findViewById(R.id.player_progressbar_right_holder)
-        playerProgressbarRightIcon = root.findViewById(R.id.player_progressbar_right_icon)
-        playerProgressbarRightLevel1 = root.findViewById(R.id.player_progressbar_right_level1)
-        playerProgressbarRightLevel2 = root.findViewById(R.id.player_progressbar_right_level2)
-        playerRew = root.findViewById(R.id.player_rew)
-        playerRewHolder = root.findViewById(R.id.player_rew_holder)
-        playerSpeedupButton = root.findViewById(R.id.player_speedup_button)
-        playerVideoHolder = root.findViewById(R.id.player_video_holder)
-        subtitleHolder = root.findViewById(R.id.subtitle_holder)
-        timeLeft = root.findViewById(R.id.time_left)
-        timeLive = root.findViewById(R.id.time_live)
-    }
-
-    /**
-     * Called once after [bindViews].  Sets up the preview seek-bar, subtitle style listener,
-     * player callbacks and basic controls; then delegates gesture/input setup to [gestureHelper].
-     */
-    fun initialize() {
-        resizeMode = DataStoreHelper.resizeMode
-        resize(resizeMode, false)
-
-        player.releaseCallbacks()
-        player.initCallbacks(
-            eventHandler = ::mainCallback,
-            requestedListeningPercentages = listOf(
-                SKIP_OP_VIDEO_PERCENTAGE,
-                PRELOAD_NEXT_EPISODE_PERCENTAGE,
-                NEXT_WATCH_EPISODE_PERCENTAGE,
-                UPDATE_SYNC_PROGRESS_PERCENTAGE,
-            ),
-        )
-
-        if (player is CS3IPlayer) {
-            // Preview bar
-            val progressBar: PreviewTimeBar? = exoPlayerView?.findViewById(R.id.exo_progress)
-            exoProgress = progressBar as? LivePreviewTimeBar
-            val previewImageView: ImageView? = exoPlayerView?.findViewById(R.id.previewImageView)
-            val previewFrameLayout: FrameLayout? =
-                exoPlayerView?.findViewById(R.id.previewFrameLayout)
-
-            /** Hide the previewFrameLayout on TV to make the skip op button not float,
-             * as previewFrameLayout is normally invisible */
-            if(isLayout(TV)) {
-                previewFrameLayout?.isVisible = false
-            }
-
-            if (progressBar != null && previewImageView != null && previewFrameLayout != null && !isLayout(TV)) {
-                var resume = false
-                progressBar.addOnScrubListener(object : PreviewBar.OnScrubListener {
-                    override fun onScrubStart(previewBar: PreviewBar?) {
-                        val cs3 = player as? CS3IPlayer ?: return
-                        val hasPreview = cs3.hasPreview()
-                        progressBar.isPreviewEnabled = hasPreview
-                        resume = cs3.getIsPlaying()
-                        if (resume) cs3.handleEvent(CSPlayerEvent.Pause, PlayerEventSource.Player)
-                        // No clashing UI
-                        if (hasPreview) subView?.isVisible = false
-                    }
-
-                    override fun onScrubMove(previewBar: PreviewBar?, progress: Int, fromUser: Boolean) {}
-
-                    override fun onScrubStop(previewBar: PreviewBar?) {
-                        val cs3 = player as? CS3IPlayer ?: return
-                        if (resume) cs3.handleEvent(CSPlayerEvent.Play, PlayerEventSource.Player)
-                        // Delay to prevent the small flicker of subtitle before seeking.
-                        subView?.postDelayed({
-                            // If we are not scrubbing then show subtitles again.
-                            if (previewBar == null || !previewBar.isPreviewEnabled || !previewBar.isShowingPreview) {
-                                subView?.isVisible = true
-                            }
-                        }, 200)
-                    }
-                })
-                progressBar.attachPreviewView(previewFrameLayout)
-                progressBar.setPreviewLoader { currentPosition, max ->
-                    val cs3 = player as? CS3IPlayer ?: return@setPreviewLoader
-                    val bitmap = cs3.getPreview(currentPosition.toFloat().div(max.toFloat()))
-                    previewImageView.isGone = bitmap == null
-                    previewImageView.setImageBitmap(bitmap)
-                }
-            }
-
-            subView = exoPlayerView?.findViewById(androidx.media3.ui.R.id.exo_subtitles)
-            (player as? CS3IPlayer)?.initSubtitles(subView, subtitleHolder, CustomDecoder.style)
-            (player as? CS3IPlayer)?.let {
-                (it.imageGenerator as? PreviewGenerator)?.params =
-                    ImageParams.new16by9(screenWidth)
-            }
-
-            /**
-             * This might seam a bit fucky and that is because it is, the seek event is captured twice, once by the player
-             * and once by the UI even if it should only be registered once by the UI.
-             */
-            exoPlayerView?.findViewById<DefaultTimeBar>(R.id.exo_progress)
-                ?.addListener(object : TimeBar.OnScrubListener {
-                    override fun onScrubStart(timeBar: TimeBar, position: Long) = Unit
-                    override fun onScrubMove(timeBar: TimeBar, position: Long) = Unit
-                    override fun onScrubStop(timeBar: TimeBar, position: Long, canceled: Boolean) {
-                        if (canceled) return
-                        val playerDuration = player.getDuration() ?: return
-                        val playerPosition = player.getPosition() ?: return
-                        mainCallback(
-                            PositionEvent(
-                                source = PlayerEventSource.UI,
-                                durationMs = playerDuration,
-                                fromMs = playerPosition,
-                                toMs = position
-                            )
-                        )
-                    }
-                })
-
-            // Read seek time and rotation settings.
-            try {
-                val sm = PreferenceManager.getDefaultSharedPreferences(context)
-                seekTime = sm.getInt(context.getString(R.string.double_tap_seek_time_key), 10)
-                    .toLong() * 1000L
-                autoPlayerRotateEnabled = sm.getBoolean(
-                    context.getString(R.string.auto_rotate_video_key), true
-                )
-            } catch (_: Exception) {
-            }
-
-            val seekSecs = (seekTime / 1000).toInt()
-            exoRewText?.text = context.getString(R.string.rew_text_regular_format).format(seekSecs)
-            exoFfwdText?.text = context.getString(R.string.ffw_text_regular_format).format(seekSecs)
-
-            playerPausePlay?.setOnClickListener {
-                scheduleAutoHide()
-                if (currentPlayerStatus == CSPlayerLoading.IsEnded && isLayout(PHONE)) {
-                    player.handleEvent(CSPlayerEvent.Restart, PlayerEventSource.UI)
-                } else {
-                    player.handleEvent(CSPlayerEvent.PlayPauseToggle, PlayerEventSource.UI)
-                }
-            }
-            playerRew?.setOnClickListener  {
-                scheduleAutoHide()
-                gestureHelper.rewind()
-            }
-            playerFfwd?.setOnClickListener {
-                scheduleAutoHide()
-                gestureHelper.fastForward()
-            }
-
-            SubtitlesFragment.applyStyleEvent += subStyleListener
-
-            try {
-                val ctx = context
-                val settingsManager = PreferenceManager.getDefaultSharedPreferences(ctx)
-                val cs3 = player as? CS3IPlayer ?: return
-                cs3.cacheSize =
-                    settingsManager.getInt(context.getString(R.string.video_buffer_size_key), 0) * 1024L * 1024L
-                cs3.simpleCacheSize =
-                    settingsManager.getInt(context.getString(R.string.video_buffer_disk_key), 0) * 1024L * 1024L
-                cs3.videoBufferMs =
-                    settingsManager.getInt(context.getString(R.string.video_buffer_length_key), 0) * 1000L
-            } catch (e: Exception) {
-                logError(e)
-            }
-
-            // Duration toggle click listeners
-            exoDuration?.setOnClickListener { setRemainingTimeCounter(true) }
-            timeLeft?.setOnClickListener { setRemainingTimeCounter(false) }
-            // Keep remaining-time text in sync with playback position
-            exoPosition?.doOnTextChanged { _, _, _, _ -> updateRemainingTime() }
-
-            // Delegate gesture/input setup (settings, brightness overlay, touch gestures, key listener)
-            gestureHelper.initialize()
-            setupKeyEventListener()
-
-            // Apply duration-mode display (remaining time vs elapsed); TV always shows remaining
-            setRemainingTimeCounter(durationMode || isLayout(TV))
-        }
-    }
-
-    /** Lifecycle delegation */
-
-    var fullscreenNotch: Boolean = true // TODO SETTING
-
-    fun enterFullscreen(updateOrientation: () -> Unit = {}) {
-        val activity = context as? Activity
-        if (isFullScreen) {
-            activity?.hideSystemUI()
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P && fullscreenNotch) {
-                val params = activity?.window?.attributes
-                params?.layoutInDisplayCutoutMode = LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES
-                activity?.window?.attributes = params
-            }
-        }
-        updateOrientation()
-    }
-
-    fun exitFullscreen() {
-        val activity = context as? Activity
-        gestureHelper.resetZoomToDefault()
-        activity?.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_USER
-        // Simply resets brightness and notch settings that might have been overridden.
-        val lp = activity?.window?.attributes
-        lp?.screenBrightness = WindowManager.LayoutParams.BRIGHTNESS_OVERRIDE_NONE
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-            lp?.layoutInDisplayCutoutMode = WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_DEFAULT
-        }
-        activity?.window?.attributes = lp
-        activity?.showSystemUI()
-    }
-
-    fun onStop() {
-        player.onStop()
-    }
-
-    fun onResume(ctx: Context) {
-        player.onResume(ctx)
-    }
-
-    /** Releases all player resources. */
-    fun release() {
-        player.release()
-        player.releaseCallbacks()
-        player = CS3IPlayer()
-
-        // keyEventListener is deregistered in onPause so that the incoming player's
-        // onResume can register its own listener without racing against release().
-
-        PlayerPipHelper.updatePIPModeActions(
-            context as? Activity,
-            CSPlayerLoading.IsPaused,
-            false,
-            null
-        )
-
-        mMediaSession?.release()
-        mMediaSession = null
-        exoPlayerView?.player = null
-
-        SubtitlesFragment.applyStyleEvent -= subStyleListener
-
-        gestureHelper.release()
-        autoHideHandler.removeCallbacksAndMessages(null)
-
-        keepScreenOn(false)
-    }
-
-    fun onPictureInPictureModeChanged(
-        isInPictureInPictureMode: Boolean,
-        activity: Activity?
-    ) {
-        try {
-            isInPIPMode = isInPictureInPictureMode
-            if (isInPictureInPictureMode) {
-                // Hide the full-screen UI (controls, etc.) while in picture-in-picture mode.
-                piphide?.isVisible = false
-                pipReceiver = object : BroadcastReceiver() {
-                    override fun onReceive(context: Context, intent: Intent) {
-                        if (ACTION_MEDIA_CONTROL != intent.action) return
-                        player.handleEvent(
-                            CSPlayerEvent.entries[intent.getIntExtra(EXTRA_CONTROL_TYPE, 0)],
-                            source = PlayerEventSource.UI
-                        )
-                    }
-                }
-                val filter = IntentFilter().apply { addAction(ACTION_MEDIA_CONTROL) }
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-                    activity?.registerReceiver(pipReceiver, filter, Context.RECEIVER_EXPORTED)
-                } else {
-                    @SuppressLint("UnspecifiedRegisterReceiverFlag")
-                    activity?.registerReceiver(pipReceiver, filter)
-                }
-                val isPlaying = player.getIsPlaying()
-                val status = if (isPlaying) CSPlayerLoading.IsPlaying else CSPlayerLoading.IsPaused
-                updateIsPlaying(status, status)
-            } else {
-                // Restore the full-screen UI.
-                piphide?.isVisible = true
-                callbacks?.exitedPipMode()
-                pipReceiver?.let {
-                    // Prevents java.lang.IllegalArgumentException: Receiver not registered
-                    safe { activity?.unregisterReceiver(it) }
-                }
-                activity?.hideSystemUI()
-                hideKeyboard(this)
-            }
-        } catch (e: Exception) {
-            logError(e)
-        }
-    }
-
-    /** Player UI helpers */
-
-    private fun keepScreenOn(on: Boolean) {
-        val window = (context as? Activity)?.window ?: return
-        if (on) window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
-        else window.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
-    }
-
-    fun updateIsPlaying(wasPlaying: CSPlayerLoading, isPlaying: CSPlayerLoading) {
-        val isPlayingRightNow = CSPlayerLoading.IsPlaying == isPlaying
-        val isBuffering = CSPlayerLoading.IsBuffering == isPlaying
-        currentPlayerStatus = isPlaying
-
-        keepScreenOn(isPlayingRightNow || isBuffering)
-
-        if (isBuffering) {
-            playerPausePlayHolderHolder?.isVisible = false
-            playerBuffering?.isVisible = true
-        } else {
-            playerPausePlayHolderHolder?.isVisible = true
-            playerBuffering?.isVisible = false
-
-            if (isPlaying == CSPlayerLoading.IsEnded && isLayout(PHONE)) {
-                playerPausePlay?.setImageResource(R.drawable.ic_baseline_replay_24)
-            } else if (wasPlaying != isPlaying) {
-                playerPausePlay?.setImageResource(
-                    if (isPlayingRightNow) R.drawable.play_to_pause else R.drawable.pause_to_play
-                )
-                val drawable = playerPausePlay?.drawable
-                var startedAnimation = false
-                if (Build.VERSION.SDK_INT > Build.VERSION_CODES.P) {
-                    if (drawable is AnimatedImageDrawable) { drawable.start(); startedAnimation = true }
-                }
-                if (drawable is AnimatedVectorDrawable) { drawable.start(); startedAnimation = true }
-                if (drawable is AnimatedVectorDrawableCompat) { drawable.start(); startedAnimation = true }
-                // Somehow the phone is wacked
-                if (!startedAnimation) {
-                    playerPausePlay?.setImageResource(
-                        if (isPlayingRightNow) R.drawable.netflix_pause else R.drawable.netflix_play
-                    )
-                }
-            } else {
-                playerPausePlay?.setImageResource(
-                    if (isPlayingRightNow) R.drawable.netflix_pause else R.drawable.netflix_play
-                )
-            }
-        }
-
-        PlayerPipHelper.updatePIPModeActions(
-            context as? Activity,
-            isPlaying,
-            hasPipModeSupport,
-            player.getAspectRatio()
-        )
-    }
-
-    private fun requestAudioFocus() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            (context as? Activity)?.requestLocalAudioFocus(AppContextUtils.getFocusRequest())
-        }
-    }
-
-    private fun playerUpdated(player: Any?) {
-        if (player is ExoPlayer) {
-            mMediaSession?.release()
-            mMediaSession = MediaSession.Builder(context, player)
-                // Ensure unique ID for concurrent players.
-                .setId(System.currentTimeMillis().toString())
-                .build()
-
-            // Necessary for multiple combined videos.
-            @Suppress("DEPRECATION")
-            exoPlayerView?.setShowMultiWindowTimeBar(true)
-            exoPlayerView?.player = player
-            exoPlayerView?.performClick()
-        }
-        callbacks?.playerUpdated(player)
-    }
-
-    private fun onSubStyleChanged(style: SaveCaptionStyle) {
-        player.updateSubtitleStyle(style)
-        // Forcefully update the subtitle encoding in case the edge size is changed.
-        player.seekTime(-1)
-    }
-
-    /** Error handling */
-
-    @MainThread
-    fun playerError(exception: Throwable) {
-        fun showErrorToast(message: String) {
-            if (callbacks?.hasNextMirror() == true) {
-                showToast(message, Toast.LENGTH_SHORT)
-                callbacks?.nextMirror()
-            } else {
-                showToast(
-                    context.getString(R.string.no_links_found_toast) + "\n" + message,
-                    Toast.LENGTH_LONG
-                )
-                (context as? FragmentActivity)?.popCurrentPage()
-            }
-        }
-
-        when (exception) {
-            is PlaybackException -> {
-                val msg = exception.message ?: ""
-                val errorName = exception.errorCodeName
-                when (val code = exception.errorCode) {
-                    PlaybackException.ERROR_CODE_IO_FILE_NOT_FOUND,
-                    PlaybackException.ERROR_CODE_IO_NO_PERMISSION,
-                    PlaybackException.ERROR_CODE_IO_READ_POSITION_OUT_OF_RANGE,
-                    PlaybackException.ERROR_CODE_IO_UNSPECIFIED,
-                    PlaybackException.ERROR_CODE_PARSING_CONTAINER_UNSUPPORTED ->
-                        showErrorToast("${context.getString(R.string.source_error)}\n$errorName ($code)\n$msg")
-
-                    PlaybackException.ERROR_CODE_REMOTE_ERROR,
-                    PlaybackException.ERROR_CODE_IO_BAD_HTTP_STATUS,
-                    PlaybackException.ERROR_CODE_TIMEOUT,
-                    PlaybackException.ERROR_CODE_IO_NETWORK_CONNECTION_FAILED,
-                    PlaybackException.ERROR_CODE_IO_NETWORK_CONNECTION_TIMEOUT,
-                    PlaybackException.ERROR_CODE_IO_INVALID_HTTP_CONTENT_TYPE ->
-                        showErrorToast("${context.getString(R.string.remote_error)}\n$errorName ($code)\n$msg")
-
-                    PlaybackErrorEvent.ERROR_AUDIO_TRACK_INIT_FAILED,
-                    PlaybackErrorEvent.ERROR_AUDIO_TRACK_OTHER,
-                    PlaybackException.ERROR_CODE_DECODING_FAILED,
-                    PlaybackException.ERROR_CODE_AUDIO_TRACK_WRITE_FAILED,
-                    PlaybackException.ERROR_CODE_DECODER_INIT_FAILED,
-                    PlaybackException.ERROR_CODE_DECODER_QUERY_FAILED ->
-                        showErrorToast("${context.getString(R.string.render_error)}\n$errorName ($code)\n$msg")
-
-                    PlaybackException.ERROR_CODE_DECODING_FORMAT_UNSUPPORTED,
-                    PlaybackException.ERROR_CODE_DECODING_FORMAT_EXCEEDS_CAPABILITIES ->
-                        showErrorToast("${context.getString(R.string.unsupported_error)}\n$errorName ($code)\n$msg")
-
-                    PlaybackException.ERROR_CODE_PARSING_CONTAINER_MALFORMED,
-                    PlaybackException.ERROR_CODE_PARSING_MANIFEST_MALFORMED ->
-                        showErrorToast("${context.getString(R.string.encoding_error)}\n$errorName ($code)\n$msg")
-
-                    else ->
-                        showErrorToast("${context.getString(R.string.unexpected_error)}\n$errorName ($code)\n$msg")
-                }
-            }
-
-            is SocketTimeoutException ->
-                showErrorToast("${context.getString(R.string.remote_error)}\n${exception.message}")
-
-            is ErrorLoadingException ->
-                exception.message?.let { showErrorToast(it) }
-                    ?: showErrorToast(exception.toString())
-
-            else ->
-                exception.message?.let { showErrorToast(it) }
-                    ?: showErrorToast(exception.toString())
-        }
-    }
-
-    /** Resize */
-
-    fun nextResize() {
-        resizeMode = (resizeMode + 1) % PlayerResize.entries.size
-        resize(resizeMode, true)
-    }
-
-    fun resize(resize: Int, showToast: Boolean) {
-        // Clear all zoom state before applying the new resize mode
-        gestureHelper.clearZoomState()
-        resize(PlayerResize.entries[resize], showToast)
-    }
-
-    fun resize(resize: PlayerResize, showToast: Boolean) {
-        DataStoreHelper.resizeMode = resize.ordinal
-        val type = when (resize) {
-            PlayerResize.Fill -> AspectRatioFrameLayout.RESIZE_MODE_FILL
-            PlayerResize.Fit -> AspectRatioFrameLayout.RESIZE_MODE_FIT
-            PlayerResize.Zoom -> AspectRatioFrameLayout.RESIZE_MODE_ZOOM
-        }
-        exoPlayerView?.resizeMode = type
-        if (showToast) showToast(resize.nameRes, Toast.LENGTH_SHORT)
-    }
-
-    /** Orientation */
-
-    /**
-     * Returns the desired [ActivityInfo] orientation constant based on [isVerticalOrientation]
-     * and [autoPlayerRotateEnabled].  TV/emulator always returns sensor-landscape.
-     * Host fragments call this from [Callbacks.playerDimensionsLoaded] to apply rotation.
-     */
-    fun dynamicOrientation(): Int {
-        if (isLayout(TV or EMULATOR)) return ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE
-        return if (autoPlayerRotateEnabled && isVerticalOrientation)
-            ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT
-        else ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE
-    }
-
-    /** Event dispatch */
-
-    /**
-     * This receives the events from the player, if you want to append functionality
-     * you do it here, do note that this only receives events for UI changes,
-     * and returning early WON'T stop it from changing in e.g. the player time
-     * or pause status.
-     */
-    @MainThread
-    fun mainCallback(event: PlayerEvent) {
-        // We don't want to spam DownloadEvent.
-        if (event !is DownloadEvent) Log.i(TAG, "Handle event: $event")
-        when (event) {
-            is DownloadEvent -> callbacks?.onDownload(event)
-            is ResizedEvent -> {
-                // Skip 0x0 dimensions that the player emits when going to STATE_IDLE
-                // to avoid incorrectly resetting the auto-detected orientation.
-                if (event.width > 0 && event.height > 0) {
-                    // TV never rotates; otherwise track whether the video is portrait.
-                    isVerticalOrientation = !isLayout(TV or EMULATOR) && event.height > event.width
-                }
-                callbacks?.playerDimensionsLoaded(event.width, event.height)
-            }
-            is PlayerAttachedEvent -> playerUpdated(event.player)
-            is SubtitlesUpdatedEvent -> callbacks?.subtitlesChanged()
-            is TimestampSkippedEvent -> callbacks?.onTimestampSkipped(event.timestamp)
-            is TimestampInvokedEvent -> callbacks?.onTimestamp(event.timestamp)
-            is TracksChangedEvent -> callbacks?.onTracksInfoChanged()
-            is EmbeddedSubtitlesFetchedEvent -> callbacks?.embeddedSubtitlesFetched(event.tracks)
-            is ErrorEvent -> callbacks?.playerError(event.error) ?: playerError(event.error)
-            is RequestAudioFocusEvent -> requestAudioFocus()
-            is EpisodeSeekEvent -> when (event.offset) {
-                -1 -> callbacks?.prevEpisode()
-                1 -> callbacks?.nextEpisode()
-            }
-            is StatusEvent -> {
-                updateIsPlaying(wasPlaying = event.wasPlaying, isPlaying = event.isPlaying)
-                scheduleAutoHide()
-                callbacks?.playerStatusChanged()
-            }
-            is PositionEvent -> callbacks?.playerPositionChanged(
-                position = event.toMs,
-                duration = event.durationMs
-            )
-            is VideoEndedEvent -> {
-                // Only play next episode if autoplay is on (default).
-                val ctx = context
-                if (PreferenceManager.getDefaultSharedPreferences(ctx)
-                        ?.getBoolean(ctx.getString(R.string.autoplay_next_key), true) == true
-                ) {
-                    player.handleEvent(CSPlayerEvent.NextEpisode, source = PlayerEventSource.Player)
-                }
-            }
-            is PauseEvent -> Unit
-            is PlayEvent -> Unit
-        }
-    }
-
-    /** Duration display */
-
-    fun setRemainingTimeCounter(showRemaining: Boolean) {
-        durationMode = showRemaining
-        exoDuration?.isInvisible = showRemaining
-        timeLeft?.isVisible = showRemaining
-        if (showRemaining) updateRemainingTime()
-    }
-
-    fun updateRemainingTime() {
-        val duration = player.getDuration()
-        val position = player.getPosition()
-
-        if (exoProgress?.isAtLiveEdge() == true) {
-            timeLeft?.alpha = 0f
-            exoDuration?.alpha = 0f
-            timeLive?.isVisible = true
-        } else {
-            timeLeft?.alpha = 1f
-            exoDuration?.alpha = 1f
-            timeLive?.isVisible = false
-        }
-
-        if (duration != null && duration > 1 && position != null) {
-            val remainingTimeSeconds = (duration - position + 500) / 1000
-            @SuppressLint("SetTextI18n")
-            timeLeft?.text = "-${DateUtils.formatElapsedTime(remainingTimeSeconds)}"
-        }
-    }
-
-    /** Auto-hide */
-
-    /**
-     * Schedules a delayed auto-hide of the player UI after [delayMs] ms.
-     * Any previously pending hide is canceled first.
-     * The hide fires only when no touch is active and [Callbacks.isUIShowing] is true;
-     * the actual hide action is delegated to [Callbacks.onAutoHideUI].
-     */
-    fun scheduleAutoHide(delayMs: Long = 3000L) {
-        val token = ++autoHideToken
-        autoHideHandler.removeCallbacksAndMessages(null)
-        autoHideHandler.postDelayed({
-            if (token != autoHideToken) return@postDelayed
-            if (gestureHelper.isCurrentTouchValid) return@postDelayed
-            if (callbacks?.isUIShowing() != true) return@postDelayed
-            callbacks?.onAutoHideUI()
-        }, delayMs)
-    }
-
-    /** Cancels any pending auto-hide scheduled by [scheduleAutoHide]. */
-    fun cancelAutoHide() {
-        autoHideToken++
-        autoHideHandler.removeCallbacksAndMessages(null)
-    }
-}

app/src/main/java/com/lagradost/cloudstream3/ui/player/RepoLinkGenerator.kt

@@ -9,8 +9,8 @@ import com.lagradost.cloudstream3.ui.result.ResultEpisode
 import com.lagradost.cloudstream3.utils.AppContextUtils.html
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.ExtractorLinkType
-import java.util.concurrent.ConcurrentHashMap
-import java.util.concurrent.atomic.AtomicInteger
+import kotlin.math.max
+import kotlin.math.min
 
 data class Cache(
     val linkCache: MutableSet<ExtractorLink>,
@@ -23,8 +23,9 @@ data class Cache(
 
 class RepoLinkGenerator(
     episodes: List<ResultEpisode>,
+    currentIndex: Int = 0,
     val page: LoadResponse? = null,
-) : VideoGenerator<ResultEpisode>(episodes) {
+) : VideoGenerator<ResultEpisode>(episodes, currentIndex) {
     companion object {
         const val TAG = "RepoLink"
         val cache: HashMap<Pair<String, Int>, Cache> =
@@ -33,7 +34,6 @@ class RepoLinkGenerator(
 
     override val hasCache = true
     override val canSkipLoading = true
-    override fun getId(index: Int): Int? = videos.getOrNull(index)?.id
 
     // this is a simple array that is used to instantly load links if they are already loaded
     //var linkCache = Array<Set<ExtractorLink>>(size = episodes.size, init = { setOf() })
@@ -48,7 +48,7 @@ class RepoLinkGenerator(
         offset: Int,
         isCasting: Boolean,
     ): Boolean {
-        val current = videos.getOrNull(offset) ?: return false
+        val current = getCurrent(offset) ?: return false
 
         val currentCache = synchronized(cache) {
             cache[current.apiName to current.id] ?: Cache(
@@ -61,12 +61,10 @@ class RepoLinkGenerator(
             }
         }
 
-        // These act as a general filter to prevent duplication of links or names
-        // Avoid any possible ConcurrentModificationException
-        val currentLinksUrls = ConcurrentHashMap.newKeySet<String>()
-        val currentSubsUrls = ConcurrentHashMap.newKeySet<String>()
-        // Use atomics as otherwise we get race conditions when incrementing, while rare it did actually happen!
-        val lastCountedSuffix = ConcurrentHashMap<String, AtomicInteger>()
+        // these act as a general filter to prevent duplication of links or names
+        val currentLinksUrls = mutableSetOf<String>()       // makes all urls unique
+        val currentSubsUrls = mutableSetOf<String>()    // makes all subs urls unique
+        val lastCountedSuffix = mutableMapOf<String, UInt>()
 
         synchronized(currentCache) {
             val outdatedCache =
@@ -77,10 +75,7 @@ class RepoLinkGenerator(
                 currentCache.subtitleCache.clear()
                 currentCache.saturated = false
             } else if (currentCache.linkCache.isNotEmpty()) {
-                Log.d(
-                    TAG,
-                    "Resumed previous loading from ${unixTime - currentCache.lastCachedTimestamp}s ago"
-                )
+                Log.d(TAG, "Resumed previous loading from ${unixTime - currentCache.lastCachedTimestamp}s ago")
             }
 
             // call all callbacks
@@ -93,7 +88,8 @@ class RepoLinkGenerator(
 
             currentCache.subtitleCache.forEach { sub ->
                 currentSubsUrls.add(sub.url)
-                lastCountedSuffix.getOrPut(sub.originalName) { AtomicInteger(0) }.incrementAndGet()
+                val suffixCount = lastCountedSuffix.getOrDefault(sub.originalName, 0u) + 1u
+                lastCountedSuffix[sub.originalName] = suffixCount
                 subtitleCallback(sub)
             }
 
@@ -112,15 +108,17 @@ class RepoLinkGenerator(
             subtitleCallback = { file ->
                 Log.d(TAG, "Loaded SubtitleFile: $file")
                 val correctFile = PlayerSubtitleHelper.getSubtitleData(file)
-                if (correctFile.url.isBlank() || !currentSubsUrls.add(correctFile.url)) {
+                if (correctFile.url.isBlank() || currentSubsUrls.contains(correctFile.url)) {
                     return@loadLinks
                 }
+                currentSubsUrls.add(correctFile.url)
 
                 // this part makes sure that all names are unique for UX
-                val nameDecoded = correctFile.originalName.html().toString()
-                    .trim() // `%3Ch1%3Esub%20name…` → `<h1>sub name…` → `sub name…`
-                val suffixCount =
-                    lastCountedSuffix.getOrPut(nameDecoded) { AtomicInteger(0) }.incrementAndGet()
+
+                val nameDecoded = correctFile.originalName.html().toString().trim() // `%3Ch1%3Esub%20name…` → `<h1>sub name…` → `sub name…`
+
+                val suffixCount = lastCountedSuffix.getOrDefault(nameDecoded, 0u) +1u
+                lastCountedSuffix[nameDecoded] = suffixCount
 
                 val updatedFile =
                     correctFile.copy(originalName = nameDecoded, nameSuffix = "$suffixCount")
@@ -134,9 +132,10 @@ class RepoLinkGenerator(
             },
             callback = { link ->
                 Log.d(TAG, "Loaded ExtractorLink: $link")
-                if (link.url.isBlank() || !currentLinksUrls.add(link.url)) {
+                if (link.url.isBlank() || currentLinksUrls.contains(link.url)) {
                     return@loadLinks
                 }
+                currentLinksUrls.add(link.url)
 
                 synchronized(currentCache) {
                     if (currentCache.linkCache.add(link)) {

app/src/main/java/com/lagradost/cloudstream3/ui/player/UpdatedDefaultExtractorsFactory.kt

@@ -13,7 +13,6 @@ package com.lagradost.cloudstream3.ui.player
 
 import android.net.Uri
 import androidx.annotation.GuardedBy
-import androidx.media3.common.C
 import androidx.media3.common.FileTypes
 import androidx.media3.common.Format
 import androidx.media3.common.util.TimestampAdjuster
@@ -49,6 +48,7 @@ import java.lang.reflect.Constructor
 import java.lang.reflect.InvocationTargetException
 import java.util.concurrent.atomic.AtomicBoolean
 
+
 /**
  * An [ExtractorsFactory] that provides an array of extractors for the following formats:
  *
@@ -103,16 +103,13 @@ class UpdatedDefaultExtractorsFactory : ExtractorsFactory {
     private var tsTimestampSearchBytes: Int
     private var textTrackTranscodingEnabled: Boolean
     private var subtitleParserFactory: SubtitleParser.Factory
-    private var codecsToParseWithinGopSampleDependencies: @C.VideoCodecFlags Int
     private var jpegFlags: @JpegExtractor.Flags Int = 0
-    private var heifFlags: @HeifExtractor.Flags Int = 0
 
     init {
         tsMode = TsExtractor.MODE_SINGLE_PMT
         tsTimestampSearchBytes = TsExtractor.DEFAULT_TIMESTAMP_SEARCH_BYTES
         subtitleParserFactory = DefaultSubtitleParserFactory()
         textTrackTranscodingEnabled = true
-        codecsToParseWithinGopSampleDependencies = C.VIDEO_CODEC_FLAG_H264 or C.VIDEO_CODEC_FLAG_H265
     }
 
     /**
@@ -349,14 +346,6 @@ class UpdatedDefaultExtractorsFactory : ExtractorsFactory {
         return this
     }
 
-    @Synchronized
-    override fun experimentalSetCodecsToParseWithinGopSampleDependencies(
-        codecsToParseWithinGopSampleDependencies: @C.VideoCodecFlags Int
-    ): UpdatedDefaultExtractorsFactory {
-        this.codecsToParseWithinGopSampleDependencies = codecsToParseWithinGopSampleDependencies
-        return this
-    }
-
     /**
      * Sets flags for [JpegExtractor] instances created by the factory.
      *
@@ -372,21 +361,6 @@ class UpdatedDefaultExtractorsFactory : ExtractorsFactory {
         return this
     }
 
-    /**
-     * Sets flags for [HeifExtractor] instances created by the factory.
-     *
-     * @see HeifExtractor.HeifExtractor
-     * @param flags The flags to use.
-     * @return The factory, for convenience.
-     */
-    @Synchronized
-    fun setHeifExtractorFlags(
-        flags: @HeifExtractor.Flags Int
-    ): UpdatedDefaultExtractorsFactory {
-        this.heifFlags = flags
-        return this
-    }
-
     @Synchronized
     override fun createExtractors(): Array<Extractor> {
         return createExtractors(Uri.EMPTY, HashMap())
@@ -494,26 +468,21 @@ class UpdatedDefaultExtractorsFactory : ExtractorsFactory {
                 extractors.add(
                     FragmentedMp4Extractor(
                         subtitleParserFactory,
-                        fragmentedMp4Flags or
-                            FragmentedMp4Extractor
-                                .codecsToParseWithinGopSampleDependenciesAsFlags(
-                                    codecsToParseWithinGopSampleDependencies
-                                ) or
-                        if (textTrackTranscodingEnabled) 0
-                        else FragmentedMp4Extractor.FLAG_EMIT_RAW_SUBTITLE_DATA
+                        fragmentedMp4Flags
+                                or (if (textTrackTranscodingEnabled)
+                            0
+                        else
+                            FragmentedMp4Extractor.FLAG_EMIT_RAW_SUBTITLE_DATA)
                     )
                 )
-
                 extractors.add(
                     Mp4Extractor(
                         subtitleParserFactory,
-                        mp4Flags or
-                            Mp4Extractor
-                                .codecsToParseWithinGopSampleDependenciesAsFlags(
-                                    codecsToParseWithinGopSampleDependencies
-                                ) or
-                        if (textTrackTranscodingEnabled) 0
-                        else Mp4Extractor.FLAG_EMIT_RAW_SUBTITLE_DATA
+                        mp4Flags
+                                or (if (textTrackTranscodingEnabled)
+                            0
+                        else
+                            Mp4Extractor.FLAG_EMIT_RAW_SUBTITLE_DATA)
                     )
                 )
             }
@@ -555,7 +524,12 @@ class UpdatedDefaultExtractorsFactory : ExtractorsFactory {
             FileTypes.PNG -> extractors.add(PngExtractor())
             FileTypes.WEBP -> extractors.add(WebpExtractor())
             FileTypes.BMP -> extractors.add(BmpExtractor())
-            FileTypes.HEIF -> extractors.add(HeifExtractor(heifFlags))
+            FileTypes.HEIF -> if ((mp4Flags and Mp4Extractor.FLAG_READ_MOTION_PHOTO_METADATA) == 0
+                && (mp4Flags and Mp4Extractor.FLAG_READ_SEF_DATA) == 0
+            ) {
+                extractors.add(HeifExtractor())
+            }
+
             FileTypes.AVIF -> extractors.add(AvifExtractor())
             FileTypes.WEBVTT, FileTypes.UNKNOWN -> {}
             else -> {}

app/src/main/java/com/lagradost/cloudstream3/ui/player/live/LiveHelper.kt

@@ -1,77 +0,0 @@
-package com.lagradost.cloudstream3.ui.player.live
-
-import androidx.annotation.OptIn
-import androidx.media3.common.Player
-import androidx.media3.common.Timeline
-import androidx.media3.common.util.UnstableApi
-import com.lagradost.cloudstream3.mvvm.debugWarning
-import java.util.WeakHashMap
-
-object LiveHelper {
-    private val liveManagers = WeakHashMap<Player, Pair<LiveManager, Player.Listener>>()
-
-    @OptIn(UnstableApi::class)
-    fun registerPlayer(player: Player?) {
-        if (player == null) {
-            debugWarning { "LiveHelper registerPlayer called with null player!" }
-            return
-        }
-
-        // Prevent duplicates
-        if (liveManagers.contains(player)) {
-            return
-        }
-
-        val liveManager = LiveManager(player)
-        val listener = object : Player.Listener {
-            override fun onTimelineChanged(timeline: Timeline, reason: Int) {
-                val window = Timeline.Window()
-                timeline.getWindow(player.currentMediaItemIndex, window)
-                if (window.isDynamic) {
-                    liveManager.submitLivestreamChunk(LivestreamChunk(window.durationMs))
-                }
-                super.onTimelineChanged(timeline, reason)
-            }
-
-            override fun onPositionDiscontinuity(
-                oldPosition: Player.PositionInfo,
-                newPosition: Player.PositionInfo,
-                reason: Int
-            ) {
-                super.onPositionDiscontinuity(oldPosition, newPosition, reason)
-                val timeAheadOfLive = liveManager.getTimeAheadOfLive(newPosition.positionMs)
-
-                // Seek back to the optimal live spot
-                if (timeAheadOfLive > 100) {
-                    player.seekTo(newPosition.positionMs - timeAheadOfLive)
-                }
-            }
-        }
-
-        synchronized(liveManagers) {
-            player.addListener(listener)
-            liveManagers[player] = liveManager to listener
-        }
-    }
-
-    fun unregisterPlayer(player: Player?) {
-        if (player == null) {
-            debugWarning { "LiveHelper unregisterPlayer called with null player!" }
-            return
-        }
-
-        // Prevent duplicates
-        if (!liveManagers.contains(player)) {
-            return
-        }
-
-        synchronized(liveManagers) {
-            liveManagers[player]?.let { (_, listener) ->
-                player.removeListener(listener)
-            }
-            liveManagers.remove(player)
-        }
-    }
-
-    fun getLiveManager(player: Player?) = liveManagers[player]?.first
-}

app/src/main/java/com/lagradost/cloudstream3/ui/player/live/LiveManager.kt

@@ -1,97 +0,0 @@
-package com.lagradost.cloudstream3.ui.player.live
-
-import androidx.media3.common.C
-import androidx.media3.common.Player
-import java.lang.ref.WeakReference
-
-// How much margin from the live point is still considered "live"
-const val LIVE_MARGIN = 6_000L
-
-// How many ms should we be behind the real live point?
-// Too low, and we cannot pre-buffer
-// Too high, and we are no longer live
-const val PREFERRED_LIVE_OFFSET = 5_000L
-
-// An extra offset from the optimal calculated timestamp
-// This is to account for chunk updates not always being the same size
-const val CHUNK_VARIANCE = 3000L
-
-// A livestream chunk from the player, the time we get it and the duration can be used to calculate
-// the expected live timestamp.
-class LivestreamChunk(
-    durationMs: Long, val receiveTimeMs: Long = System.currentTimeMillis()
-) {
-    // We want to be PREFERRED_LIVE_OFFSET ms after the latest update, but we cannot be ahead of the middle point.
-    // If we are ahead of the middle point we will reach the end before the new chunk is expected to be released.
-    val targetPosition = maxOf(0,minOf(
-        durationMs - PREFERRED_LIVE_OFFSET,
-        durationMs / 2 - CHUNK_VARIANCE
-    ))
-
-    fun isPositionLive(position: Long): Boolean {
-        val currentTime = System.currentTimeMillis()
-        val livePosition = targetPosition + (currentTime - receiveTimeMs)
-        val withinLive = position + LIVE_MARGIN > livePosition - PREFERRED_LIVE_OFFSET
-        // println("Position: $position, livePosition: ${livePosition}, Behind live: ${livePosition-position}, within live: $withinLive")
-        return withinLive
-    }
-
-    fun getTimeAheadOfLive(position: Long): Long {
-        val currentTime = System.currentTimeMillis()
-        val livePosition = targetPosition + (currentTime - receiveTimeMs)
-        // println("Ahead of live: ${position-livePosition}")
-        return position - livePosition
-    }
-}
-
-// There are two types of livestreams we need to manage
-// 1. A livestream with no history, a continually sliding window.
-// This livestream has no currentLiveOffset, which means we need to calculate
-// the real live point based on when we receive the latest update and the size of that update.
-// 2. A livestream with history.
-// This livestream has a currentLiveOffset and therefore requires no calculation to get the live point.
-// currentLiveOffset can however be inaccurate, and we need to be able to fall back to manual calculations.
-class LiveManager {
-    private var _currentPlayer: WeakReference<Player>? = null
-    val currentPlayer: Player? get() = _currentPlayer?.get()
-
-    constructor(player: Player?) {
-        _currentPlayer = WeakReference(player)
-    }
-
-    private var lastLivestreamChunk: LivestreamChunk? = null
-
-    fun submitLivestreamChunk(chunk: LivestreamChunk) {
-        lastLivestreamChunk = chunk
-    }
-
-    /** Returns how much a position is ahead of the calculated live window. Returns 0 if not ahead of live window */
-    fun getTimeAheadOfLive(position: Long): Long {
-        val player = currentPlayer ?: return 0
-        if (!player.isCurrentMediaItemDynamic || player.duration == C.TIME_UNSET) return 0
-
-        // If the currentLiveOffset is wrong we fall back to manual calculations
-        val ahead = if (player.currentLiveOffset != C.TIME_UNSET && player.currentLiveOffset < player.duration) {
-            val relativeOffset = player.currentLiveOffset - player.currentPosition + position
-            PREFERRED_LIVE_OFFSET - relativeOffset
-        } else {
-            lastLivestreamChunk?.getTimeAheadOfLive(position) ?: 0
-        }
-
-        // Ensure min of 0
-        return maxOf(0, ahead)
-    }
-
-    /** Check if the stream is currently at the expected live edge, with margins */
-    fun isAtLiveEdge(): Boolean {
-        val player = currentPlayer ?: return false
-        if (!player.isCurrentMediaItemDynamic || player.duration == C.TIME_UNSET) return false
-
-        // If the currentLiveOffset is wrong we fall back to manual calculations
-        return if (player.currentLiveOffset != C.TIME_UNSET && player.currentLiveOffset < player.duration) {
-            player.currentLiveOffset < LIVE_MARGIN + PREFERRED_LIVE_OFFSET
-        } else {
-            lastLivestreamChunk?.isPositionLive(player.currentPosition) == true
-        }
-    }
-}

app/src/main/java/com/lagradost/cloudstream3/ui/player/live/LivePreviewTimeBar.kt

@@ -1,38 +0,0 @@
-package com.lagradost.cloudstream3.ui.player.live
-
-import android.content.Context
-import android.util.AttributeSet
-import androidx.annotation.OptIn
-import androidx.media3.common.Player
-import androidx.media3.common.util.UnstableApi
-import androidx.media3.ui.PlayerControlView
-import androidx.media3.ui.PlayerView
-import androidx.media3.ui.R
-import com.github.rubensousa.previewseekbar.media3.PreviewTimeBar
-import java.lang.ref.WeakReference
-
-
-@OptIn(UnstableApi::class)
-class LivePreviewTimeBar(val ctx: Context, attrs: AttributeSet) : PreviewTimeBar(ctx, attrs) {
-
-    private var _currentPlayerView: WeakReference<PlayerView>? = null
-    val currentPlayer: Player? get() = _currentPlayerView?.get()?.player
-
-    fun registerPlayerView(player: PlayerView?) {
-        _currentPlayerView = WeakReference(player)
-        val controller =
-            _currentPlayerView?.get()?.findViewById<PlayerControlView>(R.id.exo_controller)
-
-        controller?.setProgressUpdateListener { position, bufferedPosition ->
-            currentPlayer?.let { player ->
-                if (isAtLiveEdge()) {
-                    setPosition(player.duration)
-                }
-            }
-        }
-    }
-
-    fun isAtLiveEdge(): Boolean {
-        return LiveHelper.getLiveManager(currentPlayer)?.isAtLiveEdge() == true
-    }
-}

app/src/main/java/com/lagradost/cloudstream3/ui/player/source_priority/ProfilesAdapter.kt

@@ -20,7 +20,7 @@ import com.lagradost.cloudstream3.utils.drawableToBitmap
 import com.lagradost.cloudstream3.utils.setText
 
 class ProfilesAdapter(
-    val usedProfile: Int?,
+    val usedProfile: Int,
     val clickCallback: (oldIndex: Int?, newIndex: Int) -> Unit,
 ) :
     NoStateAdapter<QualityDataHelper.QualityProfile>(diffCallback = BaseDiffCallback(itemSame = { a, b ->
@@ -68,27 +68,25 @@ class ProfilesAdapter(
         val profileBg: ImageView = binding.profileImageBackground
         val wifiText: TextView = binding.textIsWifi
         val dataText: TextView = binding.textIsMobileData
-        val downloadText: TextView = binding.textIsDownloadData
         val outline: View = binding.outline
         val cardView: View = binding.cardView
         val itemView = holder.itemView
 
         priorityText.setText(item.name)
-        dataText.isVisible = item.types.contains(QualityDataHelper.QualityProfileType.Data)
-        wifiText.isVisible = item.types.contains(QualityDataHelper.QualityProfileType.WiFi)
-        downloadText.isVisible = item.types.contains(QualityDataHelper.QualityProfileType.Download)
+        dataText.isVisible = item.type == QualityDataHelper.QualityProfileType.Data
+        wifiText.isVisible = item.type == QualityDataHelper.QualityProfileType.WiFi
 
         fun setCurrentItem() {
-            val prevIndex = currentItem
+            val prevIndex = currentItem?.first
             // Prevent UI bug when re-selecting the item quickly
             if (prevIndex == position) {
                 return
             }
-            currentItem = position
+            currentItem = position to item
             clickCallback.invoke(prevIndex, position)
         }
 
-        outline.isVisible = currentItem == position
+        outline.isVisible = currentItem?.second?.id == item.id
         val drawableResId = art[position % art.size]
         profileBg.loadImage(drawableResId)
 
@@ -109,7 +107,6 @@ class ProfilesAdapter(
                     if (color != null) {
                         wifiText.backgroundTintList = ColorStateList.valueOf(color)
                         dataText.backgroundTintList = ColorStateList.valueOf(color)
-                        downloadText.backgroundTintList = ColorStateList.valueOf(color)
                     }
                 }
             }
@@ -129,9 +126,9 @@ class ProfilesAdapter(
         }
     }
 
-    private var currentItem: Int? = null
+    private var currentItem: Pair<Int, QualityDataHelper.QualityProfile>? = null
 
     fun getCurrentProfile(): QualityDataHelper.QualityProfile? {
-        return currentItem?.let { index -> immutableCurrentList.getOrNull(index) }
+        return currentItem?.second
     }
 }

app/src/main/java/com/lagradost/cloudstream3/ui/player/source_priority/QualityDataHelper.kt

@@ -2,7 +2,6 @@ package com.lagradost.cloudstream3.ui.player.source_priority
 
 import androidx.annotation.StringRes
 import com.lagradost.cloudstream3.CloudStreamApp.Companion.getKey
-import com.lagradost.cloudstream3.CloudStreamApp.Companion.getKeys
 import com.lagradost.cloudstream3.CloudStreamApp.Companion.removeKey
 import com.lagradost.cloudstream3.CloudStreamApp.Companion.setKey
 import com.lagradost.cloudstream3.R
@@ -10,23 +9,14 @@ import com.lagradost.cloudstream3.mvvm.debugAssert
 import com.lagradost.cloudstream3.utils.UiText
 import com.lagradost.cloudstream3.utils.txt
 import com.lagradost.cloudstream3.utils.DataStoreHelper.currentAccount
-import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.Qualities
-import kotlin.math.abs
 
 object QualityDataHelper {
     private const val VIDEO_SOURCE_PRIORITY = "video_source_priority"
     private const val VIDEO_PROFILE_NAME = "video_profile_name"
     private const val VIDEO_QUALITY_PRIORITY = "video_quality_priority"
-
-    // Old key only supporting one type per profile
-    @Deprecated("Changed to support multiple types per profile")
     private const val VIDEO_PROFILE_TYPE = "video_profile_type"
-    // New key supporting more than one type per profile
-
-    private const val VIDEO_PROFILE_TYPES = "video_profile_types_2"
     private const val DEFAULT_SOURCE_PRIORITY = 1
-
     /**
      * Automatically skip loading links once this priority is reached
      **/
@@ -43,14 +33,13 @@ object QualityDataHelper {
     enum class QualityProfileType(@StringRes val stringRes: Int, val unique: Boolean) {
         None(R.string.none, false),
         WiFi(R.string.wifi, true),
-        Data(R.string.mobile_data, true),
-        Download(R.string.download, true)
+        Data(R.string.mobile_data, true)
     }
 
     data class QualityProfile(
         val name: UiText,
         val id: Int,
-        val types: Set<QualityProfileType>
+        val type: QualityProfileType
     )
 
     fun getSourcePriority(profile: Int, name: String?): Int {
@@ -62,21 +51,8 @@ object QualityDataHelper {
         ) ?: DEFAULT_SOURCE_PRIORITY
     }
 
-    fun getAllSourcePriorityNames(profile: Int): List<String> {
-        val folder = "$currentAccount/$VIDEO_SOURCE_PRIORITY/$profile"
-        return getKeys(folder)?.map { key ->
-            key.substringAfter("$folder/")
-        } ?: emptyList()
-    }
-
     fun setSourcePriority(profile: Int, name: String, priority: Int) {
-        val folder = "$currentAccount/$VIDEO_SOURCE_PRIORITY/$profile"
-        // Prevent unnecessary keys
-        if (priority == DEFAULT_SOURCE_PRIORITY) {
-            removeKey(folder, name)
-        } else {
-            setKey(folder, name, priority)
-        }
+        setKey("$currentAccount/$VIDEO_SOURCE_PRIORITY/$profile", name, priority)
     }
 
     fun setProfileName(profile: Int, name: String?) {
@@ -109,40 +85,16 @@ object QualityDataHelper {
         )
     }
 
+    fun getQualityProfileType(profile: Int): QualityProfileType {
+        return getKey("$currentAccount/$VIDEO_PROFILE_TYPE/$profile") ?: QualityProfileType.None
+    }
 
-    @Suppress("DEPRECATION")
-    fun getQualityProfileTypes(profile: Int): Set<QualityProfileType> {
-        val newKey = "$currentAccount/$VIDEO_PROFILE_TYPES/$profile"
-        // Use arrays for to make with work with setKey properly (weird crashes otherwise)
-        val newProfiles = getKey<Array<QualityProfileType>>(newKey)?.toSet()
-
-        // Migrate to new profile key
-        if (newProfiles == null) {
-            val oldProfile =
-                getKey<QualityProfileType>("$currentAccount/$VIDEO_PROFILE_TYPE/$profile")
-            val newSet = oldProfile?.let { arrayOf(it) } ?: arrayOf()
-            setKey(newKey, newSet)
-            return newSet.toSet()
+    fun setQualityProfileType(profile: Int, type: QualityProfileType?) {
+        val path = "$currentAccount/$VIDEO_PROFILE_TYPE/$profile"
+        if (type == QualityProfileType.None) {
+            removeKey(path)
         } else {
-            return newProfiles
-        }
-    }
-
-    fun addQualityProfileType(profile: Int, type: QualityProfileType) {
-        val path = "$currentAccount/$VIDEO_PROFILE_TYPES/$profile"
-        val currentTypes = getQualityProfileTypes(profile)
-
-        if (type != QualityProfileType.None) {
-            setKey(path, (currentTypes + type).toTypedArray())
-        }
-    }
-
-    fun removeQualityProfileType(profile: Int, type: QualityProfileType) {
-        val path = "$currentAccount/$VIDEO_PROFILE_TYPES/$profile"
-        val currentTypes = getQualityProfileTypes(profile)
-
-        if (type != QualityProfileType.None) {
-            setKey(path, (currentTypes - type).toTypedArray())
+            setKey(path, type)
         }
     }
 
@@ -154,39 +106,37 @@ object QualityDataHelper {
         val availableTypes = QualityProfileType.entries.toMutableList()
         val profiles = (1..PROFILE_COUNT).map { profileNumber ->
             // Get the real type
-            val types = getQualityProfileTypes(profileNumber)
+            val type = getQualityProfileType(profileNumber)
 
-            val uniqueTypes = types.mapNotNull { type ->
-                // This makes it impossible to get more than one of each type
-                if (type.unique && !availableTypes.remove(type)) {
-                    null
-                } else {
-                    type
-                }
-            }.toSet()
+            // This makes it impossible to get more than one of each type
+            // Duplicates will be turned to None
+            val uniqueType = if (type.unique && !availableTypes.remove(type)) {
+                QualityProfileType.None
+            } else {
+                type
+            }
 
             QualityProfile(
                 getProfileName(profileNumber),
                 profileNumber,
-                uniqueTypes
+                uniqueType
             )
         }.toMutableList()
 
         /**
-         * If no profile of this type exists: insert it on the earliest profile
+         * If no profile of this type exists: insert it on the earliest profile with None type
          **/
         fun insertType(
             list: MutableList<QualityProfile>,
             type: QualityProfileType
         ) {
-            if (list.any { it.types.contains(type) }) return
-
-            synchronized(list) {
-                val firstItem = list.firstOrNull() ?: return
-                val fixedTypes = firstItem.types + type
-                val fixedItem = firstItem.copy(types = fixedTypes)
-                list.set(0, fixedItem)
-            }
+            if (list.any { it.type == type }) return
+            val index =
+                list.indexOfFirst { it.type == QualityProfileType.None }
+            list.getOrNull(index)?.copy(type = type)
+                ?.let { fixed ->
+                    list.set(index, fixed)
+                }
         }
 
         QualityProfileType.entries.forEach {
@@ -195,7 +145,7 @@ object QualityDataHelper {
 
         debugAssert({
             !QualityProfileType.entries.all { type ->
-                !type.unique || profiles.any { it.types.contains(type) }
+                !type.unique || profiles.any { it.type == type }
             }
         }, { "All unique quality types do not exist" })
 
@@ -205,22 +155,4 @@ object QualityDataHelper {
 
         return profiles
     }
-
-    fun getLinkPriority(
-        qualityProfile: Int,
-        linkData: ExtractorLink?
-    ): Int {
-        val qualityPriority = getQualityPriority(
-            qualityProfile,
-            closestQuality(linkData?.quality)
-        )
-        val sourcePriority = getSourcePriority(qualityProfile, linkData?.source)
-
-        return qualityPriority + sourcePriority
-    }
-
-    private fun closestQuality(target: Int?): Qualities {
-        if (target == null) return Qualities.Unknown
-        return Qualities.entries.minBy { abs(it.value - target) }
-    }
 }

app/src/main/java/com/lagradost/cloudstream3/ui/player/source_priority/QualityProfileDialog.kt

@@ -2,74 +2,45 @@ package com.lagradost.cloudstream3.ui.player.source_priority
 
 import android.app.Dialog
 import androidx.annotation.StyleRes
-import androidx.core.view.isVisible
 import androidx.fragment.app.FragmentActivity
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.databinding.PlayerQualityProfileDialogBinding
-import com.lagradost.cloudstream3.ui.player.source_priority.QualityDataHelper.getAllSourcePriorityNames
 import com.lagradost.cloudstream3.ui.player.source_priority.QualityDataHelper.getProfileName
 import com.lagradost.cloudstream3.ui.player.source_priority.QualityDataHelper.getProfiles
-import com.lagradost.cloudstream3.utils.Coroutines.ioWork
 import com.lagradost.cloudstream3.utils.txt
 import com.lagradost.cloudstream3.utils.ExtractorLink
-import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showMultiDialog
+import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialog
 import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
 import com.lagradost.cloudstream3.utils.UIHelper.fixSystemBarsPadding
 import com.lagradost.cloudstream3.utils.setText
 
-/** Simplified ExtractorLink for the quality profile dialog */
-data class LinkSource(
-    val source: String
-) {
-    constructor(extractorLink: ExtractorLink) : this(extractorLink.source)
-}
-
-
-class QualityProfileDialog private constructor(
+class QualityProfileDialog(
     val activity: FragmentActivity,
     @StyleRes val themeRes: Int,
-    private val links: List<LinkSource>,
-    private val usedProfile: Int?,
-    private val profileSelectionCallback: ((QualityDataHelper.QualityProfile) -> Unit)?,
-    private val useProfileSelection: Boolean
+    private val links: List<ExtractorLink>,
+    private val usedProfile: Int,
+    private val profileSelectionCallback: (QualityDataHelper.QualityProfile) -> Unit
 ) : Dialog(activity, themeRes) {
-    constructor(
-        activity: FragmentActivity,
-        @StyleRes themeRes: Int,
-        links: List<LinkSource>,
-        usedProfile: Int,
-        profileSelectionCallback: ((QualityDataHelper.QualityProfile) -> Unit),
-    ) : this(activity, themeRes, links, usedProfile, profileSelectionCallback, true)
-
-    constructor(
-        activity: FragmentActivity,
-        @StyleRes themeRes: Int,
-        links: List<LinkSource>
-    ) : this(activity, themeRes, links, null, null, false)
-
-    companion object {
-        // Run on IO as this may be a heavy operation
-        suspend fun getAllDefaultSources(): List<LinkSource> = ioWork {
-            getProfiles().flatMap {
-                getAllSourcePriorityNames(it.id)
-            }.distinct().map { LinkSource(it) }
-        }
-    }
-
     override fun show() {
+
         val binding = PlayerQualityProfileDialogBinding.inflate(this.layoutInflater, null, false)
 
-        setContentView(binding.root)
+        setContentView(binding.root)//R.layout.player_quality_profile_dialog)
         fixSystemBarsPadding(binding.root)
+        /*val profilesRecyclerView: RecyclerView = profiles_recyclerview
+        val useBtt: View = use_btt
+        val editBtt: View = edit_btt
+        val cancelBtt: View = cancel_btt
+        val defaultBtt: View = set_default_btt
+        val currentProfileText: TextView = currently_selected_profile_text
+        val selectedItemActionsHolder: View = selected_item_holder*/
         binding.apply {
             fun getCurrentProfile(): QualityDataHelper.QualityProfile? {
                 return (profilesRecyclerview.adapter as? ProfilesAdapter)?.getCurrentProfile()
             }
 
             fun refreshProfiles() {
-                if (usedProfile != null) {
-                    currentlySelectedProfileText.setText(getProfileName(usedProfile))
-                }
+                currentlySelectedProfileText.setText(getProfileName(usedProfile))
                 (profilesRecyclerview.adapter as? ProfilesAdapter)?.submitList(getProfiles())
             }
 
@@ -96,52 +67,37 @@ class QualityProfileDialog private constructor(
 
             setDefaultBtt.setOnClickListener {
                 val currentProfile = getCurrentProfile() ?: return@setOnClickListener
-                val choices =
-                    QualityDataHelper.QualityProfileType.entries.filter { it != QualityDataHelper.QualityProfileType.None }
+                val choices = QualityDataHelper.QualityProfileType.entries
+                    .filter { it != QualityDataHelper.QualityProfileType.None }
                 val choiceNames = choices.map { txt(it.stringRes).asString(context) }
-                val selectedIndices = choices.mapIndexed { index, type -> index to type }
-                    .filter { currentProfile.types.contains(it.second) }.map { it.first }
 
-                activity.showMultiDialog(
+                activity.showBottomDialog(
                     choiceNames,
-                    selectedIndices,
+                    choices.indexOf(currentProfile.type),
                     txt(R.string.set_default).asString(context),
+                    false,
                     {},
                     { index ->
-                        val pickedChoices = index.mapNotNull { choices.getOrNull(it) }
-
-                        pickedChoices.forEach { pickedChoice ->
-                            // Remove previous picks
-                            if (pickedChoice.unique) {
-                                getProfiles().filter { it.types.contains(pickedChoice) }.forEach {
-                                    QualityDataHelper.removeQualityProfileType(it.id, pickedChoice)
-                                }
+                        val pickedChoice = choices.getOrNull(index) ?: return@showBottomDialog
+                        // Remove previous picks
+                        if (pickedChoice.unique) {
+                            getProfiles().filter { it.type == pickedChoice }.forEach {
+                                QualityDataHelper.setQualityProfileType(it.id, null)
                             }
-
-                            QualityDataHelper.addQualityProfileType(currentProfile.id, pickedChoice)
                         }
 
+                        QualityDataHelper.setQualityProfileType(currentProfile.id, pickedChoice)
                         refreshProfiles()
                     })
             }
 
-            cancelBtt.isVisible = useProfileSelection
-            useBtt.isVisible = useProfileSelection
-            applyBtt.isVisible = !useProfileSelection
+            cancelBtt.setOnClickListener {
+                this@QualityProfileDialog.dismissSafe()
+            }
 
-            if (useProfileSelection) {
-                cancelBtt.setOnClickListener {
-                    this@QualityProfileDialog.dismissSafe()
-                }
-
-                useBtt.setOnClickListener {
-                    getCurrentProfile()?.let {
-                        profileSelectionCallback?.invoke(it)
-                        this@QualityProfileDialog.dismissSafe()
-                    }
-                }
-            } else {
-                applyBtt.setOnClickListener {
+            useBtt.setOnClickListener {
+                getCurrentProfile()?.let {
+                    profileSelectionCallback.invoke(it)
                     this@QualityProfileDialog.dismissSafe()
                 }
             }

app/src/main/java/com/lagradost/cloudstream3/ui/player/source_priority/SourcePriorityDialog.kt

@@ -8,6 +8,7 @@ import androidx.appcompat.app.AlertDialog
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.databinding.PlayerSelectSourcePriorityBinding
 import com.lagradost.cloudstream3.utils.txt
+import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.Qualities
 import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
 import com.lagradost.cloudstream3.utils.UIHelper.fixSystemBarsPadding
@@ -15,7 +16,7 @@ import com.lagradost.cloudstream3.utils.UIHelper.fixSystemBarsPadding
 class SourcePriorityDialog(
     val ctx: Context,
     @StyleRes themeRes: Int,
-    val links: List<LinkSource>,
+    val links: List<ExtractorLink>,
     private val profile: QualityDataHelper.QualityProfile,
     /**
      * Notify that the profile overview should be updated, for example if the name has been updated

app/src/main/java/com/lagradost/cloudstream3/ui/quicksearch/QuickSearchFragment.kt

@@ -32,7 +32,6 @@ import com.lagradost.cloudstream3.ui.search.SearchAdapter
 import com.lagradost.cloudstream3.ui.search.SearchClickCallback
 import com.lagradost.cloudstream3.ui.search.SearchHelper
 import com.lagradost.cloudstream3.ui.search.SearchViewModel
-import com.lagradost.cloudstream3.ui.setRecycledViewPool
 import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR
 import com.lagradost.cloudstream3.ui.settings.Globals.PHONE
 import com.lagradost.cloudstream3.ui.settings.Globals.TV

app/src/main/java/com/lagradost/cloudstream3/ui/result/ActorAdaptor.kt

@@ -6,6 +6,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.core.view.isVisible
+import androidx.recyclerview.widget.RecyclerView
 import com.lagradost.cloudstream3.ActorData
 import com.lagradost.cloudstream3.ActorRole
 import com.lagradost.cloudstream3.R
@@ -13,7 +14,6 @@ import com.lagradost.cloudstream3.databinding.CastItemBinding
 import com.lagradost.cloudstream3.ui.BaseDiffCallback
 import com.lagradost.cloudstream3.ui.NoStateAdapter
 import com.lagradost.cloudstream3.ui.ViewHolderState
-import com.lagradost.cloudstream3.ui.newSharedPool
 import com.lagradost.cloudstream3.ui.settings.Globals.PHONE
 import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
 import com.lagradost.cloudstream3.utils.ImageLoader.loadImage
@@ -26,7 +26,7 @@ class ActorAdaptor(
 })) {
     companion object {
         val sharedPool =
-            newSharedPool { setMaxRecycledViews(CONTENT, 10) }
+            RecyclerView.RecycledViewPool().apply { this.setMaxRecycledViews(CONTENT, 10) }
     }
 
     // Easier to store it here than to store it in the ActorData

app/src/main/java/com/lagradost/cloudstream3/ui/result/EpisodeAdapter.kt

@@ -1,5 +1,6 @@
 package com.lagradost.cloudstream3.ui.result
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.ViewGroup
@@ -7,6 +8,8 @@ import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import androidx.core.view.setPadding
 import androidx.preference.PreferenceManager
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.RecyclerView
 import coil3.dispose
 import com.lagradost.cloudstream3.APIHolder.unixTimeMS
 import com.lagradost.cloudstream3.CommonActivity
@@ -21,7 +24,6 @@ import com.lagradost.cloudstream3.ui.ViewHolderState
 import com.lagradost.cloudstream3.ui.download.DOWNLOAD_ACTION_DOWNLOAD
 import com.lagradost.cloudstream3.ui.download.DOWNLOAD_ACTION_LONG_CLICK
 import com.lagradost.cloudstream3.ui.download.DownloadClickEvent
-import com.lagradost.cloudstream3.ui.newSharedPool
 import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR
 import com.lagradost.cloudstream3.ui.settings.Globals.PHONE
 import com.lagradost.cloudstream3.ui.settings.Globals.TV
@@ -30,8 +32,7 @@ import com.lagradost.cloudstream3.utils.AppContextUtils.html
 import com.lagradost.cloudstream3.utils.Coroutines.main
 import com.lagradost.cloudstream3.utils.ImageLoader.loadImage
 import com.lagradost.cloudstream3.utils.UIHelper.toPx
-import com.lagradost.cloudstream3.utils.downloader.DownloadObjects
-import com.lagradost.cloudstream3.utils.downloader.VideoDownloadManager
+import com.lagradost.cloudstream3.utils.VideoDownloadHelper
 import com.lagradost.cloudstream3.utils.setText
 import com.lagradost.cloudstream3.utils.txt
 import java.text.DateFormat
@@ -91,10 +92,11 @@ class EpisodeAdapter(
         }
 
         val sharedPool =
-            newSharedPool {
-                setMaxRecycledViews(HAS_POSTER or CONTENT, 10)
-                setMaxRecycledViews(HAS_NO_POSTER or CONTENT, 10)
-            }
+            RecyclerView.RecycledViewPool()
+                .apply {
+                    this.setMaxRecycledViews(HAS_POSTER or CONTENT, 10)
+                    this.setMaxRecycledViews(HAS_NO_POSTER or CONTENT, 10)
+                }
     }
 
     override fun onClearView(holder: ViewHolderState<Any>) {
@@ -158,7 +160,7 @@ class EpisodeAdapter(
 
                     downloadButton.isVisible = hasDownloadSupport
                     downloadButton.setDefaultClickListener(
-                        DownloadObjects.DownloadEpisodeCached(
+                        VideoDownloadHelper.DownloadEpisodeCached(
                             name = item.name,
                             poster = item.poster,
                             episode = item.episode,
@@ -197,11 +199,6 @@ class EpisodeAdapter(
                         }
                     }
 
-                    val status = VideoDownloadManager.downloadStatus[item.id]
-                    downloadButton.resetView()
-                    downloadButton.setPersistentId(item.id)
-                    downloadButton.setStatus(status)
-
                     val name =
                         if (item.name == null) "${episodeText.context.getString(R.string.episode)} ${item.episode}" else "${item.episode}. ${item.name}"
                     episodeFiller.isVisible = item.isFiller == true
@@ -379,7 +376,7 @@ class EpisodeAdapter(
                 binding.apply {
                     downloadButton.isVisible = hasDownloadSupport
                     downloadButton.setDefaultClickListener(
-                        DownloadObjects.DownloadEpisodeCached(
+                        VideoDownloadHelper.DownloadEpisodeCached(
                             name = item.name,
                             poster = item.poster,
                             episode = item.episode,
@@ -418,11 +415,6 @@ class EpisodeAdapter(
                         }
                     }
 
-                    val status = VideoDownloadManager.downloadStatus[item.id]
-                    downloadButton.resetView()
-                    downloadButton.setPersistentId(item.id)
-                    downloadButton.setStatus(status)
-
                     val name =
                         if (item.name == null) "${episodeText.context.getString(R.string.episode)} ${item.episode}" else "${item.episode}. ${item.name}"
                     episodeFiller.isVisible = item.isFiller == true

app/src/main/java/com/lagradost/cloudstream3/ui/result/ImageAdapter.kt

@@ -2,11 +2,11 @@ package com.lagradost.cloudstream3.ui.result
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
 import com.lagradost.cloudstream3.databinding.ResultMiniImageBinding
 import com.lagradost.cloudstream3.ui.BaseDiffCallback
 import com.lagradost.cloudstream3.ui.NoStateAdapter
 import com.lagradost.cloudstream3.ui.ViewHolderState
-import com.lagradost.cloudstream3.ui.newSharedPool
 import com.lagradost.cloudstream3.ui.settings.Globals.TV
 import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
 import com.lagradost.cloudstream3.utils.ImageLoader.loadImage
@@ -27,7 +27,7 @@ class ImageAdapter(
     ) {
     companion object {
         val sharedPool =
-            newSharedPool { setMaxRecycledViews(CONTENT, 10) }
+            RecyclerView.RecycledViewPool().apply { this.setMaxRecycledViews(CONTENT, 10) }
     }
 
     override fun onCreateContent(parent: ViewGroup): ViewHolderState<Any> {

app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt

@@ -4,11 +4,12 @@ import android.annotation.SuppressLint
 import android.app.Dialog
 import android.content.Intent
 import android.content.res.ColorStateList
+import android.content.res.Configuration
 import android.graphics.Rect
-import android.net.Uri
 import android.os.Build
 import android.os.Bundle
 import android.text.Editable
+import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.animation.AlphaAnimation
@@ -17,19 +18,18 @@ import android.view.animation.DecelerateInterpolator
 import android.widget.AbsListView
 import android.widget.ArrayAdapter
 import android.widget.Toast
-import androidx.appcompat.app.AlertDialog
 import androidx.core.view.isGone
 import androidx.core.view.isInvisible
 import androidx.core.view.isVisible
 import androidx.core.widget.NestedScrollView
 import androidx.core.widget.doOnTextChanged
 import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.viewModelScope
 import com.discord.panels.OverlappingPanelsLayout
 import com.discord.panels.PanelState
 import com.discord.panels.PanelsChildGestureRegionObserver
 import com.google.android.gms.cast.framework.CastButtonFactory
 import com.google.android.gms.cast.framework.CastContext
+import com.google.android.gms.cast.framework.CastState
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.button.MaterialButton
 import com.lagradost.cloudstream3.APIHolder
@@ -45,34 +45,25 @@ import com.lagradost.cloudstream3.databinding.FragmentResultBinding
 import com.lagradost.cloudstream3.databinding.FragmentResultSwipeBinding
 import com.lagradost.cloudstream3.databinding.ResultRecommendationsBinding
 import com.lagradost.cloudstream3.databinding.ResultSyncBinding
-import com.lagradost.cloudstream3.databinding.TrailerCustomLayoutBinding
 import com.lagradost.cloudstream3.mvvm.Resource
-import com.lagradost.cloudstream3.mvvm.launchSafe
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.mvvm.observe
 import com.lagradost.cloudstream3.mvvm.observeNullable
 import com.lagradost.cloudstream3.mvvm.safe
 import com.lagradost.cloudstream3.services.SubscriptionWorkManager
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.APP_STRING_SHARE
-import com.lagradost.cloudstream3.ui.BaseFragment
 import com.lagradost.cloudstream3.ui.WatchType
 import com.lagradost.cloudstream3.ui.download.DOWNLOAD_ACTION_DOWNLOAD
 import com.lagradost.cloudstream3.ui.download.DOWNLOAD_ACTION_LONG_CLICK
 import com.lagradost.cloudstream3.ui.download.DownloadButtonSetup
-import com.lagradost.cloudstream3.ui.player.CS3IPlayer
 import com.lagradost.cloudstream3.ui.player.CSPlayerEvent
-import com.lagradost.cloudstream3.ui.player.IPlayer
-import com.lagradost.cloudstream3.ui.player.PlayerView
-import com.lagradost.cloudstream3.ui.player.source_priority.QualityProfileDialog
+import com.lagradost.cloudstream3.ui.player.FullScreenPlayer
 import com.lagradost.cloudstream3.ui.quicksearch.QuickSearchFragment
 import com.lagradost.cloudstream3.ui.result.ResultFragment.bindLogo
 import com.lagradost.cloudstream3.ui.result.ResultFragment.getStoredData
 import com.lagradost.cloudstream3.ui.result.ResultFragment.updateUIEvent
 import com.lagradost.cloudstream3.ui.search.SearchAdapter
 import com.lagradost.cloudstream3.ui.search.SearchHelper
-import com.lagradost.cloudstream3.ui.setRecycledViewPool
-import com.lagradost.cloudstream3.ui.settings.SettingsGeneral.Companion.pickDownloadPath
-import com.lagradost.cloudstream3.ui.settings.utils.getChooseFolderLauncher
 import com.lagradost.cloudstream3.utils.AppContextUtils.getNameFull
 import com.lagradost.cloudstream3.utils.AppContextUtils.isCastApiAvailable
 import com.lagradost.cloudstream3.utils.AppContextUtils.loadCache
@@ -81,7 +72,6 @@ import com.lagradost.cloudstream3.utils.AppContextUtils.updateHasTrailers
 import com.lagradost.cloudstream3.utils.BackPressedCallbackHelper.attachBackPressedCallback
 import com.lagradost.cloudstream3.utils.BackPressedCallbackHelper.detachBackPressedCallback
 import com.lagradost.cloudstream3.utils.BatteryOptimizationChecker.openBatteryOptimizationSettings
-import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.ImageLoader.loadImage
 import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialog
@@ -97,20 +87,14 @@ import com.lagradost.cloudstream3.utils.UIHelper.populateChips
 import com.lagradost.cloudstream3.utils.UIHelper.popupMenuNoIconsAndNoStringRes
 import com.lagradost.cloudstream3.utils.UIHelper.setListViewHeightBasedOnItems
 import com.lagradost.cloudstream3.utils.UIHelper.setNavigationBarColorCompat
-import com.lagradost.cloudstream3.utils.downloader.DownloadFileManagement.getBasePath
-import com.lagradost.cloudstream3.utils.downloader.DownloadObjects
-import com.lagradost.cloudstream3.utils.downloader.VideoDownloadManager
+import com.lagradost.cloudstream3.utils.VideoDownloadHelper
 import com.lagradost.cloudstream3.utils.getImageFromDrawable
 import com.lagradost.cloudstream3.utils.setText
 import com.lagradost.cloudstream3.utils.setTextHtml
-import com.lagradost.cloudstream3.utils.txt
 import java.net.URLEncoder
-import java.util.concurrent.ConcurrentLinkedDeque
 import kotlin.math.roundToInt
 
-open class ResultFragmentPhone : BaseFragment<FragmentResultSwipeBinding>(
-    BindingCreator.Inflate(FragmentResultSwipeBinding::inflate)
-), PlayerView.Callbacks {
+open class ResultFragmentPhone : FullScreenPlayer() {
     private val gestureRegionsListener =
         object : PanelsChildGestureRegionObserver.GestureRegionsListener {
             override fun onGestureRegionsUpdate(gestureRegions: List<Rect>) {
@@ -118,105 +102,34 @@ open class ResultFragmentPhone : BaseFragment<FragmentResultSwipeBinding>(
             }
         }
 
-    /** Queue of pending actions that is deferred to after a custom path is set */
-    private val pendingPathActions = ConcurrentLinkedDeque<Pair<Int, ResultEpisode>>()
-
-    /**
-     * Appends all actions to a queue, and asks for a user to enter the download folder if not already set up.
-     *
-     * Then processes the queue in the given order, only after the user has selected a folder.
-     * This is to defer the download to after a file path is set, due to perms.
-     * */
-    private fun requirePathForActions(list: Collection<Pair<Int, ResultEpisode>>) {
-        pendingPathActions.addAll(list)
-        val (_, path) = context?.getBasePath() ?: return
-        if (path == null) {
-            /** If we have not set any download path, then ask the user for it before we download it */
-            try {
-                /** Give the user some info of what we are doing and why, even if it may be missed */
-                showToast(R.string.download_path_pref)
-                pathPicker.launch(Uri.EMPTY)
-            } catch (t: Throwable) {
-                logError(t)
-                /** Something went wrong, TV Device?
-                 * Use the fallback behavior of just downloading it even if no path is selected,
-                 * and hope it works */
-                processPendingActions()
-            }
-        } else {
-            /**
-             * Otherwise dispatch everything, as we already have a valid download path
-             * Even if this is "wrong", we do not care as the user has entered something
-             * */
-            processPendingActions()
-        }
-    }
-
-    /** Clear all the items in the queue and dispatch them to the viewmodel in order */
-    private fun processPendingActions() = viewModel.viewModelScope.launchSafe {
-        while (!pendingPathActions.isEmpty()) {
-            try {
-                val (action, data) = pendingPathActions.pop()
-                viewModel.handleAction(
-                    EpisodeClickEvent(
-                        action,
-                        data
-                    )
-                )
-            } catch (_: NoSuchElementException) {
-                /** In case of a race */
-            }
-        }
-    }
-
-    private val pathPicker = getChooseFolderLauncher { uri, path ->
-        if (uri == null) {
-            /** No path selected, clear the list without acting on it, canceling */
-            if (!pendingPathActions.isEmpty()) {
-                /** Only show on non-empty, just in case */
-                showToast(R.string.download_canceled)
-                pendingPathActions.clear()
-            }
-        } else {
-            /** Select the folder, and dispatch everything */
-            pickDownloadPath(uri, path)
-            processPendingActions()
-        }
-    }
-
     protected lateinit var viewModel: ResultViewModel2
     protected lateinit var syncModel: SyncViewModel
 
+    protected var binding: FragmentResultSwipeBinding? = null
     protected var resultBinding: FragmentResultBinding? = null
     protected var recommendationBinding: ResultRecommendationsBinding? = null
     protected var syncBinding: ResultSyncBinding? = null
 
-    var player: IPlayer = CS3IPlayer()
-    protected open var hasPipModeSupport: Boolean = false
-    protected open var isFullScreenPlayer: Boolean = true
-    protected open var lockRotation: Boolean = true
-    protected var playerBinding: TrailerCustomLayoutBinding? = null
-    protected var isShowing: Boolean = false
+    override var layout = R.layout.fragment_result_swipe
 
-    protected var playerHostView: PlayerView? = null
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        viewModel = ViewModelProvider(this)[ResultViewModel2::class.java]
+        syncModel = ViewModelProvider(this)[SyncViewModel::class.java]
+        updateUIEvent += ::updateUI
 
-    open fun updateUIVisibility() {}
+        val root = super.onCreateView(inflater, container, savedInstanceState) ?: return null
+        FragmentResultSwipeBinding.bind(root).let { bind ->
+            resultBinding = bind.fragmentResult
+            recommendationBinding = bind.resultRecommendations
+            syncBinding = bind.resultSync
+            binding = bind
+        }
 
-    protected fun uiReset() {
-        isShowing = false
-        updateUIVisibility()
-    }
-
-    open fun showMirrorsDialogue() {}
-    open fun showTracksDialogue() {}
-    open fun openOnlineSubPicker(
-        context: android.content.Context,
-        loadResponse: LoadResponse?,
-        dismissCallback: () -> Unit
-    ) {}
-
-    override fun fixLayout(view: View) {
-        fixSystemBarsPadding(view)
+        return root
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -240,7 +153,7 @@ open class ResultFragmentPhone : BaseFragment<FragmentResultSwipeBinding>(
 
     override fun playerError(exception: Throwable) {
         if (player.getIsPlaying()) { // because we don't want random toasts in player
-            playerHostView?.playerError(exception)
+            super.playerError(exception)
         } else {
             nextMirror()
         }
@@ -340,8 +253,7 @@ open class ResultFragmentPhone : BaseFragment<FragmentResultSwipeBinding>(
         }
 
         updateUIEvent -= ::updateUI
-        playerHostView?.release()
-        playerBinding = null
+        binding = null
         resultBinding?.resultScroll?.setOnClickListener(null)
         resultBinding = null
         syncBinding = null
@@ -365,6 +277,7 @@ open class ResultFragmentPhone : BaseFragment<FragmentResultSwipeBinding>(
 
     var selectSeason: String? = null
     var selectEpisodeRange: String? = null
+    var selectSort: EpisodeSortType? = null
 
     private fun setUrl(url: String?) {
         if (url == null) {
@@ -407,10 +320,6 @@ open class ResultFragmentPhone : BaseFragment<FragmentResultSwipeBinding>(
     override fun onResume() {
         afterPluginsLoadedEvent += ::reloadViewModel
         activity?.setNavigationBarColorCompat(R.attr.primaryBlackBackground)
-        context?.let { ctx ->
-            playerHostView?.onResume(ctx)
-            playerHostView?.setupKeyEventListener()
-        }
         super.onResume()
         PanelsChildGestureRegionObserver.Provider.get()
             .addGestureRegionsUpdateListener(gestureRegionsListener)
@@ -418,44 +327,30 @@ open class ResultFragmentPhone : BaseFragment<FragmentResultSwipeBinding>(
 
     override fun onStop() {
         afterPluginsLoadedEvent -= ::reloadViewModel
-        playerHostView?.onStop()
         super.onStop()
     }
 
-    @Suppress("UNUSED_PARAMETER")
     private fun updateUI(id: Int?) {
         syncModel.updateUserData()
         viewModel.reloadEpisodes()
     }
 
-    override fun onBindingCreated(binding: FragmentResultSwipeBinding, savedInstanceState: Bundle?) {
-        // Set up sub-binding references
-        viewModel = ViewModelProvider(this)[ResultViewModel2::class.java]
-        syncModel = ViewModelProvider(this)[SyncViewModel::class.java]
-        updateUIEvent += ::updateUI
+    override fun onConfigurationChanged(newConfig: Configuration) {
+        super.onConfigurationChanged(newConfig)
+        view?.let { fixSystemBarsPadding(it) }
+    }
 
-        resultBinding = binding.fragmentResult
-        recommendationBinding = binding.resultRecommendations
-        syncBinding = binding.resultSync
-
-        // Set up trailer player
-        val ctx = context ?: return
-        playerHostView = PlayerView(ctx)
-        playerHostView?.player = player
-        playerHostView?.hasPipModeSupport = hasPipModeSupport
-        playerHostView?.callbacks = this
-        playerHostView?.bindViews(binding.root)
-        playerBinding = binding.root.findViewById<View?>(R.id.player_holder)?.let {
-            TrailerCustomLayoutBinding.bind(it)
-        }
-        playerHostView?.initialize()
+    @SuppressLint("SetTextI18n")
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
 
         // ===== setup =====
+        fixSystemBarsPadding(view)
         val storedData = getStoredData() ?: return
         activity?.window?.decorView?.clearFocus()
         activity?.loadCache()
         context?.updateHasTrailers()
-        hideKeyboard(binding.root)
+        hideKeyboard()
         if (storedData.restart || !viewModel.hasLoaded())
             viewModel.load(
                 activity,
@@ -473,7 +368,7 @@ open class ResultFragmentPhone : BaseFragment<FragmentResultSwipeBinding>(
         // This may not be 100% reliable, and may delay for small period
         // before resultCastItems will be scrollable again, but this does work
         // most of the time.
-        binding.resultOverlappingPanels.registerEndPanelStateListeners(
+        binding?.resultOverlappingPanels?.registerEndPanelStateListeners(
             object : OverlappingPanelsLayout.PanelStateListener {
                 override fun onPanelStateChange(panelState: PanelState) {
                     PanelsChildGestureRegionObserver.Provider.get().apply {
@@ -485,8 +380,8 @@ open class ResultFragmentPhone : BaseFragment<FragmentResultSwipeBinding>(
 
         // ===== ===== =====
 
-        binding.resultSearch.isGone = storedData.name.isBlank()
-        binding.resultSearch.setOnClickListener {
+        binding?.resultSearch?.isGone = storedData.name.isBlank()
+        binding?.resultSearch?.setOnClickListener {
             QuickSearchFragment.pushSearch(activity, storedData.name)
         }
 
@@ -515,7 +410,7 @@ open class ResultFragmentPhone : BaseFragment<FragmentResultSwipeBinding>(
                     focused: View?
                 ): Boolean {
                     // Make the cast always focus the first visible item when focused
-                    // from somewhere else. Otherwise, it jumps to the last item.
+                    // from somewhere else. Otherwise it jumps to the last item.
                     return if (parent.focusedChild == null) {
                         scrollToPosition(this.findFirstCompletelyVisibleItemPosition())
                         true
@@ -533,13 +428,7 @@ open class ResultFragmentPhone : BaseFragment<FragmentResultSwipeBinding>(
                 EpisodeAdapter(
                     api?.hasDownloadSupport == true,
                     { episodeClick ->
-                        when (episodeClick.action) {
-                            ACTION_DOWNLOAD_EPISODE, ACTION_DOWNLOAD_MIRROR -> {
-                                requirePathForActions(listOf(episodeClick.action to episodeClick.data))
-                            }
-
-                            else -> viewModel.handleAction(episodeClick)
-                        }
+                        viewModel.handleAction(episodeClick)
                     },
                     { downloadClickEvent ->
                         DownloadButtonSetup.handleDownloadClick(downloadClickEvent)
@@ -574,9 +463,9 @@ open class ResultFragmentPhone : BaseFragment<FragmentResultSwipeBinding>(
             resultScroll.setOnScrollChangeListener(NestedScrollView.OnScrollChangeListener { _, _, scrollY, _, oldScrollY ->
                 val dy = scrollY - oldScrollY
                 if (dy > 0) { //check for scroll down
-                    binding.resultBookmarkFab.shrink()
+                    binding?.resultBookmarkFab?.shrink()
                 } else if (dy < -5) {
-                    binding.resultBookmarkFab.extend()
+                    binding?.resultBookmarkFab?.extend()
                 }
                 if (!isFullScreenPlayer && player.getIsPlaying()) {
                     if (scrollY > (resultBinding?.fragmentTrailer?.playerBackground?.height
@@ -588,7 +477,7 @@ open class ResultFragmentPhone : BaseFragment<FragmentResultSwipeBinding>(
             })
         }
 
-        binding.apply {
+        binding?.apply {
             resultOverlappingPanels.setStartPanelLockState(OverlappingPanelsLayout.LockState.CLOSE)
             resultOverlappingPanels.setEndPanelLockState(OverlappingPanelsLayout.LockState.CLOSE)
             resultBack.setOnClickListener {
@@ -601,13 +490,6 @@ open class ResultFragmentPhone : BaseFragment<FragmentResultSwipeBinding>(
                 } else resultOverlappingPanels.closePanels()
             }
 
-            resultMiniSync.setOnClickListener {
-                if (resultOverlappingPanels.getSelectedPanel().ordinal == 1) {
-                    resultOverlappingPanels.openStartPanel()
-                } else resultOverlappingPanels.closePanels()
-            }
-
-            /*
             resultMiniSync.setRecycledViewPool(ImageAdapter.sharedPool)
             resultMiniSync.adapter = ImageAdapter(
                 nextFocusDown = R.id.result_sync_set_score,
@@ -618,7 +500,6 @@ open class ResultFragmentPhone : BaseFragment<FragmentResultSwipeBinding>(
                         } else resultOverlappingPanels.closePanels()
                     }
                 })
-            */
             resultSubscribe.setOnClickListener {
                 viewModel.toggleSubscriptionStatus(context) { newStatus: Boolean? ->
                     if (newStatus == null) return@toggleSubscriptionStatus
@@ -781,7 +662,7 @@ open class ResultFragmentPhone : BaseFragment<FragmentResultSwipeBinding>(
         }
 
         observeNullable(viewModel.subscribeStatus) { isSubscribed ->
-            binding.resultSubscribe.isVisible = isSubscribed != null
+            binding?.resultSubscribe?.isVisible = isSubscribed != null
             if (isSubscribed == null) return@observeNullable
 
             val drawable = if (isSubscribed) {
@@ -790,11 +671,11 @@ open class ResultFragmentPhone : BaseFragment<FragmentResultSwipeBinding>(
                 R.drawable.baseline_notifications_none_24
             }
 
-            binding.resultSubscribe.setImageResource(drawable)
+            binding?.resultSubscribe?.setImageResource(drawable)
         }
 
         observeNullable(viewModel.favoriteStatus) { isFavorite ->
-            binding.resultFavorite.isVisible = isFavorite != null
+            binding?.resultFavorite?.isVisible = isFavorite != null
             if (isFavorite == null) return@observeNullable
 
             val drawable = if (isFavorite) {
@@ -803,7 +684,7 @@ open class ResultFragmentPhone : BaseFragment<FragmentResultSwipeBinding>(
                 R.drawable.ic_baseline_favorite_border_24
             }
 
-            binding.resultFavorite.setImageResource(drawable)
+            binding?.resultFavorite?.setImageResource(drawable)
         }
 
         observeNullable(viewModel.episodes) { episodes ->
@@ -811,58 +692,8 @@ open class ResultFragmentPhone : BaseFragment<FragmentResultSwipeBinding>(
                 // no failure?
                 resultEpisodeLoading.isVisible = episodes is Resource.Loading
                 resultEpisodes.isVisible = episodes is Resource.Success
-                resultBatchDownloadButton.isVisible =
-                    episodes is Resource.Success && episodes.value.isNotEmpty()
-
                 if (episodes is Resource.Success) {
                     (resultEpisodes.adapter as? EpisodeAdapter)?.submitList(episodes.value)
-
-                    // Show quality dialog with all sources
-                    resultBatchDownloadButton.setOnLongClickListener {
-                        ioSafe {
-                            val defaultSources = QualityProfileDialog.getAllDefaultSources()
-                            val activity = activity ?: return@ioSafe
-                            activity.runOnUiThread {
-                                QualityProfileDialog(
-                                    activity,
-                                    R.style.DialogFullscreenPlayer,
-                                    defaultSources,
-                                ).show()
-                            }
-                        }
-
-                        true
-                    }
-
-                    resultBatchDownloadButton.setOnClickListener { view ->
-                        val episodeStart =
-                            episodes.value.firstOrNull()?.episode ?: return@setOnClickListener
-                        val episodeEnd =
-                            episodes.value.lastOrNull()?.episode ?: return@setOnClickListener
-
-                        val episodeRange = if (episodeStart == episodeEnd) {
-                            episodeStart.toString()
-                        } else {
-                            txt(
-                                R.string.episodes_range,
-                                episodeStart,
-                                episodeEnd
-                            ).asString(view.context)
-                        }
-
-                        val rangeMessage = txt(
-                            R.string.download_episode_range,
-                            episodeRange
-                        ).asString(view.context)
-
-                        AlertDialog.Builder(view.context, R.style.AlertDialogCustom)
-                            .setTitle(R.string.download_all)
-                            .setMessage(rangeMessage)
-                            .setPositiveButton(R.string.yes) { _, _ ->
-                                requirePathForActions(episodes.value.map { ACTION_DOWNLOAD_EPISODE to it })
-                            }
-                            .setNegativeButton(R.string.cancel) { _, _ -> }.show()
-                    }
                 }
             }
         }
@@ -892,11 +723,8 @@ open class ResultFragmentPhone : BaseFragment<FragmentResultSwipeBinding>(
                         )
                         return@setOnLongClickListener true
                     }
-
-                    val status = VideoDownloadManager.downloadStatus[ep.id]
-                    downloadButton.setStatus(status)
                     downloadButton.setDefaultClickListener(
-                        DownloadObjects.DownloadEpisodeCached(
+                        VideoDownloadHelper.DownloadEpisodeCached(
                             name = ep.name,
                             poster = ep.poster,
                             episode = 0,
@@ -913,11 +741,18 @@ open class ResultFragmentPhone : BaseFragment<FragmentResultSwipeBinding>(
 
                         when (click.action) {
                             DOWNLOAD_ACTION_DOWNLOAD -> {
-                                requirePathForActions(listOf(ACTION_DOWNLOAD_EPISODE to ep))
+                                viewModel.handleAction(
+                                    EpisodeClickEvent(ACTION_DOWNLOAD_EPISODE, ep)
+                                )
                             }
 
                             DOWNLOAD_ACTION_LONG_CLICK -> {
-                                requirePathForActions(listOf(ACTION_DOWNLOAD_MIRROR to ep))
+                                viewModel.handleAction(
+                                    EpisodeClickEvent(
+                                        ACTION_DOWNLOAD_MIRROR,
+                                        ep
+                                    )
+                                )
                             }
 
                             else -> DownloadButtonSetup.handleDownloadClick(click)
@@ -991,15 +826,8 @@ open class ResultFragmentPhone : BaseFragment<FragmentResultSwipeBinding>(
                     resultComingSoon.isVisible = d.comingSoon
                     resultDataHolder.isGone = d.comingSoon
 
-                    val prefs =
-                        androidx.preference.PreferenceManager.getDefaultSharedPreferences(root.context)
-                    val showCast = prefs.getBoolean(
-                        root.context.getString(R.string.show_cast_in_details_key),
-                        true
-                    )
-
-                    resultCastItems.isGone = !showCast || d.actors.isNullOrEmpty()
-                    (resultCastItems.adapter as? ActorAdaptor)?.submitList(if (showCast) d.actors else emptyList())
+                    resultCastItems.isGone = d.actors.isNullOrEmpty()
+                    (resultCastItems.adapter as? ActorAdaptor)?.submitList(d.actors)
 
                     if (d.contentRatingText == null) {
                         // If there is no rating to display, we don't want an empty gap
@@ -1013,7 +841,7 @@ open class ResultFragmentPhone : BaseFragment<FragmentResultSwipeBinding>(
                         syncModel.addFromUrl(d.url)
                     }
 
-                    binding.apply {
+                    binding?.apply {
                         resultSearch.isGone = d.title.isBlank()
                         resultSearch.setOnClickListener {
                             QuickSearchFragment.pushSearch(activity, d.title)
@@ -1048,11 +876,10 @@ open class ResultFragmentPhone : BaseFragment<FragmentResultSwipeBinding>(
                 }
 
                 (data as? Resource.Failure)?.let { data ->
-                    @SuppressLint("SetTextI18n")
                     resultErrorText.text = storedData.url.plus("\n") + data.errorString
                 }
 
-                binding.resultBookmarkFab.isVisible = data is Resource.Success
+                binding?.resultBookmarkFab?.isVisible = data is Resource.Success
                 resultFinishLoading.isVisible = data is Resource.Success
 
                 resultLoading.isVisible = data is Resource.Loading
@@ -1100,7 +927,7 @@ open class ResultFragmentPhone : BaseFragment<FragmentResultSwipeBinding>(
         }
 
         observe(viewModel.trailers) { trailers ->
-            setTrailers(trailers.flatMap { it.mirros }) // I don't care about subtitles yet!
+            setTrailers(trailers.flatMap { it.mirros }) // I dont care about subtitles yet!
         }
 
         observe(syncModel.synced) { list ->
@@ -1109,7 +936,8 @@ open class ResultFragmentPhone : BaseFragment<FragmentResultSwipeBinding>(
 
             val newList = list.filter { it.isSynced && it.hasAccount }
 
-            binding.resultMiniSync.isVisible = newList.isNotEmpty()
+            binding?.resultMiniSync?.isVisible = newList.isNotEmpty()
+            (binding?.resultMiniSync?.adapter as? ImageAdapter)?.submitList(newList.mapNotNull { it.icon })
         }
 
 
@@ -1204,7 +1032,7 @@ open class ResultFragmentPhone : BaseFragment<FragmentResultSwipeBinding>(
                     }
                 }
             }
-            binding.resultOverlappingPanels.setStartPanelLockState(if (closed) OverlappingPanelsLayout.LockState.CLOSE else OverlappingPanelsLayout.LockState.UNLOCKED)
+            binding?.resultOverlappingPanels?.setStartPanelLockState(if (closed) OverlappingPanelsLayout.LockState.CLOSE else OverlappingPanelsLayout.LockState.UNLOCKED)
         }
         observe(viewModel.recommendations) { recommendations ->
             setRecommendations(recommendations, null)
@@ -1265,7 +1093,7 @@ open class ResultFragmentPhone : BaseFragment<FragmentResultSwipeBinding>(
         }
 
         observe(viewModel.watchStatus) { watchType ->
-            binding.resultBookmarkFab.apply {
+            binding?.resultBookmarkFab?.apply {
                 setText(watchType.stringRes)
                 if (watchType == WatchType.NONE) {
                     context?.colorFromAttribute(R.attr.white)
@@ -1320,7 +1148,6 @@ open class ResultFragmentPhone : BaseFragment<FragmentResultSwipeBinding>(
                         viewModel.skipLoading()
                     }
                     isVisible = true
-                    @SuppressLint("SetTextI18n")
                     text = "${context.getString(R.string.skip_loading)} (${load.linksLoaded})"
                 }
             }
@@ -1441,7 +1268,6 @@ open class ResultFragmentPhone : BaseFragment<FragmentResultSwipeBinding>(
     }
 
     override fun onPause() {
-        playerHostView?.releaseKeyEventListener()
         super.onPause()
         PanelsChildGestureRegionObserver.Provider.get()
             .addGestureRegionsUpdateListener(gestureRegionsListener)

app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentTv.kt

@@ -42,7 +42,6 @@ import com.lagradost.cloudstream3.ui.result.ResultFragment.updateUIEvent
 import com.lagradost.cloudstream3.ui.search.SEARCH_ACTION_FOCUSED
 import com.lagradost.cloudstream3.ui.search.SearchAdapter
 import com.lagradost.cloudstream3.ui.search.SearchHelper
-import com.lagradost.cloudstream3.ui.setRecycledViewPool
 import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR
 import com.lagradost.cloudstream3.ui.settings.Globals.TV
 import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
@@ -62,6 +61,7 @@ import com.lagradost.cloudstream3.utils.UIHelper.hideKeyboard
 import com.lagradost.cloudstream3.utils.UIHelper.navigate
 import com.lagradost.cloudstream3.utils.UIHelper.populateChips
 import com.lagradost.cloudstream3.utils.UIHelper.setNavigationBarColorCompat
+import com.lagradost.cloudstream3.utils.UiImage
 import com.lagradost.cloudstream3.utils.getImageFromDrawable
 import com.lagradost.cloudstream3.utils.setText
 import com.lagradost.cloudstream3.utils.setTextHtml
@@ -559,7 +559,7 @@ class ResultFragmentTv : BaseFragment<FragmentResultTvBinding>(
                             ExtractorLinkGenerator(
                                 extractedTrailerLinks,
                                 emptyList()
-                            ), 0
+                            )
                         )
                     )
                 }
@@ -925,16 +925,11 @@ class ResultFragmentTv : BaseFragment<FragmentResultTvBinding>(
                         resultTvComingSoon.isVisible = d.comingSoon
 
                         populateChips(resultTag, d.tags)
-                        val prefs =
-                            androidx.preference.PreferenceManager.getDefaultSharedPreferences(root.context)
-                        val showCast = prefs.getBoolean(
-                            root.context.getString(R.string.show_cast_in_details_key),
-                            true
+                        resultCastItems.isGone = d.actors.isNullOrEmpty()
+                        (resultCastItems.adapter as? ActorAdaptor)?.submitList(
+                            d.actors
                         )
 
-                        resultCastItems.isGone = !showCast || d.actors.isNullOrEmpty()
-                        (resultCastItems.adapter as? ActorAdaptor)?.submitList(if (showCast) d.actors else emptyList())
-
                         if (d.contentRatingText == null) {
                             // If there is no rating to display, we don't want an empty gap
                             resultMetaContentRating.width = 0

app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultTrailerPlayer.kt

@@ -5,74 +5,41 @@ import android.content.Context
 import android.content.res.Configuration
 import android.os.Build
 import android.os.Bundle
+import android.view.View
 import android.view.ViewGroup
 import android.widget.FrameLayout
-import androidx.core.view.ViewCompat
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
+import androidx.core.view.ViewCompat
 import com.lagradost.cloudstream3.CommonActivity.screenHeight
 import com.lagradost.cloudstream3.CommonActivity.screenWidth
 import com.lagradost.cloudstream3.LoadResponse
 import com.lagradost.cloudstream3.R
-import com.lagradost.cloudstream3.databinding.FragmentResultSwipeBinding
 import com.lagradost.cloudstream3.ui.player.CSPlayerEvent
-import com.lagradost.cloudstream3.ui.player.CSPlayerLoading
 import com.lagradost.cloudstream3.ui.player.PlayerEventSource
 import com.lagradost.cloudstream3.ui.player.SubtitleData
 import com.lagradost.cloudstream3.utils.BackPressedCallbackHelper.attachBackPressedCallback
 import com.lagradost.cloudstream3.utils.BackPressedCallbackHelper.detachBackPressedCallback
 import com.lagradost.cloudstream3.utils.UIHelper.fixSystemBarsPadding
 
-class ResultTrailerPlayer : ResultFragmentPhone() {
+open class ResultTrailerPlayer : ResultFragmentPhone() {
 
     override var lockRotation = false
     override var isFullScreenPlayer = false
     override var hasPipModeSupport = false
 
     companion object {
-        const val TAG = "ResultTrailerPlayer"
+        const val TAG = "RESULT_TRAILER"
     }
 
     private var playerWidthHeight: Pair<Int, Int>? = null
-    private var introVisible = true
-
-    // Single-tap on empty player area: toggle controls.
-    override fun onSingleTap() {
-        if (introVisible) return
-        if (isShowing) uiReset() else showControls()
-    }
-
-    private fun showControls() {
-        if (introVisible) return
-        isShowing = true
-        updateUIVisibility()
-        playerHostView?.scheduleAutoHide()
-    }
-
-    override fun isUIShowing(): Boolean = isShowing
-
-    override fun onAutoHideUI() {
-        if (player.getIsPlaying()) uiReset()
-    }
-
-    override fun onHidePlayerUI() = uiReset()
-
-    // When the hold-speedup gesture fires, hide controls so the video is unobstructed.
-    // The speedup button show/hide and speed change are handled by PlayerView.
-    override fun onHoldSpeedUp(show: Boolean) {
-        if (show && isShowing) uiReset()
-    }
-
-    override fun onGestureEnd(hadSwipe: Boolean, wasUiShowing: Boolean) {
-        if (!player.getIsPlaying() && hadSwipe && wasUiShowing && !isShowing) {
-            isShowing = true
-            showControls()
-        } else playerHostView?.scheduleAutoHide()
-    }
 
     override fun nextEpisode() {}
+
     override fun prevEpisode() {}
-    override fun playerPositionChanged(position: Long, duration: Long) {}
+
+    override fun playerPositionChanged(position: Long, duration : Long) {}
+
     override fun nextMirror() {}
 
     override fun onConfigurationChanged(newConfig: Configuration) {
@@ -82,28 +49,33 @@ class ResultTrailerPlayer : ResultFragmentPhone() {
     }
 
     private fun fixPlayerSize() {
-        binding?.apply {
-            if (isFullScreenPlayer) {
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+            binding?.apply {
+                if (isFullScreenPlayer) {
+                    // Remove listener
                     ViewCompat.setOnApplyWindowInsetsListener(root, null)
-                    root.overlay.clear()
-                }
-                root.setPadding(0, 0, 0, 0)
-            } else {
-                fixSystemBarsPadding(root)
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+                    root.overlay.clear() // Clear the cutout overlay
+                    root.setPadding(0, 0, 0, 0) // Reset padding for full screen
+                } else {
+                    // Reapply padding when not in full screen
+                    fixSystemBarsPadding(root)
                     ViewCompat.requestApplyInsets(root)
                 }
             }
         }
 
         playerWidthHeight?.let { (w, h) ->
-            if (w <= 0 || h <= 0) return@let
+            if(w <= 0 || h <= 0) return@let
 
             val orientation = context?.resources?.configuration?.orientation ?: return
 
-            val sw = if (orientation == Configuration.ORIENTATION_LANDSCAPE) screenWidth else screenHeight
+            val sw = if (orientation == Configuration.ORIENTATION_LANDSCAPE) {
+                screenWidth
+            } else {
+                screenHeight
+            }
 
+            //result_trailer_loading?.isVisible = false
             resultBinding?.resultSmallscreenHolder?.isVisible = !isFullScreenPlayer
             binding?.resultFullscreenHolder?.isVisible = isFullScreenPlayer
 
@@ -111,30 +83,35 @@ class ResultTrailerPlayer : ResultFragmentPhone() {
 
             resultBinding?.fragmentTrailer?.playerBackground?.apply {
                 isVisible = true
-                layoutParams = FrameLayout.LayoutParams(
-                    FrameLayout.LayoutParams.MATCH_PARENT,
-                    if (isFullScreenPlayer) FrameLayout.LayoutParams.MATCH_PARENT else to
-                )
+                layoutParams =
+                    FrameLayout.LayoutParams(
+                        FrameLayout.LayoutParams.MATCH_PARENT,
+                        if (isFullScreenPlayer) FrameLayout.LayoutParams.MATCH_PARENT else to
+                    )
             }
 
             playerBinding?.playerIntroPlay?.apply {
-                layoutParams = FrameLayout.LayoutParams(
-                    FrameLayout.LayoutParams.MATCH_PARENT,
-                    resultBinding?.resultTopHolder?.measuredHeight ?: FrameLayout.LayoutParams.MATCH_PARENT
-                )
+                layoutParams =
+                    FrameLayout.LayoutParams(
+                        FrameLayout.LayoutParams.MATCH_PARENT,
+                        resultBinding?.resultTopHolder?.measuredHeight
+                            ?: FrameLayout.LayoutParams.MATCH_PARENT
+                    )
             }
 
             if (playerBinding?.playerIntroPlay?.isGone == true) {
                 resultBinding?.resultTopHolder?.apply {
+
                     val anim = ValueAnimator.ofInt(
                         measuredHeight,
                         if (isFullScreenPlayer) ViewGroup.LayoutParams.MATCH_PARENT else to
                     )
-                    anim.addUpdateListener { va ->
-                        val v = va.animatedValue as Int
-                        val lp: ViewGroup.LayoutParams = layoutParams
-                        lp.height = v
-                        layoutParams = lp
+                    anim.addUpdateListener { valueAnimator ->
+                        val `val` = valueAnimator.animatedValue as Int
+                        val layoutParams: ViewGroup.LayoutParams =
+                            layoutParams
+                        layoutParams.height = `val`
+                        setLayoutParams(layoutParams)
                     }
                     anim.duration = 200
                     anim.start()
@@ -143,14 +120,9 @@ class ResultTrailerPlayer : ResultFragmentPhone() {
         }
     }
 
-    override fun playerDimensionsLoaded(width: Int, height: Int) {
+    override fun playerDimensionsLoaded(width: Int, height : Int) {
         playerWidthHeight = width to height
         fixPlayerSize()
-        // Apply autorotation when fullscreen (lockRotation = true).
-        // PlayerView already set isVerticalOrientation before this callback fires.
-        if (lockRotation) {
-            activity?.requestedOrientation = playerHostView?.dynamicOrientation() ?: return
-        }
     }
 
     override fun showMirrorsDialogue() {}
@@ -160,39 +132,33 @@ class ResultTrailerPlayer : ResultFragmentPhone() {
         context: Context,
         loadResponse: LoadResponse?,
         dismissCallback: () -> Unit
-    ) {}
-
-    override fun subtitlesChanged() {}
-    override fun embeddedSubtitlesFetched(subtitles: List<SubtitleData>) {}
-    override fun onTracksInfoChanged() {}
-    override fun exitedPipMode() {}
-
-    override fun onSeekPreviewText(text: String?) {
-        playerBinding?.playerTimeText?.apply {
-            isVisible = text != null
-            if (text != null) this.text = text
-        }
+    ) {
     }
 
+    override fun subtitlesChanged() {}
+
+    override fun embeddedSubtitlesFetched(subtitles: List<SubtitleData>) {}
+    override fun onTracksInfoChanged() {}
+
+    override fun exitedPipMode() {}
     private fun updateFullscreen(fullscreen: Boolean) {
         isFullScreenPlayer = fullscreen
         lockRotation = fullscreen
-        playerHostView?.isFullScreen = fullscreen
 
-        playerBinding?.playerFullscreen?.setImageResource(
-            if (fullscreen) R.drawable.baseline_fullscreen_exit_24 else R.drawable.baseline_fullscreen_24
-        )
+        playerBinding?.playerFullscreen?.setImageResource(if (fullscreen) R.drawable.baseline_fullscreen_exit_24 else R.drawable.baseline_fullscreen_24)
         if (fullscreen) {
-            playerHostView?.enterFullscreen()
+            enterFullscreen()
             binding?.apply {
                 resultTopBar.isVisible = false
                 resultFullscreenHolder.isVisible = true
                 resultMainHolder.isVisible = false
             }
+
             resultBinding?.fragmentTrailer?.playerBackground?.let { view ->
                 (view.parent as ViewGroup?)?.removeView(view)
                 binding?.resultFullscreenHolder?.addView(view)
             }
+
         } else {
             binding?.apply {
                 resultTopBar.isVisible = true
@@ -203,55 +169,36 @@ class ResultTrailerPlayer : ResultFragmentPhone() {
                     resultBinding?.resultSmallscreenHolder?.addView(view)
                 }
             }
-            playerHostView?.exitFullscreen()
+            exitFullscreen()
         }
         fixPlayerSize()
         uiReset()
 
         if (isFullScreenPlayer) {
-            activity?.attachBackPressedCallback("ResultTrailerPlayer") { updateFullscreen(false) }
-        } else {
-            activity?.detachBackPressedCallback("ResultTrailerPlayer")
-        }
+            activity?.attachBackPressedCallback("ResultTrailerPlayer") {
+                updateFullscreen(false)
+            }
+        } else activity?.detachBackPressedCallback("ResultTrailerPlayer")
     }
 
     override fun updateUIVisibility() {
         super.updateUIVisibility()
-        playerBinding?.apply {
-            playerGoBackHolder.isVisible = false
-            val controlsVisible = isShowing && !introVisible
-            playerTopHolder.isVisible = controlsVisible
-            playerVideoHolder.isVisible = controlsVisible
-            shadowOverlay.isVisible = controlsVisible
-            playerPausePlayHolderHolder.isVisible =
-                controlsVisible && playerHostView?.currentPlayerStatus != CSPlayerLoading.IsBuffering
-        }
-        // Fade center controls in/out; also resets stale fillAfter alpha from seek animations.
-        playerHostView?.gestureHelper?.animateCenterControls(if (isShowing && !introVisible) 1f else 0f)
+        playerBinding?.playerGoBackHolder?.isVisible = false
     }
 
-    override fun playerStatusChanged() {
-        if (introVisible) {
-            playerBinding?.playerPausePlayHolderHolder?.isVisible = false
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        playerBinding?.playerFullscreen?.setOnClickListener {
+            updateFullscreen(!isFullScreenPlayer)
         }
-    }
-
-    override fun onBindingCreated(binding: FragmentResultSwipeBinding, savedInstanceState: Bundle?) {
-        super.onBindingCreated(binding, savedInstanceState)
-
-        playerHostView?.videoOutline = playerBinding?.videoOutline
-        playerHostView?.requestUpdateBrightnessOverlayOnNextLayout()
-
-        playerBinding?.playerFullscreen?.setOnClickListener { updateFullscreen(!isFullScreenPlayer) }
         updateFullscreen(isFullScreenPlayer)
         uiReset()
 
         playerBinding?.playerIntroPlay?.setOnClickListener {
             playerBinding?.playerIntroPlay?.isGone = true
-            introVisible = false
             player.handleEvent(CSPlayerEvent.Play, PlayerEventSource.UI)
+            updateUIVisibility()
             fixPlayerSize()
-            showControls()
         }
     }
-}
+}

app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt

@@ -1,8 +1,7 @@
 package com.lagradost.cloudstream3.ui.result
 
 import android.app.Activity
-import android.content.Context
-import android.content.DialogInterface
+import android.content.*
 import android.util.Log
 import android.widget.Toast
 import androidx.annotation.MainThread
@@ -11,67 +10,33 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.lagradost.cloudstream3.APIHolder
+import com.lagradost.cloudstream3.*
+import com.lagradost.cloudstream3.actions.AlwaysAskAction
+import com.lagradost.cloudstream3.actions.VideoClickActionHolder
 import com.lagradost.cloudstream3.APIHolder.apis
 import com.lagradost.cloudstream3.APIHolder.getApiFromNameNull
 import com.lagradost.cloudstream3.APIHolder.unixTime
 import com.lagradost.cloudstream3.APIHolder.unixTimeMS
-import com.lagradost.cloudstream3.ActorData
-import com.lagradost.cloudstream3.AnimeLoadResponse
 import com.lagradost.cloudstream3.CloudStreamApp.Companion.context
 import com.lagradost.cloudstream3.CloudStreamApp.Companion.setKey
 import com.lagradost.cloudstream3.CommonActivity.activity
 import com.lagradost.cloudstream3.CommonActivity.getCastSession
 import com.lagradost.cloudstream3.CommonActivity.showToast
-import com.lagradost.cloudstream3.DubStatus
-import com.lagradost.cloudstream3.EpisodeResponse
-import com.lagradost.cloudstream3.IDownloadableMinimum
-import com.lagradost.cloudstream3.LiveStreamLoadResponse
-import com.lagradost.cloudstream3.LoadResponse
 import com.lagradost.cloudstream3.LoadResponse.Companion.addTrailer
 import com.lagradost.cloudstream3.LoadResponse.Companion.getAniListId
-import com.lagradost.cloudstream3.LoadResponse.Companion.getKitsuId
 import com.lagradost.cloudstream3.LoadResponse.Companion.getMalId
 import com.lagradost.cloudstream3.LoadResponse.Companion.isMovie
 import com.lagradost.cloudstream3.LoadResponse.Companion.readIdFromString
-import com.lagradost.cloudstream3.MainActivity
-import com.lagradost.cloudstream3.MovieLoadResponse
-import com.lagradost.cloudstream3.ProviderType
-import com.lagradost.cloudstream3.R
-import com.lagradost.cloudstream3.Score
-import com.lagradost.cloudstream3.SearchResponse
-import com.lagradost.cloudstream3.SeasonData
-import com.lagradost.cloudstream3.ShowStatus
-import com.lagradost.cloudstream3.SimklSyncServices
-import com.lagradost.cloudstream3.SubtitleFile
-import com.lagradost.cloudstream3.TorrentLoadResponse
-import com.lagradost.cloudstream3.TrackerType
-import com.lagradost.cloudstream3.TrailerData
-import com.lagradost.cloudstream3.TvSeriesLoadResponse
-import com.lagradost.cloudstream3.TvType
-import com.lagradost.cloudstream3.VPNStatus
-import com.lagradost.cloudstream3.actions.AlwaysAskAction
-import com.lagradost.cloudstream3.actions.VideoClickActionHolder
-import com.lagradost.cloudstream3.amap
-import com.lagradost.cloudstream3.isEpisodeBased
-import com.lagradost.cloudstream3.isLiveStream
 import com.lagradost.cloudstream3.metaproviders.SyncRedirector
-import com.lagradost.cloudstream3.mvvm.Resource
-import com.lagradost.cloudstream3.mvvm.debugAssert
-import com.lagradost.cloudstream3.mvvm.debugException
-import com.lagradost.cloudstream3.mvvm.launchSafe
-import com.lagradost.cloudstream3.mvvm.logError
-import com.lagradost.cloudstream3.mvvm.safe
-import com.lagradost.cloudstream3.mvvm.safeApiCall
-import com.lagradost.cloudstream3.runAllAsync
-import com.lagradost.cloudstream3.sortUrls
+import com.lagradost.cloudstream3.mvvm.*
 import com.lagradost.cloudstream3.syncproviders.AccountManager
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.secondsToReadable
-import com.lagradost.cloudstream3.syncproviders.SyncAPI
 import com.lagradost.cloudstream3.syncproviders.providers.Kitsu
+import com.lagradost.cloudstream3.syncproviders.SyncAPI
 import com.lagradost.cloudstream3.ui.APIRepository
-import com.lagradost.cloudstream3.ui.WatchType
+import com.lagradost.cloudstream3.ui.download.DOWNLOAD_NAVIGATE_TO
 import com.lagradost.cloudstream3.ui.player.GeneratorPlayer
+import com.lagradost.cloudstream3.ui.player.IGenerator
 import com.lagradost.cloudstream3.ui.player.LOADTYPE_ALL
 import com.lagradost.cloudstream3.ui.player.LOADTYPE_CHROMECAST
 import com.lagradost.cloudstream3.ui.player.LOADTYPE_INAPP
@@ -79,22 +44,21 @@ import com.lagradost.cloudstream3.ui.player.LOADTYPE_INAPP_DOWNLOAD
 import com.lagradost.cloudstream3.ui.player.RepoLinkGenerator
 import com.lagradost.cloudstream3.ui.player.SubtitleData
 import com.lagradost.cloudstream3.ui.result.EpisodeAdapter.Companion.getPlayerAction
+import com.lagradost.cloudstream3.ui.subtitles.SubtitlesFragment
+import com.lagradost.cloudstream3.ui.WatchType
+import com.lagradost.cloudstream3.utils.*
 import com.lagradost.cloudstream3.utils.AppContextUtils.getNameFull
 import com.lagradost.cloudstream3.utils.AppContextUtils.isConnectedToChromecast
 import com.lagradost.cloudstream3.utils.AppContextUtils.setDefaultFocus
 import com.lagradost.cloudstream3.utils.AppContextUtils.sortSubs
-import com.lagradost.cloudstream3.utils.AppUtils.toJson
 import com.lagradost.cloudstream3.utils.CastHelper.startCast
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
 import com.lagradost.cloudstream3.utils.Coroutines.ioWork
 import com.lagradost.cloudstream3.utils.Coroutines.ioWorkSafe
 import com.lagradost.cloudstream3.utils.Coroutines.main
-import com.lagradost.cloudstream3.utils.DOWNLOAD_HEADER_CACHE
-import com.lagradost.cloudstream3.utils.DataStore
 import com.lagradost.cloudstream3.utils.DataStore.editor
 import com.lagradost.cloudstream3.utils.DataStore.getFolderName
 import com.lagradost.cloudstream3.utils.DataStore.setKey
-import com.lagradost.cloudstream3.utils.DataStoreHelper
 import com.lagradost.cloudstream3.utils.DataStoreHelper.currentAccount
 import com.lagradost.cloudstream3.utils.DataStoreHelper.deleteBookmarkedData
 import com.lagradost.cloudstream3.utils.DataStoreHelper.getAllBookmarkedData
@@ -121,31 +85,10 @@ import com.lagradost.cloudstream3.utils.DataStoreHelper.setResultWatchState
 import com.lagradost.cloudstream3.utils.DataStoreHelper.setSubscribedData
 import com.lagradost.cloudstream3.utils.DataStoreHelper.setVideoWatchState
 import com.lagradost.cloudstream3.utils.DataStoreHelper.updateSubscribedData
-import com.lagradost.cloudstream3.utils.Editor
-import com.lagradost.cloudstream3.utils.ExtractorLink
-import com.lagradost.cloudstream3.utils.ExtractorLinkType
-import com.lagradost.cloudstream3.utils.FillerEpisodeCheck
-import com.lagradost.cloudstream3.utils.INFER_TYPE
-import com.lagradost.cloudstream3.utils.Qualities
+import com.lagradost.cloudstream3.utils.SubtitleHelper.fromTagToEnglishLanguageName
 import com.lagradost.cloudstream3.utils.UIHelper.navigate
-import com.lagradost.cloudstream3.utils.UiText
-import com.lagradost.cloudstream3.utils.VIDEO_WATCH_STATE
-import com.lagradost.cloudstream3.utils.downloader.DownloadFileManagement.sanitizeFilename
-import com.lagradost.cloudstream3.utils.downloader.DownloadObjects
-import com.lagradost.cloudstream3.utils.downloader.DownloadQueueManager
-import com.lagradost.cloudstream3.utils.downloader.DownloadUtils.downloadSubtitle
-import com.lagradost.cloudstream3.utils.loadExtractor
-import com.lagradost.cloudstream3.utils.newExtractorLink
-import com.lagradost.cloudstream3.utils.txt
-import kotlinx.coroutines.CancellationException
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.cancelChildren
-import kotlinx.coroutines.coroutineScope
-import kotlinx.coroutines.isActive
-import kotlinx.coroutines.job
-import kotlinx.coroutines.launch
 import java.util.concurrent.TimeUnit
+import kotlinx.coroutines.*
 
 /** This starts at 1 */
 data class EpisodeRange(
@@ -319,12 +262,11 @@ fun LoadResponse.toResultData(repo: APIRepository): ResultData {
                 TvType.Live -> R.string.live_singular
                 TvType.Others -> R.string.other_singular
                 TvType.NSFW -> R.string.nsfw_singular
-                TvType.Music -> R.string.music_singular
+                TvType.Music -> R.string.music_singlar
                 TvType.AudioBook -> R.string.audio_book_singular
-                TvType.CustomMedia -> R.string.custom_media_singular
-                TvType.Audio -> R.string.audio_singular
-                TvType.Podcast -> R.string.podcast_singular
-                TvType.Video -> R.string.video_singular
+                TvType.CustomMedia -> R.string.custom_media_singluar
+                TvType.Audio -> R.string.audio_singluar
+                TvType.Podcast -> R.string.podcast_singluar
             }
         ),
         yearText = txt(year?.toString()),
@@ -449,7 +391,7 @@ fun SelectPopup.getOptions(context: Context): List<String> {
 }
 
 data class ExtractedTrailerData(
-    var mirros: List<Pair<ExtractorLink, String>>,//Pair of extracted trailer link and original trailer link
+    var mirros: List<Pair<ExtractorLink,String>>,//Pair of extracted trailer link and original trailer link
     var subtitles: List<SubtitleFile> = emptyList(),
 )
 
@@ -479,8 +421,8 @@ class ResultViewModel2 : ViewModel() {
     private var currentShowFillers: Boolean = false
     var currentRepo: APIRepository? = null
     private var currentId: Int? = null
-    private var fillers: HashSet<Int> = hashSetOf()
-    private var generator: RepoLinkGenerator? = null
+    private var fillers: Map<Int, Boolean> = emptyMap()
+    private var generator: IGenerator? = null
     private var preferDubStatus: DubStatus? = null
     private var preferStartEpisode: Int? = null
     private var preferStartSeason: Int? = null
@@ -725,6 +667,228 @@ class ResultViewModel2 : ViewModel() {
                 index to list
             }.toMap()
         }
+
+        private fun downloadSubtitle(
+            context: Context?,
+            link: ExtractorSubtitleLink,
+            fileName: String,
+            folder: String
+        ) {
+            ioSafe {
+                VideoDownloadManager.downloadThing(
+                    context ?: return@ioSafe,
+                    link,
+                    "$fileName ${link.name}",
+                    folder,
+                    if (link.url.contains(".srt")) "srt" else "vtt",
+                    false,
+                    null, createNotificationCallback = {}
+                )
+            }
+        }
+
+        private fun getFolder(currentType: TvType, titleName: String): String {
+            return if (currentType.isEpisodeBased()) {
+                val sanitizedFileName = VideoDownloadManager.sanitizeFilename(titleName)
+                "${currentType.getFolderPrefix()}/$sanitizedFileName"
+            } else currentType.getFolderPrefix()
+        }
+
+        private fun downloadSubtitle(
+            context: Context?,
+            link: SubtitleData,
+            meta: VideoDownloadManager.DownloadEpisodeMetadata,
+        ) {
+            context?.let { ctx ->
+                val fileName = VideoDownloadManager.getFileName(ctx, meta)
+                val folder = getFolder(meta.type ?: return, meta.mainName)
+                downloadSubtitle(
+                    ctx,
+                    ExtractorSubtitleLink(link.name, link.url, "", link.headers),
+                    fileName,
+                    folder
+                )
+            }
+        }
+
+        fun startDownload(
+            context: Context?,
+            episode: ResultEpisode,
+            currentIsMovie: Boolean,
+            currentHeaderName: String,
+            currentType: TvType,
+            currentPoster: String?,
+            apiName: String,
+            parentId: Int,
+            url: String,
+            links: List<ExtractorLink>,
+            subs: List<SubtitleData>?
+        ) {
+            try {
+                if (context == null) return
+
+                val meta =
+                    getMeta(
+                        episode,
+                        currentHeaderName,
+                        apiName,
+                        currentPoster,
+                        currentIsMovie,
+                        currentType
+                    )
+
+                val folder = getFolder(currentType, currentHeaderName)
+
+                val src = "$DOWNLOAD_NAVIGATE_TO/$parentId" // url ?: return@let
+
+                // SET VISUAL KEYS
+                setKey(
+                    DOWNLOAD_HEADER_CACHE,
+                    parentId.toString(),
+                    VideoDownloadHelper.DownloadHeaderCached(
+                        apiName = apiName,
+                        url = url,
+                        type = currentType,
+                        name = currentHeaderName,
+                        poster = currentPoster,
+                        id = parentId,
+                        cacheTime = System.currentTimeMillis(),
+                    )
+                )
+
+                setKey(
+                    DataStore.getFolderName(
+                        DOWNLOAD_EPISODE_CACHE,
+                        parentId.toString()
+                    ), // 3 deep folder for faster acess
+                    episode.id.toString(),
+                    VideoDownloadHelper.DownloadEpisodeCached(
+                        name = episode.name,
+                        poster = episode.poster,
+                        episode = episode.episode,
+                        season = episode.season,
+                        id = episode.id,
+                        parentId = parentId,
+                        score = episode.score,
+                        description = episode.description,
+                        cacheTime = System.currentTimeMillis(),
+                    )
+                )
+
+                // DOWNLOAD VIDEO
+                VideoDownloadManager.downloadEpisodeUsingWorker(
+                    context,
+                    src,//url ?: return,
+                    folder,
+                    meta,
+                    links
+                )
+
+                // 1. Checks if the lang should be downloaded
+                // 2. Makes it into the download format
+                // 3. Downloads it as a .vtt file
+                val downloadList = SubtitlesFragment.getDownloadSubsLanguageTagIETF()
+
+                subs?.filter { subtitle ->
+                    downloadList.any { langTagIETF ->
+                        subtitle.languageCode == langTagIETF ||
+                                subtitle.originalName.contains(
+                                    fromTagToEnglishLanguageName(
+                                        langTagIETF
+                                    ) ?: langTagIETF
+                                )
+                    }
+                }
+                    ?.map { ExtractorSubtitleLink(it.name, it.url, "", it.headers) }
+                    ?.take(3) // max subtitles download hardcoded (?_?)
+                    ?.forEach { link ->
+                        val fileName = VideoDownloadManager.getFileName(context, meta)
+                        downloadSubtitle(context, link, fileName, folder)
+                    }
+            } catch (e: Exception) {
+                logError(e)
+            }
+        }
+
+        suspend fun downloadEpisode(
+            activity: Activity?,
+            episode: ResultEpisode,
+            currentIsMovie: Boolean,
+            currentHeaderName: String,
+            currentType: TvType,
+            currentPoster: String?,
+            apiName: String,
+            parentId: Int,
+            url: String,
+        ) {
+            ioSafe {
+                val generator = RepoLinkGenerator(listOf(episode))
+                val currentLinks = mutableSetOf<ExtractorLink>()
+                val currentSubs = mutableSetOf<SubtitleData>()
+                generator.generateLinks(
+                    clearCache = false,
+                    sourceTypes = LOADTYPE_INAPP_DOWNLOAD,
+                    callback = {
+                        it.first?.let { link ->
+                            currentLinks.add(link)
+                        }
+                    },
+                    subtitleCallback = { sub ->
+                        currentSubs.add(sub)
+                    })
+
+                if (currentLinks.isEmpty()) {
+                    main {
+                        showToast(
+                            R.string.no_links_found_toast,
+                            Toast.LENGTH_SHORT
+                        )
+                    }
+                    return@ioSafe
+                } else {
+                    main {
+                        showToast(
+                            R.string.download_started,
+                            Toast.LENGTH_SHORT
+                        )
+                    }
+                }
+
+                startDownload(
+                    activity,
+                    episode,
+                    currentIsMovie,
+                    currentHeaderName,
+                    currentType,
+                    currentPoster,
+                    apiName,
+                    parentId,
+                    url,
+                    sortUrls(currentLinks),
+                    sortSubs(currentSubs),
+                )
+            }
+        }
+
+        private fun getMeta(
+            episode: ResultEpisode,
+            titleName: String,
+            apiName: String,
+            currentPoster: String?,
+            currentIsMovie: Boolean,
+            tvType: TvType,
+        ): VideoDownloadManager.DownloadEpisodeMetadata {
+            return VideoDownloadManager.DownloadEpisodeMetadata(
+                episode.id,
+                VideoDownloadManager.sanitizeFilename(titleName),
+                apiName,
+                episode.poster ?: currentPoster,
+                episode.name,
+                if (currentIsMovie) null else episode.season,
+                if (currentIsMovie) null else episode.episode,
+                tvType,
+            )
+        }
     }
 
     private val _watchStatus: MutableLiveData<WatchType> = MutableLiveData(WatchType.NONE)
@@ -903,28 +1067,6 @@ class ResultViewModel2 : ViewModel() {
         }
     }
 
-    private fun getMeta(
-        episode: ResultEpisode,
-        titleName: String,
-        apiName: String,
-        currentPoster: String?,
-        currentIsMovie: Boolean,
-        tvType: TvType,
-    ): DownloadObjects.DownloadEpisodeMetadata {
-        return DownloadObjects.DownloadEpisodeMetadata(
-            episode.id,
-            episode.parentId,
-            sanitizeFilename(titleName),
-            apiName,
-            episode.poster ?: currentPoster,
-            episode.name,
-            if (currentIsMovie) null else episode.season,
-            if (currentIsMovie) null else episode.episode,
-            tvType,
-        )
-    }
-
-
     /**
      * Toggles the favorite status of an item.
      *
@@ -1293,10 +1435,9 @@ class ResultViewModel2 : ViewModel() {
                     subs += sub
                     updatePage()
                 },
-                isCasting = isCasting,
-                offset = 0
+                isCasting = isCasting
             )
-        } catch (_: CancellationException) {
+        } catch (e: CancellationException) {
             // Do nothing
         } catch (e: Exception) {
             logError(e)
@@ -1325,7 +1466,7 @@ class ResultViewModel2 : ViewModel() {
         episodeIds: Array<String>,
         watchState: VideoWatchState
     ) {
-        val watchStateString = watchState.toJson()
+        val watchStateString = DataStore.mapper.writeValueAsString(watchState)
         episodeIds.forEach {
             if (getVideoWatchState(it.toInt()) != watchState) {
                 editor.setKeyRaw(
@@ -1471,17 +1612,16 @@ class ResultViewModel2 : ViewModel() {
 
             ACTION_DOWNLOAD_EPISODE -> {
                 val response = currentResponse ?: return
-                DownloadQueueManager.addToQueue(
-                    DownloadObjects.DownloadQueueItem(
-                        click.data,
-                        response.isMovie(),
-                        response.name,
-                        response.type,
-                        response.posterUrl,
-                        response.apiName,
-                        response.getId(),
-                        response.url,
-                    ).toWrapper()
+                downloadEpisode(
+                    activity,
+                    click.data,
+                    response.isMovie(),
+                    response.name,
+                    response.type,
+                    response.posterUrl,
+                    response.apiName,
+                    response.getId(),
+                    response.url
                 )
             }
 
@@ -1492,8 +1632,9 @@ class ResultViewModel2 : ViewModel() {
                     LOADTYPE_INAPP_DOWNLOAD,
                     txt(R.string.episode_action_download_mirror)
                 ) { (result, index) ->
-                    DownloadQueueManager.addToQueue(
-                        DownloadObjects.DownloadQueueItem(
+                    ioSafe {
+                        startDownload(
+                            activity,
                             click.data,
                             response.isMovie(),
                             response.name,
@@ -1504,8 +1645,8 @@ class ResultViewModel2 : ViewModel() {
                             response.url,
                             listOf(result.links[index]),
                             result.subs,
-                        ).toWrapper()
-                    )
+                        )
+                    }
                     showToast(
                         R.string.download_started,
                         Toast.LENGTH_SHORT
@@ -1545,24 +1686,26 @@ class ResultViewModel2 : ViewModel() {
 
             ACTION_PLAY_EPISODE_IN_PLAYER -> {
                 val list = HashMap<String, String>(currentResponse?.syncData ?: emptyMap())
-                val generator = generator ?: return
-
-                // I know kinda shit to iterate all, but it is 100% sure to work
-                val index = generator.videos.indexOfFirst { value -> value.id == click.data.id }
 
+                generator?.also {
+                    it.getAll() // I know kinda shit to iterate all, but it is 100% sure to work
+                        ?.indexOfFirst { value -> value is ResultEpisode && value.id == click.data.id }
+                        ?.let { index ->
+                            if (index >= 0)
+                                it.goto(index)
+                        }
+                }
                 if (currentResponse?.type == TvType.CustomMedia) {
-                    generator.generateLinks(
-                        offset = index,
+                    generator?.generateLinks(
                         clearCache = true,
-                        isCasting = false,
-                        sourceTypes = LOADTYPE_ALL,
+                        LOADTYPE_ALL,
                         callback = {},
                         subtitleCallback = {})
                 } else {
                     activity?.navigate(
                         R.id.global_to_navigation_player,
                         GeneratorPlayer.newInstance(
-                            generator, index,list
+                            generator ?: return, list
                         )
                     )
                 }
@@ -1686,13 +1829,14 @@ class ResultViewModel2 : ViewModel() {
                 }
 
                 val realRecommendations = ArrayList<SearchResponse>()
-                val apiNames = apis.filter {
-                    it.name.contains("gogoanime", true) ||
-                        it.name.contains("9anime", true)
-                }.map {
-                    it.name
+                val apiNames = synchronized(apis) {
+                    apis.filter {
+                        it.name.contains("gogoanime", true) ||
+                                it.name.contains("9anime", true)
+                    }.map {
+                        it.name
+                    }
                 }
-
                 meta.recommendations?.forEach { rec ->
                     apiNames.forEach { name ->
                         realRecommendations.add(rec.copy(apiName = name))
@@ -1711,7 +1855,7 @@ class ResultViewModel2 : ViewModel() {
                 {
                     if (this !is AnimeLoadResponse) return@runAllAsync
                     // already exist, no need to run getTracker
-                    if (this.getAniListId() != null && this.getKitsuId() != null && this.getMalId() != null) return@runAllAsync
+                    if (this.getAniListId() != null && this.getMalId() != null) return@runAllAsync
 
                     val res = APIHolder.getTracker(
                         listOfNotNull(
@@ -1729,12 +1873,9 @@ class ResultViewModel2 : ViewModel() {
                         this.year
                     )
 
-                    val kitsuId = AccountManager.kitsuApi.getAnimeIdByTitle(this.name)
-
                     val ids = arrayOf(
                         AccountManager.malApi.idPrefix to res?.malId?.toString(),
-                        AccountManager.aniListApi.idPrefix to res?.aniId,
-                        AccountManager.kitsuApi.idPrefix to kitsuId
+                        AccountManager.aniListApi.idPrefix to res?.aniId
                     )
 
                     if (ids.any { (id, new) ->
@@ -1831,10 +1972,11 @@ class ResultViewModel2 : ViewModel() {
     }
 
 
-    private suspend fun updateFillers(data: LoadResponse) {
-        fillers = ioWorkSafe {
-            FillerEpisodeCheck.getFillerEpisodes(data)
-        } ?: hashSetOf()
+    private suspend fun updateFillers(name: String) {
+        fillers =
+            ioWorkSafe {
+                FillerEpisodeCheck.getFillerEpisodes(name)
+            } ?: emptyMap()
     }
 
     fun changeDubStatus(status: DubStatus) {
@@ -2171,8 +2313,8 @@ class ResultViewModel2 : ViewModel() {
     ) {
         _episodes.postValue(Resource.Loading())
 
-        if (updateFillers) {
-            updateFillers(loadResponse)
+        if (updateFillers && loadResponse is AnimeLoadResponse) {
+            updateFillers(loadResponse.name)
         }
 
         val allEpisodes = when (loadResponse) {
@@ -2213,7 +2355,7 @@ class ResultViewModel2 : ViewModel() {
                                     index,
                                     i.score,
                                     i.description,
-                                    fillers.contains(episode),
+                                    fillers.getOrDefault(episode, false),
                                     loadResponse.type,
                                     mainId,
                                     totalIndex,
@@ -2453,34 +2595,26 @@ class ResultViewModel2 : ViewModel() {
             loadResponse.trailers.windowed(limit, limit, true).takeWhile { list ->
                 list.amap { trailerData ->
                     try {
-                        val links = arrayListOf<Pair<ExtractorLink, String>>()
+                        val links = arrayListOf<Pair<ExtractorLink,String>>()
                         val subs = arrayListOf<SubtitleFile>()
                         if (!loadExtractor(
                                 trailerData.extractorUrl,
                                 trailerData.referer,
                                 { subs.add(it) },
-                                {
-                                    links.add(
-                                        Pair(
-                                            it,
-                                            trailerData.extractorUrl
-                                        )
-                                    )
-                                }) && trailerData.raw
+                                { links.add(Pair(it,trailerData.extractorUrl))}) && trailerData.raw
                         ) {
                             arrayListOf(
                                 Pair(
                                     newExtractorLink(
-                                        "",
-                                        "Trailer",
-                                        trailerData.extractorUrl,
-                                        type = INFER_TYPE
-                                    ) {
-                                        this.referer = trailerData.referer ?: ""
-                                        this.quality = Qualities.Unknown.value
-                                        this.headers = trailerData.headers
-                                    }, trailerData.extractorUrl
-                                )
+                                    "",
+                                    "Trailer",
+                                    trailerData.extractorUrl,
+                                    type = INFER_TYPE
+                                ) {
+                                    this.referer = trailerData.referer ?: ""
+                                    this.quality = Qualities.Unknown.value
+                                    this.headers = trailerData.headers
+                                },trailerData.extractorUrl)
                             ) to arrayListOf()
                         } else {
                             links to subs
@@ -2678,7 +2812,7 @@ class ResultViewModel2 : ViewModel() {
                     setKey(
                         DOWNLOAD_HEADER_CACHE,
                         mainId.toString(),
-                        DownloadObjects.DownloadHeaderCached(
+                        VideoDownloadHelper.DownloadHeaderCached(
                             apiName = apiName,
                             url = validUrl,
                             type = loadResponse.type,
@@ -2706,4 +2840,4 @@ class ResultViewModel2 : ViewModel() {
                 }
             }
         }
-}
+}

app/src/main/java/com/lagradost/cloudstream3/ui/result/SyncViewModel.kt

@@ -11,7 +11,6 @@ import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.mvvm.throwAbleToResource
 import com.lagradost.cloudstream3.syncproviders.AccountManager
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.aniListApi
-import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.kitsuApi
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.malApi
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.simklApi
 import com.lagradost.cloudstream3.syncproviders.SyncAPI
@@ -277,7 +276,6 @@ class SyncViewModel : ViewModel() {
         // fix because of bad old data :pensive:
         val realName = when (syncName) {
             "MAL" -> malApi.idPrefix
-            "Kitsu" -> kitsuApi.idPrefix
             "Simkl" -> simklApi.idPrefix
             "AniList" -> aniListApi.idPrefix
             else -> syncName

app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchAdaptor.kt

@@ -4,6 +4,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.FrameLayout
+import androidx.recyclerview.widget.RecyclerView
 import com.lagradost.cloudstream3.SearchResponse
 import com.lagradost.cloudstream3.databinding.SearchResultGridBinding
 import com.lagradost.cloudstream3.databinding.SearchResultGridExpandedBinding
@@ -11,7 +12,6 @@ import com.lagradost.cloudstream3.ui.AutofitRecyclerView
 import com.lagradost.cloudstream3.ui.BaseDiffCallback
 import com.lagradost.cloudstream3.ui.NoStateAdapter
 import com.lagradost.cloudstream3.ui.ViewHolderState
-import com.lagradost.cloudstream3.ui.newSharedPool
 import com.lagradost.cloudstream3.utils.UIHelper.isBottomLayout
 import kotlin.math.roundToInt
 
@@ -43,7 +43,7 @@ class SearchAdapter(
 })) {
     companion object {
         val sharedPool =
-            newSharedPool { setMaxRecycledViews(CONTENT, 10) }
+            RecyclerView.RecycledViewPool().apply { this.setMaxRecycledViews(CONTENT, 10) }
     }
 
     var hasNext: Boolean = false

app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt

@@ -21,9 +21,7 @@ import androidx.core.view.isVisible
 import androidx.fragment.app.activityViewModels
 import androidx.preference.PreferenceManager
 import androidx.recyclerview.widget.GridLayoutManager
-import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.activity.result.contract.ActivityResultContracts
-import androidx.core.view.doOnLayout
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.button.MaterialButton
@@ -57,9 +55,7 @@ import com.lagradost.cloudstream3.ui.home.HomeViewModel
 import com.lagradost.cloudstream3.ui.home.ParentItemAdapter
 import com.lagradost.cloudstream3.ui.result.FOCUS_SELF
 import com.lagradost.cloudstream3.ui.result.setLinearListLayout
-import com.lagradost.cloudstream3.ui.setRecycledViewPool
 import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR
-import com.lagradost.cloudstream3.ui.settings.Globals.PHONE
 import com.lagradost.cloudstream3.ui.settings.Globals.TV
 import com.lagradost.cloudstream3.ui.settings.Globals.isLandscape
 import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
@@ -75,8 +71,6 @@ import com.lagradost.cloudstream3.utils.Coroutines.main
 import com.lagradost.cloudstream3.utils.DataStoreHelper
 import com.lagradost.cloudstream3.utils.DataStoreHelper.currentAccount
 import com.lagradost.cloudstream3.utils.SubtitleHelper
-import com.lagradost.cloudstream3.utils.BackPressedCallbackHelper.attachBackPressedCallback
-import com.lagradost.cloudstream3.utils.BackPressedCallbackHelper.detachBackPressedCallback
 import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
 import com.lagradost.cloudstream3.utils.UIHelper.fixSystemBarsPadding
 import com.lagradost.cloudstream3.utils.UIHelper.getSpanCount
@@ -143,7 +137,6 @@ class SearchFragment : BaseFragment<FragmentSearchBinding>(
     override fun onDestroyView() {
         hideKeyboard()
         bottomSheetDialog?.ownHide()
-        activity?.detachBackPressedCallback("SearchFragment")
         super.onDestroyView()
     }
 
@@ -407,29 +400,17 @@ class SearchFragment : BaseFragment<FragmentSearchBinding>(
 
         val settingsManager = context?.let { PreferenceManager.getDefaultSharedPreferences(it) }
         val isAdvancedSearch = settingsManager?.getBoolean("advanced_search", true) ?: true
-        val isSearchSuggestionsEnabled = settingsManager?.getBoolean("search_suggestions_enabled", true) ?: true
 
         selectedSearchTypes = DataStoreHelper.searchPreferenceTags.toMutableList()
 
-        if (!isLayout(PHONE)) {
+        if (isLayout(TV)) {
             binding.searchFilter.isFocusable = true
             binding.searchFilter.isFocusableInTouchMode = true
         }
 
-        // Hide suggestions when search view loses focus (phone only)
-        if (isLayout(PHONE)) {
-            binding.mainSearch.setOnQueryTextFocusChangeListener { _, hasFocus ->
-                if (!hasFocus) {
-                    searchViewModel.clearSuggestions()
-                }
-            }
-        }
-
-
         binding.mainSearch.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
             override fun onQueryTextSubmit(query: String): Boolean {
                 search(query)
-                searchViewModel.clearSuggestions()
 
                 binding.mainSearch.let {
                     hideKeyboard(it)
@@ -444,25 +425,51 @@ class SearchFragment : BaseFragment<FragmentSearchBinding>(
                 if (showHistory) {
                     searchViewModel.clearSearch()
                     searchViewModel.updateHistory()
-                    searchViewModel.clearSuggestions()
-                } else {
-                    // Fetch suggestions when user is typing (if enabled)
-                    if (isSearchSuggestionsEnabled) {
-                        searchViewModel.fetchSuggestions(newText)
-                    }
                 }
                 binding.apply {
-                    searchHistoryRecycler.isVisible = showHistory
+                    searchHistoryHolder.isVisible = showHistory
                     searchMasterRecycler.isVisible = !showHistory && isAdvancedSearch
                     searchAutofitResults.isVisible = !showHistory && !isAdvancedSearch
-                    // Hide suggestions when showing history or showing search results
-                    searchSuggestionsRecycler.isVisible = !showHistory && isSearchSuggestionsEnabled
                 }
 
                 return true
             }
         })
 
+        binding.searchClearCallHistory.setOnClickListener {
+            activity?.let { ctx ->
+                val builder: AlertDialog.Builder = AlertDialog.Builder(ctx)
+                val dialogClickListener =
+                    DialogInterface.OnClickListener { _, which ->
+                        when (which) {
+                            DialogInterface.BUTTON_POSITIVE -> {
+                                removeKeys("$currentAccount/$SEARCH_HISTORY_KEY")
+                                searchViewModel.updateHistory()
+                            }
+
+                            DialogInterface.BUTTON_NEGATIVE -> {
+                            }
+                        }
+                    }
+
+                try {
+                    builder.setTitle(R.string.clear_history).setMessage(
+                        ctx.getString(R.string.delete_message).format(
+                            ctx.getString(R.string.history)
+                        )
+                    )
+                        .setPositiveButton(R.string.sort_clear, dialogClickListener)
+                        .setNegativeButton(R.string.cancel, dialogClickListener)
+                        .show().setDefaultFocus()
+                } catch (e: Exception) {
+                    logError(e)
+                    // ye you somehow fucked up formatting did you?
+                }
+            }
+
+
+        }
+
         observe(searchViewModel.searchResponse) {
             when (it) {
                 is Resource.Success -> {
@@ -496,30 +503,24 @@ class SearchFragment : BaseFragment<FragmentSearchBinding>(
             try {
                 // https://stackoverflow.com/questions/6866238/concurrent-modification-exception-adding-to-an-arraylist
                 listLock.lock()
-
-                val pinnedOrder = DataStoreHelper.pinnedProviders.reversedArray()
-
-                val sortedList = list.toList().sortedWith(compareBy { (providerName, _) ->
-                    val index = pinnedOrder.indexOf(providerName)
-                    if (index == -1) Int.MAX_VALUE else index
-                })
-
                 (binding.searchMasterRecycler.adapter as? ParentItemAdapter)?.apply {
-                    val newItems = sortedList.map { (providerName, providerData) ->
-                        val dataList = providerData.list
+                    val newItems = list.map { ongoing ->
+                        val dataList = ongoing.value.list
                         val dataListFiltered =
                             context?.filterSearchResultByFilmQuality(dataList) ?: dataList
 
                         val homePageList = HomePageList(
-                            providerName,
+                            ongoing.key,
                             dataListFiltered
                         )
 
-                        HomeViewModel.ExpandableHomepageList(
+                        val expandableList = HomeViewModel.ExpandableHomepageList(
                             homePageList,
-                            providerData.currentPage,
-                            providerData.hasNext
+                            ongoing.value.currentPage,
+                            ongoing.value.hasNext
                         )
+
+                        expandableList
                     }
 
                     submitList(newItems)
@@ -558,7 +559,6 @@ class SearchFragment : BaseFragment<FragmentSearchBinding>(
             val searchItem = click.item
             when (click.clickAction) {
                 SEARCH_HISTORY_OPEN -> {
-                    if (searchItem == null) return@SearchHistoryAdaptor
                     searchViewModel.clearSearch()
                     if (searchItem.type.isNotEmpty())
                         updateChips(
@@ -569,76 +569,21 @@ class SearchFragment : BaseFragment<FragmentSearchBinding>(
                 }
 
                 SEARCH_HISTORY_REMOVE -> {
-                    if (searchItem == null) return@SearchHistoryAdaptor
                     removeKey("$currentAccount/$SEARCH_HISTORY_KEY", searchItem.key)
                     searchViewModel.updateHistory()
                 }
 
-                SEARCH_HISTORY_CLEAR -> {
-                    // Show confirmation dialog (from footer button)
-                    activity?.let { ctx ->
-                        val builder: AlertDialog.Builder = AlertDialog.Builder(ctx)
-                        val dialogClickListener =
-                            DialogInterface.OnClickListener { _, which ->
-                                when (which) {
-                                    DialogInterface.BUTTON_POSITIVE -> {
-                                        removeKeys("$currentAccount/$SEARCH_HISTORY_KEY")
-                                        searchViewModel.updateHistory()
-                                    }
-
-                                    DialogInterface.BUTTON_NEGATIVE -> {
-                                    }
-                                }
-                            }
-
-                        try {
-                            builder.setTitle(R.string.clear_history).setMessage(
-                                ctx.getString(R.string.delete_message).format(
-                                    ctx.getString(R.string.history)
-                                )
-                            )
-                                .setPositiveButton(R.string.sort_clear, dialogClickListener)
-                                .setNegativeButton(R.string.cancel, dialogClickListener)
-                                .show().setDefaultFocus()
-                        } catch (e: Exception) {
-                            logError(e)
-                        }
-                    }
-                }
-
                 else -> {
                     // wth are you doing???
                 }
             }
         }
 
-        val suggestionAdapter = SearchSuggestionAdapter { callback ->
-            when (callback.clickAction) {
-                SEARCH_SUGGESTION_CLICK -> {
-                    // Search directly
-                    binding.mainSearch.setQuery(callback.suggestion, true)
-                    searchViewModel.clearSuggestions()
-                }
-                SEARCH_SUGGESTION_FILL -> {
-                    // Fill the search box without searching
-                    binding.mainSearch.setQuery(callback.suggestion, false)
-                }
-                SEARCH_SUGGESTION_CLEAR -> {
-                    // Clear suggestions (from footer button)
-                    searchViewModel.clearSuggestions()
-                }
-            }
-        }
-
         binding.apply {
             searchHistoryRecycler.adapter = historyAdapter
             searchHistoryRecycler.setLinearListLayout(isHorizontal = false, nextRight = FOCUS_SELF)
             //searchHistoryRecycler.layoutManager = GridLayoutManager(context, 1)
 
-            // Setup suggestions RecyclerView
-            searchSuggestionsRecycler.adapter = suggestionAdapter
-            searchSuggestionsRecycler.layoutManager = LinearLayoutManager(context)
-
             searchMasterRecycler.setRecycledViewPool(ParentItemAdapter.sharedPool)
             searchMasterRecycler.adapter = masterAdapter
             //searchMasterRecycler.setLinearListLayout(isHorizontal = false, nextRight = FOCUS_SELF)
@@ -654,11 +599,7 @@ class SearchFragment : BaseFragment<FragmentSearchBinding>(
 
             sq?.let { query ->
                 if (query.isBlank()) return@let
-
-                // Queries are dropped if you are submitted before layout finishes
-                mainSearch.doOnLayout {
-                    mainSearch.setQuery(query, true)
-                }
+                mainSearch.setQuery(query, true)
                 // Clear the query as to not make it request the same query every time the page is opened
                 arguments?.remove(SEARCH_QUERY)
                 savedInstanceState?.remove(SEARCH_QUERY)
@@ -667,34 +608,8 @@ class SearchFragment : BaseFragment<FragmentSearchBinding>(
         }
 
         observe(searchViewModel.currentHistory) { list ->
+            binding.searchClearCallHistory.isVisible = list.isNotEmpty()
             (binding.searchHistoryRecycler.adapter as? SearchHistoryAdaptor?)?.submitList(list)
-             // Scroll to top to show newest items (list is sorted by newest first)
-            if (list.isNotEmpty()) {
-                binding.searchHistoryRecycler.scrollToPosition(0)
-            }
-        }
-
-        // Observe search suggestions
-        observe(searchViewModel.searchSuggestions) { suggestions ->
-            val hasSuggestions = suggestions.isNotEmpty()
-            binding.searchSuggestionsRecycler.isVisible = hasSuggestions
-            (binding.searchSuggestionsRecycler.adapter as? SearchSuggestionAdapter?)?.submitList(suggestions)
-
-            // On non-phone layouts, redirect focus and handle back button
-            if (!isLayout(PHONE)) {
-                if (hasSuggestions) {
-                    binding.tvtypesChipsScroll.tvtypesChips.root.nextFocusDownId = R.id.search_suggestions_recycler
-                    // Attach back button callback to clear suggestions
-                    activity?.attachBackPressedCallback("SearchFragment") {
-                        searchViewModel.clearSuggestions()
-                    }
-                } else {
-                    // Reset to default focus target (history)
-                    binding.tvtypesChipsScroll.tvtypesChips.root.nextFocusDownId = R.id.search_history_recycler
-                    // Detach back button callback when no suggestions
-                    activity?.detachBackPressedCallback("SearchFragment")
-                }
-            }
         }
 
         searchViewModel.updateHistory()

app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchHelper.kt

@@ -11,7 +11,7 @@ import com.lagradost.cloudstream3.ui.download.DownloadClickEvent
 import com.lagradost.cloudstream3.ui.result.START_ACTION_LOAD_EP
 import com.lagradost.cloudstream3.utils.AppContextUtils.loadSearchResult
 import com.lagradost.cloudstream3.utils.DataStoreHelper
-import com.lagradost.cloudstream3.utils.downloader.DownloadObjects
+import com.lagradost.cloudstream3.utils.VideoDownloadHelper
 
 object SearchHelper {
     fun handleSearchClickCallback(callback: SearchClickCallback) {
@@ -31,7 +31,7 @@ object SearchHelper {
                             handleDownloadClick(
                                 DownloadClickEvent(
                                     DOWNLOAD_ACTION_PLAY_FILE,
-                                    DownloadObjects.DownloadEpisodeCached(
+                                    VideoDownloadHelper.DownloadEpisodeCached(
                                         name = card.name,
                                         poster = card.posterUrl,
                                         episode = card.episode ?: 0,