Fix: playerVideoTitleRez visibility

.github/workflows/build_to_archive.yml

@@ -71,10 +71,7 @@ jobs:
         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 }}
-        MAL_KEY: ${{ secrets.MAL_KEY }}
-        ANILIST_KEY: ${{ secrets.ANILIST_KEY }}
 
     - uses: actions/checkout@v6
       with:

.github/workflows/instrumented-tests.yml

@@ -1,105 +0,0 @@
-name: Instrumented Tests
-
-on:
-  issue_comment:
-    types: [created]
-
-permissions:
-  contents: read
-  pull-requests: write
-
-jobs:
-  instrumented-tests:
-    runs-on: ubuntu-latest
-    if: |
-      github.event.issue.pull_request &&
-      github.event.comment.body == '/run-tests'
-    steps:
-    - name: Check permission
-      uses: actions/github-script@v9
-      with:
-        script: |
-          const login = context.payload.comment.user.login;
-          const association = context.payload.comment.author_association;
-          const allowed = ['OWNER', 'MEMBER'];
-
-          const isAllowed =
-            login === 'Luna712' ||
-            allowed.includes(association);
-
-          if (!isAllowed) {
-            core.setFailed(`User ${login} is not permitted to trigger this workflow.`);
-          }
-
-    - uses: actions/checkout@v6
-      with:
-        ref: refs/pull/${{ github.event.issue.number }}/head
-
-    - name: Post started comment
-      uses: actions/github-script@v9
-      with:
-        script: |
-          github.rest.issues.createComment({
-            issue_number: context.issue.number,
-            owner: context.repo.owner,
-            repo: context.repo.repo,
-            body: 'Instrumented tests are running. [View live progress](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }})'
-          })
-
-    - name: Set up JDK 17
-      uses: actions/setup-java@v5
-      with:
-        distribution: temurin
-        java-version: 17
-
-    - name: Grant execute permission for gradlew
-      run: chmod +x gradlew
-
-    - name: Setup Gradle
-      uses: gradle/actions/setup-gradle@v5
-      with:
-        cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
-        cache-read-only: false
-
-    - name: Get target SDK
-      id: sdk
-      run: |
-        TARGET_SDK=$(grep 'targetSdk' gradle/libs.versions.toml | grep -o '[0-9]\+' | head -1)
-        echo "version=$TARGET_SDK" >> $GITHUB_OUTPUT
-
-    - name: Enable KVM
-      run: |
-        echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
-        sudo udevadm control --reload-rules
-        sudo udevadm trigger --name-match=kvm
-
-    - name: Run Instrumented Tests
-      id: tests
-      uses: reactivecircus/android-emulator-runner@v2
-      with:
-        api-level: ${{ steps.sdk.outputs.version }}
-        arch: x86_64
-        profile: Nexus 6
-        script: ./gradlew connectedPrereleaseDebugAndroidTest
-
-    - name: Upload Test Results
-      if: always()
-      uses: actions/upload-artifact@v7
-      with:
-        name: instrumented-test-results
-        path: '**/build/reports/androidTests/'
-
-    - name: Post finished comment
-      if: always()
-      uses: actions/github-script@v9
-      with:
-        script: |
-          const success = '${{ steps.tests.outcome }}' === 'success';
-          github.rest.issues.createComment({
-            issue_number: context.issue.number,
-            owner: context.repo.owner,
-            repo: context.repo.repo,
-            body: success
-              ? 'Instrumented tests passed. [View results](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }})'
-              : 'Instrumented tests failed. [View results](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }})'
-          })

.github/workflows/issue_action.yml

@@ -0,0 +1,98 @@
+name: Issue automatic actions
+
+on:
+  issues:
+    types: [opened]
+
+permissions:
+  contents: read
+  issues: write
+
+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@v9
+        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@v9
+        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

@@ -62,10 +62,7 @@ jobs:
         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 }}
-        MAL_KEY: ${{ secrets.MAL_KEY }}
-        ANILIST_KEY: ${{ secrets.ANILIST_KEY }}
 
     - name: Create pre-release
       uses: marvinpinto/action-automatic-releases@latest

.github/workflows/pull_request.yml

@@ -26,13 +26,8 @@ jobs:
         cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
         cache-read-only: false
 
-    - name: Ensure binary compatibility
-      # This is to ensure that your code is backwards compatible.
-      # If this fails you need to add a @Prerelease annotation to new code.
-      run: ./gradlew library:checkKotlinAbi
-
     - name: Run Gradle
-      run: ./gradlew assemblePrereleaseDebug lint check
+      run: ./gradlew assemblePrereleaseDebug lint
 
     - name: Upload Artifact
       uses: actions/upload-artifact@v7

COMPOSE.md

@@ -1,21 +0,0 @@
-# Migration guide to Compose
-
-### 1. MVI instead of MVVM 
-
-The current design of CloudStream loosely uses the MVVM architecture.
-
-This means that the UI invokes the viewmodel with function calls, and it responds with LiveData fields that are observed. While this has worked, it generates a lot of boilerplate and has created some friction.
-
-To make it easier to work with Compose, the new architecture will be based on MVI. In short this means that the viewmodel exposes a singular immutable class that is observed, and receives all UI events with a singular event that is a sealed class. All the UI should be able to be recreated based on this singular state class, and all interactions should be able to be replayed using only the event callback.
-
-For a more detailed overview, see: https://www.youtube.com/watch?v=b2z1jvD4VMQ
-
-This is part of the effort to make CloudStream cross platform, as it allows us to decouple UI and logic.
-
-### 2. KMP-compatible libraries
-
-We plan to leverage Kotlin's KMP project to compile our code to different architectures. However, this requires us to only use KMP-compatible libraries, no Java. Therefore any pull requests must ensure that they use KMP-compatible libraries only.
-
-### 3. UI Changes
-
-While migrating to the new compose UI, you also have the opportunity to change the UI. However, this should only be to freshen up the UI, not completely redesign it. It is also important to stress that this process should not lose any features of the old UI, and be very conservative with adding new features.

app/build.gradle.kts

@@ -8,7 +8,6 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
 plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.dokka)
-    alias(libs.plugins.kotlin.serialization)
 }
 
 val javaTarget = JvmTarget.fromTarget(libs.versions.jvmTarget.get())
@@ -104,8 +103,8 @@ 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 = 68
+        versionName = "4.7.0"
 
         manifestPlaceholders["target_sdk_version"] = libs.versions.targetSdk.get()
 
@@ -127,16 +126,6 @@ android {
             "SIMKL_CLIENT_SECRET",
             "\"" + (System.getenv("SIMKL_CLIENT_SECRET") ?: localProperties["simkl.secret"]) + "\""
         )
-        buildConfigField(
-            "String",
-            "MAL_KEY",
-            "\"" + (System.getenv("MAL_KEY") ?: localProperties["mal.key"]) + "\""
-        )
-        buildConfigField(
-            "String",
-            "ANILIST_KEY",
-            "\"" + (System.getenv("ANILIST_KEY") ?: localProperties["anilist.key"]) + "\""
-        )
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
 
@@ -217,11 +206,9 @@ 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)
@@ -232,7 +219,6 @@ dependencies {
     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)
@@ -268,19 +254,14 @@ dependencies {
 
     // Extensions & Other Libs
     implementation(libs.jsoup) // HTML Parser
-    implementation(libs.ksoup) // 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)
 
-    // Temp/deprecated; will be removed once extensions have time to migrate from using it
-    implementation("com.google.code.gson:gson:2.11.0")
-    // 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)
 
@@ -325,6 +306,7 @@ tasks.withType<KotlinJvmCompile> {
     compilerOptions {
         jvmTarget.set(javaTarget)
         jvmDefault.set(JvmDefaultMode.ENABLE)
+        freeCompilerArgs.add("-Xannotation-default-target=param-property")
         optIn.addAll(
             "com.lagradost.cloudstream3.InternalAPI",
             "com.lagradost.cloudstream3.Prerelease",

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

@@ -55,6 +55,12 @@ class ExampleInstrumentedTest {
         return APIHolder.allProviders.toTypedArray() //.filter { !it.usesWebView }
     }
 
+    @Test
+    fun providersExist() {
+        Assert.assertTrue(getAllProviders().isNotEmpty())
+        println("Done providersExist")
+    }
+
     @Throws
     private inline fun <reified T : ViewBinding> testAllLayouts(
         activity: Activity,

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

@@ -1,154 +0,0 @@
-package com.lagradost.cloudstream3
-
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.platform.app.InstrumentationRegistry
-import com.lagradost.cloudstream3.SkipSerializationTest
-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}")
-
-        val failures = mutableListOf<String>()
-
-        serializableClasses.forEach { kClass ->
-            runCatching {
-                val instance = Instancio.of(kClass.java).withMaxDepth(10).create()
-
-                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}")
-            }.onFailure { e ->
-                failures.add("FAILED ${kClass.qualifiedName}: ${e.message}")
-            }
-        }
-
-        if (failures.isNotEmpty()) {
-            throw AssertionError("${failures.size} class(es) failed:\n${failures.joinToString("\n")}")
-        }
-    }
-
-    @OptIn(InternalSerializationApi::class, ExperimentalSerializationApi::class)
-    @Test
-    fun isIdenticalDeserialization() {
-        val serializableClasses = findSerializableClasses("com.lagradost")
-        println("Number of serializable classes: ${serializableClasses.size}")
-
-        val failures = mutableListOf<String>()
-
-        serializableClasses.forEach { kClass ->
-            runCatching {
-                val instance = Instancio.of(kClass.java).withMaxDepth(10).create()
-                // 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}")
-            }.onFailure { e ->
-                failures.add("FAILED ${kClass.qualifiedName}: ${e.message}")
-            }
-        }
-
-        if (failures.isNotEmpty()) {
-            throw AssertionError("${failures.size} class(es) failed:\n${failures.joinToString("\n")}")
-        }
-    }
-
-    // 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 }
-                    && kClass.java.annotations.none { it is SkipSerializationTest }
-                    && !kClass.isAbstract
-            }
-    }
-
-    @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/UriSerializerTest.kt

@@ -1,41 +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.SerialName
-import kotlinx.serialization.Serializable
-import org.junit.Assert.assertEquals
-import org.junit.Assert.assertTrue
-import org.junit.Test
-
-@Serializable
-data class UriData(
-    @Serializable(with = UriSerializer::class)
-    @SerialName("uri") val uri: Uri = Uri.EMPTY,
-)
-
-class UriSerializerTest {
-
-    @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"

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

@@ -7,7 +7,7 @@ package com.lagradost.cloudstream3
 @Deprecated(
     message = "AcraApplication is deprecated, use CloudStreamApp instead",
     replaceWith = ReplaceWith("com.lagradost.cloudstream3.CloudStreamApp"),
-    level = DeprecationLevel.ERROR
+    level = DeprecationLevel.WARNING
 )
 class AcraApplication {
 	companion object {
@@ -15,14 +15,14 @@ class AcraApplication {
 		@Deprecated(
 		    message = "AcraApplication is deprecated, use CloudStreamApp instead",
 		    replaceWith = ReplaceWith("com.lagradost.cloudstream3.CloudStreamApp.context"),
-		    level = DeprecationLevel.ERROR
+		    level = DeprecationLevel.WARNING
 		)
 		val context get() = CloudStreamApp.context
 
 		@Deprecated(
 		    message = "AcraApplication is deprecated, use CloudStreamApp instead",
 		    replaceWith = ReplaceWith("com.lagradost.cloudstream3.CloudStreamApp.removeKeys(folder)"),
-		    level = DeprecationLevel.ERROR
+		    level = DeprecationLevel.WARNING
 		)
 		fun removeKeys(folder: String): Int? =
 		    CloudStreamApp.removeKeys(folder)
@@ -30,7 +30,7 @@ class AcraApplication {
 		@Deprecated(
 		    message = "AcraApplication is deprecated, use CloudStreamApp instead",
 		    replaceWith = ReplaceWith("com.lagradost.cloudstream3.CloudStreamApp.setKey(path, value)"),
-		    level = DeprecationLevel.ERROR
+		    level = DeprecationLevel.WARNING
 		)
 		fun <T> setKey(path: String, value: T) =
 			CloudStreamApp.setKey(path, value)
@@ -38,7 +38,7 @@ class AcraApplication {
 		@Deprecated(
 		    message = "AcraApplication is deprecated, use CloudStreamApp instead",
 		    replaceWith = ReplaceWith("com.lagradost.cloudstream3.CloudStreamApp.setKey(folder, path, value)"),
-		    level = DeprecationLevel.ERROR
+		    level = DeprecationLevel.WARNING
 		)
 		fun <T> setKey(folder: String, path: String, value: T) =
 			CloudStreamApp.setKey(folder, path, value)
@@ -46,7 +46,7 @@ class AcraApplication {
 		@Deprecated(
 		    message = "AcraApplication is deprecated, use CloudStreamApp instead",
 		    replaceWith = ReplaceWith("com.lagradost.cloudstream3.CloudStreamApp.getKey(path, defVal)"),
-		    level = DeprecationLevel.ERROR
+		    level = DeprecationLevel.WARNING
 		)
 		inline fun <reified T : Any> getKey(path: String, defVal: T?): T? =
 			CloudStreamApp.getKey(path, defVal)
@@ -54,7 +54,7 @@ class AcraApplication {
 		@Deprecated(
 		    message = "AcraApplication is deprecated, use CloudStreamApp instead",
 		    replaceWith = ReplaceWith("com.lagradost.cloudstream3.CloudStreamApp.getKey(path)"),
-		    level = DeprecationLevel.ERROR
+		    level = DeprecationLevel.WARNING
 		)
 		inline fun <reified T : Any> getKey(path: String): T? =
 			CloudStreamApp.getKey(path)
@@ -62,7 +62,7 @@ class AcraApplication {
 		@Deprecated(
 		    message = "AcraApplication is deprecated, use CloudStreamApp instead",
 		    replaceWith = ReplaceWith("com.lagradost.cloudstream3.CloudStreamApp.getKey(folder, path)"),
-		    level = DeprecationLevel.ERROR
+		    level = DeprecationLevel.WARNING
 		)
 		inline fun <reified T : Any> getKey(folder: String, path: String): T? =
 		    CloudStreamApp.getKey(folder, path)
@@ -70,7 +70,7 @@ class AcraApplication {
 		@Deprecated(
 		    message = "AcraApplication is deprecated, use CloudStreamApp instead",
 		    replaceWith = ReplaceWith("com.lagradost.cloudstream3.CloudStreamApp.getKey(folder, path, defVal)"),
-		    level = DeprecationLevel.ERROR
+		    level = DeprecationLevel.WARNING
 		)
 		inline fun <reified T : Any> getKey(folder: String, path: String, defVal: T?): T? =
 			CloudStreamApp.getKey(folder, path, defVal)

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

@@ -113,7 +113,7 @@ class CloudStreamApp : Application(), SingletonImageLoader.Factory {
             get() = _context?.get()
             private set(value) {
                 _context = WeakReference(value)
-                setContext(value)
+                setContext(WeakReference(value))
             }
 
         fun <T : Any> getKeyClass(path: String, valueType: Class<T>): T? {

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

@@ -579,10 +579,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())

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

@@ -171,17 +171,13 @@ import com.lagradost.cloudstream3.utils.UIHelper.hideKeyboard
 import com.lagradost.cloudstream3.utils.UIHelper.navigate
 import com.lagradost.cloudstream3.utils.UIHelper.requestRW
 import com.lagradost.cloudstream3.utils.UIHelper.setNavigationBarColorCompat
-import com.lagradost.cloudstream3.utils.UIHelper.showProgress
 import com.lagradost.cloudstream3.utils.UIHelper.toPx
 import com.lagradost.cloudstream3.utils.USER_PROVIDER_API
 import com.lagradost.cloudstream3.utils.USER_SELECTED_HOMEPAGE_API
-import com.lagradost.cloudstream3.utils.downloader.DownloadQueueManager
 import com.lagradost.cloudstream3.utils.setText
 import com.lagradost.cloudstream3.utils.setTextHtml
 import com.lagradost.cloudstream3.utils.txt
 import com.lagradost.safefile.SafeFile
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.cancel
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import java.io.File
@@ -191,8 +187,10 @@ import java.net.URLDecoder
 import java.nio.charset.Charset
 import kotlin.math.abs
 import kotlin.math.absoluteValue
-import kotlin.reflect.full.createInstance
 import kotlin.system.exitProcess
+import com.lagradost.cloudstream3.utils.downloader.DownloadQueueManager
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.cancel
 
 class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCallback {
     companion object {
@@ -410,14 +408,17 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
                                 return true
                             }
 
-                            val matchedApi = apis.filter { str.startsWith(it.mainUrl) }.firstOrNull()
-                            if (matchedApi != null) {
-                                loadResult(str, matchedApi.name, "")
+                            synchronized(apis) {
+                                for (api in apis) {
+                                    if (str.startsWith(api.mainUrl)) {
+                                        loadResult(str, api.name, "")
                                         return true
                                     }
                                 }
                             }
                         }
+                    }
+                }
                 return false
             }
 
@@ -786,6 +787,7 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
             }
         }
 
+
         val builder = NavOptions.Builder().setLaunchSingleTop(true).setRestoreState(true)
             .setEnterAnim(R.anim.enter_anim)
             .setExitAnim(R.anim.exit_anim)
@@ -807,33 +809,32 @@ 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 ->
                             list.forEach { custom ->
-                                allProviders.firstOrNull {
-                                    it::class.simpleName == custom.parentClassName
-                                }?.let {
+                                allProviders.firstOrNull { it.javaClass.simpleName == custom.parentJavaClass }
+                                    ?.let {
                                         allProviders.add(
-                                        it::class.createInstance().apply {
+                                            it.javaClass.getDeclaredConstructor().newInstance()
+                                                .apply {
                                                     name = custom.name
                                                     lang = custom.lang
                                                     mainUrl = custom.url.trimEnd('/')
                                                     canBeOverridden = false
-                                        }
-                                    )
+                                                })
                                     }
                             }
                         }
                         // it.hashCode() is not enough to make sure they are distinct
-                        apis = allProviders.distinctBy {
-                            it.lang + it.name + it.mainUrl + it::class.qualifiedName
-                        }
+                        apis =
+                            allProviders.distinctBy { it.lang + it.name + it.mainUrl + it.javaClass.name }
                         APIHolder.apiMap = null
                     } catch (e: Exception) {
                         logError(e)
@@ -1215,7 +1216,7 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
         // backup when we update the app, I don't trust myself to not boot lock users, might want to make this a setting?
         safe {
             val appVer = BuildConfig.VERSION_NAME
-            val lastAppAutoBackup: String = getKey<String>("VERSION_NAME") ?: ""
+            val lastAppAutoBackup: String = getKey("VERSION_NAME") ?: ""
             if (appVer != lastAppAutoBackup) {
                 setKey("VERSION_NAME", BuildConfig.VERSION_NAME)
                 if (lastAppAutoBackup.isEmpty()) return@safe
@@ -1429,9 +1430,8 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
 
                     else -> {
                         resultviewPreviewBookmark.isEnabled = false
-                        resultviewPreviewBookmark.showProgress()
-                        //resultviewPreviewBookmark.setIconResource(R.drawable.ic_baseline_bookmark_border_24)
-                        //resultviewPreviewBookmark.setText(R.string.loading)
+                        resultviewPreviewBookmark.setIconResource(R.drawable.ic_baseline_bookmark_border_24)
+                        resultviewPreviewBookmark.setText(R.string.loading)
                     }
                 }
             }
@@ -1657,7 +1657,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)
@@ -1965,7 +1967,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(
@@ -2018,7 +2020,7 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
         }
 
         try {
-            if (getKey<Boolean>(HAS_DONE_SETUP_KEY, false) != true) {
+            if (getKey(HAS_DONE_SETUP_KEY, false) != true) {
                 navController.navigate(R.id.navigation_setup_language)
                 // If no plugins bring up extensions screen
             } else if (PluginManager.getPluginsOnline().isEmpty()

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,17 +32,18 @@ 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
 import kotlinx.coroutines.withContext
 import java.util.concurrent.Callable
 import java.util.concurrent.FutureTask
+import kotlin.reflect.jvm.jvmName
 
 object VideoClickActionHolder {
-    val allVideoClickActions = atomicListOf(
+    val allVideoClickActions = threadSafeListOf(
         // Default
         PlayInBrowserAction(),
         CopyClipboardAction(),
@@ -65,8 +64,6 @@ object VideoClickActionHolder {
         MpvYTDLPackage(),
         MpvKtPackage(),
         MpvKtPreviewPackage(),
-        OnlyPlayer(),
-        MpvRxPackage(),
         // Always Ask option
         AlwaysAskAction(),
         // added by plugins
@@ -160,7 +157,7 @@ abstract class VideoClickAction {
         }
     }
 
-    fun uniqueId() = "$sourcePlugin:${this::class.qualifiedName}"
+    fun uniqueId() = "$sourcePlugin:${this::class.jvmName}"
 
     @Throws
     abstract fun shouldShow(context: Context?, video: ResultEpisode?): Boolean

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

@@ -7,7 +7,6 @@ import android.net.Uri
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.cloudstream3.actions.OpenInAppAction
 import com.lagradost.cloudstream3.BuildConfig
-import com.lagradost.cloudstream3.SkipSerializationTest
 import com.lagradost.cloudstream3.ui.player.ExtractorUri
 import com.lagradost.cloudstream3.ui.player.SubtitleData
 import com.lagradost.cloudstream3.ui.player.SubtitleOrigin
@@ -23,10 +22,7 @@ import com.lagradost.cloudstream3.utils.newExtractorLink
 import com.lagradost.cloudstream3.utils.Qualities
 import com.lagradost.cloudstream3.utils.SubtitleHelper.fromCodeToLangTagIETF
 import com.lagradost.cloudstream3.utils.SubtitleHelper.fromLanguageToTagIETF
-import com.lagradost.cloudstream3.utils.serializers.UriSerializer
 import com.lagradost.cloudstream3.utils.txt
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
 
 /**
  * If you want to support CloudStream 3 as an external player, then this shows how to play any video link
@@ -53,17 +49,19 @@ class CloudStreamPackage : OpenInAppAction(
         const val DURATION_EXTRA: String = "dur" // Duration time in MS (Long)
     }
 
-    @Serializable
-    @SkipSerializationTest //.Uri has issues with Jackson
     data class MinimalVideoLink(
-        @JsonProperty("uri") @SerialName("uri")
-        @Serializable(with = UriSerializer::class)
+        @JsonProperty("uri")
         val uri: Uri?,
-        @JsonProperty("url") @SerialName("url") val url: String?,
-        @JsonProperty("mimeType") @SerialName("mimeType") val mimeType: String = "video/mp4",
-        @JsonProperty("name") @SerialName("name") val name: String?,
-        @JsonProperty("headers") @SerialName("headers") var headers: Map<String, String> = mapOf(),
-        @JsonProperty("quality") @SerialName("quality") val quality: Int?,
+        @JsonProperty("url")
+        val url: String?,
+        @JsonProperty("mimeType")
+        val mimeType: String = "video/mp4",
+        @JsonProperty("name")
+        val name: String?,
+        @JsonProperty("headers")
+        var headers: Map<String, String> = mapOf(),
+        @JsonProperty("quality")
+        val quality: Int?,
     ) {
         companion object {
             fun fromExtractor(link: ExtractorLink): MinimalVideoLink = MinimalVideoLink(
@@ -99,12 +97,16 @@ class CloudStreamPackage : OpenInAppAction(
             }
     }
 
-    @Serializable
+
     data class MinimalSubtitleLink(
-        @JsonProperty("url") @SerialName("url") val url: String,
-        @JsonProperty("mimeType") @SerialName("mimeType") val mimeType: String = "text/vtt",
-        @JsonProperty("name") @SerialName("name") val name: String?,
-        @JsonProperty("headers") @SerialName("headers") var headers: Map<String, String> = mapOf(),
+        @JsonProperty("url")
+        val url: String,
+        @JsonProperty("mimeType")
+        val mimeType: String = "text/vtt",
+        @JsonProperty("name")
+        val name: String?,
+        @JsonProperty("headers")
+        var headers: Map<String, String> = mapOf(),
     ) {
         companion object {
             fun fromSubtitle(sub: SubtitleData): MinimalSubtitleLink = MinimalSubtitleLink(

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/VlcPackage.kt

@@ -60,7 +60,7 @@ open class VlcPackage: OpenInAppAction(
         intent.putExtra("secure_uri", true)
         intent.putExtra("title", video.name)
 
-        val subsLang = getKey<String>(SUBTITLE_AUTO_SELECT_KEY) ?: "en"
+        val subsLang = getKey(SUBTITLE_AUTO_SELECT_KEY) ?: "en"
         result.subs.firstOrNull {
             subsLang == it.languageCode
         }?.let {

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

@@ -1,9 +1,5 @@
 package com.lagradost.cloudstream3.actions.temp.fcast
 
-import com.fasterxml.jackson.annotation.JsonProperty
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-
 // See https://gitlab.com/futo-org/fcast/-/wikis/Protocol-version-1
 enum class Opcode(val value: Byte) {
     None(0),
@@ -22,18 +18,18 @@ enum class Opcode(val value: Byte) {
     Pong(13);
 }
 
-@Serializable
+
 data class PlayMessage(
-    @JsonProperty("container") @SerialName("container") val container: String,
-    @JsonProperty("url") @SerialName("url") val url: String? = null,
-    @JsonProperty("content") @SerialName("content") val content: String? = null,
-    @JsonProperty("time") @SerialName("time") val time: Double? = null,
-    @JsonProperty("speed") @SerialName("speed") val speed: Double? = null,
-    @JsonProperty("headers") @SerialName("headers") val headers: Map<String, String>? = null,
+    val container: String,
+    val url: String? = null,
+    val content: String? = null,
+    val time: Double? = null,
+    val speed: Double? = null,
+    val headers: Map<String, String>? = null
 )
 
 data class SeekMessage(
-    val time: Double,
+    val time: Double
 )
 
 data class PlaybackUpdateMessage(
@@ -41,26 +37,26 @@ data class PlaybackUpdateMessage(
     val time: Double,
     val duration: Double,
     val state: Int,
-    val speed: Double,
+    val speed: Double
 )
 
 data class VolumeUpdateMessage(
     val generationTime: Long,
-    val volume: Double,
+    val volume: Double
 )
 
 data class PlaybackErrorMessage(
-    val message: String,
+    val message: String
 )
 
 data class SetSpeedMessage(
-    val speed: Double,
+    val speed: Double
 )
 
 data class SetVolumeMessage(
-    val volume: Double,
+    val volume: Double
 )
 
 data class VersionMessage(
-    val version: Long,
+    val version: Long
 )

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

@@ -22,6 +22,7 @@ fun Requests.initClient(context: 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)
 }
@@ -33,6 +34,7 @@ fun buildDefaultClient(context: Context): OkHttpClient {
 }
 
 /** 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) }
     

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,8 +26,10 @@ abstract class Plugin : BasePlugin() {
     fun registerVideoClickAction(element: VideoClickAction) {
         Log.i(PLUGIN_TAG, "Adding ${element.name} VideoClickAction")
         element.sourcePlugin = this.filename
+        synchronized(VideoClickActionHolder.allVideoClickActions) {
             VideoClickActionHolder.allVideoClickActions.add(element)
         }
+    }
 
     /**
      * This will contain your resources if you specified requiresResources in gradle

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

@@ -61,8 +61,6 @@ import com.lagradost.cloudstream3.utils.txt
 import dalvik.system.PathClassLoader
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
 import java.io.File
 import java.io.InputStreamReader
 
@@ -75,13 +73,12 @@ const val EXTENSIONS_CHANNEL_NAME = "Extensions"
 const val EXTENSIONS_CHANNEL_DESCRIPT = "Extension notification channel"
 
 // Data class for internal storage
-@Serializable
 data class PluginData(
-    @JsonProperty("internalName") @SerialName("internalName") val internalName: String,
-    @JsonProperty("url") @SerialName("url") val url: String?,
-    @JsonProperty("isOnline") @SerialName("isOnline") val isOnline: Boolean,
-    @JsonProperty("filePath") @SerialName("filePath") val filePath: String,
-    @JsonProperty("version") @SerialName("version") val version: Int,
+    @JsonProperty("internalName") val internalName: String,
+    @JsonProperty("url") val url: String?,
+    @JsonProperty("isOnline") val isOnline: Boolean,
+    @JsonProperty("filePath") val filePath: String,
+    @JsonProperty("version") val version: Int,
 ) {
     @WorkerThread
     fun toSitePlugin(): SitePlugin {
@@ -176,11 +173,11 @@ object PluginManager {
 
 
     fun getPluginsOnline(): Array<PluginData> {
-        return getKey<Array<PluginData>>(PLUGINS_KEY) ?: emptyArray()
+        return getKey(PLUGINS_KEY) ?: emptyArray()
     }
 
     fun getPluginsLocal(): Array<PluginData> {
-        return getKey<Array<PluginData>>(PLUGINS_KEY_LOCAL) ?: emptyArray()
+        return getKey(PLUGINS_KEY_LOCAL) ?: emptyArray()
     }
 
     private val CLOUD_STREAM_FOLDER =
@@ -224,17 +221,17 @@ object PluginManager {
     // Helper class for updateAllOnlinePluginsAndLoadThem
     data class OnlinePluginData(
         val savedData: PluginData,
-        val onlineData: PluginWrapper,
+        val onlineData: Pair<String, SitePlugin>,
     ) {
         val isOutdated =
-            onlineData.plugin.version > savedData.version || onlineData.plugin.version == PLUGIN_VERSION_ALWAYS_UPDATE
-        val isDisabled = onlineData.plugin.status == PROVIDER_STATUS_DOWN
+            onlineData.second.version > savedData.version || onlineData.second.version == PLUGIN_VERSION_ALWAYS_UPDATE
+        val isDisabled = onlineData.second.status == PROVIDER_STATUS_DOWN
 
         fun validOnlineData(context: Context): Boolean {
             return getPluginPath(
                 context,
                 savedData.internalName,
-                onlineData.repositoryData.url
+                onlineData.first
             ).absolutePath == savedData.filePath
         }
     }
@@ -282,19 +279,19 @@ object PluginManager {
             ?: emptyArray()) + PREBUILT_REPOSITORIES
 
         val onlinePlugins = urls.toList().amap {
-            getRepoPlugins(it) ?: emptyList()
-        }.flatten().distinctBy { it.plugin.url }
+            getRepoPlugins(it.url)?.toList() ?: emptyList()
+        }.flatten().distinctBy { it.second.url }
 
         // Iterates over all offline plugins, compares to remote repo and returns the plugins which are outdated
         val outdatedPlugins = getPluginsOnline().map { savedData ->
             onlinePlugins
-                .filter { onlineData -> savedData.internalName == onlineData.plugin.internalName }
+                .filter { onlineData -> savedData.internalName == onlineData.second.internalName }
                 .map { onlineData ->
                     OnlinePluginData(savedData, onlineData)
                 }.filter {
                     it.validOnlineData(activity)
                 }
-        }.flatten().distinctBy { it.onlineData.plugin.url }
+        }.flatten().distinctBy { it.onlineData.second.url }
 
         debugPrint {
             "Outdated plugins: ${outdatedPlugins.filter { it.isOutdated }}"
@@ -309,14 +306,14 @@ object PluginManager {
             } else if (pluginData.isOutdated) {
                 downloadPlugin(
                     activity,
-                    pluginData.onlineData.plugin.url,
-                    pluginData.onlineData.plugin.fileHash,
+                    pluginData.onlineData.second.url,
+                    pluginData.onlineData.second.fileHash,
                     pluginData.savedData.internalName,
                     File(pluginData.savedData.filePath),
                     true
                 ).let { success ->
                     if (success)
-                        updatedPlugins.add(pluginData.onlineData.plugin.name)
+                        updatedPlugins.add(pluginData.onlineData.second.name)
                 }
             }
         }
@@ -359,15 +356,15 @@ object PluginManager {
         val urls = (getKey<Array<RepositoryData>>(REPOSITORIES_KEY)
             ?: emptyArray()) + PREBUILT_REPOSITORIES
         val onlinePlugins = urls.toList().amap {
-            getRepoPlugins(it)?.toList() ?: emptyList()
-        }.flatten().distinctBy { it.plugin.url }
+            getRepoPlugins(it.url)?.toList() ?: emptyList()
+        }.flatten().distinctBy { it.second.url }
 
         val providerLang = activity.getApiProviderLangSettings()
         //Log.i(TAG, "providerLang => ${providerLang.toJson()}")
 
         // Iterate online repos and returns not downloaded plugins
         val notDownloadedPlugins = onlinePlugins.mapNotNull { onlineData ->
-            val sitePlugin = onlineData.plugin
+            val sitePlugin = onlineData.second
             val tvtypes = sitePlugin.tvTypes ?: listOf()
 
             //Don't include empty urls
@@ -379,7 +376,7 @@ object PluginManager {
             }
 
             //Omit already existing plugins
-            if (getPluginPath(activity, sitePlugin.internalName, onlineData.repositoryData.url).exists()) {
+            if (getPluginPath(activity, sitePlugin.internalName, onlineData.first).exists()) {
                 Log.i(TAG, "Skip > ${sitePlugin.internalName}")
                 return@mapNotNull null
             }
@@ -421,14 +418,14 @@ object PluginManager {
         notDownloadedPlugins.amap { pluginData ->
             downloadPlugin(
                 activity,
-                pluginData.onlineData.plugin.url,
-                pluginData.onlineData.plugin.fileHash,
+                pluginData.onlineData.second.url,
+                pluginData.onlineData.second.fileHash,
                 pluginData.savedData.internalName,
-                pluginData.onlineData.repositoryData.url,
+                pluginData.onlineData.first,
                 !pluginData.isDisabled
             ).let { success ->
                 if (success)
-                    newDownloadPlugins.add(pluginData.onlineData.plugin.name)
+                    newDownloadPlugins.add(pluginData.onlineData.second.name)
             }
         }
 
@@ -512,9 +509,6 @@ object PluginManager {
             val res = dir.mkdirs()
             if (!res) {
                 Log.w(TAG, "Failed to create local directories")
-                // We have tried to load local plugins, but exit early.
-                // This needs to be true to prevent the downloader waiting for plugins.
-                loadedLocalPlugins = true
                 return
             }
         }
@@ -616,7 +610,7 @@ object PluginManager {
                     return false
                 }
                 InputStreamReader(stream).use { reader ->
-                    manifest = parseJson<BasePlugin.Manifest>(reader.readText())
+                    manifest = parseJson(reader, BasePlugin.Manifest::class.java)
                 }
             }
 
@@ -657,15 +651,9 @@ object PluginManager {
                     context.resources.configuration
                 )
             }
-            synchronized(plugins) {
             plugins[filePath] = pluginInstance
-            }
-            synchronized(classLoaders) {
             classLoaders[loader] = pluginInstance
-            }
-            synchronized(urlPlugins) {
             urlPlugins[data.url ?: filePath] = pluginInstance
-            }
             if (pluginInstance is Plugin) {
                 pluginInstance.load(context)
             } else {
@@ -701,20 +689,21 @@ object PluginManager {
         }
 
         // remove all registered apis
+        synchronized(APIHolder.apis) {
             APIHolder.apis.filter { api -> api.sourcePlugin == plugin.filename }.forEach {
                 removePluginMapping(it)
             }
-
-        APIHolder.allProviders.withLock {
-            APIHolder.allProviders.removeAll { provider -> provider.sourcePlugin == plugin.filename }
+        }
+        synchronized(APIHolder.allProviders) {
+            APIHolder.allProviders.removeIf { provider: MainAPI -> provider.sourcePlugin == plugin.filename }
         }
 
-        extractorApis.withLock {
-            extractorApis.removeAll { provider -> provider.sourcePlugin == plugin.filename }
+        synchronized(extractorApis) {
+            extractorApis.removeIf { provider: ExtractorApi -> provider.sourcePlugin == plugin.filename }
         }
 
-        VideoClickActionHolder.allVideoClickActions.withLock {
-            VideoClickActionHolder.allVideoClickActions.removeAll { action -> action.sourcePlugin == plugin.filename }
+        synchronized(VideoClickActionHolder.allVideoClickActions) {
+            VideoClickActionHolder.allVideoClickActions.removeIf { action: VideoClickAction -> action.sourcePlugin == plugin.filename }
         }
 
         synchronized(classLoaders) {
@@ -838,16 +827,16 @@ object PluginManager {
         val urls = (getKey<Array<RepositoryData>>(REPOSITORIES_KEY)
             ?: emptyArray()) + PREBUILT_REPOSITORIES
         val onlinePlugins = urls.toList().amap {
-            getRepoPlugins(it) ?: emptyList()
-        }.flatten().distinctBy { it.plugin.url }
+            getRepoPlugins(it.url)?.toList() ?: emptyList()
+        }.flatten().distinctBy { it.second.url }
 
         val allPlugins = getPluginsOnline().flatMap { savedData ->
             onlinePlugins
-                .filter { it.plugin.internalName == savedData.internalName }
+                .filter { it.second.internalName == savedData.internalName }
                 .mapNotNull { onlineData ->
                     OnlinePluginData(savedData, onlineData).takeIf { it.validOnlineData(activity) }
                 }
-        }.distinctBy { it.onlineData.plugin.url }
+        }.distinctBy { it.onlineData.second.url }
 
         val updatedPlugins = mutableListOf<String>()
 
@@ -855,7 +844,7 @@ object PluginManager {
             if (pluginData.isDisabled) {
                 Log.e(
                     "PluginManager",
-                    "Unloading disabled plugin: ${pluginData.onlineData.plugin.name}"
+                    "Unloading disabled plugin: ${pluginData.onlineData.second.name}"
                 )
                 unloadPlugin(pluginData.savedData.filePath)
             } else {
@@ -864,14 +853,14 @@ object PluginManager {
 
                 if (downloadPlugin(
                         activity,
-                        pluginData.onlineData.plugin.url,
-                        pluginData.onlineData.plugin.fileHash,
+                        pluginData.onlineData.second.url,
+                        pluginData.onlineData.second.fileHash,
                         pluginData.savedData.internalName,
                         existingFile,
                         true
                     )
                 ) {
-                    updatedPlugins.add(pluginData.onlineData.plugin.name)
+                    updatedPlugins.add(pluginData.onlineData.second.name)
                 }
             }
         }.also {

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

@@ -16,27 +16,26 @@ import com.lagradost.cloudstream3.plugins.PluginManager.getPluginSanitizedFileNa
 import com.lagradost.cloudstream3.plugins.PluginManager.unloadPlugin
 import com.lagradost.cloudstream3.ui.settings.extensions.REPOSITORIES_KEY
 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 kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
 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.TimeUnit
+import java.util.concurrent.atomic.AtomicInteger
 
 /**
  * Comes with the app, always available in the app, non removable.
- */
-@Serializable
+ * */
+
 data class Repository(
-    @JsonProperty("iconUrl") @SerialName("iconUrl") val iconUrl: String?,
-    @JsonProperty("name") @SerialName("name") val name: String,
-    @JsonProperty("description") @SerialName("description") val description: String?,
-    @JsonProperty("manifestVersion") @SerialName("manifestVersion") val manifestVersion: Int,
-    @JsonProperty("pluginLists") @SerialName("pluginLists") val pluginLists: List<String>,
+    @JsonProperty("iconUrl") val iconUrl: String?,
+    @JsonProperty("name") val name: String,
+    @JsonProperty("description") val description: String?,
+    @JsonProperty("manifestVersion") val manifestVersion: Int,
+    @JsonProperty("pluginLists") val pluginLists: List<String>
 )
 
 /**
@@ -45,60 +44,40 @@ data class Repository(
  * 1: Ok
  * 2: Slow
  * 3: Beta only
- */
-@Serializable
+ * */
 data class SitePlugin(
     // Url to the .cs3 file
-    @JsonProperty("url") @SerialName("url") val url: String,
+    @JsonProperty("url") val url: String,
     // Status to remotely disable the provider
-    @JsonProperty("status") @SerialName("status") val status: Int,
+    @JsonProperty("status") val status: Int,
     // Integer over 0, any change of this will trigger an auto update
-    @JsonProperty("version") @SerialName("version") val version: Int,
+    @JsonProperty("version") val version: Int,
     // Unused currently, used to make the api backwards compatible?
     // Set to 1
-    @JsonProperty("apiVersion") @SerialName("apiVersion") val apiVersion: Int,
+    @JsonProperty("apiVersion") val apiVersion: Int,
     // Name to be shown in app
-    @JsonProperty("name") @SerialName("name") val name: String,
+    @JsonProperty("name") val name: String,
     // Name to be referenced internally. Separate to make name and url changes possible
-    @JsonProperty("internalName") @SerialName("internalName") val internalName: String,
-    @JsonProperty("authors") @SerialName("authors") val authors: List<String>,
-    @JsonProperty("description") @SerialName("description") val description: String?,
+    @JsonProperty("internalName") val internalName: String,
+    @JsonProperty("authors") val authors: List<String>,
+    @JsonProperty("description") val description: String?,
     // Might be used to go directly to the plugin repo in the future
-    @JsonProperty("repositoryUrl") @SerialName("repositoryUrl") val repositoryUrl: String?,
+    @JsonProperty("repositoryUrl") val repositoryUrl: String?,
     // These types are yet to be mapped and used, ignore for now
-    @JsonProperty("tvTypes") @SerialName("tvTypes") val tvTypes: List<String>?,
+    @JsonProperty("tvTypes") val tvTypes: List<String>?,
     // Most often a language tag like "en" or "zh-TW"
-    @JsonProperty("language") @SerialName("language") val language: String?,
-    @JsonProperty("iconUrl") @SerialName("iconUrl") val iconUrl: String?,
+    @JsonProperty("language") val language: String?,
+    @JsonProperty("iconUrl") val iconUrl: String?,
     // Automatically generated by the gradle plugin
-    @JsonProperty("fileSize") @SerialName("fileSize") val fileSize: Long?,
-    @JsonProperty("fileHash") @SerialName("fileHash") val fileHash: String?,
+    @JsonProperty("fileSize") val fileSize: Long?,
+    @JsonProperty("fileHash") val fileHash: String?,
 )
 
-@Serializable
-data class PluginWrapper(
-    @JsonProperty("repository") @SerialName("repository") val repository: Repository,
-    @JsonProperty("repositoryData") @SerialName("repositoryData") val repositoryData: RepositoryData,
-    @JsonProperty("plugin") @SerialName("plugin") val plugin: SitePlugin
-) {
-    companion object {
-        private val localRepository = Repository("", "", "", 1, emptyList())
-        private val localRepositoryData = RepositoryData("", "", "")
-        fun getLocalPluginWrapper(plugin: SitePlugin): PluginWrapper {
-            return PluginWrapper(
-                localRepository,
-                localRepositoryData,
-                plugin
-            )
-        }
-    }
-}
-
 
 object RepositoryManager {
     const val ONLINE_PLUGINS_FOLDER = "Extensions"
     val PREBUILT_REPOSITORIES: Array<RepositoryData> by lazy {
-        getKey<Array<RepositoryData>>("PREBUILT_REPOSITORIES") ?: emptyArray()
+        getKey("PREBUILT_REPOSITORIES") ?: emptyArray()
     }
     private val GH_REGEX =
         Regex("^https://raw.githubusercontent.com/([A-Za-z0-9-]+)/([A-Za-z0-9_.-]+)/(.*)$")
@@ -141,36 +120,31 @@ object RepositoryManager {
             }
         } else if (fixedUrl.matches("^[a-zA-Z0-9!_-]+$".toRegex())) {
             safeAsync {
-                if (fixedUrl.startsWith("!")) {
-                    val response = app.get("https://py.md/${fixedUrl.removePrefix("!")}", allowRedirects = false)
-                    val url = response.headers["Location"] ?: return@safeAsync null
-                    if (url.startsWith("https://py.md/404")) return@safeAsync null
-                    if (url.removeSuffix("/") == "https://py.md") return@safeAsync null
-                    return@safeAsync url
-                } else {
-                    val response = app.get("https://cutt.ly/${fixedUrl}", allowRedirects = false)
-                    val url = response.headers["Location"] ?: return@safeAsync null
+                app.get("https://cutt.ly/${fixedUrl}", allowRedirects = false).let { it2 ->
+                    it2.headers["Location"]?.let { url ->
                         if (url.startsWith("https://cutt.ly/404")) return@safeAsync null
                         if (url.removeSuffix("/") == "https://cutt.ly") return@safeAsync null
                         return@safeAsync url
                     }
                 }
+            }
         } else null
     }
 
     suspend fun parseRepository(url: String): Repository? {
         return safeAsync {
             // Take manifestVersion and such into account later
-            app.get(convertRawGitUrl(url), cacheTime = 5, cacheUnit = TimeUnit.MINUTES)
-                .parsedSafe<Repository>()
+            app.get(convertRawGitUrl(url)).parsedSafe()
         }
     }
 
     private suspend fun parsePlugins(pluginUrls: String): List<SitePlugin> {
         // Take manifestVersion and such into account later
         return try {
-            app.get(convertRawGitUrl(pluginUrls), cacheTime = 5, cacheUnit = TimeUnit.MINUTES)
-                .parsed<Array<SitePlugin>>().toList()
+            val response = app.get(convertRawGitUrl(pluginUrls))
+            // Normal parsed function not working?
+            // return response.parsedSafe()
+            tryParseJson<Array<SitePlugin>>(response.text)?.toList() ?: emptyList()
         } catch (t: Throwable) {
             logError(t)
             emptyList()
@@ -179,17 +153,17 @@ object RepositoryManager {
 
     /**
      * Gets all plugins from repositories and pairs them with the repository url
-     */
-    suspend fun getRepoPlugins(repositoryData: RepositoryData): List<PluginWrapper>? {
-        val repo = parseRepository(repositoryData.url) ?: return null
-        val list = repo.pluginLists.amap { url ->
+     * */
+    suspend fun getRepoPlugins(repositoryUrl: String): List<Pair<String, SitePlugin>>? {
+        val repo = parseRepository(repositoryUrl) ?: return null
+        return repo.pluginLists.amap { url ->
             parsePlugins(url).map {
-                PluginWrapper(repo, repositoryData, it)
+                repositoryUrl to it
             }
         }.flatten()
-        return list
     }
 
+
     suspend fun downloadPluginToFile(
         context: Context,
         pluginUrl: String,
@@ -240,7 +214,7 @@ object RepositoryManager {
     }
 
     fun getRepositories(): Array<RepositoryData> {
-        return getKey<Array<RepositoryData>>(REPOSITORIES_KEY) ?: emptyArray()
+        return getKey(REPOSITORIES_KEY) ?: emptyArray()
     }
 
     // Don't want to read before we write in another thread
@@ -255,7 +229,7 @@ object RepositoryManager {
 
     /**
      * Also deletes downloaded repository plugins
-     */
+     * */
     suspend fun removeRepository(context: Context, repository: RepositoryData) {
         val extensionsDir = File(context.filesDir, ONLINE_PLUGINS_FOLDER)
 

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

@@ -2,7 +2,6 @@ package com.lagradost.cloudstream3.plugins
 
 import android.util.Log
 import android.widget.Toast
-import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.cloudstream3.CloudStreamApp.Companion.context
 import com.lagradost.cloudstream3.CloudStreamApp.Companion.getKey
 import com.lagradost.cloudstream3.CloudStreamApp.Companion.setKey
@@ -12,10 +11,9 @@ import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.utils.Coroutines.main
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
 
 object VotingApi {
+
     private const val LOGKEY = "VotingApi"
     private const val API_DOMAIN = "https://api.countify.xyz"
 
@@ -52,8 +50,8 @@ object VotingApi {
             votesCache[pluginUrl] = it
         }
 
-    fun hasVoted(pluginUrl: String): Boolean =
-        getKey<Boolean>("cs3-votes/${transformUrl(pluginUrl)}") ?: false
+    fun hasVoted(pluginUrl: String) =
+        getKey("cs3-votes/${transformUrl(pluginUrl)}") ?: false
 
     fun canVote(pluginUrl: String): Boolean =
         PluginManager.urlPlugins.contains(pluginUrl)
@@ -93,9 +91,8 @@ object VotingApi {
         }
     }
 
-    @Serializable
     private data class CountifyResult(
-        @JsonProperty("id") @SerialName("id") val id: String? = null,
-        @JsonProperty("count") @SerialName("count") val count: Int? = null,
+        val id: String? = null,
+        val count: Int? = null
     )
 }

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

@@ -36,7 +36,6 @@ 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
@@ -187,16 +186,6 @@ class DownloadQueueService : Service() {
             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

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

@@ -70,8 +70,7 @@ abstract class AccountManager {
             SubtitleRepo(openSubtitlesApi),
             SubtitleRepo(addic7ed),
             SubtitleRepo(subDlApi),
-            PlainAuthRepo(animeSkipApi),
-            SubtitleRepo(subSourceApi)
+            PlainAuthRepo(animeSkipApi)
         )
 
         fun updateAccountIds() {
@@ -121,8 +120,7 @@ abstract class AccountManager {
         val subtitleProviders = arrayOf(
             SubtitleRepo(openSubtitlesApi),
             SubtitleRepo(addic7ed),
-            SubtitleRepo(subDlApi),
-            SubtitleRepo(subSourceApi)
+            SubtitleRepo(subDlApi)
         )
         val syncApis = arrayOf(
             SyncRepo(malApi),

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

@@ -1,18 +1,50 @@
 package com.lagradost.cloudstream3.syncproviders
 
-import com.fasterxml.jackson.annotation.JsonAlias
+import android.util.Base64
+import androidx.annotation.WorkerThread
 import com.fasterxml.jackson.annotation.JsonProperty
-import com.lagradost.cloudstream3.APIHolder
 import com.lagradost.cloudstream3.APIHolder.unixTime
-import com.lagradost.cloudstream3.APIHolder.unixTimeMS
-import com.lagradost.cloudstream3.base64Encode
-import com.lagradost.cloudstream3.splitUrlParameters
+import com.lagradost.cloudstream3.ActorData
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.getKey
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.openBrowser
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.setKey
+import com.lagradost.cloudstream3.CommonActivity.showToast
+import com.lagradost.cloudstream3.ErrorLoadingException
+import com.lagradost.cloudstream3.LoadResponse
+import com.lagradost.cloudstream3.NextAiring
+import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.Score
+import com.lagradost.cloudstream3.SearchQuality
+import com.lagradost.cloudstream3.SearchResponse
+import com.lagradost.cloudstream3.ShowStatus
+import com.lagradost.cloudstream3.TvType
+import com.lagradost.cloudstream3.mvvm.Resource
+import com.lagradost.cloudstream3.mvvm.logError
+import com.lagradost.cloudstream3.mvvm.safe
+import com.lagradost.cloudstream3.mvvm.safeApiCall
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.APP_STRING
-import kotlinx.serialization.ExperimentalSerializationApi
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.json.JsonNames
+import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.NONE_ID
+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
+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
+import java.util.concurrent.TimeUnit
 
 data class AuthLoginPage(
     /** The website to open to authenticate */
@@ -20,60 +52,55 @@ data class AuthLoginPage(
     /**
      * State/control code to verify against the redirectUrl to make sure the request is valid.
      * This parameter will be saved, and then used in AuthAPI::login.
-     */
+     * */
     val payload: String? = null,
 )
 
-@Serializable
 data class AuthToken(
     /**
      * This is the general access tokens/api token representing a logged in user.
-     * Access tokens are the thing that applications use to make API requests on behalf of a user.
-     */
-    @JsonProperty("accessToken") @SerialName("accessToken")
+     *
+     * `Access tokens are the thing that applications use to make API requests on behalf of a user.`
+     * */
+    @JsonProperty("accessToken")
     val accessToken: String? = null,
-    /** For OAuth a special refresh token is issues to refresh the access token. */
-    @JsonProperty("refreshToken") @SerialName("refreshToken")
+    /**
+     * For OAuth a special refresh token is issues to refresh the access token.
+     * */
+    @JsonProperty("refreshToken")
     val refreshToken: String? = null,
     /** In UnixTime (sec) when it expires */
-    @JsonProperty("accessTokenLifetime") @SerialName("accessTokenLifetime")
+    @JsonProperty("accessTokenLifetime")
     val accessTokenLifetime: Long? = null,
     /** In UnixTime (sec) when it expires */
-    @JsonProperty("refreshTokenLifetime") @SerialName("refreshTokenLifetime")
+    @JsonProperty("refreshTokenLifetime")
     val refreshTokenLifetime: Long? = null,
-    /**
-     * Sometimes AuthToken needs to be customized to store e.g. username/password,
-     * this acts as a catch all to store text or JSON data.
-     */
-    @JsonProperty("payload") @SerialName("payload")
+    /** Sometimes AuthToken needs to be customized to store e.g. username/password,
+     * this acts as a catch all to store text or JSON data. */
+    @JsonProperty("payload")
     val payload: String? = null,
 ) {
     fun isAccessTokenExpired(marginSec: Long = 10L) =
-        accessTokenLifetime != null && unixTime + marginSec >= accessTokenLifetime
+        accessTokenLifetime != null && (System.currentTimeMillis() / 1000) + marginSec >= accessTokenLifetime
 
     fun isRefreshTokenExpired(marginSec: Long = 10L) =
-        refreshTokenLifetime != null && unixTime + marginSec >= refreshTokenLifetime
+        refreshTokenLifetime != null && (System.currentTimeMillis() / 1000) + marginSec >= refreshTokenLifetime
 }
 
-@OptIn(ExperimentalSerializationApi::class) // JsonNames is an experimental annotation for now
-@Serializable
 data class AuthUser(
     /** Account display-name, can also be email if name does not exist */
-    @JsonProperty("name") @SerialName("name")
+    @JsonProperty("name")
     val name: String?,
-    /**
-     * Unique account identifier. If a subsequent login is done then it
-     * will be refused if another account with the same id exists.
-     */
-    @JsonProperty("id") @SerialName("id")
+    /** Unique account identifier,
+     * if a subsequent login is done then it will be refused if another account with the same id exists*/
+    @JsonProperty("id")
     val id: Int,
     /** Profile picture URL */
-    @JsonProperty("profilePicture") @SerialName("profilePicture")
+    @JsonProperty("profilePicture")
     val profilePicture: String? = null,
     /** Profile picture Headers of the URL */
-    @JsonProperty("profilePictureHeaders") @JsonAlias("profilePictureHeader")
-    @SerialName("profilePictureHeaders") @JsonNames("profilePictureHeader")
-    val profilePictureHeaders: Map<String, String>? = null,
+    @JsonProperty("profilePictureHeader")
+    val profilePictureHeaders: Map<String, String>? = null
 )
 
 /**
@@ -83,11 +110,12 @@ data class AuthUser(
  *
  * Any local set/get key should use user.id.toString(),
  * as token.accessToken (even hashed) is unsecure, and will rotate.
- */
-@Serializable
+ * */
 data class AuthData(
-    @JsonProperty("user") @SerialName("user") val user: AuthUser,
-    @JsonProperty("token") @SerialName("token") val token: AuthToken,
+    @JsonProperty("user")
+    val user: AuthUser,
+    @JsonProperty("token")
+    val token: AuthToken,
 )
 
 data class AuthPinData(
@@ -110,12 +138,15 @@ data class AuthLoginRequirement(
 )
 
 /** What the user responds to the AuthLoginRequirement */
-@Serializable
 data class AuthLoginResponse(
-    @JsonProperty("password") @SerialName("password") val password: String?,
-    @JsonProperty("username") @SerialName("username") val username: String?,
-    @JsonProperty("email") @SerialName("email") val email: String?,
-    @JsonProperty("server") @SerialName("server") val server: String?,
+    @JsonProperty("password")
+    val password: String?,
+    @JsonProperty("username")
+    val username: String?,
+    @JsonProperty("email")
+    val email: String?,
+    @JsonProperty("server")
+    val server: String?,
 )
 
 /** Stateless Authentication class used for all personalized content */
@@ -148,32 +179,17 @@ abstract class AuthAPI {
     open val inAppLoginRequirement: AuthLoginRequirement? = null
 
     companion object {
-        @Deprecated(
-            message = "Use APIHolder.unixTime instead",
-            replaceWith = ReplaceWith(
-                expression = "APIHolder.unixTime",
-                imports = ["com.lagradost.cloudstream3.APIHolder"]
-            ),
-            level = DeprecationLevel.WARNING,
-        )
         val unixTime: Long
-            get() = APIHolder.unixTime
-
-        @Deprecated(
-            message = "Use APIHolder.unixTimeMS instead",
-            replaceWith = ReplaceWith(
-                expression = "unixTimeMS",
-                imports = ["com.lagradost.cloudstream3.APIHolder.unixTimeMS"]
-            ),
-            level = DeprecationLevel.WARNING,
-        )
+            get() = System.currentTimeMillis() / 1000L
         val unixTimeMs: Long
-            get() = unixTimeMS
+            get() = System.currentTimeMillis()
 
         fun splitRedirectUrl(redirectUrl: String): Map<String, String> {
-            return splitUrlParameters(
+            return splitQuery(
+                URL(
                     redirectUrl.replace(APP_STRING, "https").replace("/#", "?")
                 )
+            )
         }
 
         fun generateCodeVerifier(): String {
@@ -182,8 +198,9 @@ abstract class AuthAPI {
             val secureRandom = SecureRandom()
             val codeVerifierBytes = ByteArray(96) // base64 has 6bit per char; (8/6)*96 = 128
             secureRandom.nextBytes(codeVerifierBytes)
-            return base64Encode(codeVerifierBytes).trimEnd('=')
-                .replace("+", "-").replace("/", "_").replace("\n", "")
+            return Base64.encodeToString(codeVerifierBytes, Base64.DEFAULT).trimEnd('=')
+                .replace("+", "-")
+                .replace("/", "_").replace("\n", "")
         }
     }
 
@@ -226,7 +243,7 @@ abstract class AuthAPI {
      *
      * Note that this will currently only be called *once* on logout,
      * and as such any network issues it will fail silently, and the token will not be revoked.
-     */
+     **/
     @Throws
     open suspend fun invalidateToken(token: AuthToken): Nothing = throw NotImplementedError()
 

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

@@ -2,10 +2,11 @@ package com.lagradost.cloudstream3.syncproviders
 
 import androidx.annotation.WorkerThread
 import com.lagradost.cloudstream3.APIHolder.unixTime
+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) {
@@ -13,8 +14,7 @@ class SubtitleRepo(override val api: SubtitleAPI) : AuthRepo(api) {
         data class SavedSearchResponse(
             val unixTime: Long,
             val response: List<SubtitleEntity>,
-            val query: SubtitleSearch,
-            val idPrefix: String,
+            val query: SubtitleSearch
         )
 
         data class SavedResourceResponse(
@@ -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.idPrefix == idPrefix && item.query == query && (unixTime - item.unixTime) < 60 * 120) {
-                        found = item.response
-                        break
+                    if (item.query == query && (unixTime - item.unixTime) < 60 * 120) {
+                        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, idPrefix)
-                searchCache.withLock {
+                val add = SavedSearchResponse(unixTime, returnValue, query)
+                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()
                             )
                         }

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

@@ -5,8 +5,6 @@ import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.cloudstream3.Actor
 import com.lagradost.cloudstream3.ActorData
 import com.lagradost.cloudstream3.ActorRole
-import com.lagradost.cloudstream3.APIHolder
-import com.lagradost.cloudstream3.BuildConfig
 import com.lagradost.cloudstream3.CloudStreamApp.Companion.getKey
 import com.lagradost.cloudstream3.CloudStreamApp.Companion.setKey
 import com.lagradost.cloudstream3.ErrorLoadingException
@@ -27,10 +25,9 @@ import com.lagradost.cloudstream3.ui.library.ListSorting
 import com.lagradost.cloudstream3.utils.AppUtils.parseJson
 import com.lagradost.cloudstream3.utils.AppUtils.toJson
 import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
+import com.lagradost.cloudstream3.utils.DataStore.toKotlinObject
 import com.lagradost.cloudstream3.utils.DataStoreHelper.toYear
 import com.lagradost.cloudstream3.utils.txt
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
 import java.net.URLEncoder
 import java.util.Locale
 
@@ -38,7 +35,7 @@ class AniListApi : SyncAPI() {
     override var name = "AniList"
     override val idPrefix = "anilist"
 
-    private val key = BuildConfig.ANILIST_KEY
+    val key = "6871"
     override val redirectUrlIdentifier = "anilistlogin"
     override var requireLibraryRefresh = true
     override val hasOAuth2 = true
@@ -53,10 +50,9 @@ 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 = APIHolder.unixTime + sanitizer["expires_in"]!!.toLong(),
+            accessTokenLifetime = unixTime + sanitizer["expires_in"]!!.toLong(),
         )
         return token
     }
@@ -82,12 +78,13 @@ class AniListApi : SyncAPI() {
     override fun urlToId(url: String): String? =
         url.removePrefix("$mainUrl/anime/").removeSuffix("/")
 
+
     private fun getUrlFromId(id: Int): String {
         return "$mainUrl/anime/$id"
     }
 
     override suspend fun search(auth : AuthData?, query: String): List<SyncAPI.SyncSearchResult>? {
-        val data = searchShows(query) ?: return null
+        val data = searchShows(name) ?: return null
         return data.data?.page?.media?.map {
             SyncAPI.SyncSearchResult(
                 it.title.romaji ?: return null,
@@ -103,12 +100,13 @@ class AniListApi : SyncAPI() {
         val internalId = (Regex("anilist\\.co/anime/(\\d*)").find(id)?.groupValues?.getOrNull(1)
             ?: id).toIntOrNull() ?: throw ErrorLoadingException("Invalid internalId")
         val season = getSeason(internalId).data.media
+
         return SyncAPI.SyncResult(
             season.id.toString(),
             nextAiring = season.nextAiringEpisode?.let {
                 NextAiring(
                     it.episode ?: return@let null,
-                    (it.timeUntilAiring ?: return@let null) + APIHolder.unixTime
+                    (it.timeUntilAiring ?: return@let null) + unixTime
                 )
             },
             title = season.title?.userPreferred,
@@ -163,6 +161,7 @@ class AniListApi : SyncAPI() {
     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
+
         return SyncAPI.SyncStatus(
             score = Score.from100(data.score),
             watchedEpisodes = data.progress,
@@ -258,10 +257,11 @@ class AniListApi : SyncAPI() {
                 val data =
                     mapOf(
                         "query" to query,
-                        "variables" to Variables(
-                            search = name,
-                            page = 1,
-                            type = "ANIME",
+                        "variables" to
+                                mapOf(
+                                    "search" to name,
+                                    "page" to 1,
+                                    "type" to "ANIME"
                                 ).toJson()
                     )
 
@@ -271,11 +271,10 @@ class AniListApi : SyncAPI() {
                     data = data,//(if (vars == null) mapOf("query" to q) else mapOf("query" to q, "variables" to vars))
                     timeout = 5000 // REASONABLE TIMEOUT
                 ).text.replace("\\", "")
-                return parseJson<GetSearchRoot>(res)
+                return res.toKotlinObject()
             } catch (e: Exception) {
                 logError(e)
             }
-
             return null
         }
 
@@ -456,7 +455,7 @@ class AniListApi : SyncAPI() {
                 cacheTime = 0,
             ).text
 
-            return tryParseJson<SeasonResponse>(data) ?: throw ErrorLoadingException("Error parsing $data")
+            return tryParseJson(data) ?: throw ErrorLoadingException("Error parsing $data")
         }
     }
 
@@ -504,6 +503,7 @@ class AniListApi : SyncAPI() {
                 type = AniListStatusType.None,
             )
         }
+
     }
 
     private suspend fun postApi(token : AuthToken, q: String, cache: Boolean = false): String? {
@@ -524,79 +524,66 @@ class AniListApi : SyncAPI() {
         ).text.replace("\\/", "/")
     }
 
-    @Serializable
-    data class Variables(
-        @JsonProperty("search") @SerialName("search") val search: String,
-        @JsonProperty("page") @SerialName("page") val page: Int,
-        @JsonProperty("type") @SerialName("type") val type: String,
-    )
 
-    @Serializable
     data class MediaRecommendation(
-        @JsonProperty("id") @SerialName("id") val id: Int,
-        @JsonProperty("title") @SerialName("title") val title: Title?,
-        @JsonProperty("idMal") @SerialName("idMal") val idMal: Int?,
-        @JsonProperty("coverImage") @SerialName("coverImage") val coverImage: CoverImage?,
-        @JsonProperty("averageScore") @SerialName("averageScore") val averageScore: Int?,
+        @JsonProperty("id") val id: Int,
+        @JsonProperty("title") val title: Title?,
+        @JsonProperty("idMal") val idMal: Int?,
+        @JsonProperty("coverImage") val coverImage: CoverImage?,
+        @JsonProperty("averageScore") val averageScore: Int?
     )
 
-    @Serializable
     data class FullAnilistList(
-        @JsonProperty("data") @SerialName("data") val data: Data?,
+        @JsonProperty("data") val data: Data?
     )
 
-    @Serializable
     data class CompletedAt(
-        @JsonProperty("year") @SerialName("year") val year: Int,
-        @JsonProperty("month") @SerialName("month") val month: Int,
-        @JsonProperty("day") @SerialName("day") val day: Int,
+        @JsonProperty("year") val year: Int,
+        @JsonProperty("month") val month: Int,
+        @JsonProperty("day") val day: Int
     )
 
-    @Serializable
     data class StartedAt(
-        @JsonProperty("year") @SerialName("year") val year: String?,
-        @JsonProperty("month") @SerialName("month") val month: String?,
-        @JsonProperty("day") @SerialName("day") val day: String?,
+        @JsonProperty("year") val year: String?,
+        @JsonProperty("month") val month: String?,
+        @JsonProperty("day") val day: String?
     )
 
-    @Serializable
     data class Title(
-        @JsonProperty("english") @SerialName("english") val english: String?,
-        @JsonProperty("romaji") @SerialName("romaji") val romaji: String?,
+        @JsonProperty("english") val english: String?,
+        @JsonProperty("romaji") val romaji: String?
     )
 
-    @Serializable
     data class CoverImage(
-        @JsonProperty("medium") @SerialName("medium") val medium: String?,
-        @JsonProperty("large") @SerialName("large") val large: String?,
-        @JsonProperty("extraLarge") @SerialName("extraLarge") val extraLarge: String?,
+        @JsonProperty("medium") val medium: String?,
+        @JsonProperty("large") val large: String?,
+        @JsonProperty("extraLarge") val extraLarge: String?
     )
 
-    @Serializable
     data class Media(
-        @JsonProperty("id") @SerialName("id") val id: Int,
-        @JsonProperty("idMal") @SerialName("idMal") val idMal: Int?,
-        @JsonProperty("season") @SerialName("season") val season: String?,
-        @JsonProperty("seasonYear") @SerialName("seasonYear") val seasonYear: Int,
-        @JsonProperty("format") @SerialName("format") val format: String?,
-        @JsonProperty("episodes") @SerialName("episodes") val episodes: Int,
-        @JsonProperty("title") @SerialName("title") val title: Title,
-        @JsonProperty("description") @SerialName("description") val description: String?,
-        @JsonProperty("coverImage") @SerialName("coverImage") val coverImage: CoverImage,
-        @JsonProperty("synonyms") @SerialName("synonyms") val synonyms: List<String>,
-        @JsonProperty("nextAiringEpisode") @SerialName("nextAiringEpisode") val nextAiringEpisode: SeasonNextAiringEpisode?,
+        @JsonProperty("id") val id: Int,
+        @JsonProperty("idMal") val idMal: Int?,
+        @JsonProperty("season") val season: String?,
+        @JsonProperty("seasonYear") val seasonYear: Int,
+        @JsonProperty("format") val format: String?,
+        //@JsonProperty("source") val source: String,
+        @JsonProperty("episodes") val episodes: Int,
+        @JsonProperty("title") val title: Title,
+        @JsonProperty("description") val description: String?,
+        @JsonProperty("coverImage") val coverImage: CoverImage,
+        @JsonProperty("synonyms") val synonyms: List<String>,
+        @JsonProperty("nextAiringEpisode") val nextAiringEpisode: SeasonNextAiringEpisode?,
     )
 
-    @Serializable
     data class Entries(
-        @JsonProperty("status") @SerialName("status") val status: String?,
-        @JsonProperty("completedAt") @SerialName("completedAt") val completedAt: CompletedAt,
-        @JsonProperty("startedAt") @SerialName("startedAt") val startedAt: StartedAt,
-        @JsonProperty("updatedAt") @SerialName("updatedAt") val updatedAt: Int,
-        @JsonProperty("progress") @SerialName("progress") val progress: Int,
-        @JsonProperty("score") @SerialName("score") val score: Int,
-        @JsonProperty("private") @SerialName("private") val private: Boolean,
-        @JsonProperty("media") @SerialName("media") val media: Media,
+        @JsonProperty("status") val status: String?,
+        @JsonProperty("completedAt") val completedAt: CompletedAt,
+        @JsonProperty("startedAt") val startedAt: StartedAt,
+        @JsonProperty("updatedAt") val updatedAt: Int,
+        @JsonProperty("progress") val progress: Int,
+        @JsonProperty("score") val score: Int,
+        @JsonProperty("private") val private: Boolean,
+        @JsonProperty("media") val media: Media
     ) {
         fun toLibraryItem(): SyncAPI.LibraryItem {
             return SyncAPI.LibraryItem(
@@ -623,20 +610,17 @@ class AniListApi : SyncAPI() {
         }
     }
 
-    @Serializable
     data class Lists(
-        @JsonProperty("status") @SerialName("status") val status: String?,
-        @JsonProperty("entries") @SerialName("entries") val entries: List<Entries>,
+        @JsonProperty("status") val status: String?,
+        @JsonProperty("entries") val entries: List<Entries>
     )
 
-    @Serializable
     data class MediaListCollection(
-        @JsonProperty("lists") @SerialName("lists") val lists: List<Lists>,
+        @JsonProperty("lists") val lists: List<Lists>
     )
 
-    @Serializable
     data class Data(
-        @JsonProperty("MediaListCollection") @SerialName("MediaListCollection") val mediaListCollection: MediaListCollection,
+        @JsonProperty("MediaListCollection") val mediaListCollection: MediaListCollection
     )
 
     private suspend fun getAniListAnimeListSmart(auth: AuthData): Array<Lists>? {
@@ -685,6 +669,7 @@ class AniListApi : SyncAPI() {
     private suspend fun getFullAniListList(auth : AuthData): FullAnilistList? {
         val userID = auth.user.id
         val mediaType = "ANIME"
+
         val query = """
                 query (${'$'}userID: Int = $userID, ${'$'}MEDIA: MediaType = $mediaType) {
                     MediaListCollection (userId: ${'$'}userID, type: ${'$'}MEDIA) { 
@@ -726,7 +711,7 @@ class AniListApi : SyncAPI() {
                     }
             """
         val text = postApi(auth.token, query)
-        return tryParseJson<FullAnilistList>(text)
+        return text?.toKotlinObject()
     }
 
     suspend fun toggleLike(auth : AuthData, id: Int): Boolean {
@@ -747,20 +732,9 @@ class AniListApi : SyncAPI() {
     }
 
     /** Used to query a saved MediaItem on the list to get the id for removal */
-    @Serializable
-    data class MediaListItemRoot(
-        @JsonProperty("data") @SerialName("data") val data: MediaListItem? = null,
-    )
-
-    @Serializable
-    data class MediaListItem(
-        @JsonProperty("MediaList") @SerialName("MediaList") val mediaList: MediaListId? = null,
-    )
-
-    @Serializable
-    data class MediaListId(
-        @JsonProperty("id") @SerialName("id") val id: Long? = null,
-    )
+    data class MediaListItemRoot(@JsonProperty("data") val data: MediaListItem? = null)
+    data class MediaListItem(@JsonProperty("MediaList") val mediaList: MediaListId? = null)
+    data class MediaListId(@JsonProperty("id") val id: Long? = null)
 
     private suspend fun postDataAboutId(
         auth : AuthData,
@@ -770,6 +744,7 @@ class AniListApi : SyncAPI() {
         progress: Int?
     ): Boolean {
         val userID = auth.user.id
+
         val q =
             // Delete item if status type is None
             if (type == AniListStatusType.None) {
@@ -861,356 +836,305 @@ class AniListApi : SyncAPI() {
         return seasons.toList()
     }
 
-    @Serializable
     data class SeasonResponse(
-        @JsonProperty("data") @SerialName("data") val data: SeasonData,
+        @JsonProperty("data") val data: SeasonData,
     )
 
-    @Serializable
     data class SeasonData(
-        @JsonProperty("Media") @SerialName("Media") val media: SeasonMedia,
+        @JsonProperty("Media") val media: SeasonMedia,
     )
 
-    @Serializable
-    data class RecommendedMedia(
-        @JsonProperty("id") @SerialName("id") val id: Int?,
-        @JsonProperty("title") @SerialName("title") val title: MediaTitle?,
-        @JsonProperty("coverImage") @SerialName("coverImage") val coverImage: MediaCoverImage?,
-    )
-
-    @Serializable
-    data class CharacterMedia(
-        @JsonProperty("id") @SerialName("id") val id: Int?,
-        @JsonProperty("title") @SerialName("title") val title: MediaTitle?,
-        @JsonProperty("coverImage") @SerialName("coverImage") val coverImage: MediaCoverImage?,
-    )
-
-    @Serializable
     data class SeasonMedia(
-        @JsonProperty("id") @SerialName("id") val id: Int?,
-        @JsonProperty("title") @SerialName("title") val title: MediaTitle?,
-        @JsonProperty("idMal") @SerialName("idMal") val idMal: Int?,
-        @JsonProperty("format") @SerialName("format") val format: String?,
-        @JsonProperty("nextAiringEpisode") @SerialName("nextAiringEpisode") val nextAiringEpisode: SeasonNextAiringEpisode?,
-        @JsonProperty("relations") @SerialName("relations") val relations: SeasonEdges?,
-        @JsonProperty("coverImage") @SerialName("coverImage") val coverImage: MediaCoverImage?,
-        @JsonProperty("duration") @SerialName("duration") val duration: Int?,
-        @JsonProperty("episodes") @SerialName("episodes") val episodes: Int?,
-        @JsonProperty("genres") @SerialName("genres") val genres: List<String>?,
-        @JsonProperty("synonyms") @SerialName("synonyms") val synonyms: List<String>?,
-        @JsonProperty("averageScore") @SerialName("averageScore") val averageScore: Int?,
-        @JsonProperty("isAdult") @SerialName("isAdult") val isAdult: Boolean?,
-        @JsonProperty("trailer") @SerialName("trailer") val trailer: MediaTrailer?,
-        @JsonProperty("description") @SerialName("description") val description: String?,
-        @JsonProperty("characters") @SerialName("characters") val characters: CharacterConnection?,
-        @JsonProperty("recommendations") @SerialName("recommendations") val recommendations: RecommendationConnection?,
+        @JsonProperty("id") val id: Int?,
+        @JsonProperty("title") val title: MediaTitle?,
+        @JsonProperty("idMal") val idMal: Int?,
+        @JsonProperty("format") val format: String?,
+        @JsonProperty("nextAiringEpisode") val nextAiringEpisode: SeasonNextAiringEpisode?,
+        @JsonProperty("relations") val relations: SeasonEdges?,
+        @JsonProperty("coverImage") val coverImage: MediaCoverImage?,
+        @JsonProperty("duration") val duration: Int?,
+        @JsonProperty("episodes") val episodes: Int?,
+        @JsonProperty("genres") val genres: List<String>?,
+        @JsonProperty("synonyms") val synonyms: List<String>?,
+        @JsonProperty("averageScore") val averageScore: Int?,
+        @JsonProperty("isAdult") val isAdult: Boolean?,
+        @JsonProperty("trailer") val trailer: MediaTrailer?,
+        @JsonProperty("description") val description: String?,
+        @JsonProperty("characters") val characters: CharacterConnection?,
+        @JsonProperty("recommendations") val recommendations: RecommendationConnection?,
     )
 
-    @Serializable
     data class RecommendationConnection(
-        @JsonProperty("edges") @SerialName("edges") val edges: List<RecommendationEdge> = emptyList(),
-        @JsonProperty("nodes") @SerialName("nodes") val nodes: List<Recommendation> = emptyList(),
+        @JsonProperty("edges") val edges: List<RecommendationEdge> = emptyList(),
+        @JsonProperty("nodes") val nodes: List<Recommendation> = emptyList(),
+        //@JsonProperty("pageInfo") val pageInfo: PageInfo,
     )
 
-    @Serializable
     data class RecommendationEdge(
-        @JsonProperty("node") @SerialName("node") val node: Recommendation,
+        //@JsonProperty("rating") val rating: Int,
+        @JsonProperty("node") val node: Recommendation,
     )
 
-    @Serializable
     data class Recommendation(
-        @JsonProperty("mediaRecommendation") @SerialName("mediaRecommendation") val mediaRecommendation: RecommendedMedia?,
+        val id: Long,
+        @JsonProperty("mediaRecommendation") val mediaRecommendation: SeasonMedia?,
     )
 
-    @Serializable
     data class CharacterName(
-        @JsonProperty("name") @SerialName("name") val first: String?,
-        @JsonProperty("middle") @SerialName("middle") val middle: String?,
-        @JsonProperty("last") @SerialName("last") val last: String?,
-        @JsonProperty("full") @SerialName("full") val full: String?,
-        @JsonProperty("native") @SerialName("native") val native: String?,
-        @JsonProperty("alternative") @SerialName("alternative") val alternative: List<String>?,
-        @JsonProperty("alternativeSpoiler") @SerialName("alternativeSpoiler") val alternativeSpoiler: List<String>?,
-        @JsonProperty("userPreferred") @SerialName("userPreferred") val userPreferred: String?,
+        @JsonProperty("name") val first: String?,
+        @JsonProperty("middle") val middle: String?,
+        @JsonProperty("last") val last: String?,
+        @JsonProperty("full") val full: String?,
+        @JsonProperty("native") val native: String?,
+        @JsonProperty("alternative") val alternative: List<String>?,
+        @JsonProperty("alternativeSpoiler") val alternativeSpoiler: List<String>?,
+        @JsonProperty("userPreferred") val userPreferred: String?,
     )
 
-    @Serializable
     data class CharacterImage(
-        @JsonProperty("large") @SerialName("large") val large: String?,
-        @JsonProperty("medium") @SerialName("medium") val medium: String?,
+        @JsonProperty("large") val large: String?,
+        @JsonProperty("medium") val medium: String?,
     )
 
-    @Serializable
     data class Character(
-        @JsonProperty("name") @SerialName("name") val name: CharacterName?,
-        @JsonProperty("age") @SerialName("age") val age: String?,
-        @JsonProperty("image") @SerialName("image") val image: CharacterImage?,
+        @JsonProperty("name") val name: CharacterName?,
+        @JsonProperty("age") val age: String?,
+        @JsonProperty("image") val image: CharacterImage?,
     )
 
-    @Serializable
     data class CharacterEdge(
-        @JsonProperty("id") @SerialName("id") val id: Int?,
+        @JsonProperty("id") val id: Int?,
         /**
-         * MAIN - A primary character role in the media
-         * SUPPORTING - A supporting character role in the media
-         * BACKGROUND - A background character in the media
+        MAIN
+        A primary character role in the media
+
+        SUPPORTING
+        A supporting character role in the media
+
+        BACKGROUND
+        A background character in the media
          */
-        @JsonProperty("role") @SerialName("role") val role: String?,
-        @JsonProperty("name") @SerialName("name") val name: String?,
-        @JsonProperty("voiceActors") @SerialName("voiceActors") val voiceActors: List<Staff>?,
-        @JsonProperty("favouriteOrder") @SerialName("favouriteOrder") val favouriteOrder: Int?,
-        @JsonProperty("media") @SerialName("media") val media: List<CharacterMedia>?,
-        @JsonProperty("node") @SerialName("node") val node: Character?,
+        @JsonProperty("role") val role: String?,
+        @JsonProperty("name") val name: String?,
+        @JsonProperty("voiceActors") val voiceActors: List<Staff>?,
+        @JsonProperty("favouriteOrder") val favouriteOrder: Int?,
+        @JsonProperty("media") val media: List<SeasonMedia>?,
+        @JsonProperty("node") val node: Character?,
     )
 
-    @Serializable
     data class StaffImage(
-        @JsonProperty("large") @SerialName("large") val large: String?,
-        @JsonProperty("medium") @SerialName("medium") val medium: String?,
+        @JsonProperty("large") val large: String?,
+        @JsonProperty("medium") val medium: String?,
     )
 
-    @Serializable
     data class StaffName(
-        @JsonProperty("name") @SerialName("name") val first: String?,
-        @JsonProperty("middle") @SerialName("middle") val middle: String?,
-        @JsonProperty("last") @SerialName("last") val last: String?,
-        @JsonProperty("full") @SerialName("full") val full: String?,
-        @JsonProperty("native") @SerialName("native") val native: String?,
-        @JsonProperty("alternative") @SerialName("alternative") val alternative: List<String>?,
-        @JsonProperty("userPreferred") @SerialName("userPreferred") val userPreferred: String?,
+        @JsonProperty("name") val first: String?,
+        @JsonProperty("middle") val middle: String?,
+        @JsonProperty("last") val last: String?,
+        @JsonProperty("full") val full: String?,
+        @JsonProperty("native") val native: String?,
+        @JsonProperty("alternative") val alternative: List<String>?,
+        @JsonProperty("userPreferred") val userPreferred: String?,
     )
 
-    @Serializable
     data class Staff(
-        @JsonProperty("image") @SerialName("image") val image: StaffImage?,
-        @JsonProperty("name") @SerialName("name") val name: StaffName?,
-        @JsonProperty("age") @SerialName("age") val age: Int?,
+        @JsonProperty("image") val image: StaffImage?,
+        @JsonProperty("name") val name: StaffName?,
+        @JsonProperty("age") val age: Int?,
     )
 
-    @Serializable
     data class CharacterConnection(
-        @JsonProperty("edges") @SerialName("edges") val edges: List<CharacterEdge>?,
-        @JsonProperty("nodes") @SerialName("nodes") val nodes: List<Character>?,
+        @JsonProperty("edges") val edges: List<CharacterEdge>?,
+        @JsonProperty("nodes") val nodes: List<Character>?,
+        //@JsonProperty("pageInfo")  pageInfo: PageInfo
     )
 
-    @Serializable
     data class MediaTrailer(
-        @JsonProperty("id") @SerialName("id") val id: String?,
-        @JsonProperty("site") @SerialName("site") val site: String?,
-        @JsonProperty("thumbnail") @SerialName("thumbnail") val thumbnail: String?,
+        @JsonProperty("id") val id: String?,
+        @JsonProperty("site") val site: String?,
+        @JsonProperty("thumbnail") val thumbnail: String?,
     )
 
-    @Serializable
     data class MediaCoverImage(
-        @JsonProperty("extraLarge") @SerialName("extraLarge") val extraLarge: String?,
-        @JsonProperty("large") @SerialName("large") val large: String?,
-        @JsonProperty("medium") @SerialName("medium") val medium: String?,
-        @JsonProperty("color") @SerialName("color") val color: String?,
+        @JsonProperty("extraLarge") val extraLarge: String?,
+        @JsonProperty("large") val large: String?,
+        @JsonProperty("medium") val medium: String?,
+        @JsonProperty("color") val color: String?,
     )
 
-    @Serializable
     data class SeasonNextAiringEpisode(
-        @JsonProperty("episode") @SerialName("episode") val episode: Int?,
-        @JsonProperty("timeUntilAiring") @SerialName("timeUntilAiring") val timeUntilAiring: Int?,
+        @JsonProperty("episode") val episode: Int?,
+        @JsonProperty("timeUntilAiring") val timeUntilAiring: Int?,
     )
 
-    @Serializable
     data class SeasonEdges(
-        @JsonProperty("edges") @SerialName("edges") val edges: List<SeasonEdge>?,
+        @JsonProperty("edges") val edges: List<SeasonEdge>?,
     )
 
-    @Serializable
     data class SeasonEdge(
-        @JsonProperty("id") @SerialName("id") val id: Int?,
-        @JsonProperty("relationType") @SerialName("relationType") val relationType: String?,
-        @JsonProperty("node") @SerialName("node") val node: SeasonNode?,
+        @JsonProperty("id") val id: Int?,
+        @JsonProperty("relationType") val relationType: String?,
+        @JsonProperty("node") val node: SeasonNode?,
     )
 
-    @Serializable
     data class AniListFavoritesMediaConnection(
-        @JsonProperty("nodes") @SerialName("nodes") val nodes: List<LikeNode>,
+        @JsonProperty("nodes") val nodes: List<LikeNode>,
     )
 
-    @Serializable
     data class AniListFavourites(
-        @JsonProperty("anime") @SerialName("anime") val anime: AniListFavoritesMediaConnection,
+        @JsonProperty("anime") val anime: AniListFavoritesMediaConnection,
     )
 
-    @Serializable
     data class MediaTitle(
-        @JsonProperty("romaji") @SerialName("romaji") val romaji: String?,
-        @JsonProperty("english") @SerialName("english") val english: String?,
-        @JsonProperty("native") @SerialName("native") val native: String?,
-        @JsonProperty("userPreferred") @SerialName("userPreferred") val userPreferred: String?,
+        @JsonProperty("romaji") val romaji: String?,
+        @JsonProperty("english") val english: String?,
+        @JsonProperty("native") val native: String?,
+        @JsonProperty("userPreferred") val userPreferred: String?,
     )
 
-    @Serializable
     data class SeasonNode(
-        @JsonProperty("id") @SerialName("id") val id: Int,
-        @JsonProperty("format") @SerialName("format") val format: String?,
-        @JsonProperty("title") @SerialName("title") val title: Title?,
-        @JsonProperty("idMal") @SerialName("idMal") val idMal: Int?,
-        @JsonProperty("coverImage") @SerialName("coverImage") val coverImage: CoverImage?,
-        @JsonProperty("averageScore") @SerialName("averageScore") val averageScore: Int?,
+        @JsonProperty("id") val id: Int,
+        @JsonProperty("format") val format: String?,
+        @JsonProperty("title") val title: Title?,
+        @JsonProperty("idMal") val idMal: Int?,
+        @JsonProperty("coverImage") val coverImage: CoverImage?,
+        @JsonProperty("averageScore") val averageScore: Int?
+//        @JsonProperty("nextAiringEpisode") val nextAiringEpisode: SeasonNextAiringEpisode?,
     )
 
-    @Serializable
     data class AniListAvatar(
-        @JsonProperty("large") @SerialName("large") val large: String?,
+        @JsonProperty("large") val large: String?,
     )
 
-    @Serializable
     data class AniListViewer(
-        @JsonProperty("id") @SerialName("id") val id: Int,
-        @JsonProperty("name") @SerialName("name") val name: String,
-        @JsonProperty("avatar") @SerialName("avatar") val avatar: AniListAvatar?,
-        @JsonProperty("favourites") @SerialName("favourites") val favourites: AniListFavourites?,
+        @JsonProperty("id") val id: Int,
+        @JsonProperty("name") val name: String,
+        @JsonProperty("avatar") val avatar: AniListAvatar?,
+        @JsonProperty("favourites") val favourites: AniListFavourites?,
     )
 
-    @Serializable
     data class AniListData(
-        @JsonProperty("Viewer") @SerialName("Viewer") val viewer: AniListViewer?,
+        @JsonProperty("Viewer") val viewer: AniListViewer?,
     )
 
-    @Serializable
     data class AniListRoot(
-        @JsonProperty("data") @SerialName("data") val data: AniListData?,
+        @JsonProperty("data") val data: AniListData?,
     )
 
-    @Serializable
     data class AniListUser(
-        @JsonProperty("id") @SerialName("id") val id: Int,
-        @JsonProperty("name") @SerialName("name") val name: String,
-        @JsonProperty("picture") @SerialName("picture") val picture: String?,
+        @JsonProperty("id") val id: Int,
+        @JsonProperty("name") val name: String,
+        @JsonProperty("picture") val picture: String?,
     )
 
-    @Serializable
     data class LikeNode(
-        @JsonProperty("id") @SerialName("id") val id: Int?,
+        @JsonProperty("id") val id: Int?,
+        //@JsonProperty("idMal") public int idMal;
     )
 
-    @Serializable
     data class LikePageInfo(
-        @JsonProperty("total") @SerialName("total") val total: Int?,
-        @JsonProperty("currentPage") @SerialName("currentPage") val currentPage: Int?,
-        @JsonProperty("lastPage") @SerialName("lastPage") val lastPage: Int?,
-        @JsonProperty("perPage") @SerialName("perPage") val perPage: Int?,
-        @JsonProperty("hasNextPage") @SerialName("hasNextPage") val hasNextPage: Boolean?,
+        @JsonProperty("total") val total: Int?,
+        @JsonProperty("currentPage") val currentPage: Int?,
+        @JsonProperty("lastPage") val lastPage: Int?,
+        @JsonProperty("perPage") val perPage: Int?,
+        @JsonProperty("hasNextPage") val hasNextPage: Boolean?,
     )
 
-    @Serializable
     data class LikeAnime(
-        @JsonProperty("nodes") @SerialName("nodes") val nodes: List<LikeNode>?,
-        @JsonProperty("pageInfo") @SerialName("pageInfo") val pageInfo: LikePageInfo?,
+        @JsonProperty("nodes") val nodes: List<LikeNode>?,
+        @JsonProperty("pageInfo") val pageInfo: LikePageInfo?,
     )
 
-    @Serializable
     data class LikeFavourites(
-        @JsonProperty("anime") @SerialName("anime") val anime: LikeAnime?,
+        @JsonProperty("anime") val anime: LikeAnime?,
     )
 
-    @Serializable
     data class LikeViewer(
-        @JsonProperty("favourites") @SerialName("favourites") val favourites: LikeFavourites?,
+        @JsonProperty("favourites") val favourites: LikeFavourites?,
     )
 
-    @Serializable
     data class LikeData(
-        @JsonProperty("Viewer") @SerialName("Viewer") val viewer: LikeViewer?,
+        @JsonProperty("Viewer") val viewer: LikeViewer?,
     )
 
-    @Serializable
     data class LikeRoot(
-        @JsonProperty("data") @SerialName("data") val data: LikeData?,
+        @JsonProperty("data") val data: LikeData?,
     )
 
-    @Serializable
     data class AniListTitleHolder(
-        @JsonProperty("title") @SerialName("title") val title: Title?,
-        @JsonProperty("isFavourite") @SerialName("isFavourite") val isFavourite: Boolean?,
-        @JsonProperty("id") @SerialName("id") val id: Int?,
-        @JsonProperty("progress") @SerialName("progress") val progress: Int?,
-        @JsonProperty("episodes") @SerialName("episodes") val episodes: Int?,
-        @JsonProperty("score") @SerialName("score") val score: Int?,
-        @JsonProperty("type") @SerialName("type") val type: AniListStatusType?,
+        @JsonProperty("title") val title: Title?,
+        @JsonProperty("isFavourite") val isFavourite: Boolean?,
+        @JsonProperty("id") val id: Int?,
+        @JsonProperty("progress") val progress: Int?,
+        @JsonProperty("episodes") val episodes: Int?,
+        @JsonProperty("score") val score: Int?,
+        @JsonProperty("type") val type: AniListStatusType?,
     )
 
-    @Serializable
     data class GetDataMediaListEntry(
-        @JsonProperty("progress") @SerialName("progress") val progress: Int?,
-        @JsonProperty("status") @SerialName("status") val status: String?,
-        @JsonProperty("score") @SerialName("score") val score: Int?,
+        @JsonProperty("progress") val progress: Int?,
+        @JsonProperty("status") val status: String?,
+        @JsonProperty("score") val score: Int?,
     )
 
-    @Serializable
     data class Nodes(
-        @JsonProperty("id") @SerialName("id") val id: Int?,
-        @JsonProperty("mediaRecommendation") @SerialName("mediaRecommendation") val mediaRecommendation: MediaRecommendation?,
+        @JsonProperty("id") val id: Int?,
+        @JsonProperty("mediaRecommendation") val mediaRecommendation: MediaRecommendation?
     )
 
-    @Serializable
     data class GetDataMedia(
-        @JsonProperty("isFavourite") @SerialName("isFavourite") val isFavourite: Boolean?,
-        @JsonProperty("episodes") @SerialName("episodes") val episodes: Int?,
-        @JsonProperty("title") @SerialName("title") val title: Title?,
-        @JsonProperty("mediaListEntry") @SerialName("mediaListEntry") val mediaListEntry: GetDataMediaListEntry?,
+        @JsonProperty("isFavourite") val isFavourite: Boolean?,
+        @JsonProperty("episodes") val episodes: Int?,
+        @JsonProperty("title") val title: Title?,
+        @JsonProperty("mediaListEntry") val mediaListEntry: GetDataMediaListEntry?
     )
 
-    @Serializable
     data class Recommendations(
-        @JsonProperty("nodes") @SerialName("nodes") val nodes: List<Nodes>?,
+        @JsonProperty("nodes") val nodes: List<Nodes>?
     )
 
-    @Serializable
     data class GetDataData(
-        @JsonProperty("Media") @SerialName("Media") val media: GetDataMedia?,
+        @JsonProperty("Media") val media: GetDataMedia?,
     )
 
-    @Serializable
     data class GetDataRoot(
-        @JsonProperty("data") @SerialName("data") val data: GetDataData?,
+        @JsonProperty("data") val data: GetDataData?,
     )
 
-    @Serializable
     data class GetSearchTitle(
-        @JsonProperty("romaji") @SerialName("romaji") val romaji: String?,
+        @JsonProperty("romaji") val romaji: String?,
     )
 
-    @Serializable
     data class TrailerObject(
-        @JsonProperty("id") @SerialName("id") val id: String?,
-        @JsonProperty("thumbnail") @SerialName("thumbnail") val thumbnail: String?,
-        @JsonProperty("site") @SerialName("site") val site: String?,
+        @JsonProperty("id") val id: String?,
+        @JsonProperty("thumbnail") val thumbnail: String?,
+        @JsonProperty("site") val site: String?,
     )
 
-    @Serializable
     data class GetSearchMedia(
-        @JsonProperty("id") @SerialName("id") val id: Int,
-        @JsonProperty("idMal") @SerialName("idMal") val idMal: Int?,
-        @JsonProperty("seasonYear") @SerialName("seasonYear") val seasonYear: Int,
-        @JsonProperty("title") @SerialName("title") val title: GetSearchTitle,
-        @JsonProperty("startDate") @SerialName("startDate") val startDate: StartedAt,
-        @JsonProperty("averageScore") @SerialName("averageScore") val averageScore: Int?,
-        @JsonProperty("meanScore") @SerialName("meanScore") val meanScore: Int?,
-        @JsonProperty("bannerImage") @SerialName("bannerImage") val bannerImage: String?,
-        @JsonProperty("trailer") @SerialName("trailer") val trailer: TrailerObject?,
-        @JsonProperty("nextAiringEpisode") @SerialName("nextAiringEpisode") val nextAiringEpisode: SeasonNextAiringEpisode?,
-        @JsonProperty("recommendations") @SerialName("recommendations") val recommendations: Recommendations?,
-        @JsonProperty("relations") @SerialName("relations") val relations: SeasonEdges?,
+        @JsonProperty("id") val id: Int,
+        @JsonProperty("idMal") val idMal: Int?,
+        @JsonProperty("seasonYear") val seasonYear: Int,
+        @JsonProperty("title") val title: GetSearchTitle,
+        @JsonProperty("startDate") val startDate: StartedAt,
+        @JsonProperty("averageScore") val averageScore: Int?,
+        @JsonProperty("meanScore") val meanScore: Int?,
+        @JsonProperty("bannerImage") val bannerImage: String?,
+        @JsonProperty("trailer") val trailer: TrailerObject?,
+        @JsonProperty("nextAiringEpisode") val nextAiringEpisode: SeasonNextAiringEpisode?,
+        @JsonProperty("recommendations") val recommendations: Recommendations?,
+        @JsonProperty("relations") val relations: SeasonEdges?
     )
 
-    @Serializable
     data class GetSearchPage(
-        @JsonProperty("Page") @SerialName("Page") val page: GetSearchData?,
+        @JsonProperty("Page") val page: GetSearchData?,
     )
 
-    @Serializable
     data class GetSearchData(
-        @JsonProperty("media") @SerialName("media") val media: List<GetSearchMedia>?,
+        @JsonProperty("media") val media: List<GetSearchMedia>?,
     )
 
-    @Serializable
     data class GetSearchRoot(
-        @JsonProperty("data") @SerialName("data") val data: GetSearchPage?,
+        @JsonProperty("data") val data: GetSearchPage?,
     )
 }

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

@@ -1,8 +1,8 @@
 package com.lagradost.cloudstream3.syncproviders.providers
 
+
 import androidx.annotation.StringRes
 import com.fasterxml.jackson.annotation.JsonProperty
-import com.lagradost.cloudstream3.APIHolder
 import com.lagradost.cloudstream3.CloudStreamApp.Companion.getKey
 import com.lagradost.cloudstream3.CloudStreamApp.Companion.setKey
 import com.lagradost.cloudstream3.R
@@ -22,15 +22,14 @@ 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 kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
 import okhttp3.Interceptor
 import okhttp3.Request
 import okhttp3.RequestBody.Companion.toRequestBody
 import okhttp3.Response
 import java.text.SimpleDateFormat
+import java.time.Instant
 import java.time.LocalDate
-import java.time.ZoneId
+import java.time.format.DateTimeFormatter
 import java.util.Date
 import java.util.Locale
 
@@ -69,9 +68,13 @@ class KitsuApi: SyncAPI() {
             val request: Request = chain.request()
 
             try {
+
                 val response = chain.proceed(request);
+
                 if (response.isSuccessful) return response
+
                 response.close()
+
             } catch (_: Exception) {
             }
 
@@ -80,6 +83,7 @@ class KitsuApi: SyncAPI() {
                 .build()
 
             return chain.proceed(fallbackRequest)
+
         }
     }
 
@@ -103,7 +107,7 @@ class KitsuApi: SyncAPI() {
         ).parsed<ResponseToken>()
 
         return AuthToken(
-            accessTokenLifetime = APIHolder.unixTime + token.expiresIn.toLong(),
+            accessTokenLifetime = unixTime + token.expiresIn.toLong(),
             refreshToken = token.refreshToken,
             accessToken = token.accessToken,
         )
@@ -122,7 +126,7 @@ class KitsuApi: SyncAPI() {
         return AuthToken(
             accessToken = res.accessToken,
             refreshToken = res.refreshToken,
-            accessTokenLifetime = APIHolder.unixTime + res.expiresIn.toLong()
+            accessTokenLifetime = unixTime + res.expiresIn.toLong()
         )
     }
 
@@ -179,9 +183,9 @@ class KitsuApi: SyncAPI() {
             return null
         }
 
-        @Serializable
         data class KitsuResponse(
-            @JsonProperty("data") @SerialName("data") val data: KitsuNode,
+            @field:JsonProperty(value = "data")
+            val data: KitsuNode,
         )
 
         val url =
@@ -198,7 +202,7 @@ class KitsuApi: SyncAPI() {
             id = id,
             totalEpisodes = anime.episodeCount,
             title = anime.canonicalTitle ?: anime.titles?.enJp ?: anime.titles?.jaJp.orEmpty(),
-            publicScore =  Score.from(anime.ratingTwenty, 20),
+            publicScore =  Score.from(anime.ratingTwenty.toString(), 20),
             duration = anime.episodeLength,
             synopsis = anime.synopsis,
             airStatus = when(anime.status) {
@@ -217,6 +221,7 @@ class KitsuApi: SyncAPI() {
             prevSeason = null,
             actors = null,
         )
+
     }
 
     override suspend fun status(auth : AuthData?, id: String): AbstractSyncStatus? {
@@ -245,19 +250,21 @@ class KitsuApi: SyncAPI() {
         }
 
         return SyncStatus(
-            score = Score.from(anime.ratingTwenty, 20),
+            score = Score.from(anime.ratingTwenty.toString(), 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? =
@@ -268,6 +275,7 @@ class KitsuApi: SyncAPI() {
         id: String,
         newStatus: AbstractSyncStatus
     ): Boolean {
+
         return setScoreRequest(
             auth ?: return false,
             id.toIntOrNull() ?: return false,
@@ -284,12 +292,15 @@ class KitsuApi: SyncAPI() {
         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(
@@ -298,7 +309,9 @@ class KitsuApi: SyncAPI() {
                     interceptor = apiFallbackInterceptor
                 )
 
+
                 return res.isSuccessful
+
             }
 
             return setScoreRequest(
@@ -308,6 +321,7 @@ class KitsuApi: SyncAPI() {
                 score,
                 numWatchedEpisodes
             )
+
         }
 
         val data = mapOf(
@@ -346,6 +360,7 @@ class KitsuApi: SyncAPI() {
         )
 
         return res.isSuccessful
+
     }
 
     @Suppress("UNCHECKED_CAST")
@@ -378,11 +393,15 @@ class KitsuApi: SyncAPI() {
             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(
@@ -392,6 +411,7 @@ class KitsuApi: SyncAPI() {
         ).parsed<KitsuResponse>().data.firstOrNull() ?: return null
 
         return res.id.toInt()
+
     }
 
     override suspend fun library(auth : AuthData?): LibraryMetadata? {
@@ -433,52 +453,58 @@ class KitsuApi: SyncAPI() {
     }
 
     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 animeSelectedFields = arrayOf("titles","canonicalTitle","posterImage","synopsis","startDate","episodeCount")
+        val libraryEntriesSelectedFields = arrayOf("progress","rating","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 {
-        return app.get(
+        val res = app.get(
             url, headers = mapOf(
                 "Authorization" to "Bearer ${token.accessToken}",
             ),
             interceptor = apiFallbackInterceptor
         ).parsed<KitsuResponse>()
+        return res
     }
 
-    @Serializable
+
     data class ResponseToken(
-        @JsonProperty("token_type") @SerialName("token_type") val tokenType: String,
-        @JsonProperty("expires_in") @SerialName("expires_in") val expiresIn: Int,
-        @JsonProperty("access_token") @SerialName("access_token") val accessToken: String,
-        @JsonProperty("refresh_token") @SerialName("refresh_token") val refreshToken: String,
+        @JsonProperty("token_type") val tokenType: String,
+        @JsonProperty("expires_in") val expiresIn: Int,
+        @JsonProperty("access_token") val accessToken: String,
+        @JsonProperty("refresh_token") val refreshToken: String,
     )
 
-    @Serializable
     data class KitsuNode(
-        @JsonProperty("id") @SerialName("id") val id: String,
-        @JsonProperty("attributes") @SerialName("attributes") val attributes: KitsuNodeAttributes,
+        @JsonProperty("id") val id: String,
+        @JsonProperty("attributes") val attributes: KitsuNodeAttributes,
         /* User list anime node */
-        @JsonProperty("relationships") @SerialName("relationships") val relationships: KitsuRelationships?,
-        @JsonProperty("anime") @SerialName("anime") var anime: KitsuAnimeData?,
+        @JsonProperty("relationships") val relationships: KitsuRelationships?,
+        var anime: KitsuAnimeData?
     ) {
         fun toLibraryItem(): LibraryItem {
+
             val animeItem = this.anime
 
             val numEpisodes = animeItem?.attributes?.episodeCount
@@ -500,7 +526,7 @@ class KitsuApi: SyncAPI() {
                 this.id,
                 this.attributes.progress,
                 numEpisodes,
-                Score.from(this.attributes.ratingTwenty, 20),
+                Score.from(this.attributes.ratingTwenty.toString(), 20),
                 parseDateLong(this.attributes.updatedAt),
                 "Kitsu",
                 TvType.Anime,
@@ -509,9 +535,12 @@ class KitsuApi: SyncAPI() {
                 null,
                 plot = synopsis,
                 releaseDate = if (startDate == null) null else try {
-                    Date.from(LocalDate.parse(startDate).atStartOfDay()
-                        .atZone(ZoneId.systemDefault())
-                        .toInstant())
+                    Date.from(
+                        Instant.from(
+                            DateTimeFormatter.ofPattern(if (startDate.length == 4) "yyyy" else if (startDate.length == 7) "yyyy-MM" else "yyyy-MM-dd")
+                                .parse(startDate)
+                        )
+                    )
                 } catch (_: RuntimeException) {
                     null
                 }
@@ -520,100 +549,93 @@ class KitsuApi: SyncAPI() {
 
     }
 
-    @Serializable
     data class KitsuAnimeAttributes(
-        @JsonProperty("titles") @SerialName("titles") val titles: KitsuTitles?,
-        @JsonProperty("canonicalTitle") @SerialName("canonicalTitle") val canonicalTitle: String?,
-        @JsonProperty("posterImage") @SerialName("posterImage") val posterImage: KitsuPosterImage?,
-        @JsonProperty("synopsis") @SerialName("synopsis") val synopsis: String?,
-        @JsonProperty("startDate") @SerialName("startDate") val startDate: String?,
-        @JsonProperty("endDate") @SerialName("endDate") val endDate: String?,
-        @JsonProperty("episodeCount") @SerialName("episodeCount") val episodeCount: Int?,
-        @JsonProperty("episodeLength") @SerialName("episodeLength") val episodeLength: Int?,
+        @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?,
     )
 
-    @Serializable
     data class KitsuAnimeData(
-        @JsonProperty("id") @SerialName("id") val id: String,
-        @JsonProperty("attributes") @SerialName("attributes") val attributes: KitsuAnimeAttributes,
+        @JsonProperty("id") val id: String,
+        @JsonProperty("attributes") val attributes: KitsuAnimeAttributes,
     )
 
-    @Serializable
+
     data class KitsuNodeAttributes(
         /* General attributes */
-        @JsonProperty("titles") @SerialName("titles") val titles: KitsuTitles?,
-        @JsonProperty("canonicalTitle") @SerialName("canonicalTitle") val canonicalTitle: String?,
-        @JsonProperty("posterImage") @SerialName("posterImage") val posterImage: KitsuPosterImage?,
-        @JsonProperty("synopsis") @SerialName("synopsis") val synopsis: String?,
-        @JsonProperty("startDate") @SerialName("startDate") val startDate: String?,
-        @JsonProperty("endDate") @SerialName("endDate") val endDate: String?,
-        @JsonProperty("episodeCount") @SerialName("episodeCount") val episodeCount: Int?,
-        @JsonProperty("episodeLength") @SerialName("episodeLength") val episodeLength: Int?,
+        @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") @SerialName("name") val name: String?,
-        @JsonProperty("location") @SerialName("location") val location: String?,
-        @JsonProperty("createdAt") @SerialName("createdAt") val createdAt: String?,
-        @JsonProperty("avatar") @SerialName("avatar") val avatar: KitsuUserAvatar?,
+        @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") @SerialName("progress") val progress: Int?,
-        @JsonProperty("ratingTwenty") @SerialName("ratingTwenty") val ratingTwenty: Int?,
-        @JsonProperty("updatedAt") @SerialName("updatedAt") val updatedAt: String?,
-        @JsonProperty("status") @SerialName("status") val status: String?,
+        @JsonProperty("progress") val progress: Int?,
+        @JsonProperty("ratingTwenty") val ratingTwenty: Float?,
+        @JsonProperty("updatedAt") val updatedAt: String?,
+        @JsonProperty("status") val status: String?,
     )
 
-    @Serializable
     data class KitsuRelationships(
-        @JsonProperty("anime") @SerialName("anime") val anime: KitsuRelationshipsAnime?,
+        @JsonProperty("anime") val anime: KitsuRelationshipsAnime?
     )
 
-    @Serializable
     data class KitsuRelationshipsAnime(
-        @JsonProperty("links") @SerialName("links") val links: KitsuLinks?,
+        @JsonProperty("links") val links: KitsuLinks?
     )
 
-    @Serializable
     data class KitsuPosterImage(
-        @JsonProperty("large") @SerialName("large") val large: String?,
-        @JsonProperty("medium") @SerialName("medium") val medium: String?,
+        @JsonProperty("large") val large: String?,
+        @JsonProperty("medium") val medium: String?,
     )
 
-    @Serializable
     data class KitsuTitles(
-        @JsonProperty("en_jp") @SerialName("en_jp") val enJp: String?,
-        @JsonProperty("ja_jp") @SerialName("ja_jp") val jaJp: String?,
+        @JsonProperty("en_jp") val enJp: String?,
+        @JsonProperty("ja_jp") val jaJp: String?
     )
 
-    @Serializable
     data class KitsuUserAvatar(
-        @JsonProperty("original") @SerialName("original") val original: String?,
+        @JsonProperty("original") val original: String?
     )
 
-    @Serializable
     data class KitsuLinks(
         /* Pagination */
-        @JsonProperty("first") @SerialName("first") val first: String?,
-        @JsonProperty("next") @SerialName("next") val next: String?,
-        @JsonProperty("last") @SerialName("last") val last: String?,
+        @JsonProperty("first") val first: String?,
+        @JsonProperty("next") val next: String?,
+        @JsonProperty("last") val last: String?,
         /* Relationships */
-        @JsonProperty("related") @SerialName("related") val related: String?,
+        @JsonProperty("related") val related: String?
     )
 
-    @Serializable
     data class KitsuResponse(
-        @JsonProperty("links") @SerialName("links") val links: KitsuLinks?,
-        @JsonProperty("data") @SerialName("data") val data: List<KitsuNode>,
+        @JsonProperty("links") val links: KitsuLinks?,
+        @JsonProperty("data") val data: List<KitsuNode>,
         /* When requesting related info (User library entry -> anime) */
-        @JsonProperty("included") @SerialName("included") val included: List<KitsuAnimeData>?,
+        @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(
+                SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ", Locale.getDefault()).parse(
                     string ?: return null
                 )?.time?.div(1000)
-            } catch (_: Exception) {
+            } catch (e: Exception) {
                 null
             }
         }
@@ -670,7 +692,7 @@ object Kitsu {
             "https://kitsu.io/api/graphql",
             headers = headers,
             data = mapOf("query" to query)
-        ).parsed<KitsuResponse>()
+        ).parsed()
     }
 
     private val cache: MutableMap<Pair<String, String>, Map<Int, KitsuResponse.Node>> =
@@ -752,52 +774,44 @@ query {
         return map
     }
 
-    @Serializable
     data class KitsuResponse(
-        @JsonProperty("data") @SerialName("data") val data: Data? = null,
+        val data: Data? = null
     ) {
-        @Serializable
         data class Data(
-            @JsonProperty("lookupMapping") @SerialName("lookupMapping") val lookupMapping: LookupMapping? = null,
+            val lookupMapping: LookupMapping? = null
         )
 
-        @Serializable
         data class LookupMapping(
-            @JsonProperty("id") @SerialName("id") val id: String? = null,
-            @JsonProperty("episodes") @SerialName("episodes") val episodes: Episodes? = null,
+            val id: String? = null,
+            val episodes: Episodes? = null
         )
 
-        @Serializable
         data class Episodes(
-            @JsonProperty("nodes") @SerialName("nodes") val nodes: List<Node?>? = null,
+            val nodes: List<Node?>? = null
         )
 
-        @Serializable
         data class Node(
-            @JsonProperty("number") @SerialName("number") val num: Int? = null,
-            @JsonProperty("titles") @SerialName("titles") val titles: Titles? = null,
-            @JsonProperty("description") @SerialName("description") val description: Description? = null,
-            @JsonProperty("thumbnail") @SerialName("thumbnail") val thumbnail: Thumbnail? = null,
+            @JsonProperty("number")
+            val num: Int? = null,
+            val titles: Titles? = null,
+            val description: Description? = null,
+            val thumbnail: Thumbnail? = null
         )
 
-        @Serializable
         data class Description(
-            @JsonProperty("en") @SerialName("en") val en: String? = null,
+            val en: String? = null
         )
 
-        @Serializable
         data class Thumbnail(
-            @JsonProperty("original") @SerialName("original") val original: Original? = null,
+            val original: Original? = null
         )
 
-        @Serializable
         data class Original(
-            @JsonProperty("url") @SerialName("url") val url: String? = null,
+            val url: String? = null
         )
 
-        @Serializable
         data class Titles(
-            @JsonProperty("canonical") @SerialName("canonical") val canonical: String? = null,
+            val canonical: String? = null
         )
     }
 }

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

@@ -2,8 +2,6 @@ package com.lagradost.cloudstream3.syncproviders.providers
 
 import androidx.annotation.StringRes
 import com.fasterxml.jackson.annotation.JsonProperty
-import com.lagradost.cloudstream3.APIHolder
-import com.lagradost.cloudstream3.BuildConfig
 import com.lagradost.cloudstream3.CloudStreamApp.Companion.getKey
 import com.lagradost.cloudstream3.CloudStreamApp.Companion.setKey
 import com.lagradost.cloudstream3.R
@@ -21,9 +19,8 @@ import com.lagradost.cloudstream3.ui.SyncWatchType
 import com.lagradost.cloudstream3.ui.library.ListSorting
 import com.lagradost.cloudstream3.utils.AppUtils.parseJson
 import com.lagradost.cloudstream3.utils.AppUtils.toJson
+import com.lagradost.cloudstream3.utils.DataStore.toKotlinObject
 import com.lagradost.cloudstream3.utils.txt
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
 import java.text.SimpleDateFormat
 import java.time.Instant
 import java.time.format.DateTimeFormatter
@@ -37,7 +34,7 @@ class MALApi : SyncAPI() {
     override var name = "MAL"
     override val idPrefix = "mal"
 
-    private val key = BuildConfig.MAL_KEY
+    val key = "1714d6f2f4f7cc19644384f8c4629910"
     private val apiUrl = "https://api.myanimelist.net"
     override val hasOAuth2 = true
     override val redirectUrlIdentifier: String? = "mallogin"
@@ -52,17 +49,16 @@ class MALApi : SyncAPI() {
         SyncWatchType.PLANTOWATCH,
         SyncWatchType.DROPPED,
         SyncWatchType.ONHOLD,
-        SyncWatchType.NONE,
+        SyncWatchType.NONE
     )
 
-    @Serializable
-    data class Payload(
-        @JsonProperty("requestId") @SerialName("requestId") val requestId: Int,
-        @JsonProperty("codeVerifier") @SerialName("codeVerifier") val codeVerifier: String,
+    data class PayLoad(
+        val requestId: Int,
+        val codeVerifier: String
     )
 
     override suspend fun login(redirectUrl: String, payload: String?): AuthToken? {
-        val payloadData = parseJson<Payload>(payload!!)
+        val payloadData = parseJson<PayLoad>(payload!!)
         val sanitizer = splitRedirectUrl(redirectUrl)
         val state = sanitizer["state"]!!
 
@@ -78,13 +74,13 @@ class MALApi : SyncAPI() {
                 "client_id" to key,
                 "code" to currentCode,
                 "code_verifier" to payloadData.codeVerifier,
-                "grant_type" to "authorization_code",
+                "grant_type" to "authorization_code"
             )
         ).parsed<ResponseToken>()
         return AuthToken(
-            accessTokenLifetime = APIHolder.unixTime + token.expiresIn.toLong(),
+            accessTokenLifetime = unixTime + token.expiresIn.toLong(),
             refreshToken = token.refreshToken,
-            accessToken = token.accessToken,
+            accessToken = token.accessToken
         )
     }
 
@@ -98,13 +94,13 @@ class MALApi : SyncAPI() {
         return AuthUser(
             id = user.id,
             name = user.name,
-            profilePicture = user.picture,
+            profilePicture = user.picture
         )
     }
 
     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",
@@ -117,7 +113,7 @@ class MALApi : SyncAPI() {
                 this.name,
                 node.id.toString(),
                 "$mainUrl/anime/${node.id}/",
-                node.mainPicture?.large ?: node.mainPicture?.medium,
+                node.mainPicture?.large ?: node.mainPicture?.medium
             )
         }
     }
@@ -139,89 +135,82 @@ class MALApi : SyncAPI() {
         )
     }
 
-    @Serializable
     data class MalAnime(
-        @JsonProperty("id") @SerialName("id") val id: Int?,
-        @JsonProperty("title") @SerialName("title") val title: String?,
-        @JsonProperty("main_picture") @SerialName("main_picture") val mainPicture: MainPicture?,
-        @JsonProperty("alternative_titles") @SerialName("alternative_titles") val alternativeTitles: AlternativeTitles?,
-        @JsonProperty("start_date") @SerialName("start_date") val startDate: String?,
-        @JsonProperty("end_date") @SerialName("end_date") val endDate: String?,
-        @JsonProperty("synopsis") @SerialName("synopsis") val synopsis: String?,
-        @JsonProperty("mean") @SerialName("mean") val mean: Double?,
-        @JsonProperty("rank") @SerialName("rank") val rank: Int?,
-        @JsonProperty("popularity") @SerialName("popularity") val popularity: Int?,
-        @JsonProperty("num_list_users") @SerialName("num_list_users") val numListUsers: Int?,
-        @JsonProperty("num_scoring_users") @SerialName("num_scoring_users") val numScoringUsers: Int?,
-        @JsonProperty("nsfw") @SerialName("nsfw") val nsfw: String?,
-        @JsonProperty("created_at") @SerialName("created_at") val createdAt: String?,
-        @JsonProperty("updated_at") @SerialName("updated_at") val updatedAt: String?,
-        @JsonProperty("media_type") @SerialName("media_type") val mediaType: String?,
-        @JsonProperty("status") @SerialName("status") val status: String?,
-        @JsonProperty("genres") @SerialName("genres") val genres: ArrayList<Genres>?,
-        @JsonProperty("my_list_status") @SerialName("my_list_status") val myListStatus: MyListStatus?,
-        @JsonProperty("num_episodes") @SerialName("num_episodes") val numEpisodes: Int?,
-        @JsonProperty("start_season") @SerialName("start_season") val startSeason: StartSeason?,
-        @JsonProperty("broadcast") @SerialName("broadcast") val broadcast: Broadcast?,
-        @JsonProperty("source") @SerialName("source") val source: String?,
-        @JsonProperty("average_episode_duration") @SerialName("average_episode_duration") val averageEpisodeDuration: Int?,
-        @JsonProperty("rating") @SerialName("rating") val rating: String?,
-        @JsonProperty("pictures") @SerialName("pictures") val pictures: ArrayList<MainPicture>?,
-        @JsonProperty("background") @SerialName("background") val background: String?,
-        @JsonProperty("related_anime") @SerialName("related_anime") val relatedAnime: ArrayList<RelatedAnime>?,
-        @JsonProperty("related_manga") @SerialName("related_manga") val relatedManga: ArrayList<String>?,
-        @JsonProperty("recommendations") @SerialName("recommendations") val recommendations: ArrayList<Recommendations>?,
-        @JsonProperty("studios") @SerialName("studios") val studios: ArrayList<Studios>?,
-        @JsonProperty("statistics") @SerialName("statistics") val statistics: Statistics?,
+        @JsonProperty("id") val id: Int?,
+        @JsonProperty("title") val title: String?,
+        @JsonProperty("main_picture") val mainPicture: MainPicture?,
+        @JsonProperty("alternative_titles") val alternativeTitles: AlternativeTitles?,
+        @JsonProperty("start_date") val startDate: String?,
+        @JsonProperty("end_date") val endDate: String?,
+        @JsonProperty("synopsis") val synopsis: String?,
+        @JsonProperty("mean") val mean: Double?,
+        @JsonProperty("rank") val rank: Int?,
+        @JsonProperty("popularity") val popularity: Int?,
+        @JsonProperty("num_list_users") val numListUsers: Int?,
+        @JsonProperty("num_scoring_users") val numScoringUsers: Int?,
+        @JsonProperty("nsfw") val nsfw: String?,
+        @JsonProperty("created_at") val createdAt: String?,
+        @JsonProperty("updated_at") val updatedAt: String?,
+        @JsonProperty("media_type") val mediaType: String?,
+        @JsonProperty("status") val status: String?,
+        @JsonProperty("genres") val genres: ArrayList<Genres>?,
+        @JsonProperty("my_list_status") val myListStatus: MyListStatus?,
+        @JsonProperty("num_episodes") val numEpisodes: Int?,
+        @JsonProperty("start_season") val startSeason: StartSeason?,
+        @JsonProperty("broadcast") val broadcast: Broadcast?,
+        @JsonProperty("source") val source: String?,
+        @JsonProperty("average_episode_duration") val averageEpisodeDuration: Int?,
+        @JsonProperty("rating") val rating: String?,
+        @JsonProperty("pictures") val pictures: ArrayList<MainPicture>?,
+        @JsonProperty("background") val background: String?,
+        @JsonProperty("related_anime") val relatedAnime: ArrayList<RelatedAnime>?,
+        @JsonProperty("related_manga") val relatedManga: ArrayList<String>?,
+        @JsonProperty("recommendations") val recommendations: ArrayList<Recommendations>?,
+        @JsonProperty("studios") val studios: ArrayList<Studios>?,
+        @JsonProperty("statistics") val statistics: Statistics?,
     )
 
-    @Serializable
     data class Recommendations(
-        @JsonProperty("node") @SerialName("node") val node: Node? = null,
-        @JsonProperty("num_recommendations") @SerialName("num_recommendations") val numRecommendations: Int? = null,
+        @JsonProperty("node") val node: Node? = null,
+        @JsonProperty("num_recommendations") val numRecommendations: Int? = null
     )
 
-    @Serializable
     data class Studios(
-        @JsonProperty("id") @SerialName("id") val id: Int? = null,
-        @JsonProperty("name") @SerialName("name") val name: String? = null,
+        @JsonProperty("id") val id: Int? = null,
+        @JsonProperty("name") val name: String? = null
     )
 
-    @Serializable
     data class MyListStatus(
-        @JsonProperty("status") @SerialName("status") val status: String? = null,
-        @JsonProperty("score") @SerialName("score") val score: Int? = null,
-        @JsonProperty("num_episodes_watched") @SerialName("num_episodes_watched") val numEpisodesWatched: Int? = null,
-        @JsonProperty("is_rewatching") @SerialName("is_rewatching") val isRewatching: Boolean? = null,
-        @JsonProperty("updated_at") @SerialName("updated_at") val updatedAt: String? = null,
+        @JsonProperty("status") val status: String? = null,
+        @JsonProperty("score") val score: Int? = null,
+        @JsonProperty("num_episodes_watched") val numEpisodesWatched: Int? = null,
+        @JsonProperty("is_rewatching") val isRewatching: Boolean? = null,
+        @JsonProperty("updated_at") val updatedAt: String? = null
     )
 
-    @Serializable
     data class RelatedAnime(
-        @JsonProperty("node") @SerialName("node") val node: Node? = null,
-        @JsonProperty("relation_type") @SerialName("relation_type") val relationType: String? = null,
-        @JsonProperty("relation_type_formatted") @SerialName("relation_type_formatted") val relationTypeFormatted: String? = null,
+        @JsonProperty("node") val node: Node? = null,
+        @JsonProperty("relation_type") val relationType: String? = null,
+        @JsonProperty("relation_type_formatted") val relationTypeFormatted: String? = null
     )
 
-    @Serializable
     data class Status(
-        @JsonProperty("watching") @SerialName("watching") val watching: String? = null,
-        @JsonProperty("completed") @SerialName("completed") val completed: String? = null,
-        @JsonProperty("on_hold") @SerialName("on_hold") val onHold: String? = null,
-        @JsonProperty("dropped") @SerialName("dropped") val dropped: String? = null,
-        @JsonProperty("plan_to_watch") @SerialName("plan_to_watch") val planToWatch: String? = null,
+        @JsonProperty("watching") val watching: String? = null,
+        @JsonProperty("completed") val completed: String? = null,
+        @JsonProperty("on_hold") val onHold: String? = null,
+        @JsonProperty("dropped") val dropped: String? = null,
+        @JsonProperty("plan_to_watch") val planToWatch: String? = null
     )
 
-    @Serializable
     data class Statistics(
-        @JsonProperty("status") @SerialName("status") val status: Status? = null,
-        @JsonProperty("num_list_users") @SerialName("num_list_users") val numListUsers: Int? = null,
+        @JsonProperty("status") val status: Status? = null,
+        @JsonProperty("num_list_users") val numListUsers: Int? = null
     )
 
     private fun parseDate(string: String?): Long? {
         return try {
             SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()).parse(string ?: return null)?.time
-        } catch (_: Exception) {
+        } catch (e: Exception) {
             null
         }
     }
@@ -232,7 +221,7 @@ class MALApi : SyncAPI() {
             apiName = this.name,
             syncId = node.id.toString(),
             url = "$mainUrl/anime/${node.id}",
-            posterUrl = node.mainPicture?.large,
+            posterUrl = node.mainPicture?.large
         )
     }
 
@@ -345,7 +334,7 @@ class MALApi : SyncAPI() {
                 SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ", Locale.getDefault()).parse(
                     string ?: return null
                 )?.time?.div(1000)
-            } catch (_: Exception) {
+            } catch (e: Exception) {
                 null
             }
         }
@@ -355,10 +344,12 @@ class MALApi : SyncAPI() {
         val codeVerifier = generateCodeVerifier()
         val requestId = ++requestIdCounter
         val codeChallenge = codeVerifier
-        val request = "$mainUrl/v1/oauth2/authorize?response_type=code&client_id=$key&code_challenge=$codeChallenge&state=RequestID$requestId"
+        val request =
+            "$mainUrl/v1/oauth2/authorize?response_type=code&client_id=$key&code_challenge=$codeChallenge&state=RequestID$requestId"
+
         return AuthLoginPage(
             url = request,
-            payload = Payload(requestId, codeVerifier).toJson(),
+            payload = PayLoad(requestId, codeVerifier).toJson()
         )
     }
 
@@ -368,71 +359,69 @@ class MALApi : SyncAPI() {
             data = mapOf(
                 "client_id" to key,
                 "grant_type" to "refresh_token",
-                "refresh_token" to token.refreshToken!!,
+                "refresh_token" to token.refreshToken!!
             )
         ).parsed<ResponseToken>()
+
         return AuthToken(
             accessToken = res.accessToken,
             refreshToken = res.refreshToken,
-            accessTokenLifetime = APIHolder.unixTime + res.expiresIn.toLong(),
+            accessTokenLifetime = unixTime + res.expiresIn.toLong()
         )
     }
 
     private var requestIdCounter = 0
+
+
     private val allTitles = hashMapOf<Int, MalTitleHolder>()
 
-    @Serializable
     data class MalList(
-        @JsonProperty("data") @SerialName("data") val data: List<Data>,
-        @JsonProperty("paging") @SerialName("paging") val paging: Paging,
+        @JsonProperty("data") val data: List<Data>,
+        @JsonProperty("paging") val paging: Paging
     )
 
-    @Serializable
     data class MainPicture(
-        @JsonProperty("medium") @SerialName("medium") val medium: String,
-        @JsonProperty("large") @SerialName("large") val large: String,
+        @JsonProperty("medium") val medium: String,
+        @JsonProperty("large") val large: String
     )
 
-    @Serializable
     data class Node(
-        @JsonProperty("id") @SerialName("id") val id: Int,
-        @JsonProperty("title") @SerialName("title") val title: String,
-        @JsonProperty("main_picture") @SerialName("main_picture") val mainPicture: MainPicture?,
-        @JsonProperty("alternative_titles") @SerialName("alternative_titles") val alternativeTitles: AlternativeTitles?,
-        @JsonProperty("media_type") @SerialName("media_type") val mediaType: String?,
-        @JsonProperty("num_episodes") @SerialName("num_episodes") val numEpisodes: Int?,
-        @JsonProperty("status") @SerialName("status") val status: String?,
-        @JsonProperty("start_date") @SerialName("start_date") val startDate: String?,
-        @JsonProperty("end_date") @SerialName("end_date") val endDate: String?,
-        @JsonProperty("average_episode_duration") @SerialName("average_episode_duration") val averageEpisodeDuration: Int?,
-        @JsonProperty("synopsis") @SerialName("synopsis") val synopsis: String?,
-        @JsonProperty("mean") @SerialName("mean") val mean: Double?,
-        @JsonProperty("genres") @SerialName("genres") val genres: List<Genres>?,
-        @JsonProperty("rank") @SerialName("rank") val rank: Int?,
-        @JsonProperty("popularity") @SerialName("popularity") val popularity: Int?,
-        @JsonProperty("num_list_users") @SerialName("num_list_users") val numListUsers: Int?,
-        @JsonProperty("num_favorites") @SerialName("num_favorites") val numFavorites: Int?,
-        @JsonProperty("num_scoring_users") @SerialName("num_scoring_users") val numScoringUsers: Int?,
-        @JsonProperty("start_season") @SerialName("start_season") val startSeason: StartSeason?,
-        @JsonProperty("broadcast") @SerialName("broadcast") val broadcast: Broadcast?,
-        @JsonProperty("nsfw") @SerialName("nsfw") val nsfw: String?,
-        @JsonProperty("created_at") @SerialName("created_at") val createdAt: String?,
-        @JsonProperty("updated_at") @SerialName("updated_at") val updatedAt: String?,
+        @JsonProperty("id") val id: Int,
+        @JsonProperty("title") val title: String,
+        @JsonProperty("main_picture") val mainPicture: MainPicture?,
+        @JsonProperty("alternative_titles") val alternativeTitles: AlternativeTitles?,
+        @JsonProperty("media_type") val mediaType: String?,
+        @JsonProperty("num_episodes") val numEpisodes: Int?,
+        @JsonProperty("status") val status: String?,
+        @JsonProperty("start_date") val startDate: String?,
+        @JsonProperty("end_date") val endDate: String?,
+        @JsonProperty("average_episode_duration") val averageEpisodeDuration: Int?,
+        @JsonProperty("synopsis") val synopsis: String?,
+        @JsonProperty("mean") val mean: Double?,
+        @JsonProperty("genres") val genres: List<Genres>?,
+        @JsonProperty("rank") val rank: Int?,
+        @JsonProperty("popularity") val popularity: Int?,
+        @JsonProperty("num_list_users") val numListUsers: Int?,
+        @JsonProperty("num_favorites") val numFavorites: Int?,
+        @JsonProperty("num_scoring_users") val numScoringUsers: Int?,
+        @JsonProperty("start_season") val startSeason: StartSeason?,
+        @JsonProperty("broadcast") val broadcast: Broadcast?,
+        @JsonProperty("nsfw") val nsfw: String?,
+        @JsonProperty("created_at") val createdAt: String?,
+        @JsonProperty("updated_at") val updatedAt: String?
     )
 
-    @Serializable
     data class ListStatus(
-        @JsonProperty("status") @SerialName("status") val status: String?,
-        @JsonProperty("score") @SerialName("score") val score: Int,
-        @JsonProperty("num_episodes_watched") @SerialName("num_episodes_watched") val numEpisodesWatched: Int,
-        @JsonProperty("is_rewatching") @SerialName("is_rewatching") val isRewatching: Boolean,
-        @JsonProperty("updated_at") @SerialName("updated_at") val updatedAt: String,
+        @JsonProperty("status") val status: String?,
+        @JsonProperty("score") val score: Int,
+        @JsonProperty("num_episodes_watched") val numEpisodesWatched: Int,
+        @JsonProperty("is_rewatching") val isRewatching: Boolean,
+        @JsonProperty("updated_at") val updatedAt: String,
     )
 
-    @Serializable
     data class Data(
-        @JsonProperty("node") @SerialName("node") val node: Node,
-        @JsonProperty("list_status") @SerialName("list_status") val listStatus: ListStatus?,
+        @JsonProperty("node") val node: Node,
+        @JsonProperty("list_status") val listStatus: ListStatus?,
     ) {
         fun toLibraryItem(): SyncAPI.LibraryItem {
             return SyncAPI.LibraryItem(
@@ -463,34 +452,29 @@ class MALApi : SyncAPI() {
         }
     }
 
-    @Serializable
     data class Paging(
-        @JsonProperty("next") @SerialName("next") val next: String?,
+        @JsonProperty("next") val next: String?
     )
 
-    @Serializable
     data class AlternativeTitles(
-        @JsonProperty("synonyms") @SerialName("synonyms") val synonyms: List<String>,
-        @JsonProperty("en") @SerialName("en") val en: String,
-        @JsonProperty("ja") @SerialName("ja") val ja: String,
+        @JsonProperty("synonyms") val synonyms: List<String>,
+        @JsonProperty("en") val en: String,
+        @JsonProperty("ja") val ja: String
     )
 
-    @Serializable
     data class Genres(
-        @JsonProperty("id") @SerialName("id") val id: Int,
-        @JsonProperty("name") @SerialName("name") val name: String,
+        @JsonProperty("id") val id: Int,
+        @JsonProperty("name") val name: String
     )
 
-    @Serializable
     data class StartSeason(
-        @JsonProperty("year") @SerialName("year") val year: Int,
-        @JsonProperty("season") @SerialName("season") val season: String,
+        @JsonProperty("year") val year: Int,
+        @JsonProperty("season") val season: String
     )
 
-    @Serializable
     data class Broadcast(
-        @JsonProperty("day_of_the_week") @SerialName("day_of_the_week") val dayOfTheWeek: String?,
-        @JsonProperty("start_time") @SerialName("start_time") val startTime: String?,
+        @JsonProperty("day_of_the_week") val dayOfTheWeek: String?,
+        @JsonProperty("start_time") val startTime: String?
     )
 
     override suspend fun library(auth : AuthData?): LibraryMetadata? {
@@ -536,7 +520,7 @@ class MALApi : SyncAPI() {
         val fullList = mutableListOf<Data>()
         val offsetRegex = Regex("""offset=(\d+)""")
         while (true) {
-            val data: MalList = getMalAnimeListSlice(token, offset)
+            val data: MalList = getMalAnimeListSlice(token, offset) ?: break
             fullList.addAll(data.data)
             offset =
                 data.paging.next?.let { offsetRegex.find(it)?.groupValues?.get(1)?.toInt() }
@@ -545,17 +529,18 @@ class MALApi : SyncAPI() {
         return fullList.toTypedArray()
     }
 
-    private suspend fun getMalAnimeListSlice(token: AuthToken, offset: Int = 0): MalList {
+    private suspend fun getMalAnimeListSlice(token: AuthToken, offset: Int = 0): MalList? {
         val user = "@me"
         // Very lackluster docs
         // https://myanimelist.net/apiconfig/references/api/v2#operation/users_user_id_animelist_get
-        val url = "$apiUrl/v2/users/$user/animelist?fields=list_status,num_episodes,media_type,status,start_date,end_date,synopsis,alternative_titles,mean,genres,rank,num_list_users,nsfw,average_episode_duration,num_favorites,popularity,num_scoring_users,start_season,favorites_info,broadcast,created_at,updated_at&nsfw=1&limit=100&offset=$offset"
+        val url =
+            "$apiUrl/v2/users/$user/animelist?fields=list_status,num_episodes,media_type,status,start_date,end_date,synopsis,alternative_titles,mean,genres,rank,num_list_users,nsfw,average_episode_duration,num_favorites,popularity,num_scoring_users,start_season,favorites_info,broadcast,created_at,updated_at&nsfw=1&limit=100&offset=$offset"
         val res = app.get(
             url, headers = mapOf(
                 "Authorization" to "Bearer ${token.accessToken}",
             ), cacheTime = 0
         ).text
-        return parseJson<MalList>(res)
+        return res.toKotlinObject()
     }
 
     private suspend fun setScoreRequest(
@@ -598,7 +583,7 @@ class MALApi : SyncAPI() {
         val data = mapOf(
             "status" to status,
             "score" to score?.toString(),
-            "num_watched_episodes" to numWatchedEpisodes?.toString(),
+            "num_watched_episodes" to numWatchedEpisodes?.toString()
         ).filterValues { it != null } as Map<String, String>
 
         return app.put(
@@ -610,73 +595,70 @@ class MALApi : SyncAPI() {
         ).text
     }
 
-    @Serializable
+
     data class ResponseToken(
-        @JsonProperty("token_type") @SerialName("token_type") val tokenType: String,
-        @JsonProperty("expires_in") @SerialName("expires_in") val expiresIn: Int,
-        @JsonProperty("access_token") @SerialName("access_token") val accessToken: String,
-        @JsonProperty("refresh_token") @SerialName("refresh_token") val refreshToken: String,
+        @JsonProperty("token_type") val tokenType: String,
+        @JsonProperty("expires_in") val expiresIn: Int,
+        @JsonProperty("access_token") val accessToken: String,
+        @JsonProperty("refresh_token") val refreshToken: String,
     )
 
-    @Serializable
     data class MalRoot(
-        @JsonProperty("data") @SerialName("data") val data: List<MalDatum>,
+        @JsonProperty("data") val data: List<MalDatum>,
     )
 
-    @Serializable
     data class MalDatum(
-        @JsonProperty("node") @SerialName("node") val node: MalNode,
-        @JsonProperty("list_status") @SerialName("list_status") val listStatus: MalStatus,
+        @JsonProperty("node") val node: MalNode,
+        @JsonProperty("list_status") val listStatus: MalStatus,
     )
 
-    @Serializable
     data class MalNode(
-        @JsonProperty("id") @SerialName("id") val id: Int,
-        @JsonProperty("title") @SerialName("title") val title: String,
+        @JsonProperty("id") val id: Int,
+        @JsonProperty("title") val title: String,
+        /*
+        also, but not used
+        main_picture ->
+            public string medium;
+			public string large;
+         */
     )
 
-    @Serializable
     data class MalStatus(
-        @JsonProperty("status") @SerialName("status") val status: String,
-        @JsonProperty("score") @SerialName("score") val score: Int,
-        @JsonProperty("num_episodes_watched") @SerialName("num_episodes_watched") val numEpisodesWatched: Int,
-        @JsonProperty("is_rewatching") @SerialName("is_rewatching") val isRewatching: Boolean,
-        @JsonProperty("updated_at") @SerialName("updated_at") val updatedAt: String,
+        @JsonProperty("status") val status: String,
+        @JsonProperty("score") val score: Int,
+        @JsonProperty("num_episodes_watched") val numEpisodesWatched: Int,
+        @JsonProperty("is_rewatching") val isRewatching: Boolean,
+        @JsonProperty("updated_at") val updatedAt: String,
     )
 
-    @Serializable
     data class MalUser(
-        @JsonProperty("id") @SerialName("id") val id: Int,
-        @JsonProperty("name") @SerialName("name") val name: String,
-        @JsonProperty("location") @SerialName("location") val location: String,
-        @JsonProperty("joined_at") @SerialName("joined_at") val joinedAt: String,
-        @JsonProperty("picture") @SerialName("picture") val picture: String?,
+        @JsonProperty("id") val id: Int,
+        @JsonProperty("name") val name: String,
+        @JsonProperty("location") val location: String,
+        @JsonProperty("joined_at") val joinedAt: String,
+        @JsonProperty("picture") val picture: String?,
     )
 
-    @Serializable
     data class MalMainPicture(
-        @JsonProperty("large") @SerialName("large") val large: String?,
-        @JsonProperty("medium") @SerialName("medium") val medium: String?,
+        @JsonProperty("large") val large: String?,
+        @JsonProperty("medium") val medium: String?,
     )
 
     // Used for getDataAboutId()
-    @Serializable
     data class SmallMalAnime(
-        @JsonProperty("id") @SerialName("id") val id: Int,
-        @JsonProperty("title") @SerialName("title") val title: String?,
-        @JsonProperty("num_episodes") @SerialName("num_episodes") val numEpisodes: Int,
-        @JsonProperty("my_list_status") @SerialName("my_list_status") val myListStatus: MalStatus?,
-        @JsonProperty("main_picture") @SerialName("main_picture") val mainPicture: MalMainPicture?,
+        @JsonProperty("id") val id: Int,
+        @JsonProperty("title") val title: String?,
+        @JsonProperty("num_episodes") val numEpisodes: Int,
+        @JsonProperty("my_list_status") val myListStatus: MalStatus?,
+        @JsonProperty("main_picture") val mainPicture: MalMainPicture?,
     )
 
-    @Serializable
     data class MalSearchNode(
-        @JsonProperty("node") @SerialName("node") val node: Node,
+        @JsonProperty("node") val node: Node,
     )
 
-    @Serializable
     data class MalSearch(
-        @JsonProperty("data") @SerialName("data") val data: List<MalSearchNode>,
+        @JsonProperty("data") val data: List<MalSearchNode>,
         //paging
     )
 

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

@@ -2,11 +2,9 @@ package com.lagradost.cloudstream3.syncproviders.providers
 
 import android.util.Log
 import com.fasterxml.jackson.annotation.JsonProperty
-import com.lagradost.cloudstream3.APIHolder
-import com.lagradost.cloudstream3.APIHolder.unixTimeMS
+import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.ErrorLoadingException
 import com.lagradost.cloudstream3.R
-import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.subtitles.AbstractSubtitleEntities
 import com.lagradost.cloudstream3.syncproviders.AuthData
 import com.lagradost.cloudstream3.syncproviders.AuthLoginRequirement
@@ -20,8 +18,6 @@ import com.lagradost.cloudstream3.utils.AppUtils.parseJson
 import com.lagradost.cloudstream3.utils.AppUtils.toJson
 import com.lagradost.cloudstream3.utils.SubtitleHelper.fromCodeToLangTagIETF
 import com.lagradost.cloudstream3.utils.SubtitleHelper.fromCodeToOpenSubtitlesTag
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
 
 class OpenSubtitlesApi : SubtitleAPI() {
     override val name = "OpenSubtitles"
@@ -47,17 +43,17 @@ class OpenSubtitlesApi : SubtitleAPI() {
     }
 
     private fun canDoRequest(): Boolean {
-        return unixTimeMS > currentCoolDown
+        return unixTimeMs > currentCoolDown
     }
 
     private fun throwIfCantDoRequest() {
         if (!canDoRequest()) {
-            throw ErrorLoadingException("Too many requests wait for ${(currentCoolDown - unixTimeMS) / 1000L}s")
+            throw ErrorLoadingException("Too many requests wait for ${(currentCoolDown - unixTimeMs) / 1000L}s")
         }
     }
 
     private fun throwGotTooManyRequests() {
-        currentCoolDown = unixTimeMS + COOLDOWN_DURATION
+        currentCoolDown = unixTimeMs + COOLDOWN_DURATION
         throw ErrorLoadingException("Too many requests")
     }
 
@@ -93,7 +89,7 @@ class OpenSubtitlesApi : SubtitleAPI() {
             accessToken = response.token
                 ?: throw ErrorLoadingException("Invalid password or username"),
             /// JWT token is valid 24 hours after successfully authentication of user
-            accessTokenLifetime = APIHolder.unixTime + 60 * 60 * 24,
+            accessTokenLifetime = unixTime + 60 * 60 * 24,
             payload = form.toJson()
         )
     }
@@ -101,7 +97,7 @@ class OpenSubtitlesApi : SubtitleAPI() {
     /**
      * Fetch subtitles using token authenticated on previous method (see authorize).
      * Returns list of Subtitles which user can select to download (see load).
-     */
+     * */
     override suspend fun search(
         auth : AuthData?,
         query: AbstractSubtitleEntities.SubtitleSearch
@@ -181,10 +177,11 @@ class OpenSubtitlesApi : SubtitleAPI() {
         return results
     }
 
-    /**
-     * Process data returned from search.
-     * Returns string url for the subtitle file.
+    /*
+        Process data returned from search.
+        Returns string url for the subtitle file.
     */
+
     override suspend fun load(
         auth : AuthData?,
         subtitle: AbstractSubtitleEntities.SubtitleEntity
@@ -221,64 +218,57 @@ class OpenSubtitlesApi : SubtitleAPI() {
         return null
     }
 
-    @Serializable
     data class OAuthToken(
-        @JsonProperty("token") @SerialName("token") var token: String? = null,
-        @JsonProperty("status") @SerialName("status") var status: Int? = null,
+        @JsonProperty("token") var token: String? = null,
+        @JsonProperty("status") var status: Int? = null
     )
 
-    @Serializable
     data class Results(
-        @JsonProperty("data") @SerialName("data") var data: List<ResultData>? = listOf(),
+        @JsonProperty("data") var data: List<ResultData>? = listOf()
     )
 
-    @Serializable
     data class ResultData(
-        @JsonProperty("id") @SerialName("id") var id: String? = null,
-        @JsonProperty("type") @SerialName("type") var type: String? = null,
-        @JsonProperty("attributes") @SerialName("attributes") var attributes: ResultAttributes? = ResultAttributes(),
+        @JsonProperty("id") var id: String? = null,
+        @JsonProperty("type") var type: String? = null,
+        @JsonProperty("attributes") var attributes: ResultAttributes? = ResultAttributes()
     )
 
-    @Serializable
     data class ResultAttributes(
-        @JsonProperty("subtitle_id") @SerialName("subtitle_id") var subtitleId: String? = null,
-        @JsonProperty("language") @SerialName("language") var language: String? = null,
-        @JsonProperty("release") @SerialName("release") var release: String? = null,
-        @JsonProperty("url") @SerialName("url") var url: String? = null,
-        @JsonProperty("files") @SerialName("files") var files: List<ResultFiles>? = listOf(),
-        @JsonProperty("feature_details") @SerialName("feature_details") var featDetails: ResultFeatureDetails? = ResultFeatureDetails(),
-        @JsonProperty("hearing_impaired") @SerialName("hearing_impaired") var hearingImpaired: Boolean? = null,
+        @JsonProperty("subtitle_id") var subtitleId: String? = null,
+        @JsonProperty("language") var language: String? = null,
+        @JsonProperty("release") var release: String? = null,
+        @JsonProperty("url") var url: String? = null,
+        @JsonProperty("files") var files: List<ResultFiles>? = listOf(),
+        @JsonProperty("feature_details") var featDetails: ResultFeatureDetails? = ResultFeatureDetails(),
+        @JsonProperty("hearing_impaired") var hearingImpaired: Boolean? = null,
     )
 
-    @Serializable
     data class ResultFiles(
-        @JsonProperty("file_id") @SerialName("file_id") var fileId: Int? = null,
-        @JsonProperty("file_name") @SerialName("file_name") var fileName: String? = null,
+        @JsonProperty("file_id") var fileId: Int? = null,
+        @JsonProperty("file_name") var fileName: String? = null
     )
 
-    @Serializable
     data class ResultDownloadLink(
-        @JsonProperty("link") @SerialName("link") var link: String? = null,
-        @JsonProperty("file_name") @SerialName("file_name") var fileName: String? = null,
-        @JsonProperty("requests") @SerialName("requests") var requests: Int? = null,
-        @JsonProperty("remaining") @SerialName("remaining") var remaining: Int? = null,
-        @JsonProperty("message") @SerialName("message") var message: String? = null,
-        @JsonProperty("reset_time") @SerialName("reset_time") var resetTime: String? = null,
-        @JsonProperty("reset_time_utc") @SerialName("reset_time_utc") var resetTimeUtc: String? = null,
+        @JsonProperty("link") var link: String? = null,
+        @JsonProperty("file_name") var fileName: String? = null,
+        @JsonProperty("requests") var requests: Int? = null,
+        @JsonProperty("remaining") var remaining: Int? = null,
+        @JsonProperty("message") var message: String? = null,
+        @JsonProperty("reset_time") var resetTime: String? = null,
+        @JsonProperty("reset_time_utc") var resetTimeUtc: String? = null
     )
 
-    @Serializable
     data class ResultFeatureDetails(
-        @JsonProperty("year") @SerialName("year") var year: Int? = null,
-        @JsonProperty("title") @SerialName("title") var title: String? = null,
-        @JsonProperty("movie_name") @SerialName("movie_name") var movieName: String? = null,
-        @JsonProperty("imdb_id") @SerialName("imdb_id") var imdbId: Int? = null,
-        @JsonProperty("tmdb_id") @SerialName("tmdb_id") var tmdbId: Int? = null,
-        @JsonProperty("season_number") @SerialName("season_number") var seasonNumber: Int? = null,
-        @JsonProperty("episode_number") @SerialName("episode_number") var episodeNumber: Int? = null,
-        @JsonProperty("parent_imdb_id") @SerialName("parent_imdb_id") var parentImdbId: Int? = null,
-        @JsonProperty("parent_title") @SerialName("parent_title") var parentTitle: String? = null,
-        @JsonProperty("parent_tmdb_id") @SerialName("parent_tmdb_id") var parentTmdbId: Int? = null,
-        @JsonProperty("parent_feature_id") @SerialName("parent_feature_id") var parentFeatureId: Int? = null,
+        @JsonProperty("year") var year: Int? = null,
+        @JsonProperty("title") var title: String? = null,
+        @JsonProperty("movie_name") var movieName: String? = null,
+        @JsonProperty("imdb_id") var imdbId: Int? = null,
+        @JsonProperty("tmdb_id") var tmdbId: Int? = null,
+        @JsonProperty("season_number") var seasonNumber: Int? = null,
+        @JsonProperty("episode_number") var episodeNumber: Int? = null,
+        @JsonProperty("parent_imdb_id") var parentImdbId: Int? = null,
+        @JsonProperty("parent_title") var parentTitle: String? = null,
+        @JsonProperty("parent_tmdb_id") var parentTmdbId: Int? = null,
+        @JsonProperty("parent_feature_id") var parentFeatureId: Int? = null
     )
 }

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

@@ -7,10 +7,9 @@ import com.lagradost.cloudstream3.subtitles.AbstractSubtitleEntities
 import com.lagradost.cloudstream3.subtitles.SubtitleResource
 import com.lagradost.cloudstream3.syncproviders.AuthData
 import com.lagradost.cloudstream3.syncproviders.SubtitleAPI
+import com.lagradost.cloudstream3.utils.AppUtils.parseJson
+import com.lagradost.cloudstream3.utils.AppUtils.toJson
 import com.lagradost.cloudstream3.utils.SubtitleHelper
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-import java.util.concurrent.TimeUnit
 
 class SubSourceApi : SubtitleAPI() {
     override val name = "SubSource"
@@ -19,70 +18,77 @@ class SubSourceApi : SubtitleAPI() {
     override val requiresLogin = false
 
     companion object {
-        const val APIURL = "https://api.subsource.net/v1"
+        const val APIURL = "https://api.subsource.net/api"
+        const val DOWNLOADENDPOINT = "https://api.subsource.net/api/downloadSub"
     }
 
     override suspend fun search(
         auth: AuthData?,
         query: AbstractSubtitleEntities.SubtitleSearch
     ): List<AbstractSubtitleEntities.SubtitleEntity>? {
+
         //Only supports Imdb Id search for now
         if (query.imdbId == null) return null
         val queryLang = SubtitleHelper.fromTagToEnglishLanguageName(query.lang)
         val type = if ((query.seasonNumber ?: 0) > 0) TvType.TvSeries else TvType.Movie
 
-        val searchResponse = app.post(
-            url = "$APIURL/movie/search",
-            json = mapOf(
-                "includeSeasons" to false,
-                "limit" to 15,
-                "query" to query.imdbId!!,
-                "signal" to "{}"
-            ),
-            cacheTime = 120,
-            cacheUnit = TimeUnit.MINUTES,
-        ).parsedSafe<SearchRoot>() ?: return null
+        val searchRes = app.post(
+            url = "$APIURL/searchMovie",
+            data = mapOf(
+                "query" to query.imdbId!!
+            )
+        ).parsedSafe<ApiSearch>() ?: return null
 
-        val firstResult = searchResponse.results.firstOrNull() ?: return null
-
-        val apiResponse = app.get(
-            url = "$APIURL${firstResult.link.replace("series", "subtitles")}",
-            cacheTime = 120,
-            cacheUnit = TimeUnit.MINUTES,
-        ).parsedSafe<ItemRoot>() ?: return null
-
-        val filteredSubtitles = apiResponse.subtitles.filter { sub ->
-            sub.releaseType != "trailer" &&
-                    sub.language.equals(queryLang, true)
+        val postData = if (type == TvType.TvSeries) {
+            mapOf(
+                "langs" to "[]",
+                "movieName" to searchRes.found.first().linkName,
+                "season" to "season-${query.seasonNumber}"
+            )
+        } else {
+            mapOf(
+                "langs" to "[]",
+                "movieName" to searchRes.found.first().linkName,
+            )
         }
 
+        val getMovieRes = app.post(
+            url = "$APIURL/getMovie",
+            data = postData
+        ).parsedSafe<ApiResponse>().let {
             // api doesn't has episode number or lang filtering
-        val subtitles = if (type == TvType.Movie) {
-            filteredSubtitles
+            if (type == TvType.Movie) {
+                it?.subs?.filter { sub ->
+                    sub.lang == queryLang
+                }
             } else {
-            val shouldContain = String.format(
+                it?.subs?.filter { sub ->
+                    sub.releaseName!!.contains(
+                        String.format(
                             null,
                             "E%02d",
                             query.epNumber
                         )
-            filteredSubtitles.filter { sub ->
-                sub.releaseInfo.contains(
-                    shouldContain
-                )
+                    ) && sub.lang == queryLang
                 }
             }
+        } ?: return null
 
-        return subtitles.map { subtitle ->
+        return getMovieRes.map { subtitle ->
             AbstractSubtitleEntities.SubtitleEntity(
                 idPrefix = this.idPrefix,
-                name = subtitle.releaseInfo,
-                lang = subtitle.language,
-                data = subtitle.link,
+                name = subtitle.releaseName!!,
+                lang = subtitle.lang!!,
+                data = SubData(
+                    movie = subtitle.linkName!!,
+                    lang = subtitle.lang,
+                    id = subtitle.subId.toString(),
+                ).toJson(),
                 type = type,
                 source = this.name,
                 epNumber = query.epNumber,
                 seasonNumber = query.seasonNumber,
-                isHearingImpaired = subtitle.hearingImpaired == 1,
+                isHearingImpaired = subtitle.hi == 1,
             )
         }
     }
@@ -91,114 +97,71 @@ class SubSourceApi : SubtitleAPI() {
         auth: AuthData?,
         subtitle: AbstractSubtitleEntities.SubtitleEntity
     ) {
-        val data = app.get("$APIURL/subtitle/${subtitle.data}")
-            .parsedSafe<DownloadRoot>()
-            ?: return
+        val parsedSub = parseJson<SubData>(subtitle.data)
+
+        val subRes = app.post(
+            url = "$APIURL/getSub",
+            data = mapOf(
+                "movie" to parsedSub.movie,
+                "lang" to subtitle.lang,
+                "id" to parsedSub.id
+            )
+        ).parsedSafe<SubTitleLink>() ?: return
 
         this.addZipUrl(
-            "$APIURL/subtitle/download/${data.subtitle.downloadToken}"
+            "$DOWNLOADENDPOINT/${subRes.sub.downloadToken}"
         ) { name, _ ->
             name
         }
     }
 
-
-    @Serializable
-    data class SearchRoot(
-        @JsonProperty("success") @SerialName("success") var success: Boolean? = null,
-        @JsonProperty("results") @SerialName("results") var results: ArrayList<Results> = arrayListOf(),
-        @JsonProperty("users") @SerialName("users") var users: ArrayList<Users> = arrayListOf()
+    data class ApiSearch(
+        @JsonProperty("success") val success: Boolean,
+        @JsonProperty("found") val found: List<Found>,
     )
 
-    @Serializable
-    data class Users(
-
-        @JsonProperty("id") @SerialName("id") var id: Int? = null,
-        @JsonProperty("displayname") @SerialName("displayname") var displayname: String? = null,
-        @JsonProperty("avatar") @SerialName("avatar") var avatar: String? = null,
-        @JsonProperty("badges") @SerialName("badges") var badges: ArrayList<String> = arrayListOf()
-
+    data class Found(
+        @JsonProperty("id") val id: Long,
+        @JsonProperty("title") val title: String,
+        @JsonProperty("seasons") val seasons: Long,
+        @JsonProperty("type") val type: String,
+        @JsonProperty("releaseYear") val releaseYear: Long,
+        @JsonProperty("linkName") val linkName: String,
     )
 
-    @Serializable
-    data class Results(
-        @JsonProperty("id") @SerialName("id") var id: Int? = null,
-        @JsonProperty("title") @SerialName("title") var title: String? = null,
-        @JsonProperty("type") @SerialName("type") var type: String? = null,
-        @JsonProperty("link") @SerialName("link") var link: String,
-        @JsonProperty("releaseYear") @SerialName("releaseYear") var releaseYear: Int? = null,
-        @JsonProperty("poster") @SerialName("poster") var poster: String? = null,
-        @JsonProperty("subtitleCount") @SerialName("subtitleCount") var subtitleCount: String? = null,
-        @JsonProperty("rating") @SerialName("rating") var rating: Double? = null,
-        @JsonProperty("cast") @SerialName("cast") var cast: ArrayList<String> = arrayListOf(),
-        @JsonProperty("genres") @SerialName("genres") var genres: ArrayList<String> = arrayListOf(),
-        @JsonProperty("score") @SerialName("score") var score: Double? = null
+    data class ApiResponse(
+        @JsonProperty("success") val success: Boolean,
+        @JsonProperty("movie") val movie: Movie,
+        @JsonProperty("subs") val subs: List<Sub>,
     )
 
-    @Serializable
-
-    data class ItemRoot(
-
-        // @SerialName("media_type" ) var mediaType : String?              = null,
-        @JsonProperty("subtitles") @SerialName("subtitles") var subtitles: ArrayList<Subtitles>,
-        //@SerialName("movie"      ) var movie     : Movie?               = Movie()
-
+    data class Movie(
+        @JsonProperty("id") val id: Long? = null,
+        @JsonProperty("type") val type: String? = null,
+        @JsonProperty("year") val year: Long? = null,
+        @JsonProperty("fullName") val fullName: String? = null,
     )
 
-    @Serializable
-    data class Subtitles(
-
-        @JsonProperty("id") @SerialName("id") var id: Int? = null,
-        @JsonProperty("language") @SerialName("language") var language: String,
-        @JsonProperty("release_type") @SerialName("release_type") var releaseType: String? = null,
-        @JsonProperty("release_info") @SerialName("release_info") var releaseInfo: String,
-        @JsonProperty("upload_date") @SerialName("upload_date") var uploadDate: String? = null,
-        @JsonProperty("hearing_impaired") @SerialName("hearing_impaired") var hearingImpaired: Int? = null,
-        @JsonProperty("caption") @SerialName("caption") var caption: String? = null,
-        @JsonProperty("rating") @SerialName("rating") var rating: String? = null,
-        @JsonProperty("uploader_id") @SerialName("uploader_id") var uploaderId: Int? = null,
-        @JsonProperty("uploader_displayname") @SerialName("uploader_displayname") var uploaderDisplayname: String? = null,
-        @JsonProperty("uploader_badges") @SerialName("uploader_badges") var uploaderBadges: ArrayList<String> = arrayListOf(),
-        @JsonProperty("link") @SerialName("link") var link: String,
-        @JsonProperty("production_type") @SerialName("production_type") var productionType: String? = null,
-        @JsonProperty("last_subtitle") @SerialName("last_subtitle") var lastSubtitle: Boolean? = null
-
+    data class Sub(
+        @JsonProperty("hi") val hi: Int? = null,
+        @JsonProperty("fullLink") val fullLink: String? = null,
+        @JsonProperty("linkName") val linkName: String? = null,
+        @JsonProperty("lang") val lang: String? = null,
+        @JsonProperty("releaseName") val releaseName: String? = null,
+        @JsonProperty("subId") val subId: Long? = null,
     )
 
-    @Serializable
-    data class DownloadRoot(
-        @JsonProperty("subtitle") @SerialName("subtitle") var subtitle: Subtitle,
-        //@SerializedName("movie"         ) var movie         : Movie?         = Movie(),
-        //@SerializedName("donationLinks" ) var donationLinks : DonationLinks? = DonationLinks(),
-        //@SerializedName("isDownloaded"  ) var isDownloaded  : Boolean?       = null,
-        //@SerializedName("user_rated"    ) var userRated     : String?        = null
+    data class SubData(
+        @JsonProperty("movie") val movie: String,
+        @JsonProperty("lang") val lang: String,
+        @JsonProperty("id") val id: String,
     )
 
-    @Serializable
-    data class Subtitle(
-
-        @JsonProperty("id") @SerialName("id") var id: Int? = null,
-        @JsonProperty("uploaded_at") @SerialName("uploaded_at") var uploadedAt: String? = null,
-        @JsonProperty("language") @SerialName("language") var language: String? = null,
-        @JsonProperty("rating") @SerialName("rating") var rating: String? = null,
-        //SerialName("rates"            ) var rates           : Rates?              = Rates(),
-        @JsonProperty("uploaded_by") @SerialName("uploaded_by") var uploadedBy: Int? = null,
-        //@SerialName("contribs"         ) var contribs        : ArrayList<Contribs> = arrayListOf(),
-        @JsonProperty("release_info") @SerialName("release_info") var releaseInfo: ArrayList<String> = arrayListOf(),
-        @JsonProperty("commentary") @SerialName("commentary") var commentary: String? = null,
-        @JsonProperty("files") @SerialName("files") var files: String? = null,
-        @JsonProperty("size") @SerialName("size") var size: String? = null,
-        @JsonProperty("downloads") @SerialName("downloads") var downloads: Int? = null,
-        @JsonProperty("comments") @SerialName("comments") var comments: Int? = null,
-        @JsonProperty("production_type") @SerialName("production_type") var productionType: String? = null,
-        @JsonProperty("release_type") @SerialName("release_type") var releaseType: String? = null,
-        @JsonProperty("episode") @SerialName("episode") var episode: String? = null,
-        @JsonProperty("hearing_impaired") @SerialName("hearing_impaired") var hearingImpaired: Int? = null,
-        @JsonProperty("foreign_parts") @SerialName("foreign_parts") var foreignParts: String? = null,
-        @JsonProperty("framerate") @SerialName("framerate") var framerate: String? = null,
-        @JsonProperty("preview") @SerialName("preview") var preview: String? = null,
-        @JsonProperty("user_uploaded") @SerialName("user_uploaded") var userUploaded: Boolean? = null,
-        @JsonProperty("download_token") @SerialName("download_token") var downloadToken: String
+    data class SubTitleLink(
+        @JsonProperty("sub") val sub: SubToken,
+    )
 
+    data class SubToken(
+        @JsonProperty("downloadToken") val downloadToken: String,
     )
 }

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

@@ -12,8 +12,6 @@ import com.lagradost.cloudstream3.syncproviders.AuthToken
 import com.lagradost.cloudstream3.syncproviders.AuthUser
 import com.lagradost.cloudstream3.syncproviders.SubtitleAPI
 import com.lagradost.cloudstream3.TvType
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
 
 class SubDlApi : SubtitleAPI() {
     override val name = "SubDL"
@@ -26,7 +24,7 @@ class SubDlApi : SubtitleAPI() {
     override val createAccountUrl = "https://subdl.com/panel/register"
 
     companion object {
-        const val APIURL = "https://api.subdl.com"
+        const val APIURL = "https://apiold.subdl.com"
         const val APIENDPOINT = "$APIURL/api/v1/subtitles"
         const val DOWNLOADENDPOINT = "https://dl.subdl.com"
     }
@@ -124,80 +122,72 @@ class SubDlApi : SubtitleAPI() {
         }
     }
 
-    @Serializable
     data class SubtitleOAuthEntity(
-        @JsonProperty("userEmail") @SerialName("userEmail") var userEmail: String,
-        @JsonProperty("pass") @SerialName("pass") var pass: String,
-        @JsonProperty("name") @SerialName("name") var name: String? = null,
-        @JsonProperty("accessToken") @SerialName("accessToken") var accessToken: String? = null,
-        @JsonProperty("apiKey") @SerialName("apiKey") var apiKey: String? = null,
+        @JsonProperty("userEmail") var userEmail: String,
+        @JsonProperty("pass") var pass: String,
+        @JsonProperty("name") var name: String? = null,
+        @JsonProperty("accessToken") var accessToken: String? = null,
+        @JsonProperty("apiKey") var apiKey: String? = null,
     )
 
-    @Serializable
     data class OAuthTokenResponse(
-        @JsonProperty("token") @SerialName("token") val token: String,
-        @JsonProperty("userData") @SerialName("userData") val userData: UserData? = null,
-        @JsonProperty("status") @SerialName("status") val status: Boolean? = null,
-        @JsonProperty("message") @SerialName("message") val message: String? = null,
+        @JsonProperty("token") val token: String,
+        @JsonProperty("userData") val userData: UserData? = null,
+        @JsonProperty("status") val status: Boolean? = null,
+        @JsonProperty("message") val message: String? = null,
     )
 
-    @Serializable
     data class UserData(
-        @JsonProperty("email") @SerialName("email") val email: String,
-        @JsonProperty("name") @SerialName("name") val name: String,
-        @JsonProperty("country") @SerialName("country") val country: String,
-        @JsonProperty("scStepCode") @SerialName("scStepCode") val scStepCode: String,
-        @JsonProperty("scVerified") @SerialName("scVerified") val scVerified: Boolean,
-        @JsonProperty("username") @SerialName("username") val username: String? = null,
-        @JsonProperty("scUsername") @SerialName("scUsername") val scUsername: String,
+        @JsonProperty("email") val email: String,
+        @JsonProperty("name") val name: String,
+        @JsonProperty("country") val country: String,
+        @JsonProperty("scStepCode") val scStepCode: String,
+        @JsonProperty("scVerified") val scVerified: Boolean,
+        @JsonProperty("username") val username: String? = null,
+        @JsonProperty("scUsername") val scUsername: String,
     )
 
-    @Serializable
     data class ApiKeyResponse(
-        @JsonProperty("ok") @SerialName("ok") val ok: Boolean? = false,
-        @JsonProperty("api_key") @SerialName("api_key") val apiKey: String,
-        @JsonProperty("usage") @SerialName("usage") val usage: Usage? = null,
+        @JsonProperty("ok") val ok: Boolean? = false,
+        @JsonProperty("api_key") val apiKey: String,
+        @JsonProperty("usage") val usage: Usage? = null,
     )
 
-    @Serializable
     data class Usage(
-        @JsonProperty("total") @SerialName("total") val total: Long? = 0,
-        @JsonProperty("today") @SerialName("today") val today: Long? = 0,
+        @JsonProperty("total") val total: Long? = 0,
+        @JsonProperty("today") val today: Long? = 0,
     )
 
-    @Serializable
     data class ApiResponse(
-        @JsonProperty("status") @SerialName("status") val status: Boolean? = null,
-        @JsonProperty("results") @SerialName("results") val results: List<Result>? = null,
-        @JsonProperty("subtitles") @SerialName("subtitles") val subtitles: List<Subtitle>? = null,
+        @JsonProperty("status") val status: Boolean? = null,
+        @JsonProperty("results") val results: List<Result>? = null,
+        @JsonProperty("subtitles") val subtitles: List<Subtitle>? = null,
     )
 
-    @Serializable
     data class Result(
-        @JsonProperty("sd_id") @SerialName("sd_id") val sdId: Int? = null,
-        @JsonProperty("type") @SerialName("type") val type: String? = null,
-        @JsonProperty("name") @SerialName("name") val name: String? = null,
-        @JsonProperty("imdb_id") @SerialName("imdb_id") val imdbId: String? = null,
-        @JsonProperty("tmdb_id") @SerialName("tmdb_id") val tmdbId: Long? = null,
-        @JsonProperty("first_air_date") @SerialName("first_air_date") val firstAirDate: String? = null,
-        @JsonProperty("year") @SerialName("year") val year: Int? = null,
+        @JsonProperty("sd_id") val sdId: Int? = null,
+        @JsonProperty("type") val type: String? = null,
+        @JsonProperty("name") val name: String? = null,
+        @JsonProperty("imdb_id") val imdbId: String? = null,
+        @JsonProperty("tmdb_id") val tmdbId: Long? = null,
+        @JsonProperty("first_air_date") val firstAirDate: String? = null,
+        @JsonProperty("year") val year: Int? = null,
     )
 
-    @Serializable
     data class Subtitle(
-        @JsonProperty("release_name") @SerialName("release_name") val releaseName: String,
-        @JsonProperty("name") @SerialName("name") val name: String,
-        @JsonProperty("lang") @SerialName("lang") val lang: String, // subdl language code
-        @JsonProperty("author") @SerialName("author") val author: String? = null,
-        @JsonProperty("url") @SerialName("url") val url: String? = null,
-        @JsonProperty("subtitlePage") @SerialName("subtitlePage") val subtitlePage: String? = null,
-        @JsonProperty("season") @SerialName("season") val season: Int? = null,
-        @JsonProperty("episode") @SerialName("episode") val episode: Int? = null,
-        @JsonProperty("language") @SerialName("language") val language: String? = null, // full language name
-        @JsonProperty("hi") @SerialName("hi") val hearingImpaired: Boolean? = null,
+        @JsonProperty("release_name") val releaseName: String,
+        @JsonProperty("name") val name: String,
+        @JsonProperty("lang") val lang: String, // subdl language code
+        @JsonProperty("author") val author: String? = null,
+        @JsonProperty("url") val url: String? = null,
+        @JsonProperty("subtitlePage") val subtitlePage: String? = null,
+        @JsonProperty("season") val season: Int? = null,
+        @JsonProperty("episode") val episode: Int? = null,
+        @JsonProperty("language") val language: String? = null, // full language name
+        @JsonProperty("hi") val hearingImpaired: Boolean? = null,
     )
 
-    // https://subdl.com/api-files/language_list.json
+    // https://subdl.com/api-files/language_list.json
     // most of it is IETF BPC 47 conformant tag
     // but there are some exceptions
     private val langTagIETF2subdl = mapOf(
@@ -207,63 +197,63 @@ class SubDlApi : SubtitleAPI() {
         "en-nl" to "NL_EN", // "Dutch_English"
         "pt-br" to "BR_PT", // "Brazillian Portuguese"
         "zh-hant" to "ZH_BG", // "Big 5 code" -> traditional Chinese (?_?)
-        // "ar" to "AR", // "Arabic"
-        // "az" to "AZ", // "Azerbaijani"
-        // "be" to "BE", // "Belarusian"
-        // "bg" to "BG", // "Bulgarian"
-        // "bn" to "BN", // "Bengali"
-        // "bs" to "BS", // "Bosnian"
-        // "ca" to "CA", // "Catalan"
-        // "cs" to "CS", // "Czech"
-        // "da" to "DA", // "Danish"
-        // "de" to "DE", // "German"
-        // "el" to "EL", // "Greek"
-        // "en" to "EN", // "English"
-        // "eo" to "EO", // "Esperanto"
-        // "es" to "ES", // "Spanish"
-        // "et" to "ET", // "Estonian"
-        // "fa" to "FA", // "Farsi_Persian"
-        // "fi" to "FI", // "Finnish"
-        // "fr" to "FR", // "French"
-        // "he" to "HE", // "Hebrew"
-        // "hi" to "HI", // "Hindi"
-        // "hr" to "HR", // "Croatian"
-        // "hu" to "HU", // "Hungarian"
-        // "id" to "ID", // "Indonesian"
-        // "is" to "IS", // "Icelandic"
-        // "it" to "IT", // "Italian"
-        // "ja" to "JA", // "Japanese"
-        // "ka" to "KA", // "Georgian"
-        // "kl" to "KL", // "Greenlandic"
-        // "ko" to "KO", // "Korean"
-        // "ku" to "KU", // "Kurdish"
-        // "lt" to "LT", // "Lithuanian"
-        // "lv" to "LV", // "Latvian"
-        // "mk" to "MK", // "Macedonian"
-        // "ml" to "ML", // "Malayalam"
-        // "mni" to "MNI", // "Manipuri"
-        // "ms" to "MS", // "Malay"
-        // "my" to "MY", // "Burmese"
-        // "nl" to "NL", // "Dutch"
-        // "no" to "NO", // "Norwegian"
-        // "pl" to "PL", // "Polish"
-        // "pt" to "PT", // "Portuguese"
-        // "ro" to "RO", // "Romanian"
-        // "ru" to "RU", // "Russian"
-        // "si" to "SI", // "Sinhala"
-        // "sk" to "SK", // "Slovak"
-        // "sl" to "SL", // "Slovenian"
-        // "sq" to "SQ", // "Albanian"
-        // "sr" to "SR", // "Serbian"
-        // "sv" to "SV", // "Swedish"
-        // "ta" to "TA", // "Tamil"
-        // "te" to "TE", // "Telugu"
-        // "th" to "TH", // "Thai"
-        // "tl" to "TL", // "Tagalog"
-        // "tr" to "TR", // "Turkish"
-        // "uk" to "UK", // "Ukranian"
-        // "ur" to "UR", // "Urdu"
-        // "vi" to "VI", // "Vietnamese"
-        // "zh" to "ZH", // "Chinese BG code"
+        // "ar" to "AR", // "Arabic"
+        // "az" to "AZ", // "Azerbaijani"
+        // "be" to "BE", // "Belarusian"
+        // "bg" to "BG", // "Bulgarian"
+        // "bn" to "BN", // "Bengali"
+        // "bs" to "BS", // "Bosnian"
+        // "ca" to "CA", // "Catalan"
+        // "cs" to "CS", // "Czech"
+        // "da" to "DA", // "Danish"
+        // "de" to "DE", // "German"
+        // "el" to "EL", // "Greek"
+        // "en" to "EN", // "English"
+        // "eo" to "EO", // "Esperanto"
+        // "es" to "ES", // "Spanish"
+        // "et" to "ET", // "Estonian"
+        // "fa" to "FA", // "Farsi_Persian"
+        // "fi" to "FI", // "Finnish"
+        // "fr" to "FR", // "French"
+        // "he" to "HE", // "Hebrew"
+        // "hi" to "HI", // "Hindi"
+        // "hr" to "HR", // "Croatian"
+        // "hu" to "HU", // "Hungarian"
+        // "id" to "ID", // "Indonesian"
+        // "is" to "IS", // "Icelandic"
+        // "it" to "IT", // "Italian"
+        // "ja" to "JA", // "Japanese"
+        // "ka" to "KA", // "Georgian"
+        // "kl" to "KL", // "Greenlandic"
+        // "ko" to "KO", // "Korean"
+        // "ku" to "KU", // "Kurdish"
+        // "lt" to "LT", // "Lithuanian"
+        // "lv" to "LV", // "Latvian"
+        // "mk" to "MK", // "Macedonian"
+        // "ml" to "ML", // "Malayalam"
+        // "mni" to "MNI", // "Manipuri"
+        // "ms" to "MS", // "Malay"
+        // "my" to "MY", // "Burmese"
+        // "nl" to "NL", // "Dutch"
+        // "no" to "NO", // "Norwegian"
+        // "pl" to "PL", // "Polish"
+        // "pt" to "PT", // "Portuguese"
+        // "ro" to "RO", // "Romanian"
+        // "ru" to "RU", // "Russian"
+        // "si" to "SI", // "Sinhala"
+        // "sk" to "SK", // "Slovak"
+        // "sl" to "SL", // "Slovenian"
+        // "sq" to "SQ", // "Albanian"
+        // "sr" to "SR", // "Serbian"
+        // "sv" to "SV", // "Swedish"
+        // "ta" to "TA", // "Tamil"
+        // "te" to "TE", // "Telugu"
+        // "th" to "TH", // "Thai"
+        // "tl" to "TL", // "Tagalog"
+        // "tr" to "TR", // "Turkish"
+        // "uk" to "UK", // "Ukranian"
+        // "ur" to "UR", // "Urdu"
+        // "vi" to "VI", // "Vietnamese"
+        // "zh" to "ZH", // "Chinese BG code"
     )
 }

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,9 +66,11 @@ class APIRepository(val api: MainAPI) {
 
     private fun afterPluginsLoaded(forceReload: Boolean) {
         if (forceReload) {
+            synchronized(cache) {
                 cache.clear()
             }
         }
+    }
 
     init {
         afterPluginsLoadedEvent += ::afterPluginsLoaded
@@ -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

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

@@ -12,7 +12,9 @@ import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.ListView
 import androidx.appcompat.app.AlertDialog
-import com.fasterxml.jackson.annotation.JsonProperty
+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
@@ -35,24 +37,35 @@ import com.lagradost.cloudstream3.ui.player.SubtitleData
 import com.lagradost.cloudstream3.ui.result.ResultEpisode
 import com.lagradost.cloudstream3.ui.subtitles.ChromecastSubtitlesFragment
 import com.lagradost.cloudstream3.utils.AppContextUtils.sortSubs
-import com.lagradost.cloudstream3.utils.AppUtils.parseJson
 import com.lagradost.cloudstream3.utils.AppUtils.toJson
 import com.lagradost.cloudstream3.utils.CastHelper.awaitLinks
 import com.lagradost.cloudstream3.utils.CastHelper.getMediaInfo
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
+import com.lagradost.cloudstream3.utils.DataStore.toKotlinObject
 import com.lagradost.cloudstream3.utils.DataStoreHelper
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.Qualities
 import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
 import org.json.JSONObject
 
+/*class SkipOpController(val view: ImageView) : UIController() {
+    init {
+        view.setImageResource(R.drawable.exo_controls_fastforward)
+        view.setOnClickListener {
+            remoteMediaClient?.let {
+                val options = MediaSeekOptions.Builder()
+                    .setPosition(it.approximateStreamPosition + 85000)
+                it.seek(options.build())
+            }
+        }
+    }
+}*/
+
 private fun RemoteMediaClient.getItemIndex(): Int? {
     return try {
         val index = this.mediaQueue.itemIds.indexOf(this.currentItem?.itemId ?: 0)
         if (index < 0) null else index
-    } catch (_: Exception) {
+    } catch (e: Exception) {
         null
     }
 }
@@ -79,41 +92,51 @@ class SkipNextEpisodeController(val view: ImageView) : UIController() {
     }
 }
 
-@Serializable
 data class MetadataHolder(
-    @JsonProperty("apiName") @SerialName("apiName") val apiName: String,
-    @JsonProperty("isMovie") @SerialName("isMovie") val isMovie: Boolean,
-    @JsonProperty("title") @SerialName("title") val title: String?,
-    @JsonProperty("poster") @SerialName("poster") val poster: String?,
-    @JsonProperty("currentEpisodeIndex") @SerialName("currentEpisodeIndex") val currentEpisodeIndex: Int,
-    @JsonProperty("episodes") @SerialName("episodes") val episodes: List<ResultEpisode>,
-    @JsonProperty("currentLinks") @SerialName("currentLinks") val currentLinks: List<ExtractorLink>,
-    @JsonProperty("currentSubtitles") @SerialName("currentSubtitles") val currentSubtitles: List<SubtitleData>,
+    val apiName: String,
+    val isMovie: Boolean,
+    val title: String?,
+    val poster: String?,
+    val currentEpisodeIndex: Int,
+    val episodes: List<ResultEpisode>,
+    val currentLinks: List<ExtractorLink>,
+    val currentSubtitles: List<SubtitleData>
 )
 
-class SelectSourceController(val view: ImageView, val activity: ControllerActivity) : UIController() {
+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 {
+            //  lateinit var dialog: AlertDialog
             val holder = getCurrentMetaData()
+
             if (holder != null) {
                 val items = holder.currentLinks
                 if (items.isNotEmpty() && remoteMediaClient?.currentItem != null) {
-                    val subTracks = remoteMediaClient?.mediaInfo?.mediaTracks?.filter { it.type == MediaTrack.TYPE_TEXT }
+                    val subTracks =
+                        remoteMediaClient?.mediaInfo?.mediaTracks?.filter { it.type == MediaTrack.TYPE_TEXT }
                             ?: ArrayList()
 
-                    val bottomSheetDialogBuilder = AlertDialog.Builder(view.context, R.style.AlertDialogCustomBlack)
+                    val bottomSheetDialogBuilder =
+                        AlertDialog.Builder(view.context, R.style.AlertDialogCustomBlack)
                     bottomSheetDialogBuilder.setView(R.layout.sort_bottom_sheet)
-
                     val bottomSheetDialog = bottomSheetDialogBuilder.create()
                     bottomSheetDialog.show()
-
-                    val providerList = bottomSheetDialog.findViewById<ListView>(R.id.sort_providers)!!
-                    val subtitleList = bottomSheetDialog.findViewById<ListView>(R.id.sort_subtitles)!!
+                    //  bottomSheetDialog.setContentView(R.layout.sort_bottom_sheet)
+                    val providerList =
+                        bottomSheetDialog.findViewById<ListView>(R.id.sort_providers)!!
+                    val subtitleList =
+                        bottomSheetDialog.findViewById<ListView>(R.id.sort_subtitles)!!
                     if (subTracks.isEmpty()) {
-                        bottomSheetDialog.findViewById<LinearLayout>(R.id.sort_subtitles_holder)?.visibility = GONE
+                        bottomSheetDialog.findViewById<LinearLayout>(R.id.sort_subtitles_holder)?.visibility =
+                            GONE
                     } else {
-                        val arrayAdapter = ArrayAdapter<String>(view.context, R.layout.sort_bottom_single_choice)
+                        val arrayAdapter =
+                            ArrayAdapter<String>(view.context, R.layout.sort_bottom_single_choice)
                         arrayAdapter.add(view.context.getString(R.string.no_subtitles))
                         arrayAdapter.addAll(subTracks.mapNotNull { it.name })
 
@@ -121,7 +144,9 @@ class SelectSourceController(val view: ImageView, val activity: ControllerActivi
                         subtitleList.adapter = arrayAdapter
 
                         val currentTracks = remoteMediaClient?.mediaStatus?.activeTrackIds
-                        val subtitleIndex = if (currentTracks == null) 0 else subTracks.map { it.id }
+
+                        val subtitleIndex =
+                            if (currentTracks == null) 0 else subTracks.map { it.id }
                                 .indexOfFirst { currentTracks.contains(it) } + 1
 
                         subtitleList.setSelection(subtitleIndex)
@@ -134,7 +159,9 @@ class SelectSourceController(val view: ImageView, val activity: ControllerActivi
                                 ChromecastSubtitlesFragment.getCurrentSavedStyle().apply {
                                     val font = TextTrackStyle()
                                     font.setFontFamily(fontFamily ?: "Google Sans")
-                                    fontGenericFamily?.let { font.fontGenericFamily = it }
+                                    fontGenericFamily?.let {
+                                        font.fontGenericFamily = it
+                                    }
                                     font.windowColor = windowColor
                                     font.backgroundColor = backgroundColor
 
@@ -164,11 +191,13 @@ class SelectSourceController(val view: ImageView, val activity: ControllerActivi
                     val contentUrl = (remoteMediaClient?.currentItem?.media?.contentUrl
                         ?: remoteMediaClient?.currentItem?.media?.contentId)
 
-                    val sortingMethods = items.map { "${it.name} ${Qualities.getStringByInt(it.quality)}" }
+                    val sortingMethods =
+                        items.map { "${it.name} ${Qualities.getStringByInt(it.quality)}" }
                             .toTypedArray()
                     val sotringIndex = items.indexOfFirst { it.url == contentUrl }
 
-                    val arrayAdapter = ArrayAdapter<String>(view.context, R.layout.sort_bottom_single_choice)
+                    val arrayAdapter =
+                        ArrayAdapter<String>(view.context, R.layout.sort_bottom_single_choice)
                     arrayAdapter.addAll(sortingMethods.toMutableList())
 
                     providerList.choiceMode = AbsListView.CHOICE_MODE_SINGLE
@@ -178,8 +207,10 @@ class SelectSourceController(val view: ImageView, val activity: ControllerActivi
 
                     providerList.setOnItemClickListener { _, _, which, _ ->
                         val epData = holder.episodes[holder.currentEpisodeIndex]
+
                         fun loadMirror(index: Int) {
                             if (holder.currentLinks.size <= index) return
+
                             val mediaItem = getMediaInfo(
                                 epData,
                                 holder,
@@ -189,21 +220,25 @@ class SelectSourceController(val view: ImageView, val activity: ControllerActivi
                             )
 
                             val startAt = remoteMediaClient?.approximateStreamPosition ?: 0
+
+                            //remoteMediaClient.load(mediaItem, true, startAt)
                             try { // THIS IS VERY IMPORTANT BECAUSE WE NEVER WANT TO AUTOLOAD THE NEXT EPISODE
                                 val currentIdIndex = remoteMediaClient?.getItemIndex()
+
                                 val nextId = remoteMediaClient?.mediaQueue?.itemIds?.get(
                                     currentIdIndex?.plus(1) ?: 0
                                 )
-
                                 if (currentIdIndex == null && nextId != null) {
                                     awaitLinks(
                                         remoteMediaClient?.queueInsertAndPlayItem(
                                             MediaQueueItem.Builder(mediaItem).build(),
                                             nextId,
                                             startAt,
-                                            JSONObject(),
+                                            JSONObject()
                                         )
-                                    ) { loadMirror(index + 1) }
+                                    ) {
+                                        loadMirror(index + 1)
+                                    }
                                 } else {
                                     val mediaLoadOptions =
                                         MediaLoadOptions.Builder()
@@ -215,9 +250,11 @@ class SelectSourceController(val view: ImageView, val activity: ControllerActivi
                                             mediaItem,
                                             mediaLoadOptions
                                         )
-                                    ) { loadMirror(index + 1) }
+                                    ) {
+                                        loadMirror(index + 1)
                                     }
-                            } catch (_: Exception) {
+                                }
+                            } catch (e: Exception) {
                                 val mediaLoadOptions =
                                     MediaLoadOptions.Builder()
                                         .setPlayPosition(startAt)
@@ -228,8 +265,8 @@ class SelectSourceController(val view: ImageView, val activity: ControllerActivi
                                 }
                             }
                         }
-
                         loadMirror(which)
+
                         bottomSheetDialog.dismissSafe(activity)
                     }
                 }
@@ -239,19 +276,23 @@ class SelectSourceController(val view: ImageView, val activity: ControllerActivi
 
     private fun getCurrentMetaData(): MetadataHolder? {
         return try {
-            val data = remoteMediaClient?.mediaInfo?.customData?.toString() ?: return null
-            parseJson<MetadataHolder>(data)
-        } catch (_: Exception) {
+            val data = remoteMediaClient?.mediaInfo?.customData?.toString()
+            data?.toKotlinObject()
+        } catch (e: Exception) {
             null
         }
     }
 
     var isLoadingMore = false
+
+
     override fun onMediaStatusUpdated() {
         super.onMediaStatusUpdated()
         val meta = getCurrentMetaData()
-        view.visibility = if ((meta?.currentLinks?.size ?: 0) > 1) VISIBLE else INVISIBLE
 
+        view.visibility = if ((meta?.currentLinks?.size
+                ?: 0) > 1
+        ) VISIBLE else INVISIBLE
         try {
             if (meta != null && meta.episodes.size > meta.currentEpisodeIndex + 1) {
                 val currentIdIndex = remoteMediaClient?.getItemIndex() ?: return
@@ -268,7 +309,7 @@ class SelectSourceController(val view: ImageView, val activity: ControllerActivi
                             currentPosition,
                             currentDuration,
                             epData,
-                            meta.episodes.getOrNull(index + 1),
+                            meta.episodes.getOrNull(index + 1)
                         )
                 } catch (t: Throwable) {
                     logError(t)
@@ -279,7 +320,9 @@ class SelectSourceController(val view: ImageView, val activity: ControllerActivi
                     ioSafe {
                         val currentLinks = mutableSetOf<ExtractorLink>()
                         val currentSubs = mutableSetOf<SubtitleData>()
+
                         val generator = RepoLinkGenerator(listOf(epData))
+
                         val isSuccessful = safeApiCall {
                             generator.generateLinks(
                                 clearCache = false,
@@ -292,7 +335,7 @@ class SelectSourceController(val view: ImageView, val activity: ControllerActivi
                                     currentSubs.add(it)
                                 },
                                 offset = 0,
-                                isCasting = true,
+                                isCasting = true
                             )
                         }
 
@@ -303,18 +346,32 @@ class SelectSourceController(val view: ImageView, val activity: ControllerActivi
                                 val jsonCopy = meta.copy(
                                     currentLinks = sortedLinks,
                                     currentSubtitles = sortedSubs,
-                                    currentEpisodeIndex = index,
+                                    currentEpisodeIndex = index
                                 )
 
-                                val done = JSONObject(jsonCopy.toJson())
+                                val done =
+                                    JSONObject(jsonCopy.toJson())
+
                                 val mediaInfo = getMediaInfo(
                                     epData,
                                     jsonCopy,
                                     0,
                                     done,
-                                    sortedSubs,
+                                    sortedSubs
                                 )
 
+                                /*fun loadIndex(index: Int) {
+                                    println("LOAD INDEX::::: $index")
+                                    if (meta.currentLinks.size <= index) return
+                                    val info = getMediaInfo(
+                                        epData,
+                                        meta,
+                                        index,
+                                        done)
+                                    awaitLinks(remoteMediaClient?.load(info, true, 0)) {
+                                        loadIndex(index + 1)
+                                    }
+                                }*/
                                 activity.runOnUiThread {
                                     awaitLinks(
                                         remoteMediaClient?.queueAppendItem(
@@ -323,6 +380,7 @@ class SelectSourceController(val view: ImageView, val activity: ControllerActivi
                                         )
                                     ) {
                                         println("FAILED TO LOAD NEXT ITEM")
+                                        //  loadIndex(1)
                                     }
                                     isLoadingMore = false
                                 }
@@ -345,7 +403,10 @@ class SelectSourceController(val view: ImageView, val activity: ControllerActivi
 
 class SkipTimeController(val view: ImageView, forwards: Boolean) : UIController() {
     init {
+        //val settingsManager = PreferenceManager.getDefaultSharedPreferences()
+        //val time = settingsManager?.getInt("chromecast_tap_time", 30) ?: 30
         val time = 30
+        //view.setImageResource(if (forwards) R.drawable.netflix_skip_forward else R.drawable.netflix_skip_back)
         view.setImageResource(if (forwards) R.drawable.go_forward_30 else R.drawable.go_back_30)
         view.setOnClickListener {
             remoteMediaClient?.let {

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

@@ -37,10 +37,8 @@ import com.lagradost.cloudstream3.utils.DataStoreHelper
 import com.lagradost.cloudstream3.utils.DataStoreHelper.getDefaultAccount
 import com.lagradost.cloudstream3.utils.ImageLoader.loadImage
 import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
-import com.lagradost.cloudstream3.utils.UIHelper.hideProgress
 import com.lagradost.cloudstream3.utils.UIHelper.navigate
 import com.lagradost.cloudstream3.utils.UIHelper.showInputMethod
-import com.lagradost.cloudstream3.utils.UIHelper.showProgress
 
 object AccountHelper {
     fun showAccountEditDialog(
@@ -166,7 +164,7 @@ object AccountHelper {
 
         canSetPin = true
 
-        binding.editProfilePhotoButton.setOnClickListener {
+        binding.editProfilePhotoButton.setOnClickListener({
             val bottomSheetDialog = BottomSheetDialog(context)
             val sheetBinding = BottomInputDialogBinding.inflate(LayoutInflater.from(context))
             bottomSheetDialog.setContentView(sheetBinding.root)
@@ -176,13 +174,9 @@ object AccountHelper {
                 text1.text = context.getString(R.string.edit_profile_image_title)
                 nginxTextInput.hint = context.getString(R.string.edit_profile_image_hint)
 
-                applyBtt.setOnClickListener {
+                applyBtt.setOnClickListener({
                     val url = sheetBinding.nginxTextInput.text.toString()
-                    if (url.isEmpty()) {
-                        showToast(R.string.edit_profile_image_error_empty, Toast.LENGTH_SHORT)
-                        return@setOnClickListener
-                    }
-                    applyBtt.showProgress()
+                    if (url.isNotEmpty()) {
                         val imageLoader = ImageLoader(context)
                         val request = ImageRequest.Builder(context)
                             .data(url)
@@ -195,27 +189,27 @@ object AccountHelper {
                                         R.string.edit_profile_image_success,
                                         Toast.LENGTH_SHORT
                                     )
-                                bottomSheetDialog.dismissSafe()
+                                    bottomSheetDialog.dismiss()
                                 },
                                 onError = { _, _ ->
                                     showToast(
                                         R.string.edit_profile_image_error_invalid,
                                         Toast.LENGTH_SHORT
                                     )
-                                applyBtt.hideProgress()
-                            },
-                            onCancel = {
-                                applyBtt.hideProgress()
                                 }
                             )
                             .build()
                         imageLoader.enqueue(request)
+                    } else {
+                        showToast(R.string.edit_profile_image_error_empty, Toast.LENGTH_SHORT)
                     }
-                sheetBinding.cancelBtt.setOnClickListener {
                     bottomSheetDialog.dismissSafe()
+                })
+                sheetBinding.cancelBtt.setOnClickListener({
+                    bottomSheetDialog.dismissSafe()
+                })
             }
-            }
-        }
+        })
     }
 
     fun showPinInputDialog(

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

@@ -10,7 +10,6 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.lagradost.api.Log
-import com.lagradost.cloudstream3.CloudStreamApp
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.isEpisodeBased
 import com.lagradost.cloudstream3.mvvm.Resource
@@ -37,7 +36,6 @@ 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.downloadDeleteEvent
 import com.lagradost.cloudstream3.utils.downloader.VideoDownloadManager.getDownloadFileInfo
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
@@ -69,17 +67,6 @@ class DownloadViewModel : ViewModel() {
     private val _selectedItemIds = ConsistentLiveData<Set<Int>?>(null)
     val selectedItemIds: LiveData<Set<Int>?> = _selectedItemIds
 
-    init {
-        // Keep the Downloads list in sync when a download is deleted/cancelled from
-        // anywhere in the app (result page button, queue, notification, etc.). See
-        // onDownloadDeleted for the rationale (issue #1227).
-        downloadDeleteEvent += ::onDownloadDeleted
-    }
-
-    override fun onCleared() {
-        downloadDeleteEvent -= ::onDownloadDeleted
-        super.onCleared()
-    }
 
     fun cancelSelection() {
         updateSelectedItems { null }
@@ -402,18 +389,6 @@ class DownloadViewModel : ViewModel() {
         postChildren(_childCards.success?.filter { it.data.id !in idsToRemove })
     }
 
-    /**
-     * Refreshes the Downloads screen in real time when a download is deleted/cancelled.
-     */
-    private fun onDownloadDeleted(id: Int) {
-        // Keep multi-select state consistent: forget the removed id if it was selected.
-        updateSelectedItems { it?.minus(id) }
-
-        val context = CloudStreamApp.context ?: return
-        updateHeaderList(context)
-        postChildren(_childCards.success?.filterNot { it.data.id == id })
-    }
-
     private fun updateStorageStats(visual: List<VisualDownloadCached.Header>) {
         try {
             val stat = StatFs(Environment.getExternalStorageDirectory().path)

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

@@ -164,11 +164,9 @@ abstract class BaseFetchButton(context: Context, attributeSet: AttributeSet) :
         }
     }
 
-    fun downloadDeleteEvent(data: Int) {
-        if (data == persistentId) {
-            resetView()
-        }
-    }
+    /*fun downloadDeleteEvent(data: Int) {
+
+    }*/
 
     /*fun downloadEvent(data: Pair<Int, VideoDownloadManager.DownloadActionType>) {
         val (id, action) = data
@@ -187,7 +185,7 @@ abstract class BaseFetchButton(context: Context, attributeSet: AttributeSet) :
 
     override fun onAttachedToWindow() {
         VideoDownloadManager.downloadStatusEvent += ::downloadStatusEvent
-        VideoDownloadManager.downloadDeleteEvent += ::downloadDeleteEvent
+        // VideoDownloadManager.downloadDeleteEvent += ::downloadDeleteEvent
         // VideoDownloadManager.downloadEvent += ::downloadEvent
         VideoDownloadManager.downloadProgressEvent += ::downloadProgressEvent
 
@@ -202,7 +200,7 @@ abstract class BaseFetchButton(context: Context, attributeSet: AttributeSet) :
 
     override fun onDetachedFromWindow() {
         VideoDownloadManager.downloadStatusEvent -= ::downloadStatusEvent
-        VideoDownloadManager.downloadDeleteEvent -= ::downloadDeleteEvent
+        // VideoDownloadManager.downloadDeleteEvent -= ::downloadDeleteEvent
         // VideoDownloadManager.downloadEvent -= ::downloadEvent
         VideoDownloadManager.downloadProgressEvent -= ::downloadProgressEvent
 

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

@@ -24,8 +24,6 @@ import androidx.core.view.isVisible
 import androidx.fragment.app.activityViewModels
 import androidx.preference.PreferenceManager
 import androidx.recyclerview.widget.RecyclerView
-import com.lagradost.cloudstream3.plugins.PluginManager
-import com.lagradost.cloudstream3.CloudStreamApp.Companion.getActivity
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.chip.Chip
@@ -45,7 +43,6 @@ import com.lagradost.cloudstream3.mvvm.Resource
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.mvvm.observe
 import com.lagradost.cloudstream3.mvvm.observeNullable
-import com.lagradost.cloudstream3.plugins.Plugin
 import com.lagradost.cloudstream3.ui.APIRepository.Companion.noneApi
 import com.lagradost.cloudstream3.ui.APIRepository.Companion.randomApi
 import com.lagradost.cloudstream3.ui.BaseFragment
@@ -427,30 +424,11 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(
                             .inflate(R.layout.sort_bottom_single_provider_choice, parent, false)
                         val titleText = view.findViewById<TextView>(R.id.text1)
                         val pinIcon = view.findViewById<ImageView>(R.id.pinicon)
-                        val settingsIcon = view.findViewById<ImageView>(R.id.action_settings)
-
                         val name = getItem(position)
                         titleText?.text = name
-                        val providerApi = currentValidApis[position]
                         val isPinned =
-                            pinnedphashset.contains(providerApi.name)
+                            pinnedphashset.contains(currentValidApis[position].name)
                         pinIcon.visibility = if (isPinned) View.VISIBLE else View.GONE
-
-                        val pluginInstance = providerApi.sourcePlugin?.let { PluginManager.plugins[it] } as? Plugin
-                        val isDownloadedPluginWithSettings = pluginInstance?.openSettings != null && !isLayout(TV)
-
-                        settingsIcon.visibility = if (isDownloadedPluginWithSettings) View.VISIBLE else View.GONE
-                        if (isDownloadedPluginWithSettings) {
-                            settingsIcon.setOnClickListener {
-                                try {
-                                    val activityContext = it.context.getActivity() ?: it.context
-                                    pluginInstance.openSettings?.invoke(activityContext)
-                                } catch (e: Throwable) {
-                                    logError(e)
-                                }
-                            }
-                        }
-
                         return view
                     }
                 }
@@ -473,14 +451,7 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(
                     arrayAdapter.clear()
                     val sortedApis = validAPIs
                         .filter {
-                            val isPinned = pinnedphashset.contains(it.name)
-
-                            // Hide pinned NSFW when NSFW not selected. NSFW is distracting when not chosen.
-                            if (isPinned && !preSelectedTypes.contains(TvType.NSFW)) {
-                                if (it.supportedTypes.all { type -> type == TvType.NSFW }) return@filter false
-                            }
-
-                            it.hasMainPage && (isPinned || it.supportedTypes.any(
+                            it.hasMainPage && (pinnedphashset.contains(it.name) || it.supportedTypes.any(
                                 preSelectedTypes::contains
                             ))
                         }
@@ -694,6 +665,7 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(
                     fromUI = true
                 )
                 showToast(R.string.action_reload, Toast.LENGTH_SHORT)
+                true
             }
 
             homePreviewSearchButton.setOnClickListener { _ ->
@@ -701,23 +673,6 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(
                 homeViewModel.queryTextSubmit("")
             }
 
-            // Load value for toggling Tv layout real time clock. Hide by default at startup
-            // set visibility first, to apply a scroll effect later
-            context?.let {
-                if (isLayout(TV)) {
-                    val settingsManager = PreferenceManager.getDefaultSharedPreferences(it)
-                    val toggleClock =
-                        settingsManager.getBoolean(
-                            getString(R.string.tv_layout_clock_key),
-                            false
-                        )
-                    binding.homeClock.isVisible = toggleClock
-                } else {
-                    binding.homeClock.isVisible = false
-                }
-            }
-
-
             homeMasterRecycler.addOnScrollListener(object : RecyclerView.OnScrollListener() {
                 override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
                     if (isLayout(PHONE)) {
@@ -757,17 +712,6 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(
                             view.getLocationInWindow(rect)
                             scrollParent.isVisible = true
                             scrollParent.translationY = rect[1].toFloat() - 60.toPx
-
-                            // Move the TV layout real time clock out of the way too
-                            // We check if we have the correct layout and if the clock is enabled
-                            if(isLayout(TV) && binding.homeClock.isVisible) {
-                                val scrollParent = binding.homeClock
-
-                                val rect = IntArray(2)
-                                view.getLocationInWindow(rect)
-                                scrollParent.isVisible = true
-                                scrollParent.translationY = rect[1].toFloat() - 60.toPx
-                            }
                         }
                     }
                     super.onScrolled(recyclerView, dx, dy)

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

@@ -58,7 +58,7 @@ class HomeScrollAdapter(
 
         when (binding) {
             is HomeScrollViewBinding -> {
-                binding.homeScrollPreview.loadImage(posterUrl, item.posterHeaders)
+                binding.homeScrollPreview.loadImage(posterUrl)
                 binding.homeScrollPreviewTags.apply {
                     text = item.tags?.joinToString(" • ") ?: ""
                     isGone = item.tags.isNullOrEmpty()
@@ -79,7 +79,7 @@ class HomeScrollAdapter(
                 binding.homeScrollPreview.setOnClickListener { view ->
                     callback.invoke(view ?: return@setOnClickListener, position, item)
                 }
-                binding.homeScrollPreview.loadImage(posterUrl, item.posterHeaders)
+                binding.homeScrollPreview.loadImage(posterUrl)
             }
         }
     }

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

@@ -133,7 +133,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 =

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

@@ -20,7 +20,6 @@ import androidx.core.view.isVisible
 import androidx.fragment.app.activityViewModels
 import androidx.preference.PreferenceManager
 import androidx.recyclerview.widget.RecyclerView
-import com.fasterxml.jackson.annotation.JsonProperty
 import com.google.android.material.tabs.TabLayout
 import com.google.android.material.tabs.TabLayoutMediator
 import com.lagradost.cloudstream3.APIHolder
@@ -53,13 +52,12 @@ import com.lagradost.cloudstream3.utils.DataStoreHelper.currentAccount
 import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialog
 import com.lagradost.cloudstream3.utils.UIHelper.fixSystemBarsPadding
 import com.lagradost.cloudstream3.utils.UIHelper.getSpanCount
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
 import java.util.concurrent.CopyOnWriteArrayList
 import kotlin.math.abs
 
 const val LIBRARY_FOLDER = "library_folder"
 
+
 enum class LibraryOpenerType(@StringRes val stringRes: Int) {
     Default(R.string.action_default),
     Provider(R.string.none),
@@ -69,15 +67,13 @@ enum class LibraryOpenerType(@StringRes val stringRes: Int) {
 }
 
 /** Used to store how the user wants to open said poster */
-@Serializable
 data class LibraryOpener(
-    @JsonProperty("openType") @SerialName("openType") val openType: LibraryOpenerType,
-    @JsonProperty("providerData") @SerialName("providerData") val providerData: ProviderLibraryData?,
+    val openType: LibraryOpenerType,
+    val providerData: ProviderLibraryData?,
 )
 
-@Serializable
 data class ProviderLibraryData(
-    @JsonProperty("apiName") @SerialName("apiName") val apiName: String,
+    val apiName: String
 )
 
 class LibraryFragment : BaseFragment<FragmentLibraryBinding>(
@@ -214,13 +210,14 @@ class LibraryFragment : BaseFragment<FragmentLibraryBinding>(
             syncId: SyncIdName,
             apiName: String? = null,
         ) {
-            val availableProviders = allProviders.filter {
+            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,

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

@@ -96,7 +96,7 @@ 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.CLEARKEY_UUID
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
 import com.lagradost.cloudstream3.utils.Coroutines.runOnMainThread
 import com.lagradost.cloudstream3.utils.DataStoreHelper.currentAccount
@@ -104,9 +104,9 @@ import com.lagradost.cloudstream3.utils.DrmExtractorLink
 import com.lagradost.cloudstream3.utils.ExtractorLink
 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.PLAYREADY_UUID
 import com.lagradost.cloudstream3.utils.SubtitleHelper.fromTagToLanguageName
-import com.lagradost.cloudstream3.utils.WIDEVINE_DRM_UUID
+import com.lagradost.cloudstream3.utils.WIDEVINE_UUID
 import com.lagradost.cloudstream3.utils.videoskip.VideoSkipStamp
 import kotlinx.coroutines.delay
 import okhttp3.Interceptor
@@ -118,7 +118,6 @@ import java.util.concurrent.Executors
 import javax.net.ssl.HttpsURLConnection
 import javax.net.ssl.SSLContext
 import javax.net.ssl.SSLSession
-import kotlin.uuid.toJavaUuid
 
 const val TAG = "CS3ExoPlayer"
 const val PREFERRED_AUDIO_LANGUAGE_KEY = "preferred_audio_language"
@@ -719,7 +718,7 @@ class CS3IPlayer : IPlayer {
          **/
         var preferredAudioTrackLanguage: String? = null
             get() {
-                return field ?: getKey<String>(
+                return field ?: getKey(
                     "$currentAccount/$PREFERRED_AUDIO_LANGUAGE_KEY",
                     field
                 )?.also {
@@ -1279,7 +1278,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 +1299,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")
@@ -1915,7 +1914,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,

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

@@ -58,23 +58,9 @@ class DownloadedPlayerActivity : AppCompatActivity() {
         enableEdgeToEdgeCompat()
         setContentView(R.layout.empty_layout)
         Log.i(TAG, "onCreate")
-        handleIntent(intent)
 
-        /**
-         * 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) }
+        handleIntent(intent)
+        attachBackPressedCallback("DownloadedPlayerActivity") { finish() }
     }
 
     private fun handleIntent(intent: Intent) {
@@ -97,11 +83,11 @@ class DownloadedPlayerActivity : AppCompatActivity() {
                 url != null -> playLink(this, url)
                 data != null -> playUri(this, data)
                 extraText != null -> playLink(this, extraText)
-                else -> finishAndRemoveTask()
+                else -> { finish(); return }
             }
         } else if (data?.scheme == "content") {
             playUri(this, data)
-        } else finishAndRemoveTask()
+        } else finish()
     }
 
     override fun onResume() {

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

@@ -267,60 +267,66 @@ open class FullScreenPlayer : AbstractPlayerFragment<FragmentPlayerBinding>(
                 // The lib uses Invisible instead of Gone for no reason
                 binding.previewFrameLayout.height - binding.bottomPlayerBar.height
             ) else -sStyle.elevation.toPx
-
-            sView.animateY(move.toFloat())
-        }
-
-    private fun View.animateY(value: Float) {
-        ObjectAnimator.ofFloat(this, "translationY", value).apply {
-            duration = 200
-            start()
-        }
-    }
-
-    private fun View.animateX(value: Float) {
-        ObjectAnimator.ofFloat(this, "translationX", value).apply {
+            ObjectAnimator.ofFloat(sView, "translationY", move.toFloat()).apply {
                 duration = 200
                 start()
             }
         }
 
     protected fun animateLayoutChanges() {
-
-        playerBinding?.apply {
-
         if (isLayout(PHONE)) { // isEnabled also disables the onKeyDown
-                exoProgress.isEnabled = isShowing // Prevent accidental clicks/drags
+            playerBinding?.exoProgress?.isEnabled = isShowing // Prevent accidental clicks/drags
         }
 
         if (isShowing) {
             updateUIVisibility()
         } else {
             toggleEpisodesOverlay(false)
-                playerHolder.postDelayed({ updateUIVisibility() }, 200)
+            playerBinding?.playerHolder?.postDelayed({ updateUIVisibility() }, 200)
         }
 
         val titleMove = if (isShowing) 0f else -50.toPx.toFloat()
-
-            listOfNotNull(
-                playerVideoTitleHolder,
-                playerVideoTitleRez,
-                playerVideoInfo,
-                playerGoBackHolder,
-                playerVideoClock,
-            ).forEach {
-                it.animateY(titleMove)
+        playerBinding?.playerVideoTitleHolder?.let {
+            ObjectAnimator.ofFloat(it, "translationY", titleMove).apply {
+                duration = 200
+                start()
+            }
+        }
+        playerBinding?.playerVideoTitleRez?.let {
+            ObjectAnimator.ofFloat(it, "translationY", titleMove).apply {
+                duration = 200
+                start()
+            }
+        }
+        playerBinding?.playerVideoInfo?.let {
+            ObjectAnimator.ofFloat(it, "translationY", titleMove).apply {
+                duration = 200
+                start()
+            }
+        }
+        playerBinding?.playerMetadataScrim?.let {
+            ObjectAnimator.ofFloat(it, "translationY", 1f).apply {
+                duration = 200
+                start()
+            }
         }
-
-            playerMetadataScrim.animateY(1f)
 
         val playerBarMove = if (isShowing) 0f else 50.toPx.toFloat()
-            bottomPlayerBar.animateY(playerBarMove)
-
-            if (isLayout(PHONE)) {
-                playerEpisodesButton.animateX(if (isShowing) 0f else 50.toPx.toFloat())
+        playerBinding?.bottomPlayerBar?.let {
+            ObjectAnimator.ofFloat(it, "translationY", playerBarMove).apply {
+                duration = 200
+                start()
+            }
+        }
+        if (isLayout(PHONE)) {
+            playerBinding?.playerEpisodesButton?.let {
+                ObjectAnimator.ofFloat(it, "translationX", if (isShowing) 0f else 50.toPx.toFloat())
+                    .apply {
+                        duration = 200
+                        start()
+                    }
+            }
         }
-
         val fadeTo = if (isShowing) 1f else 0f
         val fadeAnimation = AlphaAnimation(1f - fadeTo, fadeTo)
 
@@ -331,7 +337,13 @@ open class FullScreenPlayer : AbstractPlayerFragment<FragmentPlayerBinding>(
 
         val playerSourceMove = if (isShowing) 0f else -50.toPx.toFloat()
 
-            playerOpenSource.animateY(playerSourceMove)
+        playerBinding?.apply {
+            playerOpenSource.let {
+                ObjectAnimator.ofFloat(it, "translationY", playerSourceMove).apply {
+                    duration = 200
+                    start()
+                }
+            }
 
             if (!isLocked) {
                 playerHostView?.gestureHelper?.animateCenterControls(fadeTo)
@@ -519,22 +531,9 @@ open class FullScreenPlayer : AbstractPlayerFragment<FragmentPlayerBinding>(
 
         var currentOffset = subtitleDelay
         binding.apply {
-            var subtitleAdapter: SubtitleOffsetItemAdapter? = null
-
             subtitleOffsetInput.doOnTextChanged { text, _, _, _ ->
                 text?.toString()?.toLongOrNull()?.let { time ->
                     currentOffset = time
-
-                    // Scroll to the first active subtitle
-                    val playerPosition = player.getPosition() ?: 0
-                    val totalPosition = playerPosition - currentOffset
-                    subtitleAdapter?.updateTime(totalPosition)
-
-                    subtitleAdapter?.getLatestActiveItem(totalPosition)
-                        ?.let { subtitlePos ->
-                            subtitleOffsetRecyclerview.scrollToPosition(subtitlePos)
-                        }
-
                     val str = when {
                         time > 0L -> {
                             txt(R.string.subtitle_offset_extra_hint_later_format, time)
@@ -560,7 +559,7 @@ open class FullScreenPlayer : AbstractPlayerFragment<FragmentPlayerBinding>(
             noSubtitlesLoadedNotice.isVisible = subtitles.isEmpty()
 
             val initialSubtitlePosition = (player.getPosition() ?: 0) - currentOffset
-            subtitleAdapter =
+            val subtitleAdapter =
                 SubtitleOffsetItemAdapter(initialSubtitlePosition) { subtitleCue ->
                     val playerPosition = player.getPosition() ?: 0
                     subtitleOffsetInput.text = Editable.Factory.getInstance()
@@ -773,7 +772,7 @@ open class FullScreenPlayer : AbstractPlayerFragment<FragmentPlayerBinding>(
             val showPlayerEpisodes = !isGone && isThereEpisodes()
             playerEpisodesButtonRoot.isVisible = showPlayerEpisodes
             playerEpisodesButton.isVisible = showPlayerEpisodes
-            playerVideoTitleHolder.isGone = togglePlayerTitleGone || playerVideoTitle.text.isBlank()
+            playerVideoTitleHolder.isGone = togglePlayerTitleGone
             playerVideoTitleRez.isGone = isGone || playerVideoTitleRez.text.isBlank()
             playerEpisodeFiller.isGone = isGone
             playerCenterMenu.isGone = isGone
@@ -946,18 +945,12 @@ open class FullScreenPlayer : AbstractPlayerFragment<FragmentPlayerBinding>(
                 player.handleEvent(CSPlayerEvent.SkipCurrentChapter)
             }
 
-            KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE, KeyEvent.KEYCODE_P, KeyEvent.KEYCODE_SPACE, KeyEvent.KEYCODE_NUMPAD_ENTER -> { // space is not captured due to navigation
+            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
                 player.handleEvent(CSPlayerEvent.PlayPauseToggle)
             }
 
-            // KEYCODE_DPAD_CENTER and KEYCODE_ENTER both act as a "select/confirm" button.
-            // Some remotes (e.g. LG Magic Remote) send KEYCODE_ENTER instead of KEYCODE_DPAD_CENTER.
-            // When the player UI or a dialog is visible, we let the event pass through (return null)
-            // so the focused button/item can handle the click normally, rather than always toggling
-            // play/pause. Only when the UI is hidden do we treat it as a play/pause toggle.
-            KeyEvent.KEYCODE_DPAD_CENTER,
-            KeyEvent.KEYCODE_ENTER -> {
-                if (isShowing || isDialogOpen()) {
+            KeyEvent.KEYCODE_DPAD_CENTER -> {
+                if (isShowing) {
                     return null
                 }
                 // If UI is not shown make click instantly skip to next chapter even if locked
@@ -1014,7 +1007,6 @@ open class FullScreenPlayer : AbstractPlayerFragment<FragmentPlayerBinding>(
                 }
                 toggleEpisodesOverlay(true)
             }
-
             else -> return null // Avoid capturing all input
         }
         return true
@@ -1203,10 +1195,6 @@ open class FullScreenPlayer : AbstractPlayerFragment<FragmentPlayerBinding>(
             }
 
             skipChapterButton.setOnClickListener {
-                // Switch focus for a better UX, as otherwise it is reset to a random button like "back button"
-                if(skipChapterButton.hasFocus()) {
-                    playerPausePlay.requestFocus()
-                }
                 player.handleEvent(CSPlayerEvent.SkipCurrentChapter)
             }
 

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

@@ -8,7 +8,6 @@ import android.content.Context
 import android.content.Intent
 import android.content.res.ColorStateList
 import android.graphics.Bitmap
-import android.graphics.Typeface
 import android.os.Build
 import android.os.Bundle
 import android.text.Spanned
@@ -80,7 +79,6 @@ import com.lagradost.cloudstream3.ui.player.CS3IPlayer.Companion.preferredAudioT
 import com.lagradost.cloudstream3.ui.player.CustomDecoder.Companion.updateForcedEncoding
 import com.lagradost.cloudstream3.ui.player.PlayerSubtitleHelper.Companion.toSubtitleMimeType
 import com.lagradost.cloudstream3.ui.player.source_priority.LinkSource
-import com.lagradost.cloudstream3.ui.player.source_priority.ProfileSettings
 import com.lagradost.cloudstream3.ui.player.source_priority.QualityDataHelper
 import com.lagradost.cloudstream3.ui.player.source_priority.QualityDataHelper.getLinkPriority
 import com.lagradost.cloudstream3.ui.player.source_priority.QualityProfileDialog
@@ -119,10 +117,8 @@ import com.lagradost.cloudstream3.utils.UIHelper.clipboardHelper
 import com.lagradost.cloudstream3.utils.UIHelper.colorFromAttribute
 import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
 import com.lagradost.cloudstream3.utils.UIHelper.fixSystemBarsPadding
-import com.lagradost.cloudstream3.utils.UIHelper.hideProgress
 import com.lagradost.cloudstream3.utils.UIHelper.hideSystemUI
 import com.lagradost.cloudstream3.utils.UIHelper.popCurrentPage
-import com.lagradost.cloudstream3.utils.UIHelper.showProgress
 import com.lagradost.cloudstream3.utils.UIHelper.toPx
 import com.lagradost.cloudstream3.utils.downloader.DownloadUtils.getImageBitmapFromUrl
 import com.lagradost.cloudstream3.utils.setText
@@ -134,7 +130,6 @@ import kotlinx.coroutines.delay
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
 import java.io.Serializable
-import java.lang.ref.WeakReference
 import java.util.Calendar
 import java.util.UUID
 import java.util.concurrent.ConcurrentHashMap
@@ -148,11 +143,7 @@ class GeneratorPlayer : FullScreenPlayer() {
         const val STOP_ACTION = "stopcs3"
 
         private val generators = ConcurrentHashMap<String, VideoGenerator<*>>()
-        fun newInstance(
-            generator: VideoGenerator<*>,
-            index: Int,
-            syncData: HashMap<String, String>? = null
-        ): Bundle {
+        fun newInstance(generator: VideoGenerator<*>, index : Int, syncData: HashMap<String, String>? = null): Bundle {
             Log.i(TAG, "newInstance = $syncData")
             val uuid = UUID.randomUUID().toString()
             generators[uuid] = generator
@@ -187,9 +178,7 @@ class GeneratorPlayer : FullScreenPlayer() {
     private var isNextEpisode: Boolean = false // this is used to reset the watch time
 
     private var preferredAutoSelectSubtitles: String? = null // null means do nothing, "" means none
-    private val allMeta: List<ResultEpisode>?
-        get() = viewModel.state.generatorState?.allMeta?.filterIsInstance<ResultEpisode>()
-            ?.map { episode ->
+    private val allMeta: List<ResultEpisode>? get() = viewModel.state.generatorState?.allMeta?.filterIsInstance<ResultEpisode>()?.map { episode ->
         // Refresh all the episodes watch duration
         getViewPos(episode.id)?.let { data ->
             episode.copy(position = data.position, duration = data.duration)
@@ -512,8 +501,7 @@ class GeneratorPlayer : FullScreenPlayer() {
 
         showDownloadProgress(DownloadEvent(0, 0, 0, null))
 
-        // uiReset() // Removed due to UX
-
+        uiReset()
         currentSelectedLink = link
         //  setEpisodes(viewModel.getAllMeta() ?: emptyList())
         setPlayerDimen(null)
@@ -796,24 +784,11 @@ class GeneratorPlayer : FullScreenPlayer() {
         }
 
         binding.applyBtt.setOnClickListener {
-            val currentSubtitle = currentSubtitle
-            if (currentSubtitle == null) {
-                dialog.dismissSafe()
-                return@setOnClickListener
-            }
-
-            val api = providers.firstOrNull { it.idPrefix == currentSubtitle.idPrefix }
-            if (api == null) {
-                dialog.dismissSafe()
-                return@setOnClickListener
-            }
-
-            binding.applyBtt.showProgress()
+            currentSubtitle?.let { currentSubtitle ->
+                providers.firstOrNull { it.idPrefix == currentSubtitle.idPrefix }?.let { api ->
                     ioSafe {
-                val apiResource =
-                    Resource.fromResult(api.resource(currentSubtitle))
-                binding.applyBtt.hideProgress()
-                when (apiResource) {
+                        when (val apiResource =
+                            Resource.fromResult(api.resource(currentSubtitle))) {
                             is Resource.Success -> {
                                 val subtitles = apiResource.value.getSubtitles().map { resource ->
                                     SubtitleData(
@@ -833,7 +808,6 @@ class GeneratorPlayer : FullScreenPlayer() {
                                     showToast(R.string.no_subtitles)
                                     return@ioSafe
                                 }
-                        dialog.dismissSafe()
                                 runOnMainThread {
                                     addAndSelectSubtitles(*subtitles.toTypedArray())
                                 }
@@ -849,6 +823,9 @@ class GeneratorPlayer : FullScreenPlayer() {
                         }
                     }
                 }
+            }
+            dialog.dismissSafe()
+        }
 
         dialog.setOnDismissListener {
             dismissCallback.invoke()
@@ -1115,29 +1092,21 @@ class GeneratorPlayer : FullScreenPlayer() {
 
                 var sourceIndex = 0
                 var startSource = 0
-                // Filtered and sorted links
-                var currentHiddenFooter: View? = null
-                var filteredLinks: List<DisplayLink> = emptyList()
+                var sortedUrls = emptyList<Pair<ExtractorLink?, ExtractorUri?>>()
 
                 fun refreshLinks(qualityProfile: Int) {
-                    val currentLinkUsed = currentSelectedLink
-                    // Always display current linkFooter
-                    val sortedLinks = viewModel.state.sortLinks(qualityProfile)
-
-                    filteredLinks = sortedLinks.filter { it.shouldUseLink || it.link == currentLinkUsed }
-
-                    if (sortedLinks.isEmpty()) {
+                    sortedUrls = viewModel.state.sortLinks(qualityProfile)
+                    if (sortedUrls.isEmpty()) {
                         sourceDialog.findViewById<LinearLayout>(R.id.sort_sources_holder)?.isGone =
                             true
                     } else {
-                        startSource = filteredLinks.indexOfFirst { it.link == currentLinkUsed }
+                        startSource = sortedUrls.indexOf(currentSelectedLink)
                         sourceIndex = startSource
 
                         val sourcesArrayAdapter =
                             ArrayAdapter<String>(ctx, R.layout.sort_bottom_single_choice)
 
-                        sourcesArrayAdapter.addAll(filteredLinks.map { displayLink ->
-                            val (link, uri) = displayLink.link
+                        sourcesArrayAdapter.addAll(sortedUrls.map { (link, uri) ->
                             val name = link?.name ?: uri?.name ?: "NULL"
                             "$name ${Qualities.getStringByInt(link?.quality)}"
                         })
@@ -1153,7 +1122,7 @@ class GeneratorPlayer : FullScreenPlayer() {
                         }
 
                         providerList.setOnItemLongClickListener { _, _, position, _ ->
-                            sortedLinks.getOrNull(position)?.link?.first?.url?.let {
+                            sortedUrls.getOrNull(position)?.first?.url?.let {
                                 clipboardHelper(
                                     txt(R.string.video_source),
                                     it
@@ -1161,25 +1130,6 @@ class GeneratorPlayer : FullScreenPlayer() {
                             }
                             true
                         }
-
-                        val hiddenLinks = sortedLinks.size - filteredLinks.size
-                        providerList.removeFooterView(currentHiddenFooter)
-
-                        if (hiddenLinks > 0) {
-                            val hiddenLinksFooter: TextView = layoutInflater.inflate(
-                                R.layout.sort_bottom_footer_add_choice, null
-                            ) as TextView
-
-                            providerList.addFooterView(hiddenLinksFooter, null, false)
-                            currentHiddenFooter = hiddenLinksFooter
-
-                            val hiddenLinksText =
-                                ctx.resources.getQuantityString(R.plurals.links_hidden, hiddenLinks)
-                                    .format(hiddenLinks)
-                            hiddenLinksFooter.text = hiddenLinksText
-                            hiddenLinksFooter.setCompoundDrawables(null, null, null, null)
-                            hiddenLinksFooter.setTypeface(null, Typeface.ITALIC)
-                        }
                     }
                 }
 
@@ -1393,8 +1343,8 @@ class GeneratorPlayer : FullScreenPlayer() {
                         }
                     }
                     if (init) {
-                        filteredLinks.getOrNull(sourceIndex)?.let {
-                            loadLink(it.link, true)
+                        sortedUrls.getOrNull(sourceIndex)?.let {
+                            loadLink(it, true)
                         }
                     }
                     sourceDialog.dismissSafe(activity)
@@ -1562,10 +1512,6 @@ class GeneratorPlayer : FullScreenPlayer() {
     }
 
     override fun playerError(exception: Throwable) {
-        currentSelectedLink?.let { link ->
-            viewModel.modifyState { this.addError(link) }
-        }
-
         val currentUrl =
             currentSelectedLink?.let { it.first?.url ?: it.second?.uri?.toString() } ?: "unknown"
         val headers = currentSelectedLink?.first?.headers?.toString() ?: "none"
@@ -1573,7 +1519,7 @@ class GeneratorPlayer : FullScreenPlayer() {
         Log.e(
             TAG,
             "playerError: $currentSelectedLink, " +
-                    "type=${exception::class.qualifiedName}, " +
+                    "type=${exception::class.java.canonicalName}, " +
                     "message=${exception.message}, url=$currentUrl, headers=$headers, " +
                     "referer=$referer, position=${player.getPosition() ?: "unknown"}, " +
                     "duration=${player.getDuration() ?: "unknown"}, " +
@@ -1588,22 +1534,8 @@ class GeneratorPlayer : FullScreenPlayer() {
 
     private fun noLinksFound() {
         viewModel.forceClearCache = true
-        val hiddenLinks = viewModel.state.sortLinks(currentQualityProfile).count { !it.shouldUseLink }
 
-        context?.let { ctx ->
-            // Display that there are hidden links to the user.
-            if (hiddenLinks > 0) {
-                val noLinksString = ctx.getString(R.string.no_links_found_toast)
-                val hiddenString =
-                    ctx.resources.getQuantityString(R.plurals.links_hidden, hiddenLinks)
-                        .format(hiddenLinks)
-                val toastText = "$noLinksString\n($hiddenString)"
-                showToast(toastText, Toast.LENGTH_SHORT)
-            } else {
         showToast(R.string.no_links_found_toast, Toast.LENGTH_SHORT)
-            }
-        }
-
         activity?.popCurrentPage()
     }
 
@@ -1614,9 +1546,7 @@ class GeneratorPlayer : FullScreenPlayer() {
         }
 
         val links = viewModel.state.sortLinks(currentQualityProfile)
-
-        val firstAvailableLink = links.firstOrNull { it.shouldUseLink }?.link
-        if (firstAvailableLink == null) {
+        if (links.isEmpty()) {
             noLinksFound()
             return
         }
@@ -1624,7 +1554,7 @@ class GeneratorPlayer : FullScreenPlayer() {
         if (!isPlayerActive.compareAndSet(false, true)) {
             return
         }
-        loadLink(firstAvailableLink, false)
+        loadLink(links.first(), false)
         showPlayerMetadata()
     }
 
@@ -1648,7 +1578,7 @@ class GeneratorPlayer : FullScreenPlayer() {
         )
 
         val meta = arrayOf(
-            load.tags?.takeIf { it.isNotEmpty() }?.take(6)?.joinToString(", "),
+            load.tags?.takeIf { it.isNotEmpty() }?.joinToString(", "),
             load.year?.toString(),
             if (!load.type.isMovieType())
                 context?.getShortSeasonText(
@@ -1668,7 +1598,7 @@ class GeneratorPlayer : FullScreenPlayer() {
 
         if (!description.isNullOrBlank()) {
             descView.isVisible = true
-            descView.text = description.html()
+            descView.text = description
         } else {
             descView.isVisible = false
 
@@ -1691,26 +1621,25 @@ class GeneratorPlayer : FullScreenPlayer() {
         }
     }
 
-    private fun getNextLink(): DisplayLink? {
-        val links = viewModel.state.sortLinks(currentQualityProfile)
-        val currentIndex = links.indexOfFirst { it.link == currentSelectedLink }
-        val nextPotentialLink =
-            links.withIndex().firstOrNull { it.index > currentIndex && it.value.shouldUseLink }
-        return nextPotentialLink?.value
-    }
-
     override fun hasNextMirror(): Boolean {
-        return getNextLink() != null
+        val links = viewModel.state.sortLinks(currentQualityProfile)
+        return links.isNotEmpty() && links.indexOf(currentSelectedLink) + 1 < links.size
     }
 
     override fun nextMirror() {
-        val nextLink = getNextLink()
-        if (nextLink == null) {
+        val links = viewModel.state.sortLinks(currentQualityProfile)
+        if (links.isEmpty()) {
             noLinksFound()
             return
         }
 
-        loadLink(nextLink.link, true)
+        val newIndex = links.indexOf(currentSelectedLink) + 1
+        if (newIndex >= links.size) {
+            noLinksFound()
+            return
+        }
+
+        loadLink(links[newIndex], true)
     }
 
     override fun onDestroy() {
@@ -1763,12 +1692,10 @@ class GeneratorPlayer : FullScreenPlayer() {
                         if (settingsManager.getBoolean(
                                 ctx.getString(R.string.episode_sync_enabled_key), true
                             )
-                        ) {
-                            maxEpisodeSet = meta.episode
+                        ) maxEpisodeSet = meta.episode
                         sync.modifyMaxEpisode(meta.totalEpisodeIndex ?: meta.episode)
                     }
                 }
-                }
 
                 if (meta.tvType.isAnimeOp()) isOpVisible = percentage < SKIP_OP_VIDEO_PERCENTAGE
             }
@@ -1799,11 +1726,11 @@ class GeneratorPlayer : FullScreenPlayer() {
     ): SubtitleData? {
         val langCode = preferredAutoSelectSubtitles ?: return null
         if (downloads) {
-            sortSubs(subtitles).firstOrNull {
+            return sortSubs(subtitles).firstOrNull {
                 it.origin == SubtitleOrigin.DOWNLOADED_FILE && it.matchesLanguageCode(
                     langCode
                 )
-            }?.let { return it }
+            }
         }
 
         if (!settings) return null
@@ -2213,11 +2140,9 @@ class GeneratorPlayer : FullScreenPlayer() {
     fun releasePlayer() {
         player.release()
         currentSelectedSubtitles = null
-        currentSelectedLink = null
         isPlayerActive.set(false)
         binding?.overlayLoadingSkipButton?.isVisible = false
         binding?.playerLoadingOverlay?.isVisible = true
-        viewModel.modifyState { setError(emptyList()) }
         uiReset()
     }
 
@@ -2227,31 +2152,19 @@ class GeneratorPlayer : FullScreenPlayer() {
         activity?.popCurrentPage()
     }
 
-    override fun onSaveInstanceState(outState: Bundle) {
-        outState.putInt("index", viewModel.episodeIndex)
-        super.onSaveInstanceState(outState)
-    }
-
     override fun onBindingCreated(binding: FragmentPlayerBinding, savedInstanceState: Bundle?) {
         viewModel = ViewModelProvider(this)[PlayerGeneratorViewModel::class.java]
         sync = ViewModelProvider(this)[SyncViewModel::class.java]
 
         val uuid = savedInstanceState?.getString("uuid") ?: arguments?.getString("uuid")
         val index = savedInstanceState?.getInt("index") ?: arguments?.getInt("index")
-        val generator = generators[uuid]
+
+        viewModel.attachGenerator(generators[uuid], index)
 
         unwrapBundle(savedInstanceState)
         unwrapBundle(arguments)
 
         super.onBindingCreated(binding, savedInstanceState)
-
-        // Avoid showing no links found
-        if (generator == null || index == null) {
-            exitPlayer()
-            return
-        }
-        viewModel.attachGenerator(generator, index)
-
         context?.let { ctx ->
             val settingsManager = PreferenceManager.getDefaultSharedPreferences(ctx)
             showName = settingsManager.getBoolean(ctx.getString(R.string.show_name_key), true)
@@ -2271,14 +2184,6 @@ class GeneratorPlayer : FullScreenPlayer() {
                     fromTagToEnglishLanguageName(it)?.lowercase() ?: return@mapNotNull null
                 } ?: listOf()
             }
-
-            // Set up TV clock visibility
-            if (isLayout(TV)) {
-                val showTvClock = settingsManager.getBoolean(ctx.getString(R.string.tv_layout_clock_key), false)
-                playerBinding?.playerVideoClock?.isVisible = showTvClock
-            } else {
-                playerBinding?.playerVideoClock?.isVisible = false
-            }
         }
 
         unwrapBundle(savedInstanceState)
@@ -2288,18 +2193,14 @@ class GeneratorPlayer : FullScreenPlayer() {
 
         preferredAutoSelectSubtitles = getAutoSelectLanguageTagIETF()
 
-        val selectedLink = currentSelectedLink
-        if (selectedLink == null) {
+        if (currentSelectedLink == null) {
             viewModel.loadLinks()
-        } else {
-            // Recreated view, so we need to recreate the
-            loadLink(selectedLink, true)
         }
 
         binding.overlayLoadingSkipButton.setOnClickListener {
             // Mark as "success" early
             viewModel.modifyState {
-                copy(loading = Resource.Success(Unit))
+                copy(loading = Resource.Success(true))
             }
         }
 
@@ -2317,13 +2218,11 @@ class GeneratorPlayer : FullScreenPlayer() {
             }
         }
 
-        observe(viewModel.currentStamps) { (stamps, instance) ->
-            if (instance != viewModel.state.instance) return@observe // Outdated observe
+        observe(viewModel.currentStamps) { stamps ->
             player.addTimeStamps(stamps)
         }
 
-        observe(viewModel.currentSubtitles) { (subtitles, instance) ->
-            if (instance != viewModel.state.instance) return@observe // Outdated observe
+        observe(viewModel.currentSubtitles) { subtitles ->
             player.setActiveSubtitles(subtitles)
 
             // If the file is downloaded then do not select auto select the subtitles
@@ -2334,9 +2233,7 @@ class GeneratorPlayer : FullScreenPlayer() {
                 autoSelectSubtitles()
             }
         }
-        observe(viewModel.loadingLinks) { (loading, instance) ->
-            if (instance != viewModel.state.instance) return@observe // Outdated observe
-
+        observe(viewModel.loadingLinks) { loading ->
             when (loading) {
                 is Resource.Loading -> {
                     releasePlayer()
@@ -2357,28 +2254,22 @@ class GeneratorPlayer : FullScreenPlayer() {
             }
         }
 
-        observe(viewModel.currentLinks) { (_, instance) ->
-            if (instance != viewModel.state.instance) return@observe // Outdated observe
-
-            val sortedLinks = viewModel.state.sortLinks(currentQualityProfile)
-            val usableLinks = sortedLinks.count { link -> link.shouldUseLink }
-
-            val turnVisible = usableLinks > 0 && viewModel.generator?.canSkipLoading == true
+        observe(viewModel.currentLinks) { links ->
+            val turnVisible = links.isNotEmpty() && viewModel.generator?.canSkipLoading == true
             val wasGone = binding.overlayLoadingSkipButton.isGone
 
             binding.overlayLoadingSkipButton.apply {
                 isVisible = turnVisible
-
-                if (usableLinks == 0) {
+                if (links.isEmpty()) {
                     setText(R.string.skip_loading)
                 } else {
                     @SuppressLint("SetTextI18n")
-                    text = "${context.getString(R.string.skip_loading)} (${usableLinks})"
+                    text = "${context.getString(R.string.skip_loading)} (${links.size})"
                 }
             }
 
             safe {
-                if (!isPlayerActive.get() && viewModel.state.links.any { link ->
+                if (viewModel.state.links.any { link ->
                         getLinkPriority(currentQualityProfile, link.first) >=
                                 QualityDataHelper.AUTO_SKIP_PRIORITY
                     }

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

@@ -4,7 +4,6 @@ import android.app.Activity
 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,15 +12,6 @@ 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(
@@ -30,8 +20,7 @@ object OfflinePlaybackHelper {
                         BasicLink(url)
                     ), id = url.hashCode()
                 ), 0
-            ),
-            replacePlayerNavOptions
+            )
         )
     }
 
@@ -63,8 +52,7 @@ object OfflinePlaybackHelper {
                     subs,
                     if (id != -1) id else null,
                 ), 0
-            ),
-            replacePlayerNavOptions
+            )
         )
         return true
     }
@@ -88,8 +76,7 @@ object OfflinePlaybackHelper {
                         )
                     )
                 ), 0
-            ),
-            replacePlayerNavOptions
+            )
         )
     }
 }

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

@@ -10,8 +10,6 @@ import com.lagradost.cloudstream3.mvvm.Resource
 import com.lagradost.cloudstream3.mvvm.launchSafe
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.mvvm.safeApiCall
-import com.lagradost.cloudstream3.ui.player.source_priority.ProfileSettings
-import com.lagradost.cloudstream3.ui.player.source_priority.QualityDataHelper
 import com.lagradost.cloudstream3.ui.player.source_priority.QualityDataHelper.getLinkPriority
 import com.lagradost.cloudstream3.ui.result.ResultEpisode
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
@@ -42,76 +40,34 @@ data class GeneratorState(
     val id: Int?,
 )
 
-data class DisplayLink(
-    val link: VideoLink,
-    // If the link should be displayed and used by the player
-    val shouldUseLink: Boolean,
-    val priority: 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 erroredLinks: PersistentSet<VideoLink> = persistentSetOf(),
     val stamps: PersistentList<VideoSkipStamp> = persistentListOf(),
-    val loading: Resource<Unit> = Resource.Loading(),
+    val loading: Resource<Boolean?> = 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<DisplayLink>> = ConcurrentHashMap()
+    private val sortedLinks: ConcurrentHashMap<Int, List<VideoLink>> = ConcurrentHashMap()
 
-    /**
-     * The cache is guaranteed to be up to date link-wise due to the immutable links.
-     * However, hideNegativeSources and hideErrorSources could be updated, which requires clearing the cache.
-     */
     fun clearSortedLinksCache() = sortedLinks.clear()
 
-    private fun hasLinkErrored(link: VideoLink): Boolean {
-        return erroredLinks.any { it == link }
-    }
-
-    private fun VideoLink.toDisplayLink(
-        qualityProfile: Int,
-        hideNegativeSources: Boolean,
-        hideErrorSources: Boolean
-    ): DisplayLink {
-        val priority = getLinkPriority(qualityProfile, this.first)
-        val shouldHideLink =
-            (hideNegativeSources && priority < 0) || (hideErrorSources && hasLinkErrored(this))
-        val displayLink = DisplayLink(this, !shouldHideLink, priority)
-
-        return displayLink
-    }
-
     // 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<DisplayLink> {
-        sortedLinks[qualityProfile]?.let {
-            return it
-        }
-
-        val hideNegativeSources =
-            QualityDataHelper.getProfileSetting(qualityProfile, ProfileSettings.HideNegativeSources)
-        val hideErrorSources =
-            QualityDataHelper.getProfileSetting(qualityProfile, ProfileSettings.HideErrorSources)
-
-        return links.map { link ->
+    fun sortLinks(qualityProfile: Int): List<VideoLink> {
+        return sortedLinks[qualityProfile] ?: links.sortedBy { link ->
             // negative because we want to sort highest quality first
-            link.toDisplayLink(qualityProfile, hideNegativeSources, hideErrorSources)
-        }.sortedBy {
-            // negative because we want to sort highest quality first
-            -it.priority
+            -getLinkPriority(qualityProfile, link.first)
         }.also { value -> sortedLinks[qualityProfile] = value }
     }
 
@@ -156,19 +112,8 @@ data class VideoState(
     @JvmName("setVideoSkipStamp")
     @Contract(pure = true)
     fun set(items: Collection<VideoSkipStamp>): VideoState = copy(stamps = items.toPersistentList())
-
-    @Contract(pure = true)
-    fun addError(item: VideoLink): VideoState = copy(erroredLinks = erroredLinks.add(item))
-
-    @Contract(pure = true)
-    fun setError(items: Collection<VideoLink>): VideoState = copy(erroredLinks = items.toPersistentSet())
 }
 
-data class VideoLive<T>(
-    val value: T,
-    val instance: Int,
-)
-
 class PlayerGeneratorViewModel : ViewModel() {
     companion object {
         const val TAG = "PlayViewGen"
@@ -178,7 +123,7 @@ class PlayerGeneratorViewModel : ViewModel() {
     var generator: VideoGenerator<*>? = null
 
     @Volatile
-    var episodeIndex: Int = 0
+    private var episodeIndex: Int = 0
 
     /**
      * The state of the video player, only modify it by modifyState to make sure observe is called,
@@ -187,20 +132,20 @@ class PlayerGeneratorViewModel : ViewModel() {
      * This value can be used without Synchronized or locking when reading, as all fields are immutable.
      * */
     @Volatile
-    var state = VideoState(instance = 0)
+    var state = VideoState()
         private set
 
-    private val _currentLinks = MutableLiveData<VideoLive<Set<VideoLink>>>(null)
-    val currentLinks: LiveData<VideoLive<Set<VideoLink>>> = _currentLinks
+    private val _currentLinks = MutableLiveData<Set<Pair<ExtractorLink?, ExtractorUri?>>>(setOf())
+    val currentLinks: LiveData<Set<Pair<ExtractorLink?, ExtractorUri?>>> = _currentLinks
 
-    private val _currentSubtitles = MutableLiveData<VideoLive<Set<SubtitleData>>>(null)
-    val currentSubtitles: LiveData<VideoLive<Set<SubtitleData>>> = _currentSubtitles
+    private val _currentSubtitles = MutableLiveData<Set<SubtitleData>>(setOf())
+    val currentSubtitles: LiveData<Set<SubtitleData>> = _currentSubtitles
 
-    private val _loadingLinks = MutableLiveData<VideoLive<Resource<Unit>>>()
-    val loadingLinks: LiveData<VideoLive<Resource<Unit>>> = _loadingLinks
+    private val _loadingLinks = MutableLiveData<Resource<Boolean?>>()
+    val loadingLinks: LiveData<Resource<Boolean?>> = _loadingLinks
 
-    private val _currentStamps = MutableLiveData<VideoLive<List<VideoSkipStamp>>>(null)
-    val currentStamps: LiveData<VideoLive<List<VideoSkipStamp>>> = _currentStamps
+    private val _currentStamps = MutableLiveData<List<VideoSkipStamp>>(emptyList())
+    val currentStamps: LiveData<List<VideoSkipStamp>> = _currentStamps
 
     /**
      * Modifies the `state` variable safely, and with the correct observe behavior.
@@ -213,15 +158,6 @@ class PlayerGeneratorViewModel : ViewModel() {
         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"
          *
@@ -229,15 +165,15 @@ class PlayerGeneratorViewModel : ViewModel() {
          * 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))
+            _currentLinks.postValue(state.links)
         if (state.stamps !== oldState.stamps)
-            _currentStamps.postValue(VideoLive(state.stamps, state.instance))
+            _currentStamps.postValue(state.stamps)
         if (state.subtitles !== oldState.subtitles)
-            _currentSubtitles.postValue(VideoLive(state.subtitles, state.instance))
+            _currentSubtitles.postValue(state.subtitles)
 
         /** Normal equality here as it is not a collection */
         if (state.loading != oldState.loading)
-            _loadingLinks.postValue(VideoLive(state.loading, state.instance))
+            _loadingLinks.postValue(state.loading)
     }
 
     private val _currentSubtitleYear = MutableLiveData<Int?>(null)
@@ -316,11 +252,14 @@ class PlayerGeneratorViewModel : ViewModel() {
         loadLinks()
     }
 
-    fun attachGenerator(newGenerator: VideoGenerator<*>, index: Int) {
-        Log.i(TAG, "attachGenerator with generator=$newGenerator and index=$index")
+    fun attachGenerator(newGenerator: VideoGenerator<*>?, index: Int?) {
+        if (generator == null) {
             generator = newGenerator
+            if (index != null) {
                 episodeIndex = index
             }
+        }
+    }
 
     /**
      * If duplicate nothing will happen
@@ -382,14 +321,14 @@ class PlayerGeneratorViewModel : ViewModel() {
     }
 
     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
 
+        currentJob = viewModelScope.launchSafe {
             // Clear old data and reset the state
             modifyState {
                 VideoState(
-                loading = Resource.Loading(),
                     generatorState = generator?.let { gen ->
                         GeneratorState(
                             meta = gen.videos.getOrNull(index),
@@ -399,19 +338,16 @@ class PlayerGeneratorViewModel : ViewModel() {
                             index = index,
                             allMeta = gen.videos
                         )
-                },
-                instance = instance + 1
+                    }
                 )
             }
 
-        currentJob = viewModelScope.launchSafe {
             // Load more data
             val loadingState = safeApiCall {
                 generator?.generateLinks(
                     sourceTypes = sourceTypes,
                     clearCache = forceClearCache,
                     callback = { link ->
-                        if (isActive)
                         modifyState {
                             add(link)
                         }
@@ -419,12 +355,11 @@ class PlayerGeneratorViewModel : ViewModel() {
                     isCasting = false,
                     offset = index,
                     subtitleCallback = { link ->
-                        if (isActive && isValidSubtitle(link))
+                        if (isValidSubtitle(link))
                             modifyState {
                                 add(link)
                             }
                     })
-                Unit
             }
 
             if (!isActive) {
@@ -433,9 +368,6 @@ class PlayerGeneratorViewModel : ViewModel() {
 
             /** 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
@@ -444,4 +376,3 @@ class PlayerGeneratorViewModel : ViewModel() {
         }
     }
 }
-}

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

@@ -8,14 +8,11 @@ import androidx.annotation.OptIn
 import androidx.media3.common.MimeTypes
 import androidx.media3.common.util.UnstableApi
 import androidx.media3.ui.SubtitleView
-import com.fasterxml.jackson.annotation.JsonIgnore
 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
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
 
 enum class SubtitleStatus {
     IS_ACTIVE,
@@ -35,19 +32,17 @@ enum class SubtitleOrigin {
  * @param url Url for the subtitle, when EMBEDDED_IN_VIDEO this variable is used as the real backend id
  * @param headers if empty it will use the base onlineDataSource headers else only the specified headers
  * @param languageCode usually, tags such as "en", "es-mx", or "zh-hant-TW". But it could be something like "English 4"
- */
-@Serializable
+ * */
 data class SubtitleData(
-    @SerialName("originalName") val originalName: String,
-    @SerialName("nameSuffix") val nameSuffix: String,
-    @SerialName("url") val url: String,
-    @SerialName("origin") val origin: SubtitleOrigin,
-    @SerialName("mimeType") val mimeType: String,
-    @SerialName("headers") val headers: Map<String, String>,
-    @SerialName("languageCode") val languageCode: String?,
+    val originalName: String,
+    val nameSuffix: String,
+    val url: String,
+    val origin: SubtitleOrigin,
+    val mimeType: String,
+    val headers: Map<String, String>,
+    val languageCode: String?,
 ) {
-    /** Internal ID for media3, unique for each link. */
-    @JsonIgnore
+    /** Internal ID for exoplayer, unique for each link*/
     fun getId(): String {
         return if (origin == SubtitleOrigin.EMBEDDED_IN_VIDEO) url
         else "$url|$name"
@@ -59,22 +54,22 @@ data class SubtitleData(
     }
 
     /** Tries hard to figure out a valid IETF tag based on language code and name. Will return null if not found. */
-    @JsonIgnore
     fun getIETF_tag(): String? {
         return fromLanguageToTagIETF(this.languageCode) ?: fromLanguageToTagIETF(this.originalName, halfMatch = true)
     }
 
-    @SerialName("name") val name = "$originalName $nameSuffix"
+    val name = "$originalName $nameSuffix"
 
     /**
      * Gets the URL, but tries to fix it if it is malformed.
      */
-    @JsonIgnore
     fun getFixedUrl(): String {
         // Some extensions fail to include the protocol, this helps with that.
         val fixedSubUrl = if (this.url.startsWith("//")) {
             "https:${this.url}"
-        } else this.url
+        } else {
+            this.url
+        }
         return fixedSubUrl
     }
 }

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

@@ -9,8 +9,6 @@ import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.ExtractorLinkType
 import com.lagradost.cloudstream3.utils.newExtractorLink
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
 import torrServer.TorrServer
 import java.io.File
 import java.net.ConnectException
@@ -41,7 +39,7 @@ object Torrent {
             app.get(
                 "$TORRENT_SERVER_URL/echo",
             ).text.isNotEmpty()
-        } catch (_: ConnectException) {
+        } catch (e: ConnectException) {
             // `Failed to connect to /127.0.0.1:8090` if the server is down
             false
         } catch (t: Throwable) {
@@ -166,7 +164,9 @@ object Torrent {
     /** Gets all the metadata of a torrent, will throw if that hash does not exists
      * https://github.com/Diegopyl1209/torrentserver-aniyomi/blob/c18f58e51b6738f053261bc863177078aa9c1c98/web/api/torrents.go#L126 */
     @Throws
-    suspend fun get(hash: String): TorrentStatus {
+    suspend fun get(
+        hash: String,
+    ): TorrentStatus {
         if(TORRENT_SERVER_URL.isEmpty()) {
             throw ErrorLoadingException("Not initialized")
         }
@@ -278,55 +278,94 @@ object Torrent {
 
     // https://github.com/Diegopyl1209/torrentserver-aniyomi/blob/c18f58e51b6738f053261bc863177078aa9c1c98/web/api/torrents.go#L18
     // https://github.com/Diegopyl1209/torrentserver-aniyomi/blob/main/web/api/route.go#L7
-    @Serializable
     data class TorrentRequest(
-        @JsonProperty("action") @SerialName("action") val action: String,
-        @JsonProperty("hash") @SerialName("hash") val hash: String = "",
-        @JsonProperty("link") @SerialName("link") val link: String = "",
-        @JsonProperty("title") @SerialName("title") val title: String = "",
-        @JsonProperty("poster") @SerialName("poster") val poster: String = "",
-        @JsonProperty("data") @SerialName("data") val data: String = "",
-        @JsonProperty("save_to_db") @SerialName("save_to_db") val saveToDB: Boolean = false,
+        @JsonProperty("action")
+        val action: String,
+        @JsonProperty("hash")
+        val hash: String = "",
+        @JsonProperty("link")
+        val link: String = "",
+        @JsonProperty("title")
+        val title: String = "",
+        @JsonProperty("poster")
+        val poster: String = "",
+        @JsonProperty("data")
+        val data: String = "",
+        @JsonProperty("save_to_db")
+        val saveToDB: Boolean = false,
     )
 
     // https://github.com/Diegopyl1209/torrentserver-aniyomi/blob/c18f58e51b6738f053261bc863177078aa9c1c98/torr/state/state.go#L33
     // omitempty = nullable
-    @Serializable
     data class TorrentStatus(
-        @JsonProperty("title") @SerialName("title") var title: String,
-        @JsonProperty("poster") @SerialName("poster") var poster: String,
-        @JsonProperty("data") @SerialName("data") var data: String?,
-        @JsonProperty("timestamp") @SerialName("timestamp") var timestamp: Long,
-        @JsonProperty("name") @SerialName("name") var name: String?,
-        @JsonProperty("hash") @SerialName("hash") var hash: String?,
-        @JsonProperty("stat") @SerialName("stat") var stat: Int,
-        @JsonProperty("stat_string") @SerialName("stat_string") var statString: String,
-        @JsonProperty("loaded_size") @SerialName("loaded_size") var loadedSize: Long?,
-        @JsonProperty("torrent_size") @SerialName("torrent_size") var torrentSize: Long?,
-        @JsonProperty("preloaded_bytes") @SerialName("preloaded_bytes") var preloadedBytes: Long?,
-        @JsonProperty("preload_size") @SerialName("preload_size") var preloadSize: Long?,
-        @JsonProperty("download_speed") @SerialName("download_speed") var downloadSpeed: Double?,
-        @JsonProperty("upload_speed") @SerialName("upload_speed") var uploadSpeed: Double?,
-        @JsonProperty("total_peers") @SerialName("total_peers") var totalPeers: Int?,
-        @JsonProperty("pending_peers") @SerialName("pending_peers") var pendingPeers: Int?,
-        @JsonProperty("active_peers") @SerialName("active_peers") var activePeers: Int?,
-        @JsonProperty("connected_seeders") @SerialName("connected_seeders") var connectedSeeders: Int?,
-        @JsonProperty("half_open_peers") @SerialName("half_open_peers") var halfOpenPeers: Int?,
-        @JsonProperty("bytes_written") @SerialName("bytes_written") var bytesWritten: Long?,
-        @JsonProperty("bytes_written_data") @SerialName("bytes_written_data") var bytesWrittenData: Long?,
-        @JsonProperty("bytes_read") @SerialName("bytes_read") var bytesRead: Long?,
-        @JsonProperty("bytes_read_data") @SerialName("bytes_read_data") var bytesReadData: Long?,
-        @JsonProperty("bytes_read_useful_data") @SerialName("bytes_read_useful_data") var bytesReadUsefulData: Long?,
-        @JsonProperty("chunks_written") @SerialName("chunks_written") var chunksWritten: Long?,
-        @JsonProperty("chunks_read") @SerialName("chunks_read") var chunksRead: Long?,
-        @JsonProperty("chunks_read_useful") @SerialName("chunks_read_useful") var chunksReadUseful: Long?,
-        @JsonProperty("chunks_read_wasted") @SerialName("chunks_read_wasted") var chunksReadWasted: Long?,
-        @JsonProperty("pieces_dirtied_good") @SerialName("pieces_dirtied_good") var piecesDirtiedGood: Long?,
-        @JsonProperty("pieces_dirtied_bad") @SerialName("pieces_dirtied_bad") var piecesDirtiedBad: Long?,
-        @JsonProperty("duration_seconds") @SerialName("duration_seconds") var durationSeconds: Double?,
-        @JsonProperty("bit_rate") @SerialName("bit_rate") var bitRate: String?,
-        @JsonProperty("file_stats") @SerialName("file_stats") var fileStats: List<TorrentFileStat>?,
-        @JsonProperty("trackers") @SerialName("trackers") var trackers: List<String>?,
+        @JsonProperty("title")
+        var title: String,
+        @JsonProperty("poster")
+        var poster: String,
+        @JsonProperty("data")
+        var data: String?,
+        @JsonProperty("timestamp")
+        var timestamp: Long,
+        @JsonProperty("name")
+        var name: String?,
+        @JsonProperty("hash")
+        var hash: String?,
+        @JsonProperty("stat")
+        var stat: Int,
+        @JsonProperty("stat_string")
+        var statString: String,
+        @JsonProperty("loaded_size")
+        var loadedSize: Long?,
+        @JsonProperty("torrent_size")
+        var torrentSize: Long?,
+        @JsonProperty("preloaded_bytes")
+        var preloadedBytes: Long?,
+        @JsonProperty("preload_size")
+        var preloadSize: Long?,
+        @JsonProperty("download_speed")
+        var downloadSpeed: Double?,
+        @JsonProperty("upload_speed")
+        var uploadSpeed: Double?,
+        @JsonProperty("total_peers")
+        var totalPeers: Int?,
+        @JsonProperty("pending_peers")
+        var pendingPeers: Int?,
+        @JsonProperty("active_peers")
+        var activePeers: Int?,
+        @JsonProperty("connected_seeders")
+        var connectedSeeders: Int?,
+        @JsonProperty("half_open_peers")
+        var halfOpenPeers: Int?,
+        @JsonProperty("bytes_written")
+        var bytesWritten: Long?,
+        @JsonProperty("bytes_written_data")
+        var bytesWrittenData: Long?,
+        @JsonProperty("bytes_read")
+        var bytesRead: Long?,
+        @JsonProperty("bytes_read_data")
+        var bytesReadData: Long?,
+        @JsonProperty("bytes_read_useful_data")
+        var bytesReadUsefulData: Long?,
+        @JsonProperty("chunks_written")
+        var chunksWritten: Long?,
+        @JsonProperty("chunks_read")
+        var chunksRead: Long?,
+        @JsonProperty("chunks_read_useful")
+        var chunksReadUseful: Long?,
+        @JsonProperty("chunks_read_wasted")
+        var chunksReadWasted: Long?,
+        @JsonProperty("pieces_dirtied_good")
+        var piecesDirtiedGood: Long?,
+        @JsonProperty("pieces_dirtied_bad")
+        var piecesDirtiedBad: Long?,
+        @JsonProperty("duration_seconds")
+        var durationSeconds: Double?,
+        @JsonProperty("bit_rate")
+        var bitRate: String?,
+        @JsonProperty("file_stats")
+        var fileStats: List<TorrentFileStat>?,
+        @JsonProperty("trackers")
+        var trackers: List<String>?,
     ) {
         fun streamUrl(url: String): String {
             val fileName =
@@ -342,10 +381,12 @@ object Torrent {
         }
     }
 
-    @Serializable
     data class TorrentFileStat(
-        @JsonProperty("id") @SerialName("id") val id: Int?,
-        @JsonProperty("path") @SerialName("path") val path: String?,
-        @JsonProperty("length") @SerialName("length") val length: Long?,
+        @JsonProperty("id")
+        val id: Int?,
+        @JsonProperty("path")
+        val path: String?,
+        @JsonProperty("length")
+        val length: Long?,
     )
 }

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

@@ -12,16 +12,12 @@ 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 java.util.EnumMap
-import java.util.concurrent.ConcurrentHashMap
-import kotlin.also
 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"
-    const val VIDEO_PROFILE_SETTINGS = "video_profile_settings"
 
     // Old key only supporting one type per profile
     @Deprecated("Changed to support multiple types per profile")
@@ -57,21 +53,13 @@ object QualityDataHelper {
         val types: Set<QualityProfileType>
     )
 
-
-    // Map profile and name to priority
-    val sourcePriorityCache: ConcurrentHashMap<Int, HashMap<String, Int>> = ConcurrentHashMap()
-
     fun getSourcePriority(profile: Int, name: String?): Int {
         if (name == null) return DEFAULT_SOURCE_PRIORITY
-
-        return sourcePriorityCache[profile]?.get(name) ?: (getKey<Int>(
+        return getKey(
             "$currentAccount/$VIDEO_SOURCE_PRIORITY/$profile",
             name,
             DEFAULT_SOURCE_PRIORITY
-        ) ?: DEFAULT_SOURCE_PRIORITY).also {
-            sourcePriorityCache.getOrPut(profile) { hashMapOf() }
-            sourcePriorityCache[profile]?.set(name, it)
-        }
+        ) ?: DEFAULT_SOURCE_PRIORITY
     }
 
     fun getAllSourcePriorityNames(profile: Int): List<String> {
@@ -89,8 +77,6 @@ object QualityDataHelper {
         } else {
             setKey(folder, name, priority)
         }
-
-        sourcePriorityCache[profile]?.set(name, priority)
     }
 
     fun setProfileName(profile: Int, name: String?) {
@@ -107,17 +93,12 @@ object QualityDataHelper {
             ?: txt(R.string.profile_number, profile)
     }
 
-    // Map profile and quality to priority
-    val qualityPriorityCache: ConcurrentHashMap<Int, EnumMap<Qualities, Int>> = ConcurrentHashMap()
     fun getQualityPriority(profile: Int, quality: Qualities): Int {
-        return qualityPriorityCache[profile]?.get(quality) ?: (getKey<Int>(
+        return getKey(
             "$currentAccount/$VIDEO_QUALITY_PRIORITY/$profile",
             quality.value.toString(),
             quality.defaultPriority
-        )?.also {
-            qualityPriorityCache.getOrPut(profile) { EnumMap(Qualities::class.java) }
-            qualityPriorityCache[profile]?.set(quality, it)
-        }) ?: quality.defaultPriority
+        ) ?: quality.defaultPriority
     }
 
     fun setQualityPriority(profile: Int, quality: Qualities, priority: Int) {
@@ -126,24 +107,8 @@ object QualityDataHelper {
             quality.value.toString(),
             priority
         )
-        qualityPriorityCache[profile]?.set(quality, priority)
     }
 
-    fun <T> setProfileSetting(profile: Int, setting: ProfileSettings<T>, value: T) {
-        val folder = "$currentAccount/$VIDEO_PROFILE_SETTINGS/$profile"
-        // Prevent unnecessary keys
-        if (value == setting.defaultValue) {
-            removeKey(folder, setting.key)
-        } else {
-            setKey(folder, setting.key, value)
-        }
-    }
-
-    inline fun <reified T : Any> getProfileSetting(profile: Int, setting: ProfileSettings<T>): T {
-        val folder = "$currentAccount/$VIDEO_PROFILE_SETTINGS/$profile"
-        val value = getKey<T>(folder, setting.key)
-        return value ?: setting.defaultValue
-    }
 
     @Suppress("DEPRECATION")
     fun getQualityProfileTypes(profile: Int): Set<QualityProfileType> {
@@ -259,8 +224,3 @@ object QualityDataHelper {
         return Qualities.entries.minBy { abs(it.value - target) }
     }
 }
-
-sealed class ProfileSettings<T>(val key: String, val defaultValue: T) {
-    object HideErrorSources : ProfileSettings<Boolean>("hide_error_sources", false)
-    object HideNegativeSources : ProfileSettings<Boolean>("hide_negative_sources", false)
-}

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

@@ -14,7 +14,7 @@ import com.lagradost.cloudstream3.utils.UIHelper.fixSystemBarsPadding
 
 class SourcePriorityDialog(
     val ctx: Context,
-    @StyleRes val themeRes: Int,
+    @StyleRes themeRes: Int,
     val links: List<LinkSource>,
     private val profile: QualityDataHelper.QualityProfile,
     /**
@@ -28,27 +28,28 @@ class SourcePriorityDialog(
             PlayerSelectSourcePriorityBinding.inflate(LayoutInflater.from(ctx), null, false)
         setContentView(binding.root)
         fixSystemBarsPadding(binding.root)
+        val sourcesRecyclerView = binding.sortSources
+        val qualitiesRecyclerView = binding.sortQualities
+        val profileText = binding.profileTextEditable
+        val saveBtt = binding.saveBtt
+        val exitBtt = binding.closeBtt
+        val helpBtt = binding.helpBtt
 
-        binding.apply {
-            profileTextEditable.setText(
-                QualityDataHelper.getProfileName(profile.id).asString(context)
-            )
-            profileTextEditable.hint = txt(R.string.profile_number, profile.id).asString(context)
+        profileText.setText(QualityDataHelper.getProfileName(profile.id).asString(context))
+        profileText.hint = txt(R.string.profile_number, profile.id).asString(context)
 
-            sortSources.adapter = PriorityAdapter<Nothing?>(
+        sourcesRecyclerView.adapter = PriorityAdapter<Nothing?>(
         ).apply {
-                val sortedLinks = links.map { link ->
+            submitList(links.map { link ->
                 SourcePriority(
                     null,
                     link.source,
                     QualityDataHelper.getSourcePriority(profile.id, link.source)
                 )
-                }.distinctBy { it.name }.sortedBy { -it.priority }
-
-                submitList(sortedLinks)
+            }.distinctBy { it.name }.sortedBy { -it.priority })
         }
 
-            sortQualities.adapter = PriorityAdapter<Qualities>(
+        qualitiesRecyclerView.adapter = PriorityAdapter<Qualities>(
         ).apply {
             submitList(Qualities.entries.mapNotNull {
                 SourcePriority(
@@ -61,8 +62,8 @@ class SourcePriorityDialog(
 
         @Suppress("UNCHECKED_CAST") // We know the types
         saveBtt.setOnClickListener {
-                val qualityAdapter = sortQualities.adapter as? PriorityAdapter<Qualities>
-                val sourcesAdapter = sortSources.adapter as? PriorityAdapter<Nothing?>
+            val qualityAdapter = qualitiesRecyclerView.adapter as? PriorityAdapter<Qualities>
+            val sourcesAdapter = sourcesRecyclerView.adapter as? PriorityAdapter<Nothing?>
 
             val qualities = qualityAdapter?.immutableCurrentList ?: emptyList()
             val sources = sourcesAdapter?.immutableCurrentList ?: emptyList()
@@ -78,7 +79,7 @@ class SourcePriorityDialog(
             qualityAdapter?.submitList(qualities.sortedBy { -it.priority })
             sourcesAdapter?.submitList(sources.sortedBy { -it.priority })
 
-                val savedProfileName = profileTextEditable.text.toString()
+            val savedProfileName = profileText.text.toString()
             if (savedProfileName.isBlank()) {
                 QualityDataHelper.setProfileName(profile.id, null)
             } else {
@@ -87,8 +88,8 @@ class SourcePriorityDialog(
             updatedCallback.invoke()
         }
 
-            closeBtt.setOnClickListener {
-                dismissSafe()
+        exitBtt.setOnClickListener {
+            this.dismissSafe()
         }
 
         helpBtt.setOnClickListener {
@@ -97,10 +98,6 @@ class SourcePriorityDialog(
             }.show()
         }
 
-            settingsBtt.setOnClickListener {
-                SourceProfileSettingsDialog(ctx, themeRes, profile.id).show()
-            }
-        }
         super.show()
     }
 }

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

@@ -1,48 +0,0 @@
-package com.lagradost.cloudstream3.ui.player.source_priority
-
-import android.app.Dialog
-import android.content.Context
-import android.view.LayoutInflater
-import androidx.annotation.StyleRes
-import com.lagradost.cloudstream3.databinding.SourceProfileSettingsDialogBinding
-import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
-import com.lagradost.cloudstream3.utils.UIHelper.fixSystemBarsPadding
-
-class SourceProfileSettingsDialog(
-    val ctx: Context,
-    @StyleRes themeRes: Int,
-    val profile: Int
-) : Dialog(ctx, themeRes) {
-     override fun show() {
-         val binding =
-             SourceProfileSettingsDialogBinding.inflate(LayoutInflater.from(ctx), null, false)
-         setContentView(binding.root)
-         fixSystemBarsPadding(binding.root)
-
-         binding.apply {
-             var hideErrorSources = QualityDataHelper.getProfileSetting(profile, ProfileSettings.HideErrorSources)
-             var hideNegativeSources = QualityDataHelper.getProfileSetting(profile, ProfileSettings.HideNegativeSources)
-
-             profileHideErrorSources.isChecked = hideErrorSources
-             profileHideErrorSources.setOnCheckedChangeListener { _, bool ->
-                 hideErrorSources = bool
-             }
-
-             profileHideNegativeSources.isChecked = hideNegativeSources
-             profileHideNegativeSources.setOnCheckedChangeListener { _, bool ->
-                 hideNegativeSources = bool
-             }
-
-             applyBtt.setOnClickListener {
-                 QualityDataHelper.setProfileSetting(profile, ProfileSettings.HideErrorSources, hideErrorSources)
-                 QualityDataHelper.setProfileSetting(profile, ProfileSettings.HideNegativeSources, hideNegativeSources)
-                 dismissSafe()
-             }
-
-             cancelBtt.setOnClickListener {
-                 dismissSafe()
-             }
-         }
-         super.show()
-     }
-}

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

@@ -5,9 +5,6 @@ import android.content.Intent
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.view.animation.Animation
-import android.view.animation.OvershootInterpolator
-import android.view.animation.ScaleAnimation
 import androidx.core.view.isVisible
 import com.lagradost.cloudstream3.ActorData
 import com.lagradost.cloudstream3.ActorRole
@@ -49,24 +46,6 @@ class ActorAdaptor(
         }
     }
 
-    override fun onUpdateContent(holder: ViewHolderState<Any>, item: ActorData, position: Int) {
-        when (val binding = holder.view) {
-            is CastItemBinding -> {
-                val anim: Animation = ScaleAnimation(
-                    0.8f, 1f,
-                    0.8f, 1f,
-                    Animation.RELATIVE_TO_SELF, 0.5f,
-                    Animation.RELATIVE_TO_SELF, 0.5f
-                )
-                anim.fillAfter = true
-                anim.duration = 200
-                anim.interpolator = OvershootInterpolator()
-                binding.voiceActorImageHolder2.startAnimation(anim)
-            }
-        }
-        super.onUpdateContent(holder, item, position)
-    }
-
     override fun onBindContent(holder: ViewHolderState<Any>, item: ActorData, position: Int) {
         when (val binding = holder.view) {
             is CastItemBinding -> {

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

@@ -21,8 +21,6 @@ import com.lagradost.cloudstream3.utils.DataStoreHelper.getViewPos
 import com.lagradost.cloudstream3.utils.Event
 import com.lagradost.cloudstream3.utils.ImageLoader.loadImage
 import com.lagradost.cloudstream3.utils.UiImage
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
 
 const val START_ACTION_RESUME_LATEST = 1
 const val START_ACTION_LOAD_EP = 2
@@ -36,32 +34,33 @@ enum class VideoWatchState {
     Watched
 }
 
-@Serializable
 data class ResultEpisode(
-    @SerialName("headerName") val headerName: String,
-    @SerialName("name") val name: String?,
-    @SerialName("poster") val poster: String?,
-    @SerialName("episode") val episode: Int,
-    @SerialName("seasonIndex") val seasonIndex: Int?, // this is the "season" index used season names
-    @SerialName("season") val season: Int?, // this is the display
-    @SerialName("data") val data: String,
-    @SerialName("apiName") val apiName: String,
-    @SerialName("id") val id: Int,
-    @SerialName("index") val index: Int,
-    @SerialName("position") val position: Long, // time in MS
-    @SerialName("duration") val duration: Long, // duration in MS
-    @SerialName("score") val score: Score?,
-    @SerialName("description") val description: String?,
-    @SerialName("isFiller") val isFiller: Boolean?,
-    @SerialName("tvType") val tvType: TvType,
-    @SerialName("parentId") val parentId: Int,
-    /** Conveys if the episode itself is marked as watched. */
-    @SerialName("videoWatchState") val videoWatchState: VideoWatchState,
-    /** Sum of all previous season episode counts + episode. */
-    @SerialName("totalEpisodeIndex") val totalEpisodeIndex: Int? = null,
-    @SerialName("airDate") val airDate: Long? = null,
-    @SerialName("runTime") val runTime: Int? = null,
-    @SerialName("seasonData") val seasonData: SeasonData? = null,
+    val headerName: String,
+    val name: String?,
+    val poster: String?,
+    val episode: Int,
+    val seasonIndex: Int?,  // this is the "season" index used season names
+    val season: Int?, // this is the display
+    val data: String,
+    val apiName: String,
+    val id: Int,
+    val index: Int,
+    val position: Long, // time in MS
+    val duration: Long, // duration in MS
+    val score: Score?,
+    val description: String?,
+    val isFiller: Boolean?,
+    val tvType: TvType,
+    val parentId: Int,
+    /**
+     * Conveys if the episode itself is marked as watched
+     **/
+    val videoWatchState: VideoWatchState,
+    /** Sum of all previous season episode counts + episode */
+    val totalEpisodeIndex: Int? = null,
+    val airDate: Long? = null,
+    val runTime: Int? = null,
+    val seasonData: SeasonData? = null,
 )
 
 fun ResultEpisode.getRealPosition(): Long {

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

@@ -877,7 +877,7 @@ class ResultFragmentTv : BaseFragment<FragmentResultTvBinding>(
                         resultCastText.setText(d.actorsText)
                         resultNextAiring.setText(d.nextAiringEpisode)
                         resultNextAiringTime.setText(d.nextAiringDate)
-                        resultPoster.loadImage(d.posterImage, headers = d.posterHeaders)
+                        resultPoster.loadImage(d.posterImage)
 
                         var isExpanded = false
                         resultDescription.apply {
@@ -910,7 +910,7 @@ class ResultFragmentTv : BaseFragment<FragmentResultTvBinding>(
                             R.drawable.profile_bg_teal
                         ).random()
 
-                        backgroundPoster.loadImage(d.posterBackgroundImage, headers = d.posterHeaders) {
+                        backgroundPoster.loadImage(d.posterBackgroundImage) {
                             error { getImageFromDrawable(context ?: return@error null, error) }
                         }
 

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

@@ -83,7 +83,6 @@ 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
@@ -1325,7 +1324,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(
@@ -1686,13 +1685,14 @@ class ResultViewModel2 : ViewModel() {
                 }
 
                 val realRecommendations = ArrayList<SearchResponse>()
-                val apiNames = apis.filter {
+                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))

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

@@ -182,7 +182,6 @@ class SyncViewModel : ViewModel() {
     fun publishUserData() = ioSafe {
         Log.i(TAG, "publishUserData")
         val user = userData.value
-        _userDataResponse.postValue(Resource.Loading())
         if (user is Resource.Success) {
             syncs.forEach { (prefix, id) ->
                 repos.firstOrNull { it.idPrefix == prefix }?.updateStatus(id, user.value)

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

@@ -13,15 +13,12 @@ import com.lagradost.cloudstream3.ui.ViewHolderState
 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 kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
 
-@Serializable
 data class SearchHistoryItem(
-    @JsonProperty("searchedAt") @SerialName("searchedAt") val searchedAt: Long,
-    @JsonProperty("searchText") @SerialName("searchText") val searchText: String,
-    @JsonProperty("type") @SerialName("type") val type: List<TvType>,
-    @JsonProperty("key") @SerialName("key") val key: String,
+    @JsonProperty("searchedAt") val searchedAt: Long,
+    @JsonProperty("searchText") val searchText: String,
+    @JsonProperty("type") val type: List<TvType>,
+    @JsonProperty("key") val key: String,
 )
 
 data class SearchHistoryCallback(

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

@@ -4,8 +4,6 @@ import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.nicehttp.NiceResponse
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
 
 /**
  * API for fetching search suggestions from external sources.
@@ -15,18 +13,16 @@ object SearchSuggestionApi {
     private const val TMDB_API_URL = "https://api.themoviedb.org/3/search/multi"
     private const val TMDB_API_KEY = "e6333b32409e02a4a6eba6fb7ff866bb"
     
-    @Serializable
     data class TmdbSearchResult(
-        @JsonProperty("results") @SerialName("results") val results: List<TmdbSearchItem>?,
+        @JsonProperty("results") val results: List<TmdbSearchItem>?
     )
     
-    @Serializable
     data class TmdbSearchItem(
-        @JsonProperty("media_type") @SerialName("media_type") val mediaType: String?,
-        @JsonProperty("title") @SerialName("title") val title: String?,
-        @JsonProperty("name") @SerialName("name") val name: String?,
-        @JsonProperty("original_title") @SerialName("original_title") val originalTitle: String?,
-        @JsonProperty("original_name") @SerialName("original_name") val originalName: String?,
+        @JsonProperty("media_type") val mediaType: String?,
+        @JsonProperty("title") val title: String?,
+        @JsonProperty("name") val name: String?,
+        @JsonProperty("original_title") val originalTitle: String?,
+        @JsonProperty("original_name") val originalName: String?
     )
     
     /**
@@ -61,7 +57,7 @@ object SearchSuggestionApi {
      * Parses the TMDB search response and extracts movie/TV show titles.
      * Filters to only include movies, TV shows, and anime.
      */
-    private suspend fun parseSuggestions(response: NiceResponse): List<String> {
+    private fun parseSuggestions(response: NiceResponse): List<String> {
         return try {
             val parsed = response.parsed<TmdbSearchResult>()
             parsed.results

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

@@ -49,7 +49,7 @@ class SearchViewModel : ViewModel() {
 
     private var suggestionJob: Job? = null
 
-    private var repos = apis.withLock { apis.map { APIRepository(it) } }
+    private var repos = synchronized(apis) { apis.map { APIRepository(it) } }
 
     fun clearSearch() {
         _searchResponse.postValue(Resource.Success(ExpandableSearchList(emptyList(), 0, false)))
@@ -68,7 +68,7 @@ class SearchViewModel : ViewModel() {
     private var onGoingSearch: Job? = null
 
     fun reloadRepos() {
-        repos = apis.withLock { apis.map { APIRepository(it) } }
+        repos = synchronized(apis) { apis.map { APIRepository(it) } }
     }
 
     fun searchAndCancel(

app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsAccount.kt

@@ -65,8 +65,6 @@ import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialogTe
 import com.lagradost.cloudstream3.utils.UIHelper.colorFromAttribute
 import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
 import com.lagradost.cloudstream3.utils.UIHelper.hideKeyboard
-import com.lagradost.cloudstream3.utils.UIHelper.hideProgress
-import com.lagradost.cloudstream3.utils.UIHelper.showProgress
 import com.lagradost.cloudstream3.utils.setText
 import com.lagradost.cloudstream3.utils.txt
 import qrcode.QRCode
@@ -350,7 +348,6 @@ class SettingsAccount : BasePreferenceFragmentCompat(), BiometricCallback {
                     email = if (req.email) binding.loginEmailInput.text?.toString() else null,
                     server = if (req.server) binding.loginServerInput.text?.toString() else null,
                 )
-                binding.applyBtt.showProgress()
                 ioSafe {
                     try {
                         if (api.login(loginData)) {
@@ -380,8 +377,6 @@ class SettingsAccount : BasePreferenceFragmentCompat(), BiometricCallback {
                                 api.name
                             )
                         )
-                    } finally {
-                        binding.applyBtt.hideProgress()
                     }
                 }
             }

app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsFragment.kt

@@ -249,7 +249,7 @@ class SettingsFragment : BaseFragment<MainSettingsBinding>(
 
         val appVersion = BuildConfig.VERSION_NAME
         val commitHash = activity?.currentCommitHash() ?: ""
-        val buildTimestamp = SimpleDateFormat.getDateTimeInstance(DateFormat.LONG, DateFormat.MEDIUM,
+        val buildTimestamp = SimpleDateFormat.getDateTimeInstance(DateFormat.LONG, DateFormat.LONG,
             Locale.getDefault()
         ).apply { timeZone = TimeZone.getTimeZone("UTC")
         }.format(Date(BuildConfig.BUILD_DATE)).replace("UTC", "")

app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt

@@ -10,7 +10,6 @@ import androidx.core.content.edit
 import androidx.core.os.ConfigurationCompat
 import androidx.fragment.app.Fragment
 import androidx.preference.PreferenceManager
-import com.fasterxml.jackson.annotation.JsonAlias
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.cloudstream3.APIHolder.allProviders
 import com.lagradost.cloudstream3.CloudStreamApp
@@ -49,10 +48,6 @@ import com.lagradost.cloudstream3.utils.USER_PROVIDER_API
 import com.lagradost.cloudstream3.utils.downloader.DownloadFileManagement
 import com.lagradost.cloudstream3.utils.downloader.DownloadFileManagement.getBasePath
 import com.lagradost.cloudstream3.utils.downloader.DownloadQueueManager
-import kotlinx.serialization.ExperimentalSerializationApi
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.json.JsonNames
 import java.util.Locale
 
 // Change local language settings in the app.
@@ -77,7 +72,6 @@ val appLanguages = arrayListOf(
     Pair("Azərbaycan dili", "az"),
     Pair("Bahasa Indonesia", "in"),
     Pair("Bahasa Melayu", "ms"),
-    Pair("català", "ca"),
     Pair("Deutsch", "de"),
     Pair("English", "en"),
     Pair("Español", "es"),
@@ -98,7 +92,6 @@ val appLanguages = arrayListOf(
     Pair("Português", "pt"),
     Pair("Português (Brasil)", "pt-BR"),
     Pair("Română", "ro"),
-    Pair("Shqip мова", "sq"),
     Pair("Slovenčina", "sk"),
     Pair("Soomaaliga", "so"),
     Pair("Svenska", "sv"),
@@ -108,7 +101,6 @@ val appLanguages = arrayListOf(
     Pair("Wikang Filipino", "fil"),
     Pair("Čeština", "cs"),
     Pair("Ελληνικά", "el"),
-    Pair("беларуская мова", "be"),
     Pair("български", "bg"),
     Pair("македонски", "mk"),
     Pair("русский", "ru"),
@@ -142,7 +134,7 @@ fun Pair<String, String>.nameNextToFlagEmoji(): String {
     // fallback to [A][A] -> [?] question mak flag
     val flag = SubtitleHelper.getFlagFromIso(this.second) ?: "\ud83c\udde6\ud83c\udde6"
 
-    return "$flag\u00a0${this.first}" // \u00a0 non-breaking space
+    return "$flag\u00a0${this.first}" // \u00a0 non-breaking space
 }
 
 class SettingsGeneral : BasePreferenceFragmentCompat() {
@@ -153,15 +145,15 @@ class SettingsGeneral : BasePreferenceFragmentCompat() {
         setToolBarScrollFlags()
     }
 
-    @OptIn(ExperimentalSerializationApi::class) // JsonNames is an experimental annotation for now
-    @Serializable
     data class CustomSite(
-        @JsonProperty("parentClassName") @JsonAlias("parentJavaClass")
-        @SerialName("parentClassName") @JsonNames("parentJavaClass")
-        val parentClassName: String, // ::class.simpleName
-        @JsonProperty("name") @SerialName("name") val name: String,
-        @JsonProperty("url") @SerialName("url") val url: String,
-        @JsonProperty("lang") @SerialName("lang") val lang: String,
+        @JsonProperty("parentJavaClass") // javaClass.simpleName
+        val parentJavaClass: String,
+        @JsonProperty("name")
+        val name: String,
+        @JsonProperty("url")
+        val url: String,
+        @JsonProperty("lang")
+        val lang: String,
     )
 
     companion object {
@@ -227,7 +219,7 @@ class SettingsGeneral : BasePreferenceFragmentCompat() {
         }
 
         fun showAdd() {
-            val providers = allProviders.distinctBy { it::class }.sortedBy { it.name }
+            val providers = synchronized(allProviders) { allProviders.distinctBy { it.javaClass }.sortedBy { it.name } }
             activity?.showDialog(
                 providers.map { "${it.name} (${it.mainUrl})" },
                 -1,
@@ -251,14 +243,13 @@ class SettingsGeneral : BasePreferenceFragmentCompat() {
                     val url = binding.siteUrlInput.text?.toString()
                     val lang = binding.siteLangInput.text?.toString()
                     val realLang = if (lang.isNullOrBlank()) provider.lang else lang
-                    val simpleName = provider::class.simpleName
-                    if (url.isNullOrBlank() || name.isNullOrBlank() || simpleName == null) {
+                    if (url.isNullOrBlank() || name.isNullOrBlank()) {
                         showToast(R.string.error_invalid_data, Toast.LENGTH_SHORT)
                         return@setOnClickListener
                     }
 
                     val current = getCurrent()
-                    val newSite = CustomSite(simpleName, name, url, realLang)
+                    val newSite = CustomSite(provider.javaClass.simpleName, name, url, realLang)
                     current.add(newSite)
                     setKey(USER_PROVIDER_API, current.toTypedArray())
                     // reload apis
@@ -362,7 +353,7 @@ class SettingsGeneral : BasePreferenceFragmentCompat() {
             } ?: emptyList()
         }
 
-        settingsManager.edit { putBoolean(getString(R.string.jsdelivr_proxy_key), getKey<Boolean>(getString(R.string.jsdelivr_proxy_key), false) ?: false) }
+        settingsManager.edit { putBoolean(getString(R.string.jsdelivr_proxy_key), getKey(getString(R.string.jsdelivr_proxy_key), false) ?: false) }
         getPref(R.string.jsdelivr_proxy_key)?.setOnPreferenceChangeListener { _, newValue ->
             setKey(getString(R.string.jsdelivr_proxy_key), newValue)
             return@setOnPreferenceChangeListener true

app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsPlayer.kt

@@ -205,35 +205,29 @@ class SettingsPlayer : BasePreferenceFragmentCompat() {
         }
 
         getPref(R.string.player_default_key)?.setOnPreferenceClickListener {
-            // Pair each player with its display name, dropping any with none,
-            // which would mean something is definitely wrong.
-            val players = VideoClickActionHolder.getPlayers(activity).mapNotNull { player ->
-                (player.name.asStringNull(activity) ?: player::class.simpleName)?.let { player to it }
-            }
-
+            val players = VideoClickActionHolder.getPlayers(activity)
             val prefNames = buildList {
-                add(getString(R.string.player_settings_play_in_app)) // built-in player display name
-                addAll(players.map { (_, name) -> name })
+                add(getString(R.string.player_settings_play_in_app))
+                addAll(players.map { it.name.asStringNull(activity) ?: it.javaClass.simpleName })
             }
-
             val prefValues = buildList {
-                add("") // "" = built-in player, matches default
-                addAll(players.map { (player, _) -> player.uniqueId() })
+                add("")
+                addAll(players.map { it.uniqueId() })
             }
+            val current =
+                settingsManager.getString(getString(R.string.player_default_key), "") ?: ""
 
-            val current = settingsManager.getString(getString(R.string.player_default_key), "") ?: ""
             activity?.showBottomDialog(
                 prefNames.toList(),
-                prefValues.indexOf(current), // finds index of currently selected player
+                prefValues.indexOf(current),
                 getString(R.string.player_pref),
                 true,
-                {},
+                {}
             ) {
                 settingsManager.edit {
                     putString(getString(R.string.player_default_key), prefValues[it])
                 }
             }
-
             return@setOnPreferenceClickListener true
         }
 

app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsProviders.kt

@@ -111,10 +111,10 @@ class SettingsProviders : BasePreferenceFragmentCompat() {
 
         getPref(R.string.provider_lang_key)?.setOnPreferenceClickListener {
             activity?.getApiProviderLangSettings()?.let { currentLangTags ->
-                val languagesTagName = APIHolder.apis.withLock {
+                val languagesTagName = synchronized(APIHolder.apis) {
                     listOf( Pair(AllLanguagesName, getString(R.string.all_languages_preference)) ) +
                     APIHolder.apis.map { Pair(it.lang, getNameNextToFlagEmoji(it.lang) ?: it.lang) }
-                            .toSet().sortedBy { it.second.substringAfter("\u00a0").lowercase() }
+                        .toSet().sortedBy { it.second.substringAfter("\u00a0").lowercase() } // name ignoring flag emoji
                 }
 
                 val currentIndexList = currentLangTags.map { langTag ->

app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUI.kt

@@ -228,8 +228,6 @@ class SettingsUI : BasePreferenceFragmentCompat() {
             return@setOnPreferenceClickListener true
         }
 
-        getPref(R.string.tv_layout_clock_key)?.hideOn(PHONE or EMULATOR)
-
         getPref(R.string.confirm_exit_key)?.setOnPreferenceClickListener {
             val prefNames = resources.getStringArray(R.array.confirm_exit)
             val prefValues = resources.getIntArray(R.array.confirm_exit_values)

app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/ExtensionsFragment.kt

@@ -5,12 +5,10 @@ import android.content.Context
 import android.content.DialogInterface
 import android.os.Build
 import android.view.LayoutInflater
-import android.view.MenuItem
 import android.view.View
 import android.widget.LinearLayout
 import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
-import androidx.appcompat.widget.SearchView
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import androidx.core.view.marginBottom
@@ -28,7 +26,6 @@ import com.lagradost.cloudstream3.plugins.RepositoryManager
 import com.lagradost.cloudstream3.ui.BaseFragment
 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.TV
 import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setSystemBarsPadding
@@ -39,8 +36,6 @@ import com.lagradost.cloudstream3.utils.AppContextUtils.setDefaultFocus
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
 import com.lagradost.cloudstream3.utils.Coroutines.main
 import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
-import com.lagradost.cloudstream3.utils.UIHelper.hideProgress
-import com.lagradost.cloudstream3.utils.UIHelper.showProgress
 import com.lagradost.cloudstream3.utils.setText
 
 class ExtensionsFragment : BaseFragment<FragmentExtensionsBinding>(
@@ -48,7 +43,6 @@ class ExtensionsFragment : BaseFragment<FragmentExtensionsBinding>(
 ) {
 
     private val extensionViewModel: ExtensionsViewModel by activityViewModels()
-    private val pluginViewModel: PluginsViewModel by activityViewModels()
 
     private fun View.setLayoutWidth(weight: Int) {
         val param = LinearLayout.LayoutParams(
@@ -116,7 +110,11 @@ class ExtensionsFragment : BaseFragment<FragmentExtensionsBinding>(
             adapter = RepoAdapter(false, {
                 findNavController().navigate(
                     R.id.navigation_settings_extensions_to_navigation_settings_plugins,
-                    PluginsFragment.newInstance(it)
+                    PluginsFragment.newInstance(
+                        it.name,
+                        it.url,
+                        false
+                    )
                 )
             }, { repo ->
                 // Prompt user before deleting repo
@@ -128,10 +126,7 @@ class ExtensionsFragment : BaseFragment<FragmentExtensionsBinding>(
                             when (which) {
                                 DialogInterface.BUTTON_POSITIVE -> {
                                     ioSafe {
-                                        RepositoryManager.removeRepository(
-                                            uiContext.applicationContext,
-                                            repo
-                                        )
+                                        RepositoryManager.removeRepository(uiContext.applicationContext, repo)
                                         extensionViewModel.loadStats()
                                         extensionViewModel.loadRepositories()
                                     }
@@ -150,11 +145,10 @@ class ExtensionsFragment : BaseFragment<FragmentExtensionsBinding>(
             })
         }
 
-        observe(extensionViewModel.repositories) { repos ->
-            binding.repoRecyclerView.isVisible = repos.isNotEmpty()
-            binding.blankRepoScreen.isVisible = repos.isEmpty()
-            (binding.repoRecyclerView.adapter as? RepoAdapter)?.submitList(repos.toList())
-            pluginViewModel.updatePluginList(binding.root.context, repos.toList())
+        observe(extensionViewModel.repositories) {
+            binding.repoRecyclerView.isVisible = it.isNotEmpty()
+            binding.blankRepoScreen.isVisible = it.isEmpty()
+            (binding.repoRecyclerView.adapter as? RepoAdapter)?.submitList(it.toList())
         }
 
         observeNullable(extensionViewModel.pluginStats) { value ->
@@ -183,75 +177,14 @@ class ExtensionsFragment : BaseFragment<FragmentExtensionsBinding>(
         binding.pluginStorageAppbar.setOnClickListener {
             findNavController().navigate(
                 R.id.navigation_settings_extensions_to_navigation_settings_plugins,
-                PluginsFragment.newLocalInstance(
+                PluginsFragment.newInstance(
                     getString(R.string.extensions),
+                    "",
+                    true
                 )
             )
         }
 
-        binding.pluginRecyclerView.apply {
-            setLinearListLayout(
-                isHorizontal = false,
-                nextDown = FOCUS_SELF,
-                nextRight = FOCUS_SELF,
-            )
-            setRecycledViewPool(PluginAdapter.sharedPool)
-            adapter =
-                PluginAdapter(true) {
-                    val urls = extensionViewModel.repositories.value?.toList() ?: emptyList()
-                    pluginViewModel.handlePluginAction(activity, urls, it, false)
-                }
-        }
-
-        observe(pluginViewModel.filteredPlugins) { (scrollToTop, list) ->
-            (binding.pluginRecyclerView.adapter as? PluginAdapter)?.submitList(list)
-            if (scrollToTop) {
-                binding.pluginRecyclerView.scrollToPosition(0)
-            }
-        }
-
-        binding.settingsToolbar.apply {
-            val searchItem = menu?.findItem(R.id.search_button)
-            val searchView = searchItem?.actionView as? SearchView
-
-            searchItem?.setOnActionExpandListener(object : MenuItem.OnActionExpandListener {
-                override fun onMenuItemActionCollapse(p0: MenuItem): Boolean {
-                    binding.pluginRecyclerView.isVisible = false
-                    binding.repoRecyclerView.isVisible = true
-                    return true
-
-                }
-
-                override fun onMenuItemActionExpand(p0: MenuItem): Boolean {
-                    binding.pluginRecyclerView.isVisible = true
-                    binding.repoRecyclerView.isVisible = false
-                    return true
-                }
-            })
-
-            // Don't go back if active query
-            setNavigationOnClickListener {
-                if (searchView?.isIconified == false) {
-                    searchView.isIconified = true
-                } else {
-                    dispatchBackPressed()
-                }
-            }
-
-            searchView?.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
-                override fun onQueryTextSubmit(query: String?): Boolean {
-                    pluginViewModel.search(query)
-                    return true
-                }
-
-                override fun onQueryTextChange(newText: String?): Boolean {
-                    pluginViewModel.search(newText)
-                    return true
-                }
-            })
-        }
-
-
         val addRepositoryClick = View.OnClickListener {
             val ctx = context ?: return@OnClickListener
             val binding = AddRepoInputBinding.inflate(LayoutInflater.from(ctx), null, false)
@@ -266,10 +199,7 @@ class ExtensionsFragment : BaseFragment<FragmentExtensionsBinding>(
             )?.text?.toString()?.let { copiedText ->
                 if (copiedText.contains(RepoAdapter.SHAREABLE_REPO_SEPARATOR)) {
                     // text is of format <repository name> : <repository url>
-                    val (name, url) = copiedText.split(
-                        RepoAdapter.SHAREABLE_REPO_SEPARATOR,
-                        limit = 2
-                    )
+                    val (name, url) = copiedText.split(RepoAdapter.SHAREABLE_REPO_SEPARATOR, limit = 2)
                     binding.repoUrlInput.setText(url.trim())
                     binding.repoNameInput.setText(name.trim())
                 } else {
@@ -280,18 +210,13 @@ class ExtensionsFragment : BaseFragment<FragmentExtensionsBinding>(
             binding.applyBtt.setOnClickListener secondListener@{
                 val name = binding.repoNameInput.text?.toString()
                 val urlInput = binding.repoUrlInput.text?.toString()
-                if (urlInput.isNullOrEmpty()) {
-                    showToast(R.string.error_invalid_url, Toast.LENGTH_SHORT)
-                    return@secondListener
-                }
-                binding.applyBtt.showProgress()
                 ioSafe {
-                    try {
-                        val url = RepositoryManager.parseRepoUrl(urlInput)
+                    val url = urlInput?.let { it1 -> RepositoryManager.parseRepoUrl(it1) }
                     if (url.isNullOrBlank()) {
+                        main {
                             showToast(R.string.error_invalid_data, Toast.LENGTH_SHORT)
-                            return@ioSafe
                         }
+                    } else {
                         val repository = RepositoryManager.parseRepository(url)
 
                         // Exit if wrong repository
@@ -307,28 +232,24 @@ class ExtensionsFragment : BaseFragment<FragmentExtensionsBinding>(
                         extensionViewModel.loadStats()
                         extensionViewModel.loadRepositories()
 
-                        dialog.dismissSafe(activity) // Only dismiss if the repo was added
-
-                        val plugins = RepositoryManager.getRepoPlugins(newRepo)
+                        val plugins = RepositoryManager.getRepoPlugins(url)
                         if (plugins.isNullOrEmpty()) {
                             showToast(R.string.no_plugins_found_error, Toast.LENGTH_LONG)
-                            return@ioSafe
-                        }
-
+                        } else {
                             this@ExtensionsFragment.activity?.addRepositoryDialog(
-                            newRepo
+                                fixedName,
+                                url,
                             )
-                    } finally {
-                        binding.applyBtt.hideProgress()
                         }
                     }
                 }
+                dialog.dismissSafe(activity)
+            }
             binding.cancelBtt.setOnClickListener {
                 dialog.dismissSafe(activity)
             }
         }
 
-
         val isTv = isLayout(TV)
         binding.apply {
             addRepoButton.isGone = isTv

app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/ExtensionsViewModel.kt

@@ -15,14 +15,11 @@ import com.lagradost.cloudstream3.plugins.RepositoryManager.PREBUILT_REPOSITORIE
 import com.lagradost.cloudstream3.utils.UiText
 import com.lagradost.cloudstream3.utils.txt
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
 
-@Serializable
 data class RepositoryData(
-    @JsonProperty("iconUrl") @SerialName("iconUrl") val iconUrl: String?,
-    @JsonProperty("name") @SerialName("name") val name: String,
-    @JsonProperty("url") @SerialName("url") val url: String,
+    @JsonProperty("iconUrl") val iconUrl: String?,
+    @JsonProperty("name") val name: String,
+    @JsonProperty("url") val url: String
 ){
     constructor(name: String,url: String):this(null,name,url)
 }
@@ -55,16 +52,16 @@ class ExtensionsViewModel : ViewModel() {
             ?: emptyArray()) + PREBUILT_REPOSITORIES
 
         val onlinePlugins = urls.toList().amap {
-            RepositoryManager.getRepoPlugins(it)?.toList() ?: emptyList()
-        }.flatten().distinctBy { it.plugin.url }
+            RepositoryManager.getRepoPlugins(it.url)?.toList() ?: emptyList()
+        }.flatten().distinctBy { it.second.url }
 
         // Iterates over all offline plugins, compares to remote repo and returns the plugins which are outdated
-        val outdatedPlugins = getPluginsOnline().flatMap { savedData ->
-            onlinePlugins.filter { onlineData -> savedData.internalName == onlineData.plugin.internalName }
+        val outdatedPlugins = getPluginsOnline().map { savedData ->
+            onlinePlugins.filter { onlineData -> savedData.internalName == onlineData.second.internalName }
                 .map { onlineData ->
                     PluginManager.OnlinePluginData(savedData, onlineData)
                 }
-        }.distinctBy { it.onlineData.plugin.url }
+        }.flatten().distinctBy { it.onlineData.second.url }
 
         val total = onlinePlugins.count()
         val disabled = outdatedPlugins.count { it.isDisabled }

app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginAdapter.kt

@@ -15,7 +15,6 @@ import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.TvType
 import com.lagradost.cloudstream3.databinding.RepositoryItemBinding
 import com.lagradost.cloudstream3.plugins.PluginManager
-import com.lagradost.cloudstream3.plugins.PluginWrapper
 import com.lagradost.cloudstream3.ui.BaseDiffCallback
 import com.lagradost.cloudstream3.ui.NoStateAdapter
 import com.lagradost.cloudstream3.ui.ViewHolderState
@@ -35,7 +34,7 @@ import kotlin.math.log10
 import kotlin.math.pow
 
 data class PluginViewData(
-    val pluginWrapper: PluginWrapper,
+    val plugin: Plugin,
     val isDownloaded: Boolean,
 )
 
@@ -45,9 +44,9 @@ class RepositoryViewHolderState(view: ViewBinding) : ViewHolderState<Any>(view)
 }
 
 class PluginAdapter(
-    val showRepositoryNames: Boolean = false, val iconClickCallback: (PluginWrapper) -> Unit,
+    val iconClickCallback: (Plugin) -> Unit
 ) : NoStateAdapter<PluginViewData>(diffCallback = BaseDiffCallback(itemSame = { a, b ->
-    a.pluginWrapper.plugin.internalName == b.pluginWrapper.plugin.internalName && a.pluginWrapper.repositoryData.url == b.pluginWrapper.repositoryData.url
+    a.plugin.second.internalName == b.plugin.second.internalName && a.plugin.first == b.plugin.first
 })) {
     override fun onCreateContent(parent: ViewGroup): ViewHolderState<Any> {
         val layout = if (isLayout(TV)) R.layout.repository_item_tv else R.layout.repository_item
@@ -74,22 +73,14 @@ class PluginAdapter(
         val binding = holder.view as? RepositoryItemBinding ?: return
         val itemView = holder.itemView
 
-        val metadata = item.pluginWrapper.plugin
+        val metadata = item.plugin.second
         val disabled = metadata.status == PROVIDER_STATUS_DOWN
         val name = metadata.name.removeSuffix("Provider")
         val alpha = if (disabled) 0.6f else 1f
-        val isLocal = !item.pluginWrapper.plugin.url.startsWith("http")
+        val isLocal = !item.plugin.second.url.startsWith("http")
         binding.mainText.alpha = alpha
         binding.subText.alpha = alpha
 
-        binding.repositoryNameText.isVisible = showRepositoryNames
-        if (showRepositoryNames) {
-            val name = item.pluginWrapper.repositoryData.name
-            binding.repositoryNameText.text = name
-        } else {
-            binding.repositoryNameText.text = ""
-        }
-
         val drawableInt = if (item.isDownloaded)
             R.drawable.ic_baseline_delete_outline_24
         else R.drawable.netflix_download
@@ -98,7 +89,7 @@ class PluginAdapter(
         binding.actionButton.setImageResource(drawableInt)
 
         binding.actionButton.setOnClickListener {
-            iconClickCallback.invoke(item.pluginWrapper)
+            iconClickCallback.invoke(item.plugin)
         }
         itemView.setOnClickListener {
             if (isLocal) return@setOnClickListener

app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginDetailsFragment.kt

@@ -54,7 +54,7 @@ class PluginDetailsFragment(val data: PluginViewData) : BaseBottomSheetDialogFra
     }
 
     override fun onBindingCreated(binding: FragmentPluginDetailsBinding) {
-        val metadata = data.pluginWrapper.plugin
+        val metadata = data.plugin.second
         binding.apply {
             pluginIcon.loadImage(metadata.iconUrl?.replace("%size%", "$iconSize")
                 ?.replace("%exact_size%", "$iconSizeExact")) {
@@ -135,7 +135,7 @@ class PluginDetailsFragment(val data: PluginViewData) : BaseBottomSheetDialogFra
     }
 
     private fun updateVoting(value: Int) {
-        val metadata = data.pluginWrapper.plugin
+        val metadata = data.plugin.second
         binding?.apply {
             pluginVotes.text = value.toString()
             if (metadata.hasVoted()) {

app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsFragment.kt

@@ -4,13 +4,13 @@ import android.os.Bundle
 import android.view.View
 import androidx.appcompat.widget.SearchView
 import androidx.core.view.isVisible
-import androidx.lifecycle.ViewModelProvider
+import androidx.fragment.app.activityViewModels
 import com.lagradost.cloudstream3.AllLanguagesName
 import com.lagradost.cloudstream3.BuildConfig
-import com.lagradost.cloudstream3.R
-import com.lagradost.cloudstream3.TvType
 import com.lagradost.cloudstream3.databinding.FragmentPluginsBinding
 import com.lagradost.cloudstream3.mvvm.observe
+import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.TvType
 import com.lagradost.cloudstream3.ui.BaseFragment
 import com.lagradost.cloudstream3.ui.home.HomeFragment.Companion.bindChips
 import com.lagradost.cloudstream3.ui.result.FOCUS_SELF
@@ -23,19 +23,19 @@ import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setSyst
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setToolBarScrollFlags
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setUpToolbar
 import com.lagradost.cloudstream3.utils.AppContextUtils.getApiProviderLangSettings
-import com.lagradost.cloudstream3.utils.AppUtils.toJson
-import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
 import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showMultiDialog
 import com.lagradost.cloudstream3.utils.SubtitleHelper.getNameNextToFlagEmoji
 import com.lagradost.cloudstream3.utils.UIHelper.toPx
 
-const val PLUGINS_BUNDLE_DATA = "data"
+const val PLUGINS_BUNDLE_NAME = "name"
+const val PLUGINS_BUNDLE_URL = "url"
 const val PLUGINS_BUNDLE_LOCAL = "isLocal"
 
 class PluginsFragment : BaseFragment<FragmentPluginsBinding>(
     BaseFragment.BindingCreator.Inflate(FragmentPluginsBinding::inflate)
 ) {
-    private lateinit var pluginViewModel: PluginsViewModel
+
+    private val pluginViewModel: PluginsViewModel by activityViewModels()
 
     override fun onDestroyView() {
         pluginViewModel.clear() // clear for the next observe
@@ -47,8 +47,6 @@ class PluginsFragment : BaseFragment<FragmentPluginsBinding>(
     }
 
     override fun onBindingCreated(binding: FragmentPluginsBinding) {
-        pluginViewModel = ViewModelProvider(this)[PluginsViewModel::class.java]
-
         // Since the ViewModel is getting reused the tvTypes must be cleared between uses
         pluginViewModel.tvTypes.clear()
         pluginViewModel.selectedLanguages = listOf()
@@ -62,25 +60,24 @@ class PluginsFragment : BaseFragment<FragmentPluginsBinding>(
             }
         }
 
-        val repositoryData = arguments?.getString(PLUGINS_BUNDLE_DATA)?.let { data ->
-            tryParseJson<RepositoryData>(data)
-        }
+        val name = arguments?.getString(PLUGINS_BUNDLE_NAME)
+        val url = arguments?.getString(PLUGINS_BUNDLE_URL)
         val isLocal = arguments?.getBoolean(PLUGINS_BUNDLE_LOCAL) == true
         // download all extensions button
         val downloadAllButton = binding.settingsToolbar.menu?.findItem(R.id.download_all)
 
-        if (repositoryData == null) {
+        if (url == null || name == null) {
             dispatchBackPressed()
             return
         }
 
         setToolBarScrollFlags()
-        setUpToolbar(repositoryData.name)
+        setUpToolbar(name)
         binding.settingsToolbar.apply {
             setOnMenuItemClickListener { menuItem ->
                 when (menuItem?.itemId) {
                     R.id.download_all -> {
-                        PluginsViewModel.downloadAll(activity, repositoryData, pluginViewModel)
+                        PluginsViewModel.downloadAll(activity, url, pluginViewModel)
                     }
 
                     R.id.lang_filter -> {
@@ -133,6 +130,9 @@ class PluginsFragment : BaseFragment<FragmentPluginsBinding>(
                     dispatchBackPressed()
                 }
             }
+            searchView?.setOnQueryTextFocusChangeListener { _, hasFocus ->
+                if (!hasFocus) pluginViewModel.search(null)
+            }
 
             searchView?.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
                 override fun onQueryTextSubmit(query: String?): Boolean {
@@ -161,7 +161,7 @@ class PluginsFragment : BaseFragment<FragmentPluginsBinding>(
             setRecycledViewPool(PluginAdapter.sharedPool)
             adapter =
                 PluginAdapter {
-                    pluginViewModel.handlePluginAction(activity, listOf(repositoryData), it, isLocal)
+                    pluginViewModel.handlePluginAction(activity, url, it, isLocal)
                 }
         }
 
@@ -185,7 +185,7 @@ class PluginsFragment : BaseFragment<FragmentPluginsBinding>(
 
             binding.tvtypesChipsScroll.root.isVisible = false
         } else {
-            pluginViewModel.updatePluginList(context, listOf(repositoryData))
+            pluginViewModel.updatePluginList(context, url)
             binding.tvtypesChipsScroll.root.isVisible = true
             // not needed for users but may be useful for devs
             downloadAllButton?.isVisible = BuildConfig.DEBUG
@@ -206,17 +206,21 @@ class PluginsFragment : BaseFragment<FragmentPluginsBinding>(
     }
 
     companion object {
-        fun newInstance(repositoryData: RepositoryData): Bundle {
+        fun newInstance(name: String, url: String, isLocal: Boolean): Bundle {
             return Bundle().apply {
-                putString(PLUGINS_BUNDLE_DATA, repositoryData.toJson())
-                putBoolean(PLUGINS_BUNDLE_LOCAL, false)
-            }
-        }
-         fun newLocalInstance(name: String): Bundle {
-            return Bundle().apply {
-                putString(PLUGINS_BUNDLE_DATA, RepositoryData("", name, "").toJson())
-                putBoolean(PLUGINS_BUNDLE_LOCAL, true)
+                putString(PLUGINS_BUNDLE_NAME, name)
+                putString(PLUGINS_BUNDLE_URL, url)
+                putBoolean(PLUGINS_BUNDLE_LOCAL, isLocal)
             }
         }
+
+//        class RepoSearchView(context: Context) : android.widget.SearchView(context) {
+//            var onActionViewCollapsed = {}
+//
+//            override fun onActionViewCollapsed() {
+//                onActionViewCollapsed()
+//            }
+//        }
+
     }
 }

app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsViewModel.kt

@@ -17,15 +17,17 @@ import com.lagradost.cloudstream3.amap
 import com.lagradost.cloudstream3.mvvm.launchSafe
 import com.lagradost.cloudstream3.plugins.PluginManager
 import com.lagradost.cloudstream3.plugins.PluginManager.getPluginPath
-import com.lagradost.cloudstream3.plugins.PluginWrapper
 import com.lagradost.cloudstream3.plugins.RepositoryManager
+import com.lagradost.cloudstream3.plugins.SitePlugin
 import com.lagradost.cloudstream3.utils.txt
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
 import com.lagradost.cloudstream3.utils.Coroutines.main
 import com.lagradost.cloudstream3.utils.Coroutines.runOnMainThread
-import com.lagradost.cloudstream3.utils.Levenshtein
+import me.xdrop.fuzzywuzzy.FuzzySearch
 import java.io.File
 
+// String => repository url
+typealias Plugin = Pair<String, SitePlugin>
 /**
  * The boolean signifies if the plugin list should be scrolled to the top, used for searching.
  * */
@@ -38,7 +40,7 @@ class PluginsViewModel : ViewModel() {
         set(value) {
             // Also set all the plugin languages for easier filtering
             value.map { pluginViewData ->
-                val language = pluginViewData.pluginWrapper.plugin.language?.lowercase()
+                val language = pluginViewData.plugin.second.language?.lowercase()
                 pluginLanguages.add(
                     when {
                         language.isNullOrBlank() -> "none"
@@ -60,7 +62,7 @@ class PluginsViewModel : ViewModel() {
     private var currentQuery: String? = null
 
     companion object {
-        private val repositoryCache: MutableMap<String, List<PluginWrapper>> = mutableMapOf()
+        private val repositoryCache: MutableMap<String, List<Plugin>> = mutableMapOf()
         const val TAG = "PLG"
 
         private fun isDownloaded(
@@ -72,33 +74,32 @@ class PluginsViewModel : ViewModel() {
         }
 
         private suspend fun getPlugins(
-            repository: RepositoryData,
+            repositoryUrl: String,
             canUseCache: Boolean = true
-        ): List<PluginWrapper> {
-            Log.i(TAG, "getPlugins = $repository")
-            if (canUseCache && repositoryCache.containsKey(repository.url)) {
-                repositoryCache[repository.url]?.let {
+        ): List<Plugin> {
+            Log.i(TAG, "getPlugins = $repositoryUrl")
+            if (canUseCache && repositoryCache.containsKey(repositoryUrl)) {
+                repositoryCache[repositoryUrl]?.let {
                     return it
                 }
             }
-
-            return RepositoryManager.getRepoPlugins(repository)
-                ?.also { repositoryCache[repository.url] = it } ?: emptyList()
+            return RepositoryManager.getRepoPlugins(repositoryUrl)
+                ?.also { repositoryCache[repositoryUrl] = it } ?: emptyList()
         }
 
         /**
          * @param viewModel optional, updates the plugins livedata for that viewModel if included
          * */
-        fun downloadAll(activity: Activity?, repository: RepositoryData, viewModel: PluginsViewModel?) =
+        fun downloadAll(activity: Activity?, repositoryUrl: String, viewModel: PluginsViewModel?) =
             ioSafe {
                 if (activity == null) return@ioSafe
-                val plugins = getPlugins(repository)
+                val plugins = getPlugins(repositoryUrl)
 
-                plugins.filter { pluginWrapper ->
+                plugins.filter { plugin ->
                     !isDownloaded(
                         activity,
-                        pluginWrapper.plugin.internalName,
-                        repository.url
+                        plugin.second.internalName,
+                        repositoryUrl
                     )
                 }.also { list ->
                     main {
@@ -123,13 +124,13 @@ class PluginsViewModel : ViewModel() {
                             Toast.LENGTH_SHORT
                         )
                     }
-                }.amap { (_, repo, metadata) ->
+                }.amap { (repo, metadata) ->
                     PluginManager.downloadPlugin(
                         activity,
                         metadata.url,
                         metadata.fileHash,
                         metadata.internalName,
-                        repo.url,
+                        repo,
                         metadata.status != PROVIDER_STATUS_DOWN
                     )
                 }.main { list ->
@@ -142,7 +143,7 @@ class PluginsViewModel : ViewModel() {
                             ),
                             Toast.LENGTH_SHORT
                         )
-                        viewModel?.updatePluginListPrivate(activity, listOf(repository))
+                        viewModel?.updatePluginListPrivate(activity, repositoryUrl)
                     } else if (list.isNotEmpty()) {
                         showToast(R.string.download_failed, Toast.LENGTH_SHORT)
                     }
@@ -156,32 +157,32 @@ class PluginsViewModel : ViewModel() {
      * */
     fun handlePluginAction(
         activity: Activity?,
-        repositoryUrls: List<RepositoryData>,
-        pluginWrapper: PluginWrapper,
+        repositoryUrl: String,
+        plugin: Plugin,
         isLocal: Boolean
     ) = ioSafe {
-        Log.i(TAG, "handlePluginAction = ${repositoryUrls}, $pluginWrapper, $isLocal")
+        Log.i(TAG, "handlePluginAction = $repositoryUrl, $plugin, $isLocal")
 
         if (activity == null) return@ioSafe
-        val (_, repositoryData, metadata) = pluginWrapper
+        val (repo, metadata) = plugin
 
-        val file = if (isLocal) File(pluginWrapper.plugin.url) else getPluginPath(
+        val file = if (isLocal) File(plugin.second.url) else getPluginPath(
             activity,
-            pluginWrapper.plugin.internalName,
-            pluginWrapper.repositoryData.url
+            plugin.second.internalName,
+            plugin.first
         )
 
         val (success, message) = if (file.exists()) {
             PluginManager.deletePlugin(file) to R.string.plugin_deleted
         } else {
-            val isEnabled = pluginWrapper.plugin.status != PROVIDER_STATUS_DOWN
+            val isEnabled = plugin.second.status != PROVIDER_STATUS_DOWN
             val message = if (isEnabled) R.string.plugin_loaded else R.string.plugin_downloaded
             PluginManager.downloadPlugin(
                 activity,
                 metadata.url,
                 metadata.fileHash,
                 metadata.internalName,
-                repositoryData.url,
+                repo,
                 isEnabled
             ) to message
         }
@@ -197,23 +198,20 @@ class PluginsViewModel : ViewModel() {
             if (isLocal)
                 updatePluginListLocal()
             else
-                updatePluginListPrivate(activity, repositoryUrls)
+                updatePluginListPrivate(activity, repositoryUrl)
     }
 
-    private suspend fun updatePluginListPrivate(context: Context, repositories: List<RepositoryData>) {
+    private suspend fun updatePluginListPrivate(context: Context, repositoryUrl: String) {
         val isAdult = PreferenceManager.getDefaultSharedPreferences(context)
             .getStringSet(context.getString(R.string.prefer_media_type_key), emptySet())
             ?.contains(TvType.NSFW.ordinal.toString()) == true
 
-        val plugins = repositories.flatMap { repositoryUrl ->
-            getPlugins(repositoryUrl)
-        }
-
+        val plugins = getPlugins(repositoryUrl)
         val list = plugins.filter {
             // Show all non-nsfw plugins or all if nsfw is enabled
-            it.plugin.tvTypes?.contains(TvType.NSFW.name) != true || isAdult
+            it.second.tvTypes?.contains(TvType.NSFW.name) != true || isAdult
         }.map { plugin ->
-            PluginViewData(plugin, isDownloaded(context, plugin.plugin.internalName, plugin.repositoryData.url))
+            PluginViewData(plugin, isDownloaded(context, plugin.second.internalName, plugin.first))
         }
 
         this.plugins = list
@@ -226,8 +224,8 @@ class PluginsViewModel : ViewModel() {
     private fun List<PluginViewData>.filterTvTypes(): List<PluginViewData> {
         if (tvTypes.isEmpty()) return this
         return this.filter {
-            (it.pluginWrapper.plugin.tvTypes?.any { type -> tvTypes.contains(type) } == true) ||
-                    (tvTypes.contains(TvType.Others.name) && (it.pluginWrapper.plugin.tvTypes
+            (it.plugin.second.tvTypes?.any { type -> tvTypes.contains(type) } == true) ||
+                    (tvTypes.contains(TvType.Others.name) && (it.plugin.second.tvTypes
                         ?: emptyList()).isEmpty())
         }
     }
@@ -235,36 +233,24 @@ class PluginsViewModel : ViewModel() {
     private fun List<PluginViewData>.filterLang(): List<PluginViewData> {
         if (selectedLanguages.isEmpty()) return this // do not filter
         return this.filter {
-            if (it.pluginWrapper.plugin.language == null) {
+            if (it.plugin.second.language == null) {
                 return@filter selectedLanguages.contains("none")
             }
-            selectedLanguages.contains(it.pluginWrapper.plugin.language.lowercase())
+            selectedLanguages.contains(it.plugin.second.language?.lowercase())
         }
     }
 
     private fun List<PluginViewData>.sortByQuery(query: String?): List<PluginViewData> {
-        return if (query.isNullOrBlank()) {
+        return if (query == null) {
             // Return list to base state if no query
-            this.sortedBy { it.pluginWrapper.plugin.name }
+            this.sortedBy { it.plugin.second.name }
         } else {
-            this.mapNotNull {
-                // Try matching name
-                val score = Levenshtein.partialRatio(
-                    it.pluginWrapper.plugin.name.lowercase(),
-                    query.lowercase()
-                ).takeIf { score -> score > 80 } ?:
-                // Fallback to description, but limit characters to reduce lag
-                it.pluginWrapper.plugin.description?.lowercase()?.take(64)
-                    ?.let { description ->
-                        Levenshtein.partialRatio(
-                            description,
+            this.sortedBy {
+                -FuzzySearch.partialRatio(
+                    it.plugin.second.name.lowercase(),
                     query.lowercase()
                 )
-                    }?.takeIf { score -> score > 80 } ?: return@mapNotNull null
-                it to score
-            }.sortedBy {
-                -it.second
-            }.map { it.first }
+            }
         }
     }
 
@@ -281,17 +267,16 @@ class PluginsViewModel : ViewModel() {
         )
     }
 
-    fun updatePluginList(context: Context?, repositories: List<RepositoryData>) =
-        viewModelScope.launchSafe {
+    fun updatePluginList(context: Context?, repositoryUrl: String) = viewModelScope.launchSafe {
         if (context == null) return@launchSafe
-            Log.i(TAG, "updatePluginList = $repositories")
-            updatePluginListPrivate(context, repositories)
+        Log.i(TAG, "updatePluginList = $repositoryUrl")
+        updatePluginListPrivate(context, repositoryUrl)
     }
 
     fun search(query: String?) {
         currentQuery = query
         _filteredPlugins.postValue(
-            true to plugins.filterTvTypes().filterLang().sortByQuery(query)
+            true to (filteredPlugins.value?.second?.sortByQuery(query) ?: emptyList())
         )
     }
 
@@ -304,7 +289,7 @@ class PluginsViewModel : ViewModel() {
         val downloadedPlugins = (PluginManager.getPluginsOnline() + PluginManager.getPluginsLocal())
             .distinctBy { it.filePath }
             .map {
-                PluginViewData(PluginWrapper.getLocalPluginWrapper(it.toSitePlugin()), true)
+                PluginViewData("" to it.toSitePlugin(), true)
             }
 
         plugins = downloadedPlugins

app/src/main/java/com/lagradost/cloudstream3/ui/settings/testing/TestViewModel.kt

@@ -5,7 +5,7 @@ import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import com.lagradost.cloudstream3.APIHolder
 import com.lagradost.cloudstream3.MainAPI
-import com.lagradost.cloudstream3.utils.Coroutines.atomicListOf
+import com.lagradost.cloudstream3.utils.Coroutines.threadSafeListOf
 import com.lagradost.cloudstream3.utils.TestingUtils
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -40,7 +40,7 @@ class TestViewModel : ViewModel() {
         get() = scope != null
 
     private var filter = ProviderFilter.All
-    private val providers = atomicListOf<Pair<MainAPI, TestingUtils.TestResultProvider>>()
+    private val providers = threadSafeListOf<Pair<MainAPI, TestingUtils.TestResultProvider>>()
     private var passed = 0
     private var failed = 0
     private var total = 0
@@ -51,9 +51,9 @@ class TestViewModel : ViewModel() {
     }
 
     private fun postProviders() {
-        providers.withLock {
+        synchronized(providers) {
             val filtered = when (filter) {
-                ProviderFilter.All -> providers.toList()
+                ProviderFilter.All -> providers
                 ProviderFilter.Passed -> providers.filter { it.second.success }
                 ProviderFilter.Failed -> providers.filter { !it.second.success }
             }
@@ -68,7 +68,7 @@ class TestViewModel : ViewModel() {
     }
 
     private fun addProvider(api: MainAPI, results: TestingUtils.TestResultProvider) {
-        providers.withLock {
+        synchronized(providers) {
             val index = providers.indexOfFirst { it.first == api }
             if (index == -1) {
                 providers.add(api to results)
@@ -81,14 +81,14 @@ class TestViewModel : ViewModel() {
     }
 
     fun init() {
-        total = APIHolder.allProviders.withLock { APIHolder.allProviders.size }
+        total = synchronized(APIHolder.allProviders) { APIHolder.allProviders.size }
         updateProgress()
     }
 
     fun startTest() {
         scope = CoroutineScope(Dispatchers.Default)
 
-        val apis = APIHolder.allProviders.withLock { APIHolder.allProviders.toTypedArray() }
+        val apis = synchronized(APIHolder.allProviders) { APIHolder.allProviders.toTypedArray() }
         total = apis.size
         failed = 0
         passed = 0

app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentExtensions.kt

@@ -56,7 +56,7 @@ class SetupFragmentExtensions : BaseFragment<FragmentSetupExtensionsBinding>(
 
             if (hasRepos) {
                 binding?.repoRecyclerView?.adapter = RepoAdapter(true, {}, {
-                    PluginsViewModel.downloadAll(activity, it, null)
+                    PluginsViewModel.downloadAll(activity, it.url, null)
                 }).apply { submitList(repositories.toList()) }
             }
 //            else {
@@ -84,7 +84,7 @@ class SetupFragmentExtensions : BaseFragment<FragmentSetupExtensionsBinding>(
                     if (isSetup)
                         if (
                         // If any available languages
-                            apis.distinctBy { it.lang }.size > 1
+                            synchronized(apis) { apis.distinctBy { it.lang }.size > 1 }
                         ) {
                             findNavController().navigate(R.id.action_navigation_setup_extensions_to_navigation_setup_provider_languages)
                         } else {

app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentProviderLanguage.kt

@@ -36,10 +36,10 @@ class SetupFragmentProviderLanguage : BaseFragment<FragmentSetupProviderLanguage
 
             val currentLangTags = ctx.getApiProviderLangSettings()
 
-            val languagesTagName = APIHolder.apis.withLock {
+            val languagesTagName = synchronized(APIHolder.apis) {
                 listOf( Pair(AllLanguagesName, getString(R.string.all_languages_preference)) ) +
                 APIHolder.apis.map { Pair(it.lang, getNameNextToFlagEmoji(it.lang) ?: it.lang) }
-                    .toSet().sortedBy { it.second.substringAfter("\u00a0").lowercase() } // name ignoring flag emoji
+                    .toSet().sortedBy { it.second.substringAfter("\u00a0").lowercase() } // name ignoring flag emoji
             }
 
             val currentIndexList = currentLangTags.map { langTag ->

app/src/main/java/com/lagradost/cloudstream3/ui/subtitles/ChromecastSubtitlesFragment.kt

@@ -38,21 +38,18 @@ import com.lagradost.cloudstream3.utils.UIHelper.fixSystemBarsPadding
 import com.lagradost.cloudstream3.utils.UIHelper.hideSystemUI
 import com.lagradost.cloudstream3.utils.UIHelper.navigate
 import com.lagradost.cloudstream3.utils.UIHelper.popCurrentPage
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
 
 const val CHROME_SUBTITLE_KEY = "chome_subtitle_settings"
 
-@Serializable
 data class SaveChromeCaptionStyle(
-    @JsonProperty("fontFamily") @SerialName("fontFamily") var fontFamily: String? = null,
-    @JsonProperty("fontGenericFamily") @SerialName("fontGenericFamily") var fontGenericFamily: Int? = null,
-    @JsonProperty("backgroundColor") @SerialName("backgroundColor") var backgroundColor: Int = 0x00FFFFFF, // transparent
-    @JsonProperty("edgeColor") @SerialName("edgeColor") var edgeColor: Int = Color.BLACK, // BLACK
-    @JsonProperty("edgeType") @SerialName("edgeType") var edgeType: Int = EDGE_TYPE_OUTLINE,
-    @JsonProperty("foregroundColor") @SerialName("foregroundColor") var foregroundColor: Int = Color.WHITE,
-    @JsonProperty("fontScale") @SerialName("fontScale") var fontScale: Float = 1.05f,
-    @JsonProperty("windowColor") @SerialName("windowColor") var windowColor: Int = Color.TRANSPARENT,
+    @JsonProperty("fontFamily") var fontFamily: String? = null,
+    @JsonProperty("fontGenericFamily") var fontGenericFamily: Int? = null,
+    @JsonProperty("backgroundColor") var backgroundColor: Int = 0x00FFFFFF, // transparent
+    @JsonProperty("edgeColor") var edgeColor: Int = Color.BLACK, // BLACK
+    @JsonProperty("edgeType") var edgeType: Int = EDGE_TYPE_OUTLINE,
+    @JsonProperty("foregroundColor") var foregroundColor: Int = Color.WHITE,
+    @JsonProperty("fontScale") var fontScale: Float = 1.05f,
+    @JsonProperty("windowColor") var windowColor: Int = Color.TRANSPARENT,
 )
 
 class ChromecastSubtitlesFragment : BaseFragment<ChromecastSubtitleSettingsBinding>(
@@ -101,7 +98,7 @@ class ChromecastSubtitlesFragment : BaseFragment<ChromecastSubtitleSettingsBindi
         }
 
         fun getCurrentSavedStyle(): SaveChromeCaptionStyle {
-            return getKey<SaveChromeCaptionStyle>(CHROME_SUBTITLE_KEY) ?: defaultState
+            return getKey(CHROME_SUBTITLE_KEY) ?: defaultState
         }
 
         private val defaultState = SaveChromeCaptionStyle()

app/src/main/java/com/lagradost/cloudstream3/ui/subtitles/SubtitlesFragment.kt

@@ -54,39 +54,40 @@ import com.lagradost.cloudstream3.utils.UIHelper.hideSystemUI
 import com.lagradost.cloudstream3.utils.UIHelper.navigate
 import com.lagradost.cloudstream3.utils.UIHelper.popCurrentPage
 import com.lagradost.cloudstream3.utils.UIHelper.toPx
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
 import java.io.File
 
 const val SUBTITLE_KEY = "subtitle_settings"
 const val SUBTITLE_AUTO_SELECT_KEY = "subs_auto_select"
 const val SUBTITLE_DOWNLOAD_KEY = "subs_auto_download"
 
-@Serializable
 data class SaveCaptionStyle(
-    @JsonProperty("foregroundColor") @SerialName("foregroundColor") var foregroundColor: Int,
-    @JsonProperty("backgroundColor") @SerialName("backgroundColor") var backgroundColor: Int,
-    @JsonProperty("windowColor") @SerialName("windowColor") var windowColor: Int,
+    @JsonProperty("foregroundColor") var foregroundColor: Int,
+    @JsonProperty("backgroundColor") var backgroundColor: Int,
+    @JsonProperty("windowColor") var windowColor: Int,
     @OptIn(UnstableApi::class)
-    @JsonProperty("edgeType") @SerialName("edgeType") var edgeType: @CaptionStyleCompat.EdgeType Int,
-    @JsonProperty("edgeColor") @SerialName("edgeColor") var edgeColor: Int,
-    @FontRes @JsonProperty("typeface") @SerialName("typeface") var typeface: Int?,
-    @JsonProperty("typefaceFilePath") @SerialName("typefaceFilePath") var typefaceFilePath: String?,
-    @JsonProperty("elevation") @SerialName("elevation") var elevation: Int, // in dp
-    @JsonProperty("fixedTextSize") @SerialName("fixedTextSize") var fixedTextSize: Float?, // in sp
-    @Px @JsonProperty("edgeSize") @SerialName("edgeSize") var edgeSize: Float? = null,
-    @JsonProperty("removeCaptions") @SerialName("removeCaptions") var removeCaptions: Boolean = false,
-    @JsonProperty("removeBloat") @SerialName("removeBloat") var removeBloat: Boolean = true,
-    /** Apply caps lock to the text */
-    @JsonProperty("upperCase") @SerialName("upperCase") var upperCase: Boolean = false,
-    /** Apply bold to the text */
-    @JsonProperty("bold") @SerialName("bold") var bold: Boolean = false,
-    /** Apply italic to the text */
-    @JsonProperty("italic") @SerialName("italic") var italic: Boolean = false,
-    /** in px, background radius, aka how round the background (backgroundColor) on each row is */
-    @JsonProperty("backgroundRadius") @SerialName("backgroundRadius") var backgroundRadius: Float? = null,
+    @JsonProperty("edgeType") var edgeType: @CaptionStyleCompat.EdgeType Int,
+    @JsonProperty("edgeColor") var edgeColor: Int,
+    @FontRes
+    @JsonProperty("typeface") var typeface: Int?,
+    @JsonProperty("typefaceFilePath") var typefaceFilePath: String?,
+    /**in dp**/
+    @JsonProperty("elevation") var elevation: Int,
+    /**in sp**/
+    @JsonProperty("fixedTextSize") var fixedTextSize: Float?,
+    @Px
+    @JsonProperty("edgeSize") var edgeSize: Float? = null,
+    @JsonProperty("removeCaptions") var removeCaptions: Boolean = false,
+    @JsonProperty("removeBloat") var removeBloat: Boolean = true,
+    /** Apply caps lock to the text **/
+    @JsonProperty("upperCase") var upperCase: Boolean = false,
+    /** Apply bold to the text **/
+    @JsonProperty("bold") var bold: Boolean = false,
+    /** Apply italic to the text **/
+    @JsonProperty("italic") var italic: Boolean = false,
+    /** in px, background radius, aka how round the background (backgroundColor) on each row is **/
+    @JsonProperty("backgroundRadius") var backgroundRadius: Float? = null,
     /** The SSA_ALIGNMENT */
-    @JsonProperty("alignment") @SerialName("alignment") var alignment: Int? = null,
+    @JsonProperty("alignment") var alignment: Int? = null,
 )
 
 const val DEF_SUBS_ELEVATION = 20
@@ -115,9 +116,6 @@ class SubtitlesFragment : BaseDialogFragment<SubtitleSettingsBinding>(
                 )
             }
 
-            view.clipToPadding = false
-            view.clipChildren = false
-
             // we default to 25sp, this is needed as RoundedBackgroundColorSpan breaks on override sizes
             val size = data.fixedTextSize ?: 25.0f
             view.setFixedTextSize(TypedValue.COMPLEX_UNIT_SP, size)
@@ -264,7 +262,7 @@ class SubtitlesFragment : BaseDialogFragment<SubtitleSettingsBinding>(
         }
 
         fun getCurrentSavedStyle(): SaveCaptionStyle {
-            return cachedSubtitleStyle ?: (getKey<SaveCaptionStyle>(SUBTITLE_KEY) ?: SaveCaptionStyle(
+            return cachedSubtitleStyle ?: (getKey(SUBTITLE_KEY) ?: SaveCaptionStyle(
                 foregroundColor = getDefColor(0),
                 backgroundColor = getDefColor(2),
                 windowColor = getDefColor(3),
@@ -296,11 +294,11 @@ class SubtitlesFragment : BaseDialogFragment<SubtitleSettingsBinding>(
         }
 
         fun getDownloadSubsLanguageTagIETF(): List<String> {
-            return getKey<List<String>>(SUBTITLE_DOWNLOAD_KEY) ?: listOf("en")
+            return getKey(SUBTITLE_DOWNLOAD_KEY) ?: listOf("en")
         }
 
         fun getAutoSelectLanguageTagIETF(): String {
-            return getKey<String>(SUBTITLE_AUTO_SELECT_KEY) ?: "en"
+            return getKey(SUBTITLE_AUTO_SELECT_KEY) ?: "en"
         }
     }
 

app/src/main/java/com/lagradost/cloudstream3/utils/AppContextUtils.kt

@@ -90,9 +90,12 @@ import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import okhttp3.Cache
 import java.io.File
+import java.net.URL
+import java.net.URLDecoder
 import java.util.concurrent.Executor
 import java.util.concurrent.Executors
 
+
 object AppContextUtils {
     fun RecyclerView.isRecyclerScrollable(): Boolean {
         val layoutManager =
@@ -144,7 +147,6 @@ object AppContextUtils {
             text.toSpanned()
         }
     }
-
     /** Get channel ID by name */
     @SuppressLint("RestrictedApi")
     private fun buildWatchNextProgramUri(
@@ -362,22 +364,33 @@ object AppContextUtils {
         }
     }
 
-    /** Sort subtitles by names */
     fun sortSubs(subs: Set<SubtitleData>): List<SubtitleData> {
-        // Be aware, sorting by "$originalName $nameSuffix" causes "a (b) 1" < "a 1",
-        // where "originalName then nameSuffix" preserves "a 1" < "a (b) 1", because we do not compare '(' and '1'.
-        return subs
-            .sortedWith(
-                compareBy { subtitle: SubtitleData -> subtitle.originalName }
-                    .thenBy { subtitle: SubtitleData -> subtitle.nameSuffix })
+        return subs.sortedBy { it.name }
     }
 
     fun Context.getApiSettings(): HashSet<String> {
+        //val settingsManager = PreferenceManager.getDefaultSharedPreferences(this)
+
         val hashSet = HashSet<String>()
         val activeLangs = getApiProviderLangSettings()
         val hasUniversal = activeLangs.contains(AllLanguagesName)
-        hashSet.addAll(apis.filter { hasUniversal || activeLangs.contains(it.lang) }
+        hashSet.addAll(synchronized(apis) { apis.filter { hasUniversal || activeLangs.contains(it.lang) } }
             .map { it.name })
+
+        /*val set = settingsManager.getStringSet(
+            this.getString(R.string.search_providers_list_key),
+            hashSet
+        )?.toHashSet() ?: hashSet
+
+        val list = HashSet<String>()
+        for (name in set) {
+            val api = getApiFromNameNull(name) ?: continue
+            if (activeLangs.contains(api.lang)) {
+                list.add(name)
+            }
+        }*/
+        //if (list.isEmpty()) return hashSet
+        //return list
         return hashSet
     }
 
@@ -468,8 +481,9 @@ object AppContextUtils {
         } ?: default
         val langs = this.getApiProviderLangSettings()
         val hasUniversal = langs.contains(AllLanguagesName)
-        val allApis =
+        val allApis = synchronized(apis) {
             apis.filter { api -> (hasUniversal || langs.contains(api.lang)) && (api.hasMainPage || !hasHomePageIsRequired) }
+        }
         return if (currentPrefMedia.isEmpty()) {
             allApis
         } else {
@@ -523,12 +537,13 @@ object AppContextUtils {
     fun Activity.loadRepository(url: String) {
         ioSafe {
             val repo = RepositoryManager.parseRepository(url) ?: return@ioSafe
-            val data = RepositoryData(
+            RepositoryManager.addRepository(
+                RepositoryData(
                     repo.iconUrl ?: "",
                     repo.name,
                     url
                 )
-            RepositoryManager.addRepository(data)
+            )
             main {
                 showToast(
                     getString(R.string.player_loaded_subtitles, repo.name),
@@ -536,12 +551,13 @@ object AppContextUtils {
                 )
             }
             afterRepositoryLoadedEvent.invoke(true)
-            addRepositoryDialog(data)
+            addRepositoryDialog(repo.name, url)
         }
     }
 
     fun Activity.addRepositoryDialog(
-        repositoryData: RepositoryData
+        repositoryName: String,
+        repositoryURL: String,
     ) {
         val repos = RepositoryManager.getRepositories()
 
@@ -551,7 +567,9 @@ object AppContextUtils {
                 navigate(
                     R.id.global_to_navigation_settings_plugins,
                     PluginsFragment.newInstance(
-                        repositoryData,
+                        repositoryName,
+                        repositoryURL,
+                        false,
                     )
                 )
             }
@@ -559,7 +577,7 @@ object AppContextUtils {
 
         runOnUiThread {
             AlertDialog.Builder(this).apply {
-                setTitle(repositoryData.name)
+                setTitle(repositoryName)
                 setMessage(R.string.download_all_plugins_from_repo)
                 setPositiveButton(R.string.open_downloaded_repo) { _, _ ->
                     openAddedRepo()
@@ -632,17 +650,16 @@ object AppContextUtils {
         }
     }
 
-    // Deprecate after next stable
-    /* @Deprecated(
-        message = "Use splitUrlParameters instead.",
-        replaceWith = ReplaceWith(
-            expression = "splitUrlParameters(url.toString())",
-            imports = ["com.lagradost.cloudstream3.splitUrlParameters"],
-        ),
-        level = DeprecationLevel.WARNING,
-    ) */
-    fun splitQuery(url: java.net.URL): Map<String, String> {
-        return com.lagradost.cloudstream3.splitUrlParameters(url.toString())
+    fun splitQuery(url: URL): Map<String, String> {
+        val queryPairs: MutableMap<String, String> = LinkedHashMap()
+        val query: String = url.query
+        val pairs = query.split("&").toTypedArray()
+        for (pair in pairs) {
+            val idx = pair.indexOf("=")
+            queryPairs[URLDecoder.decode(pair.substring(0, idx), "UTF-8")] =
+                URLDecoder.decode(pair.substring(idx + 1), "UTF-8")
+        }
+        return queryPairs
     }
 
     /**| S1:E2 Hello World
@@ -846,8 +863,7 @@ object AppContextUtils {
     }
 
     fun Context.isUsingMobileData(): Boolean {
-        val connectionManager =
-            getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+        val connectionManager = getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
         return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
             val activeNetwork: Network? = connectionManager.activeNetwork
             val networkCapabilities = connectionManager.getNetworkCapabilities(activeNetwork)

app/src/main/java/com/lagradost/cloudstream3/utils/BackupUtils.kt

@@ -10,6 +10,7 @@ import androidx.core.net.toUri
 import androidx.fragment.app.FragmentActivity
 import androidx.preference.PreferenceManager
 import com.fasterxml.jackson.annotation.JsonProperty
+import com.fasterxml.jackson.module.kotlin.readValue
 import com.lagradost.cloudstream3.CloudStreamApp.Companion.getActivity
 import com.lagradost.cloudstream3.CommonActivity.showToast
 import com.lagradost.cloudstream3.R
@@ -20,12 +21,11 @@ import com.lagradost.cloudstream3.syncproviders.AccountManager
 import com.lagradost.cloudstream3.syncproviders.providers.AniListApi.Companion.ANILIST_CACHED_LIST
 import com.lagradost.cloudstream3.syncproviders.providers.MALApi.Companion.MAL_CACHED_LIST
 import com.lagradost.cloudstream3.syncproviders.providers.KitsuApi.Companion.KITSU_CACHED_LIST
-import com.lagradost.cloudstream3.utils.AppUtils.parseJson
-import com.lagradost.cloudstream3.utils.AppUtils.toJson
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
 import com.lagradost.cloudstream3.utils.Coroutines.main
 import com.lagradost.cloudstream3.utils.DataStore.getDefaultSharedPrefs
 import com.lagradost.cloudstream3.utils.DataStore.getSharedPrefs
+import com.lagradost.cloudstream3.utils.DataStore.mapper
 import com.lagradost.cloudstream3.utils.UIHelper.checkWrite
 import com.lagradost.cloudstream3.utils.UIHelper.requestRW
 import com.lagradost.cloudstream3.utils.downloader.VideoDownloadManager.setupStream
@@ -36,8 +36,6 @@ import com.lagradost.cloudstream3.utils.downloader.VideoDownloadManager.KEY_RESU
 import com.lagradost.cloudstream3.utils.downloader.VideoDownloadManager.KEY_RESUME_PACKAGES
 import com.lagradost.safefile.MediaFileContentType
 import com.lagradost.safefile.SafeFile
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
 import okhttp3.internal.closeQuietly
 import java.io.IOException
 import java.io.OutputStream
@@ -51,7 +49,7 @@ object BackupUtils {
 
     /**
      * No sensitive or breaking data in the backup
-     */
+     * */
     private val nonTransferableKeys = listOf(
         ANILIST_CACHED_LIST,
         MAL_CACHED_LIST,
@@ -120,24 +118,24 @@ object BackupUtils {
     private var restoreFileSelector: ActivityResultLauncher<Array<String>>? = null
 
     // Kinda hack, but I couldn't think of a better way
-    @Serializable
     data class BackupVars(
-        @JsonProperty("_Bool") @SerialName("_Bool") val bool: Map<String, Boolean>?,
-        @JsonProperty("_Int") @SerialName("_Int") val int: Map<String, Int>?,
-        @JsonProperty("_String") @SerialName("_String") val string: Map<String, String>?,
-        @JsonProperty("_Float") @SerialName("_Float") val float: Map<String, Float>?,
-        @JsonProperty("_Long") @SerialName("_Long") val long: Map<String, Long>?,
-        @JsonProperty("_StringSet") @SerialName("_StringSet") val stringSet: Map<String, Set<String>?>?,
+        @JsonProperty("_Bool") val bool: Map<String, Boolean>?,
+        @JsonProperty("_Int") val int: Map<String, Int>?,
+        @JsonProperty("_String") val string: Map<String, String>?,
+        @JsonProperty("_Float") val float: Map<String, Float>?,
+        @JsonProperty("_Long") val long: Map<String, Long>?,
+        @JsonProperty("_StringSet") val stringSet: Map<String, Set<String>?>?,
     )
 
-    @Serializable
     data class BackupFile(
-        @JsonProperty("datastore") @SerialName("datastore") val datastore: BackupVars,
-        @JsonProperty("settings") @SerialName("settings") val settings: BackupVars,
+        @JsonProperty("datastore") val datastore: BackupVars,
+        @JsonProperty("settings") val settings: BackupVars
     )
 
     @Suppress("UNCHECKED_CAST")
-    private fun getBackup(context: Context): BackupFile {
+    private fun getBackup(context: Context?): BackupFile? {
+        if (context == null) return null
+
         val allData = context.getSharedPrefs().all.filter { it.key.isTransferable() }
         val allSettings = context.getDefaultSharedPrefs().all.filter { it.key.isTransferable() }
 
@@ -147,7 +145,7 @@ object BackupUtils {
             allData.filter { it.value is String } as? Map<String, String>,
             allData.filter { it.value is Float } as? Map<String, Float>,
             allData.filter { it.value is Long } as? Map<String, Long>,
-            allData.filter { it.value as? Set<String> != null } as? Map<String, Set<String>>,
+            allData.filter { it.value as? Set<String> != null } as? Map<String, Set<String>>
         )
 
         val allSettingsSorted = BackupVars(
@@ -156,12 +154,12 @@ object BackupUtils {
             allSettings.filter { it.value is String } as? Map<String, String>,
             allSettings.filter { it.value is Float } as? Map<String, Float>,
             allSettings.filter { it.value is Long } as? Map<String, Long>,
-            allSettings.filter { it.value as? Set<String> != null } as? Map<String, Set<String>>,
+            allSettings.filter { it.value as? Set<String> != null } as? Map<String, Set<String>>
         )
 
         return BackupFile(
             allDataSorted,
-            allSettingsSorted,
+            allSettingsSorted
         )
     }
 
@@ -170,7 +168,7 @@ object BackupUtils {
         context: Context?,
         backupFile: BackupFile,
         restoreSettings: Boolean,
-        restoreDataStore: Boolean,
+        restoreDataStore: Boolean
     ) {
         if (context == null) return
         if (restoreSettings) {
@@ -199,9 +197,9 @@ object BackupUtils {
 
     fun backup(context: Context?) = ioSafe {
         if (context == null) return@ioSafe
+
         var fileStream: OutputStream? = null
         var printStream: PrintWriter? = null
-
         try {
             if (!context.checkWrite()) {
                 showToast(R.string.backup_failed, Toast.LENGTH_LONG)
@@ -216,14 +214,18 @@ object BackupUtils {
 
             fileStream = stream.openNew()
             printStream = PrintWriter(fileStream)
-            printStream.print(backupFile.toJson())
-            showToast(R.string.backup_success, Toast.LENGTH_LONG)
+            printStream.print(mapper.writeValueAsString(backupFile))
+
+            showToast(
+                R.string.backup_success,
+                Toast.LENGTH_LONG
+            )
         } catch (e: Exception) {
             logError(e)
             try {
                 showToast(
                     txt(R.string.backup_failed_error_format, e.toString()),
-                    Toast.LENGTH_LONG,
+                    Toast.LENGTH_LONG
                 )
             } catch (e: Exception) {
                 logError(e)
@@ -242,7 +244,7 @@ object BackupUtils {
             name,
             folder = null,
             extension = ext,
-            tryResume = false,
+            tryResume = false
         )
     }
 
@@ -257,14 +259,14 @@ object BackupUtils {
                             val input = activity.contentResolver.openInputStream(uri)
                                 ?: return@ioSafe
 
-                            val text = input.bufferedReader().readText()
-                            val restoredValue = parseJson<BackupFile>(text)
+                            val restoredValue =
+                                mapper.readValue<BackupFile>(input)
 
                             restore(
                                 activity,
                                 restoredValue,
                                 restoreSettings = true,
-                                restoreDataStore = true,
+                                restoreDataStore = true
                             )
                             activity.runOnUiThread { activity.recreate() }
                         } catch (e: Exception) {
@@ -305,7 +307,7 @@ object BackupUtils {
 
     private fun <T> Context.restoreMap(
         map: Map<String, T>?,
-        isEditingAppSettings: Boolean = false,
+        isEditingAppSettings: Boolean = false
     ) {
         val editor = DataStore.editor(this, isEditingAppSettings)
         map?.forEach {
@@ -317,27 +319,21 @@ object BackupUtils {
     }
 
     /**
-     * Copy of [com.lagradost.cloudstream3.utils.downloader.DownloadFileManagement.getDefaultDir],
-     * modified for backup-specific paths.
-     */
+     * Copy of [com.lagradost.cloudstream3.utils.downloader.VideoDownloadManager.basePathToFile], [com.lagradost.cloudstream3.utils.downloader.VideoDownloadManager.getDefaultDir] and [com.lagradost.cloudstream3.utils.downloader.VideoDownloadManager.getBasePath]
+     * modded for backup specific paths
+     * */
+
     fun getDefaultBackupDir(context: Context): SafeFile? {
         return SafeFile.fromMedia(context, MediaFileContentType.Downloads)
     }
 
-    /**
-     * Copy of [com.lagradost.cloudstream3.utils.downloader.DownloadFileManagement.getBasePath],
-     * modified for backup-specific paths.
-     */
     fun getCurrentBackupDir(context: Context): Pair<SafeFile?, String?> {
         val settingsManager = PreferenceManager.getDefaultSharedPreferences(context)
-        val basePathSetting = settingsManager.getString(context.getString(R.string.backup_path_key), null)
+        val basePathSetting =
+            settingsManager.getString(context.getString(R.string.backup_path_key), null)
         return baseBackupPathToFile(context, basePathSetting) to basePathSetting
     }
 
-    /**
-     * Copy of [com.lagradost.cloudstream3.utils.downloader.DownloadFileManagement.basePathToFile],
-     * modified for backup-specific paths.
-     */
     private fun baseBackupPathToFile(context: Context, path: String?): SafeFile? {
         return when {
             path.isNullOrBlank() -> getDefaultBackupDir(context)

app/src/main/java/com/lagradost/cloudstream3/utils/DataStore.kt

@@ -2,16 +2,17 @@ package com.lagradost.cloudstream3.utils
 
 import android.content.Context
 import android.content.SharedPreferences
-import androidx.core.content.edit
 import androidx.preference.PreferenceManager
+import com.fasterxml.jackson.databind.DeserializationFeature
+import com.fasterxml.jackson.databind.json.JsonMapper
+import com.fasterxml.jackson.module.kotlin.kotlinModule
 import com.lagradost.cloudstream3.CloudStreamApp.Companion.getKeyClass
 import com.lagradost.cloudstream3.CloudStreamApp.Companion.removeKey
 import com.lagradost.cloudstream3.CloudStreamApp.Companion.setKeyClass
 import com.lagradost.cloudstream3.mvvm.logError
-import com.lagradost.cloudstream3.utils.AppUtils.parseJson
-import com.lagradost.cloudstream3.utils.AppUtils.toJsonLiteral
 import kotlin.reflect.KClass
 import kotlin.reflect.KProperty
+import androidx.core.content.edit
 
 /** Used to display metadata about downloads and resume watching */
 const val DOWNLOAD_HEADER_CACHE = "download_header_cache"
@@ -87,18 +88,8 @@ data class Editor(
 }
 
 object DataStore {
-    // Extensions shouldn't have really been using this version of it, but it seems
-    // some have. Since there has always been a very easy alternative, we won't
-    // need to deprecate it that long, and should be able to fully remove it
-    // once extensions at least use the other version.
-    @Deprecated(
-        "Please do not use the mapper version from DataStore. Preferably use methods from AppUtils " +
-            "to parse JSON. However, you can use the stable-API version of the mapper at " +
-            "com.lagradost.cloudstream3.mapper to access the mapper directly if necessary.",
-        level = DeprecationLevel.ERROR,
-        replaceWith = ReplaceWith("com.lagradost.cloudstream3.mapper"),
-    )
-    val mapper = com.lagradost.cloudstream3.mapper
+    val mapper: JsonMapper = JsonMapper.builder().addModule(kotlinModule())
+        .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false).build()
 
     private fun getPreferences(context: Context): SharedPreferences {
         return context.getSharedPreferences(PREFERENCES_NAME, Context.MODE_PRIVATE)
@@ -108,6 +99,7 @@ object DataStore {
         return getPreferences(this)
     }
 
+
     fun getFolderName(folder: String, path: String): String {
         return "${folder}/${path}"
     }
@@ -173,19 +165,19 @@ object DataStore {
     fun <T> Context.setKey(path: String, value: T) {
         try {
             getSharedPrefs().edit {
-                putString(path, value?.toJsonLiteral())
+                putString(path, mapper.writeValueAsString(value))
             }
         } catch (e: Exception) {
             logError(e)
         }
     }
 
-    fun <T : Any> Context.getKey(path: String, valueType: Class<T>): T? {
-        return try {
+    fun <T> Context.getKey(path: String, valueType: Class<T>): T? {
+        try {
             val json: String = getSharedPrefs().getString(path, null) ?: return null
-            parseJson(json, valueType.kotlin)
-        } catch (_: Exception) {
-            null
+            return json.toKotlinObject(valueType)
+        } catch (e: Exception) {
+            return null
         }
     }
 
@@ -193,37 +185,21 @@ object DataStore {
         setKey(getFolderName(folder, path), value)
     }
 
-    @Deprecated(
-        message = "Use parseJson<T>(this) directly instead.",
-        level = DeprecationLevel.WARNING,
-        replaceWith = ReplaceWith(
-            expression = "parseJson<T>(this)",
-            imports = ["com.lagradost.cloudstream3.utils.AppUtils.parseJson"],
-        ),
-    )
     inline fun <reified T : Any> String.toKotlinObject(): T {
-        return parseJson(this)
+        return mapper.readValue(this, T::class.java)
     }
 
-    @Deprecated(
-        message = "Use parseJson<T>(this) directly instead.",
-        level = DeprecationLevel.WARNING,
-        replaceWith = ReplaceWith(
-            expression = "parseJson<T>(this)",
-            imports = ["com.lagradost.cloudstream3.utils.AppUtils.parseJson"],
-        ),
-    )
-    fun <T : Any> String.toKotlinObject(valueType: Class<T>): T {
-        return parseJson(this, valueType.kotlin)
+    fun <T> String.toKotlinObject(valueType: Class<T>): T {
+        return mapper.readValue(this, valueType)
     }
 
     // GET KEY GIVEN PATH AND DEFAULT VALUE, NULL IF ERROR
     inline fun <reified T : Any> Context.getKey(path: String, defVal: T?): T? {
-        return try {
+        try {
             val json: String = getSharedPrefs().getString(path, null) ?: return defVal
-            parseJson<T>(json)
-        } catch (_: Exception) {
-            null
+            return json.toKotlinObject()
+        } catch (e: Exception) {
+            return null
         }
     }
 

app/src/main/java/com/lagradost/cloudstream3/utils/DataStoreHelper.kt

@@ -1,7 +1,6 @@
 package com.lagradost.cloudstream3.utils
 
 import android.content.Context
-import com.fasterxml.jackson.annotation.JsonIgnore
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.cloudstream3.APIHolder.unixTimeMS
 import com.lagradost.cloudstream3.CloudStreamApp.Companion.context
@@ -32,12 +31,6 @@ import com.lagradost.cloudstream3.ui.result.ResultEpisode
 import com.lagradost.cloudstream3.ui.result.VideoWatchState
 import com.lagradost.cloudstream3.utils.AppContextUtils.filterProviderByPreferredMedia
 import com.lagradost.cloudstream3.utils.downloader.DownloadObjects
-import com.lagradost.cloudstream3.utils.serializers.WriteOnlySerializer
-import kotlinx.serialization.ExperimentalSerializationApi
-import kotlinx.serialization.KeepGeneratedSerializer
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.Transient
 import java.util.Calendar
 import java.util.Date
 import java.util.GregorianCalendar
@@ -50,18 +43,17 @@ const val RESULT_WATCH_STATE = "result_watch_state"
 const val RESULT_WATCH_STATE_DATA = "result_watch_state_data"
 const val RESULT_SUBSCRIBED_STATE_DATA = "result_subscribed_state_data"
 const val RESULT_FAVORITES_STATE_DATA = "result_favorites_state_data"
-const val RESULT_RESUME_WATCHING = "result_resume_watching_2" // Changed due to id changes
+const val RESULT_RESUME_WATCHING = "result_resume_watching_2" // changed due to id changes
 const val RESULT_RESUME_WATCHING_OLD = "result_resume_watching"
 const val RESULT_RESUME_WATCHING_HAS_MIGRATED = "result_resume_watching_migrated"
 const val RESULT_EPISODE = "result_episode"
 const val RESULT_SEASON = "result_season"
 const val RESULT_DUB = "result_dub"
 const val KEY_RESULT_SORT = "result_sort"
-const val USER_PINNED_PROVIDERS = "user_pinned_providers" // Key for pinned user set
+const val USER_PINNED_PROVIDERS = "user_pinned_providers" //key for pinned user set
 
 class UserPreferenceDelegate<T : Any>(
-    private val key: String,
-    private val default: T,
+    private val key: String, private val default: T //, private val klass: KClass<T>
 ) {
     private val klass: KClass<out T> = default::class
     private val realKey get() = "${DataStoreHelper.currentAccount}/$key"
@@ -71,7 +63,7 @@ class UserPreferenceDelegate<T : Any>(
     operator fun setValue(
         self: Any?,
         property: KProperty<*>,
-        t: T?,
+        t: T?
     ) {
         if (t == null) {
             removeKey(realKey)
@@ -90,7 +82,7 @@ object DataStoreHelper {
         R.drawable.profile_bg_pink,
         R.drawable.profile_bg_purple,
         R.drawable.profile_bg_red,
-        R.drawable.profile_bg_teal,
+        R.drawable.profile_bg_teal
     )
 
     private var searchPreferenceProvidersStrings: List<String> by UserPreferenceDelegate(
@@ -120,17 +112,16 @@ object DataStoreHelper {
     private var searchPreferenceTagsStrings: List<String> by UserPreferenceDelegate(
         "search_pref_tags",
         listOf(TvType.Movie, TvType.TvSeries).map { it.name })
-
     var searchPreferenceTags: List<TvType>
         get() = deserializeTv(searchPreferenceTagsStrings)
         set(value) {
             searchPreferenceTagsStrings = serializeTv(value)
         }
 
+
     private var homePreferenceStrings: List<String> by UserPreferenceDelegate(
         "home_pref_homepage",
         listOf(TvType.Movie, TvType.TvSeries).map { it.name })
-
     var homePreference: List<TvType>
         get() = deserializeTv(homePreferenceStrings)
         set(value) {
@@ -141,38 +132,38 @@ object DataStoreHelper {
         "home_bookmarked_last_list",
         IntArray(0)
     )
-
     var playBackSpeed: Float by UserPreferenceDelegate("playback_speed", 1.0f)
     var resizeMode: Int by UserPreferenceDelegate("resize_mode", 0)
     var librarySortingMode: Int by UserPreferenceDelegate(
         "library_sorting_mode",
         ListSorting.AlphabeticalA.ordinal
     )
-
     private var _resultsSortingMode: Int by UserPreferenceDelegate(
         "results_sorting_mode",
         EpisodeSortType.NUMBER_ASC.ordinal
     )
-
     var resultsSortingMode: EpisodeSortType
         get() = EpisodeSortType.entries.getOrNull(_resultsSortingMode) ?: EpisodeSortType.NUMBER_ASC
         set(value) {
             _resultsSortingMode = value.ordinal
         }
 
-    @Serializable
     data class Account(
-        @JsonProperty("keyIndex") @SerialName("keyIndex") val keyIndex: Int,
-        @JsonProperty("name") @SerialName("name") val name: String,
-        @JsonProperty("customImage") @SerialName("customImage") val customImage: String? = null,
-        @JsonProperty("defaultImageIndex") @SerialName("defaultImageIndex") val defaultImageIndex: Int,
-        @JsonProperty("lockPin") @SerialName("lockPin") val lockPin: String? = null,
+        @JsonProperty("keyIndex")
+        val keyIndex: Int,
+        @JsonProperty("name")
+        val name: String,
+        @JsonProperty("customImage")
+        val customImage: String? = null,
+        @JsonProperty("defaultImageIndex")
+        val defaultImageIndex: Int,
+        @JsonProperty("lockPin")
+        val lockPin: String? = null,
     ) {
-        @get:JsonIgnore
-        val image get() = customImage?.let { UiImage.Image(it) } ?:
-            profileImages.getOrNull(defaultImageIndex)?.let {
-                UiImage.Drawable(it)
-            } ?: UiImage.Drawable(profileImages.first())
+        val image
+            get() = customImage?.let { UiImage.Image(it) } ?: profileImages.getOrNull(
+                defaultImageIndex
+            )?.let { UiImage.Drawable(it) } ?: UiImage.Drawable(profileImages.first())
     }
 
     const val TAG = "data_store_helper"
@@ -185,7 +176,7 @@ object DataStoreHelper {
      * Setting this does not automatically reload the homepage.
      */
     var currentHomePage: String?
-        get() = getKey<String>("$currentAccount/$USER_SELECTED_HOMEPAGE_API")
+        get() = getKey("$currentAccount/$USER_SELECTED_HOMEPAGE_API")
         set(value) {
             val key = "$currentAccount/$USER_SELECTED_HOMEPAGE_API"
             if (value == null) {
@@ -197,6 +188,7 @@ object DataStoreHelper {
 
     fun setAccount(account: Account) {
         val homepage = currentHomePage
+
         selectedKeyIndex = account.keyIndex
         AccountManager.updateAccountIds()
         showToast(context?.getString(R.string.logged_account, account.name) ?: account.name)
@@ -214,7 +206,7 @@ object DataStoreHelper {
             currentAccounts.getOrNull(currentAccounts.indexOfFirst { it.keyIndex == 0 }) ?: Account(
                 keyIndex = 0,
                 name = context.getString(R.string.default_account),
-                defaultImageIndex = 0,
+                defaultImageIndex = 0
             )
         }
     }
@@ -240,21 +232,18 @@ object DataStoreHelper {
         }
     }
 
-    @Serializable
     data class PosDur(
-        @JsonProperty("position") @SerialName("position") val position: Long,
-        @JsonProperty("duration") @SerialName("duration") val duration: Long,
+        @JsonProperty("position") val position: Long,
+        @JsonProperty("duration") val duration: Long
     )
 
     fun PosDur.fixVisual(): PosDur {
         if (duration <= 0) return PosDur(0, duration)
         val percentage = position * 100 / duration
-        return when {
-            percentage <= 1 -> PosDur(0, duration)
-            percentage <= 5 -> PosDur(5 * duration / 100, duration)
-            percentage >= 95 -> PosDur(duration, duration)
-            else -> this
-        }
+        if (percentage <= 1) return PosDur(0, duration)
+        if (percentage <= 5) return PosDur(5 * duration / 100, duration)
+        if (percentage >= 95) return PosDur(duration, duration)
+        return this
     }
 
     fun Int.toYear(): Date =
@@ -262,38 +251,28 @@ object DataStoreHelper {
 
     /**
      * Used to display notifications on new episodes and posters in library.
-     */
-    @Serializable
+     **/
     abstract class LibrarySearchResponse(
-       /**
-        * These fields are marked @Transient because this class is only ever serialized through
-        * through its subclasses, which redeclare each property with their own @SerialName
-        * annotations. Without @Transient here, kotlinx.serialization would try to
-        * generate a serializer for the abstract base class itself (or double-serialize
-        * these fields), which fails/conflicts since these are meant to be overridden,
-        * not serialized directly from the parent.
-        */
-        @Transient override var id: Int? = null,
-        @Transient open val latestUpdatedTime: Long = 0L,
-        @Transient override val name: String = "",
-        @Transient override val url: String = "",
-        @Transient override val apiName: String = "",
-        @Transient override var type: TvType? = null,
-        @Transient override var posterUrl: String? = null,
-        @Transient open val year: Int? = null,
-        @Transient open val syncData: Map<String, String>? = null,
-        @Transient override var quality: SearchQuality? = null,
-        @Transient override var posterHeaders: Map<String, String>? = null,
-        @Transient open val plot: String? = null,
-        @Transient override var score: Score? = null,
-        @Transient open val tags: List<String>? = null,
+        @JsonProperty("id") override var id: Int?,
+        @JsonProperty("latestUpdatedTime") open val latestUpdatedTime: Long,
+        @JsonProperty("name") override val name: String,
+        @JsonProperty("url") override val url: String,
+        @JsonProperty("apiName") override val apiName: String,
+        @JsonProperty("type") override var type: TvType?,
+        @JsonProperty("posterUrl") override var posterUrl: String?,
+        @JsonProperty("year") open val year: Int?,
+        @JsonProperty("syncData") open val syncData: Map<String, String>?,
+        @JsonProperty("quality") override var quality: SearchQuality?,
+        @JsonProperty("posterHeaders") override var posterHeaders: Map<String, String>?,
+        @JsonProperty("plot") open val plot: String? = null,
+        @JsonProperty("score") override var score: Score? = null,
+        @JsonProperty("tags") open val tags: List<String>? = null,
     ) : SearchResponse {
         @JsonProperty("rating", access = JsonProperty.Access.WRITE_ONLY)
-        @SerialName("rating")
         @Deprecated(
             "`rating` is the old scoring system, use score instead",
             replaceWith = ReplaceWith("score"),
-            level = DeprecationLevel.ERROR,
+            level = DeprecationLevel.ERROR
         )
         var rating: Int? = null
             set(value) {
@@ -304,26 +283,23 @@ object DataStoreHelper {
             }
     }
 
-    @OptIn(ExperimentalSerializationApi::class) // KeepGeneratedSerializer is an experimental annotation for now
-    @KeepGeneratedSerializer
-    @Serializable(with = SubscribedData.Serializer::class)
     data class SubscribedData(
-        @JsonProperty("subscribedTime") @SerialName("subscribedTime") val subscribedTime: Long,
-        @JsonProperty("lastSeenEpisodeCount") @SerialName("lastSeenEpisodeCount") val lastSeenEpisodeCount: Map<DubStatus, Int?>,
-        @JsonProperty("id") @SerialName("id") override var id: Int?,
-        @JsonProperty("latestUpdatedTime") @SerialName("latestUpdatedTime") override val latestUpdatedTime: Long,
-        @JsonProperty("name") @SerialName("name") override val name: String,
-        @JsonProperty("url") @SerialName("url") override val url: String,
-        @JsonProperty("apiName") @SerialName("apiName") override val apiName: String,
-        @JsonProperty("type") @SerialName("type") override var type: TvType?,
-        @JsonProperty("posterUrl") @SerialName("posterUrl") override var posterUrl: String?,
-        @JsonProperty("year") @SerialName("year") override val year: Int?,
-        @JsonProperty("syncData") @SerialName("syncData") override val syncData: Map<String, String>? = null,
-        @JsonProperty("quality") @SerialName("quality") override var quality: SearchQuality? = null,
-        @JsonProperty("posterHeaders") @SerialName("posterHeaders") override var posterHeaders: Map<String, String>? = null,
-        @JsonProperty("plot") @SerialName("plot") override val plot: String? = null,
-        @JsonProperty("score") @SerialName("score") override var score: Score? = null,
-        @JsonProperty("tags") @SerialName("tags") override val tags: List<String>? = null,
+        @JsonProperty("subscribedTime") val subscribedTime: Long,
+        @JsonProperty("lastSeenEpisodeCount") val lastSeenEpisodeCount: Map<DubStatus, Int?>,
+        override var id: Int?,
+        override val latestUpdatedTime: Long,
+        override val name: String,
+        override val url: String,
+        override val apiName: String,
+        override var type: TvType?,
+        override var posterUrl: String?,
+        override val year: Int?,
+        override val syncData: Map<String, String>? = null,
+        override var quality: SearchQuality? = null,
+        override var posterHeaders: Map<String, String>? = null,
+        override val plot: String? = null,
+        override var score: Score? = null,
+        override val tags: List<String>? = null,
     ) : LibrarySearchResponse(
         id,
         latestUpdatedTime,
@@ -338,13 +314,8 @@ object DataStoreHelper {
         posterHeaders,
         plot,
         score,
-        tags,
+        tags
     ) {
-        object Serializer : WriteOnlySerializer<SubscribedData>(
-            SubscribedData.generatedSerializer(),
-            setOf("rating"),
-        )
-
         fun toLibraryItem(): SyncAPI.LibraryItem? {
             return SyncAPI.LibraryItem(
                 name,
@@ -363,30 +334,27 @@ object DataStoreHelper {
                 this.id,
                 plot = this.plot,
                 score = this.score,
-                tags = this.tags,
+                tags = this.tags
             )
         }
     }
 
-    @OptIn(ExperimentalSerializationApi::class) // KeepGeneratedSerializer is an experimental annotation for now
-    @KeepGeneratedSerializer
-    @Serializable(with = BookmarkedData.Serializer::class)
     data class BookmarkedData(
-        @JsonProperty("bookmarkedTime") @SerialName("bookmarkedTime") val bookmarkedTime: Long,
-        @JsonProperty("id") @SerialName("id") override var id: Int?,
-        @JsonProperty("latestUpdatedTime") @SerialName("latestUpdatedTime") override val latestUpdatedTime: Long,
-        @JsonProperty("name") @SerialName("name") override val name: String,
-        @JsonProperty("url") @SerialName("url") override val url: String,
-        @JsonProperty("apiName") @SerialName("apiName") override val apiName: String,
-        @JsonProperty("type") @SerialName("type") override var type: TvType?,
-        @JsonProperty("posterUrl") @SerialName("posterUrl") override var posterUrl: String?,
-        @JsonProperty("year") @SerialName("year") override val year: Int?,
-        @JsonProperty("syncData") @SerialName("syncData") override val syncData: Map<String, String>? = null,
-        @JsonProperty("quality") @SerialName("quality") override var quality: SearchQuality? = null,
-        @JsonProperty("posterHeaders") @SerialName("posterHeaders") override var posterHeaders: Map<String, String>? = null,
-        @JsonProperty("plot") @SerialName("plot") override val plot: String? = null,
-        @JsonProperty("score") @SerialName("score") override var score: Score? = null,
-        @JsonProperty("tags") @SerialName("tags") override val tags: List<String>? = null,
+        @JsonProperty("bookmarkedTime") val bookmarkedTime: Long,
+        override var id: Int?,
+        override val latestUpdatedTime: Long,
+        override val name: String,
+        override val url: String,
+        override val apiName: String,
+        override var type: TvType?,
+        override var posterUrl: String?,
+        override val year: Int?,
+        override val syncData: Map<String, String>? = null,
+        override var quality: SearchQuality? = null,
+        override var posterHeaders: Map<String, String>? = null,
+        override val plot: String? = null,
+        override var score: Score? = null,
+        override val tags: List<String>? = null,
     ) : LibrarySearchResponse(
         id,
         latestUpdatedTime,
@@ -399,13 +367,8 @@ object DataStoreHelper {
         syncData,
         quality,
         posterHeaders,
-        plot,
+        plot
     ) {
-        object Serializer : WriteOnlySerializer<BookmarkedData>(
-            BookmarkedData.generatedSerializer(),
-            setOf("rating"),
-        )
-
         fun toLibraryItem(id: String): SyncAPI.LibraryItem {
             return SyncAPI.LibraryItem(
                 name,
@@ -424,30 +387,27 @@ object DataStoreHelper {
                 this.id,
                 plot = this.plot,
                 score = this.score,
-                tags = this.tags,
+                tags = this.tags
             )
         }
     }
 
-    @OptIn(ExperimentalSerializationApi::class) // KeepGeneratedSerializer is an experimental annotation for now
-    @KeepGeneratedSerializer
-    @Serializable(with = FavoritesData.Serializer::class)
     data class FavoritesData(
-        @JsonProperty("favoritesTime") @SerialName("favoritesTime") val favoritesTime: Long,
-        @JsonProperty("id") @SerialName("id") override var id: Int?,
-        @JsonProperty("latestUpdatedTime") @SerialName("latestUpdatedTime") override val latestUpdatedTime: Long,
-        @JsonProperty("name") @SerialName("name") override val name: String,
-        @JsonProperty("url") @SerialName("url") override val url: String,
-        @JsonProperty("apiName") @SerialName("apiName") override val apiName: String,
-        @JsonProperty("type") @SerialName("type") override var type: TvType?,
-        @JsonProperty("posterUrl") @SerialName("posterUrl") override var posterUrl: String?,
-        @JsonProperty("year") @SerialName("year") override val year: Int?,
-        @JsonProperty("syncData") @SerialName("syncData") override val syncData: Map<String, String>? = null,
-        @JsonProperty("quality") @SerialName("quality") override var quality: SearchQuality? = null,
-        @JsonProperty("posterHeaders") @SerialName("posterHeaders") override var posterHeaders: Map<String, String>? = null,
-        @JsonProperty("plot") @SerialName("plot") override val plot: String? = null,
-        @JsonProperty("score") @SerialName("score") override var score: Score? = null,
-        @JsonProperty("tags") @SerialName("tags") override val tags: List<String>? = null,
+        @JsonProperty("favoritesTime") val favoritesTime: Long,
+        override var id: Int?,
+        override val latestUpdatedTime: Long,
+        override val name: String,
+        override val url: String,
+        override val apiName: String,
+        override var type: TvType?,
+        override var posterUrl: String?,
+        override val year: Int?,
+        override val syncData: Map<String, String>? = null,
+        override var quality: SearchQuality? = null,
+        override var posterHeaders: Map<String, String>? = null,
+        override val plot: String? = null,
+        override var score: Score? = null,
+        override val tags: List<String>? = null,
     ) : LibrarySearchResponse(
         id,
         latestUpdatedTime,
@@ -460,13 +420,8 @@ object DataStoreHelper {
         syncData,
         quality,
         posterHeaders,
-        plot,
+        plot
     ) {
-        object Serializer : WriteOnlySerializer<FavoritesData>(
-            FavoritesData.generatedSerializer(),
-            setOf("rating"),
-        )
-
         fun toLibraryItem(): SyncAPI.LibraryItem? {
             return SyncAPI.LibraryItem(
                 name,
@@ -485,32 +440,31 @@ object DataStoreHelper {
                 this.id,
                 plot = this.plot,
                 score = this.score,
-                tags = this.tags,
+                tags = this.tags
             )
         }
     }
 
-    @Serializable
     data class ResumeWatchingResult(
-        @JsonProperty("name") @SerialName("name") override val name: String,
-        @JsonProperty("url") @SerialName("url") override val url: String,
-        @JsonProperty("apiName") @SerialName("apiName") override val apiName: String,
-        @JsonProperty("type") @SerialName("type") override var type: TvType? = null,
-        @JsonProperty("posterUrl") @SerialName("posterUrl") override var posterUrl: String?,
-        @JsonProperty("watchPos") @SerialName("watchPos") val watchPos: PosDur?,
-        @JsonProperty("id") @SerialName("id") override var id: Int?,
-        @JsonProperty("parentId") @SerialName("parentId") val parentId: Int?,
-        @JsonProperty("episode") @SerialName("episode") val episode: Int?,
-        @JsonProperty("season") @SerialName("season") val season: Int?,
-        @JsonProperty("isFromDownload") @SerialName("isFromDownload") val isFromDownload: Boolean,
-        @JsonProperty("quality") @SerialName("quality") override var quality: SearchQuality? = null,
-        @JsonProperty("posterHeaders") @SerialName("posterHeaders") override var posterHeaders: Map<String, String>? = null,
-        @JsonProperty("score") @SerialName("score") override var score: Score? = null,
+        @JsonProperty("name") override val name: String,
+        @JsonProperty("url") override val url: String,
+        @JsonProperty("apiName") override val apiName: String,
+        @JsonProperty("type") override var type: TvType? = null,
+        @JsonProperty("posterUrl") override var posterUrl: String?,
+        @JsonProperty("watchPos") val watchPos: PosDur?,
+        @JsonProperty("id") override var id: Int?,
+        @JsonProperty("parentId") val parentId: Int?,
+        @JsonProperty("episode") val episode: Int?,
+        @JsonProperty("season") val season: Int?,
+        @JsonProperty("isFromDownload") val isFromDownload: Boolean,
+        @JsonProperty("quality") override var quality: SearchQuality? = null,
+        @JsonProperty("posterHeaders") override var posterHeaders: Map<String, String>? = null,
+        @JsonProperty("score") override var score: Score? = null,
     ) : SearchResponse
 
     /**
      * A datastore wide account for future implementations of a multiple account system
-     */
+     **/
 
     fun getAllWatchStateIds(): List<Int>? {
         val folder = "$currentAccount/$RESULT_WATCH_STATE"
@@ -546,7 +500,7 @@ object DataStoreHelper {
     }
 
     fun migrateResumeWatching() {
-        // if (getKey<Boolean>(RESULT_RESUME_WATCHING_HAS_MIGRATED, false) != true) {
+        // if (getKey(RESULT_RESUME_WATCHING_HAS_MIGRATED, false) != true) {
         setKey(RESULT_RESUME_WATCHING_HAS_MIGRATED, true)
         getAllResumeStateIdsOld()?.forEach { id ->
             getLastWatchedOld(id)?.let {
@@ -556,7 +510,7 @@ object DataStoreHelper {
                     it.episode,
                     it.season,
                     it.isFromDownload,
-                    it.updateTime,
+                    it.updateTime
                 )
                 removeLastWatchedOld(it.parentId)
             }
@@ -582,7 +536,7 @@ object DataStoreHelper {
                 episode,
                 season,
                 updateTime ?: System.currentTimeMillis(),
-                isFromDownload,
+                isFromDownload
             )
         )
     }
@@ -599,7 +553,7 @@ object DataStoreHelper {
 
     fun getLastWatched(id: Int?): DownloadObjects.ResumeWatching? {
         if (id == null) return null
-        return getKey<DownloadObjects.ResumeWatching>(
+        return getKey(
             "$currentAccount/$RESULT_RESUME_WATCHING",
             id.toString(),
         )
@@ -607,7 +561,7 @@ object DataStoreHelper {
 
     private fun getLastWatchedOld(id: Int?): DownloadObjects.ResumeWatching? {
         if (id == null) return null
-        return getKey<DownloadObjects.ResumeWatching>(
+        return getKey(
             "$currentAccount/$RESULT_RESUME_WATCHING_OLD",
             id.toString(),
         )
@@ -621,18 +575,18 @@ object DataStoreHelper {
 
     fun getBookmarkedData(id: Int?): BookmarkedData? {
         if (id == null) return null
-        return getKey<BookmarkedData>("$currentAccount/$RESULT_WATCH_STATE_DATA", id.toString())
+        return getKey("$currentAccount/$RESULT_WATCH_STATE_DATA", id.toString())
     }
 
     fun getAllBookmarkedData(): List<BookmarkedData> {
         return getKeys("$currentAccount/$RESULT_WATCH_STATE_DATA")?.mapNotNull {
-            getKey<BookmarkedData>(it)
+            getKey(it)
         } ?: emptyList()
     }
 
     fun getAllSubscriptions(): List<SubscribedData> {
         return getKeys("$currentAccount/$RESULT_SUBSCRIBED_STATE_DATA")?.mapNotNull {
-            getKey<SubscribedData>(it)
+            getKey(it)
         } ?: emptyList()
     }
 
@@ -644,12 +598,12 @@ object DataStoreHelper {
 
     /**
      * Set new seen episodes and update time
-     */
+     **/
     fun updateSubscribedData(id: Int?, data: SubscribedData?, episodeResponse: EpisodeResponse?) {
         if (id == null || data == null || episodeResponse == null) return
         val newData = data.copy(
             latestUpdatedTime = unixTimeMS,
-            lastSeenEpisodeCount = episodeResponse.getLatestEpisodes(),
+            lastSeenEpisodeCount = episodeResponse.getLatestEpisodes()
         )
         setKey("$currentAccount/$RESULT_SUBSCRIBED_STATE_DATA", id.toString(), newData)
     }
@@ -662,12 +616,12 @@ object DataStoreHelper {
 
     fun getSubscribedData(id: Int?): SubscribedData? {
         if (id == null) return null
-        return getKey<SubscribedData>("$currentAccount/$RESULT_SUBSCRIBED_STATE_DATA", id.toString())
+        return getKey("$currentAccount/$RESULT_SUBSCRIBED_STATE_DATA", id.toString())
     }
 
     fun getAllFavorites(): List<FavoritesData> {
         return getKeys("$currentAccount/$RESULT_FAVORITES_STATE_DATA")?.mapNotNull {
-            getKey<FavoritesData>(it)
+            getKey(it)
         } ?: emptyList()
     }
 
@@ -685,7 +639,7 @@ object DataStoreHelper {
 
     fun getFavoritesData(id: Int?): FavoritesData? {
         if (id == null) return null
-        return getKey<FavoritesData>("$currentAccount/$RESULT_FAVORITES_STATE_DATA", id.toString())
+        return getKey("$currentAccount/$RESULT_FAVORITES_STATE_DATA", id.toString())
     }
 
     fun setViewPos(id: Int?, pos: Long, dur: Long) {
@@ -694,10 +648,10 @@ object DataStoreHelper {
         setKey("$currentAccount/$VIDEO_POS_DUR", id.toString(), PosDur(pos, dur))
     }
 
-    /**
-     * Sets the position, duration, and resume data of an episode/movie,
-     * If nextEpisode is not specified it will not be able to set the next episode as resumable if progress > NEXT_WATCH_EPISODE_PERCENTAGE
-     */
+    /** Sets the position, duration, and resume data of an episode/movie,
+     *
+     * if nextEpisode is not specified it will not be able to set the next episode as resumable if progress > NEXT_WATCH_EPISODE_PERCENTAGE
+     * */
     fun setViewPosAndResume(id: Int?, position: Long, duration: Long, currentEpisode: Any?, nextEpisode: Any?) {
         setViewPos(id, position, duration)
         if (id != null) {
@@ -733,7 +687,7 @@ object DataStoreHelper {
                         resumeMeta.id,
                         resumeMeta.episode,
                         resumeMeta.season,
-                        isFromDownload = false,
+                        isFromDownload = false
                     )
                 }
 
@@ -743,7 +697,7 @@ object DataStoreHelper {
                         resumeMeta.id,
                         resumeMeta.episode,
                         resumeMeta.season,
-                        isFromDownload = true,
+                        isFromDownload = true
                     )
                 }
             }
@@ -752,16 +706,17 @@ object DataStoreHelper {
 
     fun getViewPos(id: Int?): PosDur? {
         if (id == null) return null
-        return getKey<PosDur>("$currentAccount/$VIDEO_POS_DUR", id.toString(), null)
+        return getKey("$currentAccount/$VIDEO_POS_DUR", id.toString(), null)
     }
 
     fun getVideoWatchState(id: Int?): VideoWatchState? {
         if (id == null) return null
-        return getKey<VideoWatchState>("$currentAccount/$VIDEO_WATCH_STATE", id.toString(), null)
+        return getKey("$currentAccount/$VIDEO_WATCH_STATE", id.toString(), null)
     }
 
     fun setVideoWatchState(id: Int?, watchState: VideoWatchState) {
         if (id == null) return
+
         // None == No key
         if (watchState == VideoWatchState.None) {
             removeKey("$currentAccount/$VIDEO_WATCH_STATE", id.toString())
@@ -772,7 +727,7 @@ object DataStoreHelper {
 
     fun getDub(id: Int): DubStatus? {
         return DubStatus.entries
-            .getOrNull(getKey<Int>("$currentAccount/$RESULT_DUB", id.toString(), -1) ?: -1)
+            .getOrNull(getKey("$currentAccount/$RESULT_DUB", id.toString(), -1) ?: -1)
     }
 
     fun setDub(id: Int, status: DubStatus) {
@@ -793,13 +748,13 @@ object DataStoreHelper {
             getKey<Int>(
                 "$currentAccount/$RESULT_WATCH_STATE",
                 id.toString(),
-                null,
+                null
             )
         )
     }
 
     fun getResultSeason(id: Int): Int? {
-        return getKey<Int>("$currentAccount/$RESULT_SEASON", id.toString(), null)
+        return getKey("$currentAccount/$RESULT_SEASON", id.toString(), null)
     }
 
     fun setResultSeason(id: Int, value: Int?) {
@@ -807,7 +762,7 @@ object DataStoreHelper {
     }
 
     fun getResultEpisode(id: Int): Int? {
-        return getKey<Int>("$currentAccount/$RESULT_EPISODE", id.toString(), null)
+        return getKey("$currentAccount/$RESULT_EPISODE", id.toString(), null)
     }
 
     fun setResultEpisode(id: Int, value: Int?) {
@@ -820,11 +775,12 @@ object DataStoreHelper {
 
     fun getSync(id: Int, idPrefixes: List<String>): List<String?> {
         return idPrefixes.map { idPrefix ->
-            getKey<String>("${idPrefix}_sync", id.toString())
+            getKey("${idPrefix}_sync", id.toString())
         }
     }
 
     var pinnedProviders: Array<String>
-        get() = getKey<Array<String>>(USER_PINNED_PROVIDERS) ?: emptyArray<String>()
+        get() = getKey(USER_PINNED_PROVIDERS) ?: emptyArray<String>()
         set(value) = setKey(USER_PINNED_PROVIDERS, value)
+
 }

app/src/main/java/com/lagradost/cloudstream3/utils/FillerEpisodeCheck.kt

@@ -10,14 +10,12 @@ import com.lagradost.cloudstream3.LoadResponse.Companion.getMalId
 import com.lagradost.cloudstream3.LoadResponse.Companion.getTMDbId
 import com.lagradost.cloudstream3.TvType
 import com.lagradost.cloudstream3.ui.result.getId
-import com.lagradost.cloudstream3.utils.AppUtils.parseJson
 import com.lagradost.cloudstream3.utils.Coroutines.main
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-import java.io.InputStream
 import java.lang.Thread.sleep
 import java.util.*
 import kotlin.concurrent.thread
+import com.lagradost.cloudstream3.utils.AppUtils.parseJson
+import java.io.InputStream
 import kotlin.let
 
 object FillerEpisodeCheck {
@@ -27,45 +25,66 @@ object FillerEpisodeCheck {
         return q + "cache" + z
     }
 
-    @Serializable
     data class Show(
-        @JsonProperty("slug") @SerialName("slug") val slug: String,
-        @JsonProperty("title") @SerialName("title") val title: String,
-        @JsonProperty("filler") @SerialName("filler") val filler: ArrayList<Int>,
-        @JsonProperty("mixedCanon") @SerialName("mixedCanon") val mixedCanon: ArrayList<Int>,
-        @JsonProperty("mangaCanon") @SerialName("mangaCanon") val mangaCanon: ArrayList<Int>,
-        @JsonProperty("animeCanon") @SerialName("animeCanon") val animeCanon: ArrayList<Int>,
+        @JsonProperty("slug")
+        val slug: String,
+        @JsonProperty("title")
+        val title: String,
+        @JsonProperty("filler")
+        val filler: ArrayList<Int>,
+        @JsonProperty("mixedCanon")
+        val mixedCanon: ArrayList<Int>,
+        @JsonProperty("mangaCanon")
+        val mangaCanon: ArrayList<Int>,
+        @JsonProperty("animeCanon")
+        val animeCanon: ArrayList<Int>,
     )
 
-    @Serializable
     data class MappingRoot(
-        @JsonProperty("type") @SerialName("type") val type: String?,
-        @JsonProperty("anidb_id") @SerialName("anidb_id") val anidbId: Long?,
-        @JsonProperty("anilist_id") @SerialName("anilist_id") val anilistId: Long?,
-        @JsonProperty("animecountdown_id") @SerialName("animecountdown_id") val animecountdownId: Long?,
-        @JsonProperty("animenewsnetwork_id") @SerialName("animenewsnetwork_id") val animenewsnetworkId: Long?,
-        @JsonProperty("anime-planet_id") @SerialName("anime-planet_id") val animePlanetId: String?,
-        @JsonProperty("anisearch_id") @SerialName("anisearch_id") val anisearchId: Long?,
-        @JsonProperty("imdb_id") @SerialName("imdb_id") val imdbId: String?,
-        @JsonProperty("kitsu_id") @SerialName("kitsu_id") val kitsuId: Long?,
-        @JsonProperty("livechart_id") @SerialName("livechart_id") val livechartId: Long?,
-        @JsonProperty("mal_id") @SerialName("mal_id") val malId: Long?,
-        @JsonProperty("simkl_id") @SerialName("simkl_id") val simklId: Long?,
-        @JsonProperty("themoviedb_id") @SerialName("themoviedb_id") val themoviedbId: Long?,
-        @JsonProperty("tvdb_id") @SerialName("tvdb_id") val tvdbId: Long?,
-        @JsonProperty("season") @SerialName("season") val season: Season?,
+        @JsonProperty("type")
+        val type: String?,
+        @JsonProperty("anidb_id")
+        val anidbId: Long?,
+        @JsonProperty("anilist_id")
+        val anilistId: Long?,
+        @JsonProperty("animecountdown_id")
+        val animecountdownId: Long?,
+        @JsonProperty("animenewsnetwork_id")
+        val animenewsnetworkId: Long?,
+        @JsonProperty("anime-planet_id")
+        val animePlanetId: String?,
+        @JsonProperty("anisearch_id")
+        val anisearchId: Long?,
+        @JsonProperty("imdb_id")
+        val imdbId: String?,
+        @JsonProperty("kitsu_id")
+        val kitsuId: Long?,
+        @JsonProperty("livechart_id")
+        val livechartId: Long?,
+        @JsonProperty("mal_id")
+        val malId: Long?,
+        @JsonProperty("simkl_id")
+        val simklId: Long?,
+        @JsonProperty("themoviedb_id")
+        val themoviedbId: Long?,
+        @JsonProperty("tvdb_id")
+        val tvdbId: Long?,
+        @JsonProperty("season")
+        val season: Season?,
     )
 
-    @Serializable
     data class Season(
-        @JsonProperty("tvdb") @SerialName("tvdb") val tvdb: Long?,
-        @JsonProperty("tmdb") @SerialName("tmdb") val tmdb: Long?,
+        @JsonProperty("tvdb")
+        val tvdb: Long?,
+        @JsonProperty("tmdb")
+        val tmdb: Long?,
     )
 
-    @Serializable
     data class CombinedMedia(
-        @JsonProperty("mapping") @SerialName("mapping") val mapping: MappingRoot?,
-        @JsonProperty("show") @SerialName("show") val show: Show,
+        @JsonProperty("mapping")
+        val mapping: MappingRoot?,
+        @JsonProperty("show")
+        val show: Show
     )
 
     data class Database(

app/src/main/java/com/lagradost/cloudstream3/utils/ImageModuleCoil.kt

@@ -3,7 +3,6 @@ package com.lagradost.cloudstream3.utils
 import android.graphics.Bitmap
 import android.graphics.drawable.Drawable
 import android.net.Uri
-import android.os.Build
 import android.os.Build.VERSION.SDK_INT
 import android.util.Log
 import android.widget.ImageView
@@ -12,7 +11,6 @@ import coil3.EventListener
 import coil3.ImageLoader
 import coil3.PlatformContext
 import coil3.SingletonImageLoader
-import coil3.decode.BitmapFactoryDecoder
 import coil3.disk.DiskCache
 import coil3.dispose
 import coil3.load
@@ -24,86 +22,82 @@ import coil3.request.CachePolicy
 import coil3.request.ErrorResult
 import coil3.request.ImageRequest
 import coil3.request.allowHardware
-import coil3.request.bitmapConfig
 import coil3.request.crossfade
 import coil3.util.DebugLogger
 import com.lagradost.cloudstream3.BuildConfig
 import com.lagradost.cloudstream3.USER_AGENT
 import com.lagradost.cloudstream3.network.buildDefaultClient
+import okhttp3.HttpUrl
 import okio.Path.Companion.toOkioPath
 import java.io.File
 import java.nio.ByteBuffer
 
 object ImageLoader {
+
     private const val TAG = "CoilImgLoader"
-    internal fun buildImageLoader(context: PlatformContext): ImageLoader {
-        val isBrokenHardware = hasPotentialBrokenHardware()
-        return ImageLoader.Builder(context)
+
+    internal fun buildImageLoader(context: PlatformContext): ImageLoader = ImageLoader.Builder(context)
             .crossfade(200)
-            .allowHardware(SDK_INT >= 28 && !isBrokenHardware)
+            .allowHardware(SDK_INT >= 28) // SDK_INT >= 28, cant use hardware bitmaps for Palette Builder
             .diskCachePolicy(CachePolicy.ENABLED)
             .networkCachePolicy(CachePolicy.ENABLED)
             .memoryCache {
-                MemoryCache.Builder().maxSizePercent(context, 0.1)//10 % of heap for mem-cache
-                    .strongReferencesEnabled(false)
+                MemoryCache.Builder().maxSizePercent(context, 0.1) // Use 10 % of the app's available memory for caching
                     .build()
             }
             .diskCache {
                 DiskCache.Builder()
                     .directory(context.cacheDir.resolve("cs3_image_cache").toOkioPath())
                     .maxSizeBytes(512L * 1024 * 1024) // 512 MB
-                    .maxSizePercent(0.04) // max 4% of storage for disk caching
+                    .maxSizePercent(0.04) // Use 4 % of the device's storage space for disk caching
                     .build()
             }
             /** Pass interceptors with care, unnecessary passing tokens to servers
             or image hosting services causes unauthorized exceptions **/
-            .components {
-                add(OkHttpNetworkFetcherFactory(callFactory = { buildDefaultClient(context) }))
-                if (isBrokenHardware) {
-                    add(BitmapFactoryDecoder.Factory())
-                } // sw decoder
-            }
-            .apply {
-                if (isBrokenHardware) { // coil will auto choose optimal config on modern device
-                    bitmapConfig(Bitmap.Config.ARGB_8888)
-                }
-                setupCoilLogger()
+            .components { add(OkHttpNetworkFetcherFactory(callFactory = { buildDefaultClient(context) })) }
+            .also {
+                it.setupCoilLogger()
+                Log.d(TAG, "buildImageLoader: Setting COIL Image Loader.")
             }
             .build()
-    }
 
-    /** DebugLogger on debug builds which won't slow down release builds & use EventListener for
+    /** Use DebugLogger on debug builds which won't slow down release builds & use EventListener for
     Errors on release builds. **/
     internal fun ImageLoader.Builder.setupCoilLogger() {
         if (BuildConfig.DEBUG) {
             logger(DebugLogger())
+            Log.d(TAG, "setupCoilLogger: Activated DEBUG_LOGGER FOR COIL")
         } else {
             eventListener(object : EventListener() {
                 override fun onError(request: ImageRequest, result: ErrorResult) {
                     super.onError(request, result)
-                    Log.e(TAG, "Image load error: ${result.throwable.message ?: result.throwable}")
-                    Log.e(TAG, "  URL: ${request.data}")
-                    Log.e(TAG, "  allowHardware: ${request.allowHardware}")
-                    Log.e(TAG, "  hardware: ${Build.HARDWARE}, board: ${Build.BOARD}")
+                    Log.e(TAG, "Error loading image: ${result.throwable}")
                 }
             })
+            Log.d(TAG, "setupCoilLogger: Activated EVENT_LISTENER FOR COIL")
         }
     }
 
-    /** coil's built in loader attached w/ global synchronized instance **/
+    /** we use coil's built in loader with our global synchronized instance, this way we achieve
+    latest and complete functionality as well as stability **/
     private fun ImageView.loadImageInternal(
         imageData: Any?,
         headers: Map<String, String>? = null,
         builder: ImageRequest.Builder.() -> Unit = {} // for placeholder, error & transformations
     ) {
-        // clear image to avoid loading & flickering issue at fast scrolling (~recycler view/lazy column)
+        // clear image to avoid loading & flickering issue at fast scrolling (e.g, an image recycler)
         this.dispose()
-        if (imageData == null) return
+
+        if(imageData == null) return // Just in case
+
         // setImageResource is better than coil3 on resources due to attr
         if(imageData is Int) {
-            this.setImageResource(imageData); return
+            this.setImageResource(imageData)
+            return
         }
-        // headers can be overridden by extensions.
+
+        // Use Coil's built-in load method but with our custom module & a decent USER-AGENT always
+        // which can be overridden by extensions.
         this.load(imageData, SingletonImageLoader.get(context)) {
             this.httpHeaders(NetworkHeaders.Builder().also { headerBuilder ->
                 headerBuilder["User-Agent"] = USER_AGENT
@@ -111,22 +105,11 @@ object ImageLoader {
                     headerBuilder[key] = value
                 }
             }.build())
+
             builder() // if passed
         }
     }
 
-    private fun hasPotentialBrokenHardware(): Boolean {
-        val hardware = Build.HARDWARE?.lowercase() ?: ""
-        val board = Build.BOARD?.lowercase() ?: ""
-        val model = Build.MODEL?.lowercase() ?: ""
-        val manufacturer = Build.MANUFACTURER?.lowercase() ?: ""
-        val allwinnerPatterns = listOf("sun50iw9", "h713", "allwinner", "sunxi")
-        val problematicModels =
-            listOf("hy320", "hy300", "a10plus", "magcubic", "sinoy", "android tv box")
-        return allwinnerPatterns.any { it in hardware || it in board || it in manufacturer } ||
-                problematicModels.any { it in model }
-    }
-
     /** TYPE_SAFE_LOADERS **/
     fun ImageView.loadImage(
         imageData: UiImage?,
@@ -155,6 +138,12 @@ object ImageLoader {
         builder: ImageRequest.Builder.() -> Unit = {}
     ) = loadImageInternal(imageData = imageData, headers = headers, builder = builder)
 
+    fun ImageView.loadImage(
+        imageData: HttpUrl?,
+        headers: Map<String, String>? = null,
+        builder: ImageRequest.Builder.() -> Unit = {}
+    ) = loadImageInternal(imageData = imageData, headers = headers, builder = builder)
+
     fun ImageView.loadImage(
         imageData: File?,
         builder: ImageRequest.Builder.() -> Unit = {}

app/src/main/java/com/lagradost/cloudstream3/utils/InAppUpdater.kt

@@ -27,8 +27,6 @@ import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
 import com.lagradost.cloudstream3.utils.GitInfo.currentCommitHash
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
 import okio.BufferedSink
 import okio.buffer
 import okio.sink
@@ -44,43 +42,38 @@ object InAppUpdater {
     private const val PRERELEASE_PACKAGE_NAME = "com.lagradost.cloudstream3.prerelease"
     private const val LOG_TAG = "InAppUpdater"
 
-    @Serializable
     private data class GithubAsset(
-        @JsonProperty("name") @SerialName("name") val name: String,
-        @JsonProperty("size") @SerialName("size") val size: Int, // Size in bytes
-        @JsonProperty("browser_download_url") @SerialName("browser_download_url") val browserDownloadUrl: String,
-        @JsonProperty("content_type") @SerialName("content_type") val contentType: String, // application/vnd.android.package-archive
+        @JsonProperty("name") val name: String,
+        @JsonProperty("size") val size: Int, // Size in bytes
+        @JsonProperty("browser_download_url") val browserDownloadUrl: String,
+        @JsonProperty("content_type") val contentType: String, // application/vnd.android.package-archive
     )
 
-    @Serializable
     private data class GithubRelease(
-        @JsonProperty("tag_name") @SerialName("tag_name") val tagName: String, // Version code
-        @JsonProperty("body") @SerialName("body") val body: String, // Description
-        @JsonProperty("assets") @SerialName("assets") val assets: List<GithubAsset>,
-        @JsonProperty("target_commitish") @SerialName("target_commitish") val targetCommitish: String, // Branch
-        @JsonProperty("prerelease") @SerialName("prerelease") val prerelease: Boolean,
-        @JsonProperty("node_id") @SerialName("node_id") val nodeId: String,
+        @JsonProperty("tag_name") val tagName: String, // Version code
+        @JsonProperty("body") val body: String, // Description
+        @JsonProperty("assets") val assets: List<GithubAsset>,
+        @JsonProperty("target_commitish") val targetCommitish: String, // Branch
+        @JsonProperty("prerelease") val prerelease: Boolean,
+        @JsonProperty("node_id") val nodeId: String,
     )
 
-    @Serializable
     private data class GithubObject(
-        @JsonProperty("sha") @SerialName("sha") val sha: String, // SHA-256 hash
-        @JsonProperty("type") @SerialName("type") val type: String,
-        @JsonProperty("url") @SerialName("url") val url: String,
+        @JsonProperty("sha") val sha: String, // SHA-256 hash
+        @JsonProperty("type") val type: String,
+        @JsonProperty("url") val url: String,
     )
 
-    @Serializable
     private data class GithubTag(
-        @JsonProperty("object") @SerialName("object") val githubObject: GithubObject,
+        @JsonProperty("object") val githubObject: GithubObject,
     )
 
-    @Serializable
     private data class Update(
-        @JsonProperty("shouldUpdate") @SerialName("shouldUpdate") val shouldUpdate: Boolean,
-        @JsonProperty("updateURL") @SerialName("updateURL") val updateURL: String?,
-        @JsonProperty("updateVersion") @SerialName("updateVersion") val updateVersion: String?,
-        @JsonProperty("changelog") @SerialName("changelog") val changelog: String?,
-        @JsonProperty("updateNodeId") @SerialName("updateNodeId") val updateNodeId: String?,
+        @JsonProperty("shouldUpdate") val shouldUpdate: Boolean,
+        @JsonProperty("updateURL") val updateURL: String?,
+        @JsonProperty("updateVersion") val updateVersion: String?,
+        @JsonProperty("changelog") val changelog: String?,
+        @JsonProperty("updateNodeId") val updateNodeId: String?,
     )
 
     private suspend fun Activity.getAppUpdate(installPrerelease: Boolean): Update {
@@ -100,9 +93,9 @@ object InAppUpdater {
     private suspend fun Activity.getReleaseUpdate(): Update {
         val url = "https://api.github.com/repos/$GITHUB_USER_NAME/$GITHUB_REPO/releases"
         val headers = mapOf("Accept" to "application/vnd.github.v3+json")
-        val response = parseJson<Array<GithubRelease>>(
+        val response = parseJson<List<GithubRelease>>(
             app.get(url, headers = headers).text
-        ).toList()
+        )
 
         val versionRegex = Regex("""(.*?((\d+)\.(\d+)\.(\d+))\.apk)""")
         val versionRegexLocal = Regex("""(.*?((\d+)\.(\d+)\.(\d+)).*)""")
@@ -110,7 +103,9 @@ object InAppUpdater {
             !rel.prerelease
         }.sortedWith(compareBy { release ->
             release.assets.firstOrNull { it.contentType == "application/vnd.android.package-archive" }?.name?.let { it1 ->
-                versionRegex.find(it1)?.groupValues?.let {
+                versionRegex.find(
+                    it1
+                )?.groupValues?.let {
                     it[3].toInt() * 100_000_000 + it[4].toInt() * 10_000 + it[5].toInt()
                 }
             }
@@ -155,9 +150,9 @@ object InAppUpdater {
             "https://api.github.com/repos/$GITHUB_USER_NAME/$GITHUB_REPO/git/ref/tags/pre-release"
         val releaseUrl = "https://api.github.com/repos/$GITHUB_USER_NAME/$GITHUB_REPO/releases"
         val headers = mapOf("Accept" to "application/vnd.github.v3+json")
-        val response = parseJson<Array<GithubRelease>>(
+        val response = parseJson<List<GithubRelease>>(
             app.get(releaseUrl, headers = headers).text
-        ).toList()
+        )
 
         val found = response.lastOrNull { rel ->
             rel.prerelease || rel.tagName == "pre-release"

app/src/main/java/com/lagradost/cloudstream3/utils/SyncUtil.kt

@@ -5,11 +5,10 @@ package com.lagradost.cloudstream3.utils
 import android.util.Log
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.cloudstream3.APIHolder.apis
+//import com.lagradost.cloudstream3.animeproviders.AniflixProvider
 import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.mvvm.logError
-import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
+import com.lagradost.cloudstream3.utils.AppUtils.parseJson
 import java.util.concurrent.TimeUnit
 
 object SyncUtil {
@@ -25,16 +24,18 @@ object SyncUtil {
     private const val NINE_ANIME = "9anime"
     private const val TWIST_MOE = "Twistmoe"
 
-    private val matchList = mapOf(
+    private val matchList =
+        mapOf(
             "9anime" to NINE_ANIME,
             "gogoanime" to GOGOANIME,
             "gogoanimes" to GOGOANIME,
-        "twist.moe" to TWIST_MOE,
+            "twist.moe" to TWIST_MOE
         )
 
     suspend fun getIdsFromUrl(url: String?): Pair<String?, String?>? {
         if (url == null) return null
         Log.i(TAG, "getIdsFromUrl $url")
+
         for (regex in regexs) {
             regex.find(url)?.let { match ->
                 if (match.groupValues.size == 3) {
@@ -55,120 +56,117 @@ object SyncUtil {
                 }
             }
         }
-
         return null
     }
 
-    /**
-     * first. Mal, second. Anilist,
-     * Valid sites are: Gogoanime, Twistmoe and 9anime
-     */
+    /** first. Mal, second. Anilist,
+     * valid sites are: Gogoanime, Twistmoe and 9anime*/
     private suspend fun getIdsFromSlug(
         slug: String,
-        site: String = "Gogoanime",
+        site: String = "Gogoanime"
     ): Pair<String?, String?>? {
         Log.i(TAG, "getIdsFromSlug $slug $site")
         try {
             //Gogoanime, Twistmoe and 9anime
-            val url = "https://raw.githubusercontent.com/MALSync/MAL-Sync-Backup/master/data/pages/$site/$slug.json"
+            val url =
+                "https://raw.githubusercontent.com/MALSync/MAL-Sync-Backup/master/data/pages/$site/$slug.json"
             val response = app.get(url, cacheTime = 1, cacheUnit = TimeUnit.DAYS).text
-            val mapped = tryParseJson<MalSyncPage>(response)
+            val mapped = parseJson<MalSyncPage?>(response)
 
             val overrideMal = mapped?.malId ?: mapped?.mal?.id ?: mapped?.anilist?.malId
             val overrideAnilist = mapped?.aniId ?: mapped?.anilist?.id
+
             if (overrideMal != null) {
                 return overrideMal.toString() to overrideAnilist?.toString()
             }
-
             return null
         } catch (e: Exception) {
             logError(e)
         }
-
         return null
     }
 
     suspend fun getUrlsFromId(id: String, type: String = "anilist"): List<String> {
-        val url = "https://raw.githubusercontent.com/MALSync/MAL-Sync-Backup/master/data/$type/anime/$id.json"
+        val url =
+            "https://raw.githubusercontent.com/MALSync/MAL-Sync-Backup/master/data/$type/anime/$id.json"
         val response = app.get(url, cacheTime = 1, cacheUnit = TimeUnit.DAYS).parsed<SyncPage>()
         val pages = response.pages ?: return emptyList()
-        val current = pages.gogoanime.values.union(pages.nineanime.values).union(pages.twistmoe.values)
+        val current =
+            pages.gogoanime.values.union(pages.nineanime.values).union(pages.twistmoe.values)
                 .mapNotNull { it.url }.toMutableList()
 
         if (type == "anilist") { // TODO MAKE BETTER
+            synchronized(apis) {
                 apis.filter { it.name.contains("Aniflix", ignoreCase = true) }.forEach {
                     current.add("${it.mainUrl}/anime/$id")
                 }
             }
-
+        }
         return current
     }
 
-    @Serializable
     data class SyncPage(
-        @JsonProperty("Pages") @SerialName("Pages") val pages: SyncPages?,
+        @JsonProperty("Pages") val pages: SyncPages?,
     )
 
-    @Serializable
     data class SyncPages(
-        @JsonProperty("9anime") @SerialName("9anime") val nineanime: Map<String, ProviderPage> = emptyMap(),
-        @JsonProperty("Gogoanime") @SerialName("Gogoanime") val gogoanime: Map<String, ProviderPage> = emptyMap(),
-        @JsonProperty("Twistmoe") @SerialName("Twistmoe") val twistmoe: Map<String, ProviderPage> = emptyMap(),
+        @JsonProperty("9anime") val nineanime: Map<String, ProviderPage> = emptyMap(),
+        @JsonProperty("Gogoanime") val gogoanime: Map<String, ProviderPage> = emptyMap(),
+        @JsonProperty("Twistmoe") val twistmoe: Map<String, ProviderPage> = emptyMap(),
     )
 
-    @Serializable
     data class ProviderPage(
-        @JsonProperty("url") @SerialName("url") val url: String?,
+        @JsonProperty("url") val url: String?,
     )
 
-    @Serializable
     data class MalSyncPage(
-        @JsonProperty("identifier") @SerialName("identifier") val identifier: String?,
-        @JsonProperty("type") @SerialName("type") val type: String?,
-        @JsonProperty("page") @SerialName("page") val page: String?,
-        @JsonProperty("title") @SerialName("title") val title: String?,
-        @JsonProperty("url") @SerialName("url") val url: String?,
-        @JsonProperty("image") @SerialName("image") val image: String?,
-        @JsonProperty("hentai") @SerialName("hentai") val hentai: Boolean?,
-        @JsonProperty("sticky") @SerialName("sticky") val sticky: Boolean?,
-        @JsonProperty("active") @SerialName("active") val active: Boolean?,
-        @JsonProperty("actor") @SerialName("actor") val actor: String?,
-        @JsonProperty("malId") @SerialName("malId") val malId: Int?,
-        @JsonProperty("aniId") @SerialName("aniId") val aniId: Int?,
-        @JsonProperty("createdAt") @SerialName("createdAt") val createdAt: String?,
-        @JsonProperty("updatedAt") @SerialName("updatedAt") val updatedAt: String?,
-        @JsonProperty("deletedAt") @SerialName("deletedAt") val deletedAt: String?,
-        @JsonProperty("Mal") @SerialName("Mal") val mal: Mal?,
-        @JsonProperty("Anilist") @SerialName("Anilist") val anilist: Anilist?,
-        @JsonProperty("malUrl") @SerialName("malUrl") val malUrl: String?,
+        @JsonProperty("identifier") val identifier: String?,
+        @JsonProperty("type") val type: String?,
+        @JsonProperty("page") val page: String?,
+        @JsonProperty("title") val title: String?,
+        @JsonProperty("url") val url: String?,
+        @JsonProperty("image") val image: String?,
+        @JsonProperty("hentai") val hentai: Boolean?,
+        @JsonProperty("sticky") val sticky: Boolean?,
+        @JsonProperty("active") val active: Boolean?,
+        @JsonProperty("actor") val actor: String?,
+        @JsonProperty("malId") val malId: Int?,
+        @JsonProperty("aniId") val aniId: Int?,
+        @JsonProperty("createdAt") val createdAt: String?,
+        @JsonProperty("updatedAt") val updatedAt: String?,
+        @JsonProperty("deletedAt") val deletedAt: String?,
+        @JsonProperty("Mal") val mal: Mal?,
+        @JsonProperty("Anilist") val anilist: Anilist?,
+        @JsonProperty("malUrl") val malUrl: String?
     )
 
-    @Serializable
     data class Anilist(
-        @JsonProperty("id") @SerialName("id") val id: Int?,
-        @JsonProperty("malId") @SerialName("malId") val malId: Int?,
-        @JsonProperty("type") @SerialName("type") val type: String?,
-        @JsonProperty("title") @SerialName("title") val title: String?,
-        @JsonProperty("url") @SerialName("url") val url: String?,
-        @JsonProperty("image") @SerialName("image") val image: String?,
-        @JsonProperty("category") @SerialName("category") val category: String?,
-        @JsonProperty("hentai") @SerialName("hentai") val hentai: Boolean?,
-        @JsonProperty("createdAt") @SerialName("createdAt") val createdAt: String?,
-        @JsonProperty("updatedAt") @SerialName("updatedAt") val updatedAt: String?,
-        @JsonProperty("deletedAt") @SerialName("deletedAt") val deletedAt: String?,
+//            @JsonProperty("altTitle") val altTitle: List<String>?,
+//            @JsonProperty("externalLinks") val externalLinks: List<String>?,
+        @JsonProperty("id") val id: Int?,
+        @JsonProperty("malId") val malId: Int?,
+        @JsonProperty("type") val type: String?,
+        @JsonProperty("title") val title: String?,
+        @JsonProperty("url") val url: String?,
+        @JsonProperty("image") val image: String?,
+        @JsonProperty("category") val category: String?,
+        @JsonProperty("hentai") val hentai: Boolean?,
+        @JsonProperty("createdAt") val createdAt: String?,
+        @JsonProperty("updatedAt") val updatedAt: String?,
+        @JsonProperty("deletedAt") val deletedAt: String?
     )
 
-    @Serializable
     data class Mal(
-        @JsonProperty("id") @SerialName("id") val id: Int?,
-        @JsonProperty("type") @SerialName("type") val type: String?,
-        @JsonProperty("title") @SerialName("title") val title: String?,
-        @JsonProperty("url") @SerialName("url") val url: String?,
-        @JsonProperty("image") @SerialName("image") val image: String?,
-        @JsonProperty("category") @SerialName("category") val category: String?,
-        @JsonProperty("hentai") @SerialName("hentai") val hentai: Boolean?,
-        @JsonProperty("createdAt") @SerialName("createdAt") val createdAt: String?,
-        @JsonProperty("updatedAt") @SerialName("updatedAt") val updatedAt: String?,
-        @JsonProperty("deletedAt") @SerialName("deletedAt") val deletedAt: String?,
+//            @JsonProperty("altTitle") val altTitle: List<String>?,
+        @JsonProperty("id") val id: Int?,
+        @JsonProperty("type") val type: String?,
+        @JsonProperty("title") val title: String?,
+        @JsonProperty("url") val url: String?,
+        @JsonProperty("image") val image: String?,
+        @JsonProperty("category") val category: String?,
+        @JsonProperty("hentai") val hentai: Boolean?,
+        @JsonProperty("createdAt") val createdAt: String?,
+        @JsonProperty("updatedAt") val updatedAt: String?,
+        @JsonProperty("deletedAt") val deletedAt: String?
     )
 }

app/src/main/java/com/lagradost/cloudstream3/utils/TestingUtils.kt

@@ -3,10 +3,10 @@ package com.lagradost.cloudstream3.utils
 import com.lagradost.cloudstream3.*
 import com.lagradost.cloudstream3.mvvm.logError
 import kotlinx.coroutines.*
+import org.junit.Assert
 import kotlin.random.Random
 
 object TestingUtils {
-
     open class TestResult(val success: Boolean) {
         companion object {
             val Pass = TestResult(true)
@@ -49,10 +49,6 @@ object TestingUtils {
         }
     }
 
-    private fun fail(message: String): Nothing = throw AssertionError(message)
-    private fun assertTrue(message: String, condition: Boolean) { if (!condition) fail(message) }
-    private fun assertNotNull(message: String, value: Any?) { if (value == null) fail(message) }
-
     class TestResultList(val results: List<SearchResponse>) : TestResult(true)
     class TestResultLoad(val extractorData: String, val shouldLoadLinks: Boolean) : TestResult(true)
 
@@ -91,7 +87,7 @@ object TestingUtils {
             } catch (e: Throwable) {
                 when (e) {
                     is NotImplementedError -> {
-                        fail("Provider marked as hasMainPage, while in reality is has not been implemented")
+                        Assert.fail("Provider marked as hasMainPage, while in reality is has not been implemented")
                     }
 
                     is CancellationException -> {
@@ -119,7 +115,7 @@ object TestingUtils {
                 api.search(query, 1)?.items?.takeIf { it.isNotEmpty() }
             } catch (e: Throwable) {
                 if (e is NotImplementedError) {
-                    fail("Provider has not implemented search()")
+                    Assert.fail("Provider has not implemented search()")
                 } else if (e is CancellationException) {
                     throw e
                 }
@@ -129,7 +125,7 @@ object TestingUtils {
         }
 
         return if (searchResults.isNullOrEmpty()) {
-            fail("Api ${api.name} did not return any search responses")
+            Assert.fail("Api ${api.name} did not return any search responses")
             TestResult.Fail // Should not be reached
         } else {
             TestResultList(searchResults)
@@ -200,7 +196,7 @@ object TestingUtils {
                 }
 
                 else -> {
-                    logger.error("Unknown load response: ${loadResponse::class.qualifiedName}")
+                    logger.error("Unknown load response: ${loadResponse.javaClass.name}")
                     return TestResult.Fail
                 }
             } ?: return TestResult.Fail
@@ -220,7 +216,7 @@ object TestingUtils {
 //            return TestResult(validResults)
         } catch (e: Throwable) {
             if (e is NotImplementedError) {
-                fail("Provider has not implemented load()")
+                Assert.fail("Provider has not implemented load()")
             }
             throw e
         }
@@ -232,14 +228,14 @@ object TestingUtils {
         url: String?,
         logger: Logger
     ): TestResult {
-        assertNotNull("Api ${api.name} has invalid url on episode", url)
+        Assert.assertNotNull("Api ${api.name} has invalid url on episode", url)
         if (url == null) return TestResult.Fail // Should never trigger
 
         var linksLoaded = 0
         try {
             val success = api.loadLinks(url, false, {}) { link ->
                 logger.log("Video loaded: ${link.name}")
-                assertTrue(
+                Assert.assertTrue(
                     "Api ${api.name} returns link with invalid url ${link.url}",
                     link.url.length > 4
                 )
@@ -249,12 +245,12 @@ object TestingUtils {
                 logger.log("Links loaded: $linksLoaded")
                 return TestResult(linksLoaded > 0)
             } else {
-                fail("Api ${api.name} returns false on loadLinks() with $linksLoaded links loaded")
+                Assert.fail("Api ${api.name} returns false on loadLinks() with $linksLoaded links loaded")
             }
         } catch (e: Throwable) {
             when (e) {
                 is NotImplementedError -> {
-                    fail("Provider has not implemented loadLinks()")
+                    Assert.fail("Provider has not implemented loadLinks()")
                 }
 
                 else -> {
@@ -280,7 +276,7 @@ object TestingUtils {
 
                     // Test Homepage
                     val homepage = testHomepage(api, logger)
-                    assertTrue("Homepage failed to load", homepage.success)
+                    Assert.assertTrue("Homepage failed to load", homepage.success)
                     val homePageList = (homepage as? TestResultList)?.results ?: emptyList()
 
                     // Test Search Results
@@ -291,7 +287,7 @@ object TestingUtils {
                                 listOf("over", "iron", "guy")).take(3)
 
                     val searchResults = testSearch(api, searchQueries, logger)
-                    assertTrue("Failed to get search results", searchResults.success)
+                    Assert.assertTrue("Failed to get search results", searchResults.success)
                     searchResults as TestResultList
 
                     // Test Load and LoadLinks

app/src/main/java/com/lagradost/cloudstream3/utils/TvChannelUtils.kt

@@ -23,15 +23,15 @@ const val PROGRAM_ID_LIST_KEY = "persistent_program_ids"
 
 object TvChannelUtils {
     fun Context.saveProgramId(programId: Long) {
-        val existing: List<Long> = getKey<List<Long>>(PROGRAM_ID_LIST_KEY) ?: emptyList()
+        val existing: List<Long> = getKey(PROGRAM_ID_LIST_KEY) ?: emptyList()
         val updated = (existing + programId).distinct()
         setKey(PROGRAM_ID_LIST_KEY, updated)
     }
     fun Context.getStoredProgramIds(): List<Long> {
-        return getKey<List<Long>>(PROGRAM_ID_LIST_KEY) ?: emptyList()
+        return getKey(PROGRAM_ID_LIST_KEY) ?: emptyList()
     }
     fun Context.removeProgramId(programId: Long) {
-        val existing: List<Long> = getKey<List<Long>>(PROGRAM_ID_LIST_KEY) ?: emptyList()
+        val existing: List<Long> = getKey(PROGRAM_ID_LIST_KEY) ?: emptyList()
         val updated = existing.filter { it != programId }
         setKey(PROGRAM_ID_LIST_KEY, updated)
     }
@@ -149,12 +149,10 @@ object TvChannelUtils {
             .setInputId(inputId)
             .build()
 
-        val channelUri = runCatching {
-            context.contentResolver.insert(
+        val channelUri = context.contentResolver.insert(
             TvContractCompat.Channels.CONTENT_URI,
             channel.toContentValues()
         )
-        }.getOrNull()
 
         channelUri?.let {
             val channelId = ContentUris.parseId(it)

app/src/main/java/com/lagradost/cloudstream3/utils/UIHelper.kt

@@ -65,12 +65,9 @@ import androidx.navigation.fragment.NavHostFragment
 import androidx.palette.graphics.Palette
 import androidx.preference.PreferenceManager
 import com.google.android.material.appbar.AppBarLayout
-import com.google.android.material.button.MaterialButton
 import com.google.android.material.chip.Chip
 import com.google.android.material.chip.ChipDrawable
 import com.google.android.material.chip.ChipGroup
-import com.google.android.material.progressindicator.CircularProgressIndicatorSpec
-import com.google.android.material.progressindicator.IndeterminateDrawable
 import com.lagradost.cloudstream3.CloudStreamApp.Companion.context
 import com.lagradost.cloudstream3.CommonActivity.activity
 import com.lagradost.cloudstream3.CommonActivity.showToast
@@ -586,43 +583,6 @@ object UIHelper {
         }
     }
 
-    /**
-     * Source: https://stackoverflow.com/questions/70954321/circular-progress-indicator-inside-buttons-android-material-design
-     *
-     * Shows indeterminate progress bar on this button in place of where icon would be.
-     * By default the tint of progress bar is the same as iconTint.
-     *
-     * @param tintColor (@ColorInt Int) Sets custom progress bar tint color.
-     */
-    fun MaterialButton.showProgress(@ColorInt tintColor: Int = this.iconTint.defaultColor) =
-        // Use runOnMainThreadNative to allow process on io threads, to make the code a bit cleaner
-        runOnMainThreadNative {
-            // No need to set it again, as then it will reset the animation
-            if(this.icon is IndeterminateDrawable<*>) {
-                return@runOnMainThreadNative
-            }
-            val spec = CircularProgressIndicatorSpec(
-                context, null, 0,
-                com.google.android.material.R.style.Widget_Material3_CircularProgressIndicator_ExtraSmall
-            )
-
-            spec.indicatorColors = intArrayOf(tintColor)
-
-            val progressIndicatorDrawable =
-                IndeterminateDrawable.createCircularDrawable(context, spec)
-
-            this.icon = progressIndicatorDrawable
-            if (this.getTag(R.id.text1) == null)
-                this.setTag(R.id.text1, this.text)
-            this.text = ""
-        }
-
-    fun MaterialButton.hideProgress() =
-        runOnMainThreadNative {
-            this.text = this.getTag(R.id.text1) as? String
-            this.icon = null
-        }
-
     /**id, stringRes */
     @SuppressLint("RestrictedApi")
     fun View.popupMenuNoIcons(

app/src/main/java/com/lagradost/cloudstream3/utils/downloader/DownloadManager.kt

@@ -804,7 +804,6 @@ object VideoDownloadManager {
         private suspend fun resolve(
             startByte: Long,
             endByte: Long?,
-            buffer: ByteArray,
             callback: (suspend CoroutineScope.(LazyStreamDownloadResponse) -> Unit)
         ): Long = withContext(Dispatchers.IO) {
             var currentByte: Long = startByte
@@ -823,6 +822,7 @@ object VideoDownloadManager {
             )
             val requestStream = request.body.byteStream()
 
+            val buffer = ByteArray(bufferSize)
             var read: Int
 
             try {
@@ -853,7 +853,6 @@ object VideoDownloadManager {
         suspend fun resolveSafe(
             index: Int,
             retries: Int = 3,
-            buffer: ByteArray,
             callback: (suspend CoroutineScope.(LazyStreamDownloadResponse) -> Unit)
         ): Boolean {
             var start = chuckStartByte.getOrNull(index) ?: return false
@@ -862,7 +861,7 @@ object VideoDownloadManager {
             for (i in 0 until retries) {
                 try {
                     // in case
-                    start = resolve(start, end, buffer, callback)
+                    start = resolve(start, end, callback)
                     // no end defined, so we don't care exactly where it ended
                     if (end == null) return true
                     // we have download more or exactly what we needed
@@ -1159,29 +1158,13 @@ object VideoDownloadManager {
                             }
                         }
 
-                    // Reuse a download buffer to decrease unnecessary alloc
-                    val buffer = ByteArray(items.bufferSize)
-
-                    // This will take up the first available job and resolve
+                    // this will take up the first available job and resolve
                     while (true) {
                         if (!isActive) return@launch
-
-                        var isTooFarAhead = false
                         fileMutex.withLock {
                             if (metadata.type == DownloadType.IsStopped
                                 || metadata.type == DownloadType.IsFailed
                             ) return@launch
-
-                            // Limit RAM usage by throttling if too much data is downloaded but not yet written to disk
-                            // 50MB limit
-                            if (metadata.bytesDownloaded - metadata.bytesWritten > 50_000_000) {
-                                isTooFarAhead = true
-                            }
-                        }
-
-                        if (isTooFarAhead) {
-                            delay(500)
-                            continue
                         }
 
                         // mutex just in case, we never want this to fail due to multithreading
@@ -1192,7 +1175,7 @@ object VideoDownloadManager {
 
                         // in case something has gone wrong set to failed if the fail is not caused by
                         // user cancellation
-                        if (!items.resolveSafe(index, buffer = buffer, callback = callback)) {
+                        if (!items.resolveSafe(index, callback = callback)) {
                             fileMutex.withLock {
                                 if (metadata.type != DownloadType.IsStopped) {
                                     metadata.type = DownloadType.IsFailed
@@ -1350,23 +1333,10 @@ object VideoDownloadManager {
                 launch(Dispatchers.IO) {
                     while (true) {
                         if (!isActive) return@launch
-
-                        var isTooFarAhead = false
                         fileMutex.withLock {
                             if (metadata.type == DownloadType.IsStopped
                                 || metadata.type == DownloadType.IsFailed
                             ) return@launch
-
-                            // Limit RAM usage by throttling if too much data is downloaded but not yet written to disk
-                            // 50MB limit
-                            if (metadata.bytesDownloaded - metadata.bytesWritten > 50_000_000) {
-                                isTooFarAhead = true
-                            }
-                        }
-
-                        if (isTooFarAhead) {
-                            delay(500)
-                            continue
                         }
 
                         // mutex just in case, we never want this to fail due to multithreading
@@ -1640,11 +1610,11 @@ object VideoDownloadManager {
     }
 
     fun getDownloadResumePackage(context: Context, id: Int): DownloadResumePackage? {
-        return context.getKey<DownloadResumePackage>(KEY_RESUME_PACKAGES, id.toString())
+        return context.getKey(KEY_RESUME_PACKAGES, id.toString())
     }
 
     fun getDownloadQueuePackage(context: Context, id: Int): DownloadQueueWrapper? {
-        return context.getKey<DownloadQueueWrapper>(KEY_RESUME_IN_QUEUE, id.toString())
+        return context.getKey(KEY_RESUME_IN_QUEUE, id.toString())
     }
 
     fun getDownloadEpisodeMetadata(

app/src/main/java/com/lagradost/cloudstream3/utils/downloader/DownloadObjects.kt

@@ -1,32 +1,23 @@
 package com.lagradost.cloudstream3.utils.downloader
 
 import android.net.Uri
-import com.fasterxml.jackson.annotation.JsonIgnore
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.cloudstream3.Score
-import com.lagradost.cloudstream3.SkipSerializationTest
 import com.lagradost.cloudstream3.TvType
 import com.lagradost.cloudstream3.services.DownloadQueueService
 import com.lagradost.cloudstream3.ui.player.SubtitleData
 import com.lagradost.cloudstream3.ui.result.ResultEpisode
 import com.lagradost.cloudstream3.utils.ExtractorLink
-import com.lagradost.cloudstream3.utils.serializers.UriSerializer
-import com.lagradost.cloudstream3.utils.serializers.WriteOnlySerializer
 import com.lagradost.safefile.SafeFile
-import kotlinx.serialization.ExperimentalSerializationApi
-import kotlinx.serialization.KeepGeneratedSerializer
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
 import java.io.IOException
 import java.io.OutputStream
 import java.util.Objects
 
 object DownloadObjects {
     /** An item can either be something to resume or something new to start */
-    @Serializable
     data class DownloadQueueWrapper(
-        @JsonProperty("resumePackage") @SerialName("resumePackage") val resumePackage: DownloadResumePackage?,
-        @JsonProperty("downloadItem") @SerialName("downloadItem") val downloadItem: DownloadQueueItem?,
+        @JsonProperty("resumePackage") val resumePackage: DownloadResumePackage?,
+        @JsonProperty("downloadItem") val downloadItem: DownloadQueueItem?,
     ) {
         init {
             assert(resumePackage != null || downloadItem != null) {
@@ -35,66 +26,56 @@ object DownloadObjects {
         }
 
         /** Loop through the current download instances to see if it is currently downloading. Also includes link loading. */
-        @JsonIgnore
         fun isCurrentlyDownloading(): Boolean {
             return DownloadQueueService.downloadInstances.value.any { it.downloadQueueWrapper.id == this.id }
         }
 
-        @JsonProperty("id") @SerialName("id")
+        @JsonProperty("id")
         val id = resumePackage?.item?.ep?.id ?: downloadItem!!.episode.id
 
-        @JsonProperty("parentId") @SerialName("parentId")
+        @JsonProperty("parentId")
         val parentId = resumePackage?.item?.ep?.parentId ?: downloadItem!!.episode.parentId
     }
 
     /** General data about the episode and show to start a download from. */
-    @Serializable
     data class DownloadQueueItem(
-        @JsonProperty("episode") @SerialName("episode") val episode: ResultEpisode,
-        @JsonProperty("isMovie") @SerialName("isMovie") val isMovie: Boolean,
-        @JsonProperty("resultName") @SerialName("resultName") val resultName: String,
-        @JsonProperty("resultType") @SerialName("resultType") val resultType: TvType,
-        @JsonProperty("resultPoster") @SerialName("resultPoster") val resultPoster: String?,
-        @JsonProperty("apiName") @SerialName("apiName") val apiName: String,
-        @JsonProperty("resultId") @SerialName("resultId") val resultId: Int,
-        @JsonProperty("resultUrl") @SerialName("resultUrl") val resultUrl: String,
-        @JsonProperty("links") @SerialName("links") val links: List<ExtractorLink>? = null,
-        @JsonProperty("subs") @SerialName("subs") val subs: List<SubtitleData>? = null,
+        @JsonProperty("episode") val episode: ResultEpisode,
+        @JsonProperty("isMovie") val isMovie: Boolean,
+        @JsonProperty("resultName") val resultName: String,
+        @JsonProperty("resultType") val resultType: TvType,
+        @JsonProperty("resultPoster") val resultPoster: String?,
+        @JsonProperty("apiName") val apiName: String,
+        @JsonProperty("resultId") val resultId: Int,
+        @JsonProperty("resultUrl") val resultUrl: String,
+        @JsonProperty("links") val links: List<ExtractorLink>? = null,
+        @JsonProperty("subs") val subs: List<SubtitleData>? = null,
     ) {
         fun toWrapper(): DownloadQueueWrapper {
             return DownloadQueueWrapper(null, this)
         }
     }
 
-    interface DownloadCached {
-        val id: Int
-    }
 
-    @OptIn(ExperimentalSerializationApi::class) // KeepGeneratedSerializer is an experimental annotation for now
-    @KeepGeneratedSerializer
-    @Serializable(with = DownloadEpisodeCached.Serializer::class)
-    data class DownloadEpisodeCached(
-        @JsonProperty("name") @SerialName("name") val name: String?,
-        @JsonProperty("poster") @SerialName("poster") val poster: String?,
-        @JsonProperty("episode") @SerialName("episode") val episode: Int,
-        @JsonProperty("season") @SerialName("season") val season: Int?,
-        @JsonProperty("parentId") @SerialName("parentId") val parentId: Int,
-        @JsonProperty("score") @SerialName("score") var score: Score? = null,
-        @JsonProperty("description") @SerialName("description") val description: String?,
-        @JsonProperty("cacheTime") @SerialName("cacheTime") val cacheTime: Long,
-        @JsonProperty("id") @SerialName("id") override val id: Int,
-    ) : DownloadCached {
-        object Serializer : WriteOnlySerializer<DownloadEpisodeCached>(
-            DownloadEpisodeCached.generatedSerializer(),
-            setOf("rating"),
+    abstract class DownloadCached(
+        @JsonProperty("id") open val id: Int,
     )
 
+    data class DownloadEpisodeCached(
+        @JsonProperty("name") val name: String?,
+        @JsonProperty("poster") val poster: String?,
+        @JsonProperty("episode") val episode: Int,
+        @JsonProperty("season") val season: Int?,
+        @JsonProperty("parentId") val parentId: Int,
+        @JsonProperty("score") var score: Score? = null,
+        @JsonProperty("description") val description: String?,
+        @JsonProperty("cacheTime") val cacheTime: Long,
+        override val id: Int,
+    ) : DownloadCached(id) {
         @JsonProperty("rating", access = JsonProperty.Access.WRITE_ONLY)
-        @SerialName("rating")
         @Deprecated(
             "`rating` is the old scoring system, use score instead",
             replaceWith = ReplaceWith("score"),
-            level = DeprecationLevel.ERROR,
+            level = DeprecationLevel.ERROR
         )
         var rating: Int? = null
             set(value) {
@@ -106,81 +87,74 @@ object DownloadObjects {
     }
 
     /** What to display to the user for a downloaded show/movie. Includes info such as name, poster and url */
-    @Serializable
     data class DownloadHeaderCached(
-        @JsonProperty("apiName") @SerialName("apiName") val apiName: String,
-        @JsonProperty("url") @SerialName("url") val url: String,
-        @JsonProperty("type") @SerialName("type") val type: TvType,
-        @JsonProperty("name") @SerialName("name") val name: String,
-        @JsonProperty("poster") @SerialName("poster") val poster: String?,
-        @JsonProperty("cacheTime") @SerialName("cacheTime") val cacheTime: Long,
-        @JsonProperty("id") @SerialName("id") override val id: Int,
-    ) : DownloadCached
+        @JsonProperty("apiName") val apiName: String,
+        @JsonProperty("url") val url: String,
+        @JsonProperty("type") val type: TvType,
+        @JsonProperty("name") val name: String,
+        @JsonProperty("poster") val poster: String?,
+        @JsonProperty("cacheTime") val cacheTime: Long,
+        override val id: Int,
+    ) : DownloadCached(id)
 
-    @Serializable
     data class DownloadResumePackage(
-        @JsonProperty("item") @SerialName("item") val item: DownloadItem,
+        @JsonProperty("item") val item: DownloadItem,
         /** Tills which link should get resumed */
-        @JsonProperty("linkIndex") @SerialName("linkIndex") val linkIndex: Int?,
+        @JsonProperty("linkIndex") val linkIndex: Int?,
     ) {
         fun toWrapper(): DownloadQueueWrapper {
             return DownloadQueueWrapper(this, null)
         }
     }
 
-    @Serializable
     data class DownloadItem(
-        @JsonProperty("source") @SerialName("source") val source: String?,
-        @JsonProperty("folder") @SerialName("folder") val folder: String?,
-        @JsonProperty("ep") @SerialName("ep") val ep: DownloadEpisodeMetadata,
-        @JsonProperty("links") @SerialName("links") val links: List<ExtractorLink>,
+        @JsonProperty("source") val source: String?,
+        @JsonProperty("folder") val folder: String?,
+        @JsonProperty("ep") val ep: DownloadEpisodeMetadata,
+        @JsonProperty("links") val links: List<ExtractorLink>,
     )
 
     /** Metadata for a specific episode and how to display it. */
-    @Serializable
     data class DownloadEpisodeMetadata(
-        @JsonProperty("id") @SerialName("id") val id: Int,
-        @JsonProperty("parentId") @SerialName("parentId") val parentId: Int,
-        @JsonProperty("mainName") @SerialName("mainName") val mainName: String,
-        @JsonProperty("sourceApiName") @SerialName("sourceApiName") val sourceApiName: String?,
-        @JsonProperty("poster") @SerialName("poster") val poster: String?,
-        @JsonProperty("name") @SerialName("name") val name: String?,
-        @JsonProperty("season") @SerialName("season") val season: Int?,
-        @JsonProperty("episode") @SerialName("episode") val episode: Int?,
-        @JsonProperty("type") @SerialName("type") val type: TvType?,
+        @JsonProperty("id") val id: Int,
+        @JsonProperty("parentId") val parentId: Int,
+        @JsonProperty("mainName") val mainName: String,
+        @JsonProperty("sourceApiName") val sourceApiName: String?,
+        @JsonProperty("poster") val poster: String?,
+        @JsonProperty("name") val name: String?,
+        @JsonProperty("season") val season: Int?,
+        @JsonProperty("episode") val episode: Int?,
+        @JsonProperty("type") val type: TvType?,
     )
 
-    @Serializable
+
     data class DownloadedFileInfo(
-        @JsonProperty("totalBytes") @SerialName("totalBytes") val totalBytes: Long,
-        @JsonProperty("relativePath") @SerialName("relativePath") val relativePath: String,
-        @JsonProperty("displayName") @SerialName("displayName") val displayName: String,
-        @JsonProperty("extraInfo") @SerialName("extraInfo") val extraInfo: String? = null,
-        @JsonProperty("basePath") @SerialName("basePath") val basePath: String? = null, // null is for legacy downloads. See getBasePath()
+        @JsonProperty("totalBytes") val totalBytes: Long,
+        @JsonProperty("relativePath") val relativePath: String,
+        @JsonProperty("displayName") val displayName: String,
+        @JsonProperty("extraInfo") val extraInfo: String? = null,
+        @JsonProperty("basePath") val basePath: String? = null, // null is for legacy downloads. See getBasePath()
         // Hash of the link associated with this DownloadFile, used so not override old data in the DownloadedFileInfo
-        @JsonProperty("linkHash") @SerialName("linkHash") val linkHash: Int? = null,
+        @JsonProperty("linkHash") val linkHash : Int? = null
     )
 
-    @Serializable
-    @SkipSerializationTest // Uri has issues with Jackson
     data class DownloadedFileInfoResult(
-        @JsonProperty("fileLength") @SerialName("fileLength") val fileLength: Long,
-        @JsonProperty("totalBytes") @SerialName("totalBytes") val totalBytes: Long,
-        @JsonProperty("path") @SerialName("path")
-        @Serializable(with = UriSerializer::class)
-        val path: Uri,
+        @JsonProperty("fileLength") val fileLength: Long,
+        @JsonProperty("totalBytes") val totalBytes: Long,
+        @JsonProperty("path") val path: Uri,
     )
 
-    @Serializable
+
     data class ResumeWatching(
-        @JsonProperty("parentId") @SerialName("parentId") val parentId: Int,
-        @JsonProperty("episodeId") @SerialName("episodeId") val episodeId: Int?,
-        @JsonProperty("episode") @SerialName("episode") val episode: Int?,
-        @JsonProperty("season") @SerialName("season") val season: Int?,
-        @JsonProperty("updateTime") @SerialName("updateTime") val updateTime: Long,
-        @JsonProperty("isFromDownload") @SerialName("isFromDownload") val isFromDownload: Boolean,
+        @JsonProperty("parentId") val parentId: Int,
+        @JsonProperty("episodeId") val episodeId: Int?,
+        @JsonProperty("episode") val episode: Int?,
+        @JsonProperty("season") val season: Int?,
+        @JsonProperty("updateTime") val updateTime: Long,
+        @JsonProperty("isFromDownload") val isFromDownload: Boolean,
     )
 
+
     data class DownloadStatus(
         /** if you should retry with the same args and hope for a better result */
         val retrySame: Boolean,
@@ -190,13 +164,14 @@ object DownloadObjects {
         val success: Boolean,
     )
 
+
     data class CreateNotificationMetadata(
         val type: VideoDownloadManager.DownloadType,
         val bytesDownloaded: Long,
         val bytesTotal: Long,
         val hlsProgress: Long? = null,
         val hlsTotal: Long? = null,
-        val bytesPerSecond: Long,
+        val bytesPerSecond: Long
     )
 
     data class StreamData(
@@ -223,11 +198,9 @@ object DownloadObjects {
         val exists: Boolean get() = file.exists() == true
     }
 
-    /**
-     * Bytes have the size end-start where the byte range is [start,end)
-     * note that ByteArray is a pointer and therefore can't be stored
-     * without cloning it.
-     */
+
+    /** bytes have the size end-start where the byte range is [start,end)
+     * note that ByteArray is a pointer and therefore cant be stored without cloning it */
     data class LazyStreamDownloadResponse(
         val bytes: ByteArray,
         val startByte: Long,

app/src/main/java/com/lagradost/cloudstream3/utils/serializers/UriSerializer.kt

@@ -1,42 +0,0 @@
-package com.lagradost.cloudstream3.utils.serializers
-
-import android.net.Uri
-import com.lagradost.cloudstream3.InternalAPI
-import kotlinx.serialization.KSerializer
-import kotlinx.serialization.descriptors.PrimitiveKind
-import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
-import kotlinx.serialization.descriptors.SerialDescriptor
-import kotlinx.serialization.encoding.Decoder
-import kotlinx.serialization.encoding.Encoder
-
-/**
- * Custom KSerializer for Android's [Uri] type.
- *
- * Uri is an Android platform type and cannot be annotated with @Serializable directly.
- * Registering it in a SerializersModule globally would require a custom module passed to
- * every Json instance, which adds hidden coupling. This serializer is also used sparingly
- * across the codebase, so the overhead of a global registration isn't justified.
- * Instead, we keep it explicit so that each usage site opts in intentionally and the
- * serialization behavior remains visible.
- *
- * Usage:
- *
- *   @Serializable
- *   data class MyData(
- *       @Serializable(with = UriSerializer::class)
- *       val uri: Uri,
- *   )
- */
-@InternalAPI
-object UriSerializer : KSerializer<Uri> {
-    override val descriptor: SerialDescriptor = 
-        PrimitiveSerialDescriptor("Uri", PrimitiveKind.STRING)
-
-    override fun serialize(encoder: Encoder, value: Uri) {
-        encoder.encodeString(value.toString())
-    }
-
-    override fun deserialize(decoder: Decoder): Uri {
-        return Uri.parse(decoder.decodeString())
-    }
-}

app/src/main/java/com/lagradost/cloudstream3/utils/videoskip/AniSkip.kt

@@ -1,14 +1,12 @@
 package com.lagradost.cloudstream3.utils.videoskip
 
-import com.fasterxml.jackson.annotation.JsonProperty
+import com.fasterxml.jackson.databind.annotation.JsonSerialize
 import com.lagradost.cloudstream3.AnimeLoadResponse
 import com.lagradost.cloudstream3.LoadResponse
 import com.lagradost.cloudstream3.LoadResponse.Companion.getMalId
 import com.lagradost.cloudstream3.TvType
 import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.ui.result.ResultEpisode
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
 
 // taken from https://github.com/saikou-app/saikou/blob/3803f8a7a59b826ca193664d46af3a22bbc989f7/app/src/main/java/ani/saikou/others/AniSkip.kt
 // the following is GPLv3 code https://github.com/saikou-app/saikou/blob/main/LICENSE.md
@@ -49,25 +47,22 @@ class AniSkip : SkipAPI() {
         }
     }
 
-    @Serializable
     data class AniSkipResponse(
-        @JsonProperty("found") @SerialName("found") val found: Boolean,
-        @JsonProperty("results") @SerialName("results") val results: List<Stamp>?,
-        @JsonProperty("message") @SerialName("message") val message: String?,
-        @JsonProperty("statusCode") @SerialName("statusCode") val statusCode: Int,
+        @JsonSerialize val found: Boolean,
+        @JsonSerialize val results: List<Stamp>?,
+        @JsonSerialize val message: String?,
+        @JsonSerialize val statusCode: Int
     )
 
-    @Serializable
     data class Stamp(
-        @JsonProperty("interval") @SerialName("interval") val interval: AniSkipInterval,
-        @JsonProperty("skipType") @SerialName("skipType") val skipType: String,
-        @JsonProperty("skipId") @SerialName("skipId") val skipId: String,
-        @JsonProperty("episodeLength") @SerialName("episodeLength") val episodeLength: Double,
+        @JsonSerialize val interval: AniSkipInterval,
+        @JsonSerialize val skipType: String,
+        @JsonSerialize val skipId: String,
+        @JsonSerialize val episodeLength: Double
     )
 
-    @Serializable
     data class AniSkipInterval(
-        @JsonProperty("startTime") @SerialName("startTime") val startTime: Double,
-        @JsonProperty("endTime") @SerialName("endTime") val endTime: Double,
+        @JsonSerialize val startTime: Double,
+        @JsonSerialize val endTime: Double
     )
 }

app/src/main/java/com/lagradost/cloudstream3/utils/videoskip/AnimeSkip.kt

@@ -17,8 +17,6 @@ import com.lagradost.cloudstream3.syncproviders.PlainAuthRepo
 import com.lagradost.cloudstream3.ui.result.ResultEpisode
 import com.lagradost.cloudstream3.utils.AppUtils.parseJson
 import com.lagradost.cloudstream3.utils.AppUtils.toJson
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
 import java.math.BigInteger
 import java.util.concurrent.ConcurrentHashMap
 import java.security.MessageDigest
@@ -36,51 +34,58 @@ class AnimeSkipAuth : AuthAPI() {
         return BigInteger(1, md.digest(input.toByteArray())).toString(16).padStart(32, '0')
     }
 
-    @Serializable
     data class LoginRoot(
-        @JsonProperty("data") @SerialName("data") val data: LoginData,
+        @JsonProperty("data")
+        val data: LoginData,
     )
 
-    @Serializable
     data class LoginData(
-        @JsonProperty("login") @SerialName("login") val login: Login,
+        @JsonProperty("login")
+        val login: Login,
     )
 
-    @Serializable
     data class Login(
-        @JsonProperty("authToken") @SerialName("authToken") val authToken: String,
-        @JsonProperty("refreshToken") @SerialName("refreshToken") val refreshToken: String,
-        @JsonProperty("account") @SerialName("account") val account: Account,
+        @JsonProperty("authToken")
+        val authToken: String,
+        @JsonProperty("refreshToken")
+        val refreshToken: String,
+        @JsonProperty("account")
+        val account: Account,
     )
 
-    @Serializable
     data class ApiRoot(
-        @JsonProperty("data") @SerialName("data") val data: ApiData,
+        @JsonProperty("data")
+        val data: ApiData,
     )
 
-    @Serializable
     data class ApiData(
-        @JsonProperty("myApiClients") @SerialName("myApiClients") val myApiClients: List<MyApiClient>,
+        @JsonProperty("myApiClients")
+        val myApiClients: List<MyApiClient>,
     )
 
-    @Serializable
     data class MyApiClient(
-        @JsonProperty("id") @SerialName("id") val id: String,
+        @JsonProperty("id")
+        val id: String,
     )
 
-    @Serializable
     data class Account(
-        @JsonProperty("profileUrl") @SerialName("profileUrl") val profileUrl: String,
-        @JsonProperty("username") @SerialName("username") val username: String,
-        @JsonProperty("email") @SerialName("email") val email: String,
+        @JsonProperty("profileUrl")
+        val profileUrl: String,
+        @JsonProperty("username")
+        val username: String,
+        @JsonProperty("email")
+        val email: String,
     )
 
-    @Serializable
     data class Payload(
-        @JsonProperty("profileUrl") @SerialName("profileUrl") val profileUrl: String,
-        @JsonProperty("username") @SerialName("username") val username: String,
-        @JsonProperty("email") @SerialName("email") val email: String,
-        @JsonProperty("clientId") @SerialName("clientId") val clientId: String,
+        @JsonProperty("profileUrl")
+        val profileUrl: String,
+        @JsonProperty("username")
+        val username: String,
+        @JsonProperty("email")
+        val email: String,
+        @JsonProperty("clientId")
+        val clientId: String,
     )
 
     override suspend fun user(token: AuthToken?): AuthUser? {
@@ -182,43 +187,52 @@ class AnimeSkip : SkipAPI() {
             name?.replace(asciiRegex, "")?.lowercase()
     }
 
-    @Serializable
     data class Root(
-        @JsonProperty("data") @SerialName("data") val data: Data,
+        @JsonProperty("data")
+        val data: Data,
     )
 
-    @Serializable
     data class Data(
-        @JsonProperty("searchShows") @SerialName("searchShows") val searchShows: List<SearchShow>,
+        @JsonProperty("searchShows")
+        val searchShows: List<SearchShow>,
     )
 
-    @Serializable
     data class SearchShow(
-        @JsonProperty("name") @SerialName("name") val name: String,
-        @JsonProperty("originalName") @SerialName("originalName") val originalName: String?,
-        @JsonProperty("seasonCount") @SerialName("seasonCount") val seasonCount: Long,
-        @JsonProperty("episodeCount") @SerialName("episodeCount") val episodeCount: Long,
-        @JsonProperty("baseDuration") @SerialName("baseDuration") val baseDuration: Double,
-        @JsonProperty("episodes") @SerialName("episodes") val episodes: List<Episode>,
+        @JsonProperty("name")
+        val name: String,
+        @JsonProperty("originalName")
+        val originalName: String?,
+        @JsonProperty("seasonCount")
+        val seasonCount: Long,
+        @JsonProperty("episodeCount")
+        val episodeCount: Long,
+        @JsonProperty("baseDuration")
+        val baseDuration: Double,
+        @JsonProperty("episodes")
+        val episodes: List<Episode>,
     )
 
-    @Serializable
     data class Episode(
-        @JsonProperty("number") @SerialName("number") val number: String?,
-        @JsonProperty("absoluteNumber") @SerialName("absoluteNumber") val absoluteNumber: String?,
-        @JsonProperty("season") @SerialName("season") val season: String?,
-        @JsonProperty("timestamps") @SerialName("timestamps") val timestamps: List<Timestamp>,
+        @JsonProperty("number")
+        val number: String?,
+        @JsonProperty("absoluteNumber")
+        val absoluteNumber: String?,
+        @JsonProperty("season")
+        val season: String?,
+        @JsonProperty("timestamps")
+        val timestamps: List<Timestamp>,
     )
 
-    @Serializable
     data class Timestamp(
-        @JsonProperty("at") @SerialName("at") val at: Double,
-        @JsonProperty("type") @SerialName("type") val type: Type,
+        @JsonProperty("at")
+        val at: Double,
+        @JsonProperty("type")
+        val type: Type,
     )
 
-    @Serializable
     data class Type(
-        @JsonProperty("name") @SerialName("name") val name: String,
+        @JsonProperty("name")
+        val name: String,
     )
 
     val cache: ConcurrentHashMap<String, Data> = ConcurrentHashMap()
@@ -353,3 +367,4 @@ class AnimeSkip : SkipAPI() {
         return result
     }
 }
+

app/src/main/java/com/lagradost/cloudstream3/utils/videoskip/IntroDbSkip.kt

@@ -6,8 +6,6 @@ import com.lagradost.cloudstream3.LoadResponse.Companion.getImdbId
 import com.lagradost.cloudstream3.TvType
 import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.ui.result.ResultEpisode
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
 
 class IntroDbSkip : SkipAPI() {
     override val name = "IntroDb"
@@ -57,24 +55,23 @@ class IntroDbSkip : SkipAPI() {
         )
     }
 
-    @Serializable
+
     data class IntroDbResponse(
-        @JsonProperty("imdb_id") @SerialName("imdb_id") val imdbId: String?,
-        @JsonProperty("season") @SerialName("season") val season: Int?,
-        @JsonProperty("episode") @SerialName("episode") val episode: Int?,
-        @JsonProperty("intro") @SerialName("intro") val intro: Segment?,
-        @JsonProperty("recap") @SerialName("recap") val recap: Segment?,
-        @JsonProperty("outro") @SerialName("outro") val outro: Segment?,
+        @JsonProperty("imdb_id") val imdbId: String?,
+        val season: Int?,
+        val episode: Int?,
+        val intro: Segment?,
+        val recap: Segment?,
+        val outro: Segment?,
     )
 
-    @Serializable
     data class Segment(
-        @JsonProperty("start_sec") @SerialName("start_sec") val startSec: Double?,
-        @JsonProperty("end_sec") @SerialName("end_sec") val endSec: Double?,
-        @JsonProperty("start_ms") @SerialName("start_ms") val startMs: Long?,
-        @JsonProperty("end_ms") @SerialName("end_ms") val endMs: Long?,
-        @JsonProperty("confidence") @SerialName("confidence") val confidence: Double?,
-        @JsonProperty("submission_count") @SerialName("submission_count") val submissionCount: Int?,
-        @JsonProperty("updated_at") @SerialName("updated_at") val updatedAt: String?,
+        @JsonProperty("start_sec") val startSec: Double?,
+        @JsonProperty("end_sec") val endSec: Double?,
+        @JsonProperty("start_ms") val startMs: Long?,
+        @JsonProperty("end_ms") val endMs: Long?,
+        val confidence: Double?,
+        @JsonProperty("submission_count") val submissionCount: Int?,
+        @JsonProperty("updated_at") val updatedAt: String?,
     )
 }