Fix subtitleoffset

.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/pull_request.yml

@@ -26,11 +26,6 @@ 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
 

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

@@ -268,7 +268,6 @@ dependencies {
 
     // Extensions & Other Libs
     implementation(libs.jsoup) // HTML Parser
-    implementation(libs.ksoup) // HTML Parser
     implementation(libs.rhino) // Run JavaScript
     implementation(libs.safefile) // To Prevent the URI File Fu*kery
     coreLibraryDesugaring(libs.desugar.jdk.libs.nio) // NIO Flavor Needed for NewPipeExtractor
@@ -323,9 +322,11 @@ 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",
+            "kotlin.uuid.ExperimentalUuidApi",
         )
     }
 }

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

@@ -2,7 +2,6 @@ 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
@@ -30,11 +29,8 @@ class SerializationClassTester {
         val serializableClasses = findSerializableClasses("com.lagradost")
         println("Number of serializable classes: ${serializableClasses.size}")
 
-        val failures = mutableListOf<String>()
-
         serializableClasses.forEach { kClass ->
-            runCatching {
+            val instance = Instancio.create(kClass.java)
-                val instance = Instancio.of(kClass.java).withMaxDepth(10).create()
 
             val jacksonJson = jacksonMapper.writeValueAsString(instance)
             val kotlinxJson = serializeWithKotlinx(kClass, instance)
@@ -55,13 +51,6 @@ class SerializationClassTester {
                     """.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")}")
         }
     }
 
@@ -71,11 +60,8 @@ class SerializationClassTester {
         val serializableClasses = findSerializableClasses("com.lagradost")
         println("Number of serializable classes: ${serializableClasses.size}")
 
-        val failures = mutableListOf<String>()
-
         serializableClasses.forEach { kClass ->
-            runCatching {
+            val instance = Instancio.create(kClass.java)
-                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)
@@ -89,6 +75,7 @@ class SerializationClassTester {
             // 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()
@@ -110,13 +97,6 @@ class SerializationClassTester {
                     """.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")}")
         }
     }
 
@@ -136,9 +116,9 @@ class SerializationClassTester {
                 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.any {
-                    && kClass.java.annotations.none { it is SkipSerializationTest }
+                    it is Serializable
-                    && !kClass.isAbstract
+                }
             }
     }
 

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

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

app/src/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/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/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 {
@@ -786,6 +784,7 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
             }
         }
 
+
         val builder = NavOptions.Builder().setLaunchSingleTop(true).setRestoreState(true)
             .setEnterAnim(R.anim.enter_anim)
             .setExitAnim(R.anim.exit_anim)
@@ -816,24 +815,22 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
                     try {
                         getKey<Array<SettingsGeneral.CustomSite>>(USER_PROVIDER_API)?.let { list ->
                             list.forEach { custom ->
-                                allProviders.firstOrNull {
+                                allProviders.firstOrNull { it.javaClass.simpleName == custom.parentJavaClass }
-                                    it::class.simpleName == custom.parentClassName
+                                    ?.let {
-                                }?.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 {
+                        apis =
-                            it.lang + it.name + it.mainUrl + it::class.qualifiedName
+                            allProviders.distinctBy { it.lang + it.name + it.mainUrl + it.javaClass.name }
-                        }
                         APIHolder.apiMap = null
                     } catch (e: Exception) {
                         logError(e)
@@ -1215,7 +1212,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 +1426,8 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
 
                     else -> {
                         resultviewPreviewBookmark.isEnabled = false
-                        resultviewPreviewBookmark.showProgress()
+                        resultviewPreviewBookmark.setIconResource(R.drawable.ic_baseline_bookmark_border_24)
-                        //resultviewPreviewBookmark.setIconResource(R.drawable.ic_baseline_bookmark_border_24)
+                        resultviewPreviewBookmark.setText(R.string.loading)
-                        //resultviewPreviewBookmark.setText(R.string.loading)
                     }
                 }
             }
@@ -2018,7 +2014,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

@@ -42,6 +42,7 @@ 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(
@@ -160,7 +161,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")
+        @JsonProperty("uri")
-        @Serializable(with = UriSerializer::class)
         val uri: Uri?,
-        @JsonProperty("url") @SerialName("url") val url: String?,
+        @JsonProperty("url")
-        @JsonProperty("mimeType") @SerialName("mimeType") val mimeType: String = "video/mp4",
+        val url: String?,
-        @JsonProperty("name") @SerialName("name") val name: String?,
+        @JsonProperty("mimeType")
-        @JsonProperty("headers") @SerialName("headers") var headers: Map<String, String> = mapOf(),
+        val mimeType: String = "video/mp4",
-        @JsonProperty("quality") @SerialName("quality") val quality: Int?,
+        @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("url")
-        @JsonProperty("mimeType") @SerialName("mimeType") val mimeType: String = "text/vtt",
+        val url: String,
-        @JsonProperty("name") @SerialName("name") val name: String?,
+        @JsonProperty("mimeType")
-        @JsonProperty("headers") @SerialName("headers") var headers: Map<String, String> = mapOf(),
+        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/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,
+    val container: String,
-    @JsonProperty("url") @SerialName("url") val url: String? = null,
+    val url: String? = null,
-    @JsonProperty("content") @SerialName("content") val content: String? = null,
+    val content: String? = null,
-    @JsonProperty("time") @SerialName("time") val time: Double? = null,
+    val time: Double? = null,
-    @JsonProperty("speed") @SerialName("speed") val speed: Double? = null,
+    val speed: Double? = null,
-    @JsonProperty("headers") @SerialName("headers") val headers: Map<String, String>? = 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/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("internalName") val internalName: String,
-    @JsonProperty("url") @SerialName("url") val url: String?,
+    @JsonProperty("url") val url: String?,
-    @JsonProperty("isOnline") @SerialName("isOnline") val isOnline: Boolean,
+    @JsonProperty("isOnline") val isOnline: Boolean,
-    @JsonProperty("filePath") @SerialName("filePath") val filePath: String,
+    @JsonProperty("filePath") val filePath: String,
-    @JsonProperty("version") @SerialName("version") val version: Int,
+    @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
+            onlineData.second.version > savedData.version || onlineData.second.version == PLUGIN_VERSION_ALWAYS_UPDATE
-        val isDisabled = onlineData.plugin.status == PROVIDER_STATUS_DOWN
+        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()
+            getRepoPlugins(it.url)?.toList() ?: emptyList()
-        }.flatten().distinctBy { it.plugin.url }
+        }.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.second.url,
-                    pluginData.onlineData.plugin.fileHash,
+                    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()
+            getRepoPlugins(it.url)?.toList() ?: emptyList()
-        }.flatten().distinctBy { it.plugin.url }
+        }.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.second.url,
-                pluginData.onlineData.plugin.fileHash,
+                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
             }
         }
@@ -838,16 +832,16 @@ object PluginManager {
         val urls = (getKey<Array<RepositoryData>>(REPOSITORIES_KEY)
             ?: emptyArray()) + PREBUILT_REPOSITORIES
         val onlinePlugins = urls.toList().amap {
-            getRepoPlugins(it) ?: emptyList()
+            getRepoPlugins(it.url)?.toList() ?: emptyList()
-        }.flatten().distinctBy { it.plugin.url }
+        }.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 +849,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 +858,14 @@ object PluginManager {
 
                 if (downloadPlugin(
                         activity,
-                        pluginData.onlineData.plugin.url,
+                        pluginData.onlineData.second.url,
-                        pluginData.onlineData.plugin.fileHash,
+                        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("iconUrl") val iconUrl: String?,
-    @JsonProperty("name") @SerialName("name") val name: String,
+    @JsonProperty("name") val name: String,
-    @JsonProperty("description") @SerialName("description") val description: String?,
+    @JsonProperty("description") val description: String?,
-    @JsonProperty("manifestVersion") @SerialName("manifestVersion") val manifestVersion: Int,
+    @JsonProperty("manifestVersion") val manifestVersion: Int,
-    @JsonProperty("pluginLists") @SerialName("pluginLists") val pluginLists: List<String>,
+    @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("internalName") val internalName: String,
-    @JsonProperty("authors") @SerialName("authors") val authors: List<String>,
+    @JsonProperty("authors") val authors: List<String>,
-    @JsonProperty("description") @SerialName("description") val description: 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("language") val language: String?,
-    @JsonProperty("iconUrl") @SerialName("iconUrl") val iconUrl: String?,
+    @JsonProperty("iconUrl") val iconUrl: String?,
     // Automatically generated by the gradle plugin
-    @JsonProperty("fileSize") @SerialName("fileSize") val fileSize: Long?,
+    @JsonProperty("fileSize") val fileSize: Long?,
-    @JsonProperty("fileHash") @SerialName("fileHash") val fileHash: String?,
+    @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("!")) {
+                app.get("https://cutt.ly/${fixedUrl}", allowRedirects = false).let { it2 ->
-                    val response = app.get("https://py.md/${fixedUrl.removePrefix("!")}", allowRedirects = false)
+                    it2.headers["Location"]?.let { url ->
-                    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
                         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)
+            app.get(convertRawGitUrl(url)).parsedSafe()
-                .parsedSafe<Repository>()
         }
     }
 
     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)
+            val response = app.get(convertRawGitUrl(pluginUrls))
-                .parsed<Array<SitePlugin>>().toList()
+            // 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>? {
+    suspend fun getRepoPlugins(repositoryUrl: String): List<Pair<String, SitePlugin>>? {
-        val repo = parseRepository(repositoryData.url) ?: return null
+        val repo = parseRepository(repositoryUrl) ?: return null
-        val list = repo.pluginLists.amap { url ->
+        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 =
+    fun hasVoted(pluginUrl: String) =
-        getKey<Boolean>("cs3-votes/${transformUrl(pluginUrl)}") ?: false
+        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,
+        val id: String? = null,
-        @JsonProperty("count") @SerialName("count") val count: Int? = null,
+        val count: Int? = null
     )
 }

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

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

@@ -1,17 +1,13 @@
 package com.lagradost.cloudstream3.syncproviders
 
-import com.fasterxml.jackson.annotation.JsonAlias
 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.syncproviders.AccountManager.Companion.APP_STRING
-import kotlinx.serialization.ExperimentalSerializationApi
+import com.lagradost.cloudstream3.utils.AppContextUtils.splitQuery
-import kotlinx.serialization.SerialName
+import java.net.URI
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.json.JsonNames
 import java.security.SecureRandom
 
 data class AuthLoginPage(
@@ -20,32 +16,32 @@ 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.
+     *
-     */
+     * `Access tokens are the thing that applications use to make API requests on behalf of a user.`
-    @JsonProperty("accessToken") @SerialName("accessToken")
+     * */
+    @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,
-     * Sometimes AuthToken needs to be customized to store e.g. username/password,
+     * this acts as a catch all to store text or JSON data. */
-     * this acts as a catch all to store text or JSON data.
+    @JsonProperty("payload")
-     */
-    @JsonProperty("payload") @SerialName("payload")
     val payload: String? = null,
 ) {
     fun isAccessTokenExpired(marginSec: Long = 10L) =
@@ -55,25 +51,20 @@ data class AuthToken(
         refreshTokenLifetime != null && unixTime + 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,
-     * Unique account identifier. If a subsequent login is done then it
+     * if a subsequent login is done then it will be refused if another account with the same id exists*/
-     * will be refused if another account with the same id exists.
+    @JsonProperty("id")
-     */
-    @JsonProperty("id") @SerialName("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")
+    @JsonProperty("profilePictureHeader")
-    @SerialName("profilePictureHeaders") @JsonNames("profilePictureHeader")
+    val profilePictureHeaders: Map<String, String>? = null
-    val profilePictureHeaders: Map<String, String>? = null,
 )
 
 /**
@@ -83,11 +74,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("user")
-    @JsonProperty("token") @SerialName("token") val token: AuthToken,
+    val user: AuthUser,
+    @JsonProperty("token")
+    val token: AuthToken,
 )
 
 data class AuthPinData(
@@ -110,12 +102,15 @@ data class AuthLoginRequirement(
 )
 
 /** What the user responds to the AuthLoginRequirement */
-@Serializable
 data class AuthLoginResponse(
-    @JsonProperty("password") @SerialName("password") val password: String?,
+    @JsonProperty("password")
-    @JsonProperty("username") @SerialName("username") val username: String?,
+    val password: String?,
-    @JsonProperty("email") @SerialName("email") val email: String?,
+    @JsonProperty("username")
-    @JsonProperty("server") @SerialName("server") val server: String?,
+    val username: String?,
+    @JsonProperty("email")
+    val email: String?,
+    @JsonProperty("server")
+    val server: String?,
 )
 
 /** Stateless Authentication class used for all personalized content */
@@ -171,8 +166,10 @@ abstract class AuthAPI {
             get() = unixTimeMS
 
         fun splitRedirectUrl(redirectUrl: String): Map<String, String> {
-            return splitUrlParameters(
+            return splitQuery(
+                URI(
                     redirectUrl.replace(APP_STRING, "https").replace("/#", "?")
+                ).toURL()
             )
         }
 
@@ -226,7 +223,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,6 +2,7 @@ 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
@@ -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 query: SubtitleSearch
-            val idPrefix: String,
         )
 
         data class SavedResourceResponse(
@@ -66,7 +66,7 @@ class SubtitleRepo(override val api: SubtitleAPI) : AuthRepo(api) {
                 var found: List<SubtitleEntity>? = null
                 for (item in searchCache) {
                     // 120 min save
-                    if (item.idPrefix == idPrefix && item.query == query && (unixTime - item.unixTime) < 60 * 120) {
+                    if (item.query == query && (unixTime - item.unixTime) < 60 * 120) {
                         found = item.response
                         break
                     }
@@ -79,7 +79,7 @@ class SubtitleRepo(override val api: SubtitleAPI) : AuthRepo(api) {
 
             // only cache valid return values
             if (returnValue.isNotEmpty()) {
-                val add = SavedSearchResponse(unixTime, returnValue, query, idPrefix)
+                val add = SavedSearchResponse(unixTime, returnValue, query)
                 searchCache.withLock {
                     if (searchCache.size > CACHE_SIZE) {
                         searchCache[searchCacheIndex] = add // rolling cache

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

@@ -27,10 +27,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
 
@@ -82,6 +81,7 @@ class AniListApi : SyncAPI() {
     override fun urlToId(url: String): String? =
         url.removePrefix("$mainUrl/anime/").removeSuffix("/")
 
+
     private fun getUrlFromId(id: Int): String {
         return "$mainUrl/anime/$id"
     }
@@ -103,6 +103,7 @@ 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 {
@@ -163,6 +164,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 +260,11 @@ class AniListApi : SyncAPI() {
                 val data =
                     mapOf(
                         "query" to query,
-                        "variables" to Variables(
+                        "variables" to
-                            search = name,
+                                mapOf(
-                            page = 1,
+                                    "search" to name,
-                            type = "ANIME",
+                                    "page" to 1,
+                                    "type" to "ANIME"
                                 ).toJson()
                     )
 
@@ -271,11 +274,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 +458,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 +506,7 @@ class AniListApi : SyncAPI() {
                 type = AniListStatusType.None,
             )
         }
+
     }
 
     private suspend fun postApi(token: AuthToken, q: String, cache: Boolean = false): String? {
@@ -524,79 +527,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("id") val id: Int,
-        @JsonProperty("title") @SerialName("title") val title: Title?,
+        @JsonProperty("title") val title: Title?,
-        @JsonProperty("idMal") @SerialName("idMal") val idMal: Int?,
+        @JsonProperty("idMal") val idMal: Int?,
-        @JsonProperty("coverImage") @SerialName("coverImage") val coverImage: CoverImage?,
+        @JsonProperty("coverImage") val coverImage: CoverImage?,
-        @JsonProperty("averageScore") @SerialName("averageScore") val averageScore: Int?,
+        @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("year") val year: Int,
-        @JsonProperty("month") @SerialName("month") val month: Int,
+        @JsonProperty("month") val month: Int,
-        @JsonProperty("day") @SerialName("day") val day: Int,
+        @JsonProperty("day") val day: Int
     )
 
-    @Serializable
     data class StartedAt(
-        @JsonProperty("year") @SerialName("year") val year: String?,
+        @JsonProperty("year") val year: String?,
-        @JsonProperty("month") @SerialName("month") val month: String?,
+        @JsonProperty("month") val month: String?,
-        @JsonProperty("day") @SerialName("day") val day: String?,
+        @JsonProperty("day") val day: String?
     )
 
-    @Serializable
     data class Title(
-        @JsonProperty("english") @SerialName("english") val english: String?,
+        @JsonProperty("english") val english: String?,
-        @JsonProperty("romaji") @SerialName("romaji") val romaji: String?,
+        @JsonProperty("romaji") val romaji: String?
     )
 
-    @Serializable
     data class CoverImage(
-        @JsonProperty("medium") @SerialName("medium") val medium: String?,
+        @JsonProperty("medium") val medium: String?,
-        @JsonProperty("large") @SerialName("large") val large: String?,
+        @JsonProperty("large") val large: String?,
-        @JsonProperty("extraLarge") @SerialName("extraLarge") val extraLarge: String?,
+        @JsonProperty("extraLarge") val extraLarge: String?
     )
 
-    @Serializable
     data class Media(
-        @JsonProperty("id") @SerialName("id") val id: Int,
+        @JsonProperty("id") val id: Int,
-        @JsonProperty("idMal") @SerialName("idMal") val idMal: Int?,
+        @JsonProperty("idMal") val idMal: Int?,
-        @JsonProperty("season") @SerialName("season") val season: String?,
+        @JsonProperty("season") val season: String?,
-        @JsonProperty("seasonYear") @SerialName("seasonYear") val seasonYear: Int,
+        @JsonProperty("seasonYear") val seasonYear: Int,
-        @JsonProperty("format") @SerialName("format") val format: String?,
+        @JsonProperty("format") val format: String?,
-        @JsonProperty("episodes") @SerialName("episodes") val episodes: Int,
+        //@JsonProperty("source") val source: String,
-        @JsonProperty("title") @SerialName("title") val title: Title,
+        @JsonProperty("episodes") val episodes: Int,
-        @JsonProperty("description") @SerialName("description") val description: String?,
+        @JsonProperty("title") val title: Title,
-        @JsonProperty("coverImage") @SerialName("coverImage") val coverImage: CoverImage,
+        @JsonProperty("description") val description: String?,
-        @JsonProperty("synonyms") @SerialName("synonyms") val synonyms: List<String>,
+        @JsonProperty("coverImage") val coverImage: CoverImage,
-        @JsonProperty("nextAiringEpisode") @SerialName("nextAiringEpisode") val nextAiringEpisode: SeasonNextAiringEpisode?,
+        @JsonProperty("synonyms") val synonyms: List<String>,
+        @JsonProperty("nextAiringEpisode") val nextAiringEpisode: SeasonNextAiringEpisode?,
     )
 
-    @Serializable
     data class Entries(
-        @JsonProperty("status") @SerialName("status") val status: String?,
+        @JsonProperty("status") val status: String?,
-        @JsonProperty("completedAt") @SerialName("completedAt") val completedAt: CompletedAt,
+        @JsonProperty("completedAt") val completedAt: CompletedAt,
-        @JsonProperty("startedAt") @SerialName("startedAt") val startedAt: StartedAt,
+        @JsonProperty("startedAt") val startedAt: StartedAt,
-        @JsonProperty("updatedAt") @SerialName("updatedAt") val updatedAt: Int,
+        @JsonProperty("updatedAt") val updatedAt: Int,
-        @JsonProperty("progress") @SerialName("progress") val progress: Int,
+        @JsonProperty("progress") val progress: Int,
-        @JsonProperty("score") @SerialName("score") val score: Int,
+        @JsonProperty("score") val score: Int,
-        @JsonProperty("private") @SerialName("private") val private: Boolean,
+        @JsonProperty("private") val private: Boolean,
-        @JsonProperty("media") @SerialName("media") val media: Media,
+        @JsonProperty("media") val media: Media
     ) {
         fun toLibraryItem(): SyncAPI.LibraryItem {
             return SyncAPI.LibraryItem(
@@ -623,20 +613,17 @@ class AniListApi : SyncAPI() {
         }
     }
 
-    @Serializable
     data class Lists(
-        @JsonProperty("status") @SerialName("status") val status: String?,
+        @JsonProperty("status") val status: String?,
-        @JsonProperty("entries") @SerialName("entries") val entries: List<Entries>,
+        @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 +672,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 +714,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 +735,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") val data: MediaListItem? = null)
-    data class MediaListItemRoot(
+    data class MediaListItem(@JsonProperty("MediaList") val mediaList: MediaListId? = null)
-        @JsonProperty("data") @SerialName("data") val data: MediaListItem? = null,
+    data class MediaListId(@JsonProperty("id") val id: Long? = 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,
-    )
 
     private suspend fun postDataAboutId(
         auth: AuthData,
@@ -770,6 +747,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 +839,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("id") val id: Int?,
-        @JsonProperty("title") @SerialName("title") val title: MediaTitle?,
+        @JsonProperty("title") val title: MediaTitle?,
-        @JsonProperty("idMal") @SerialName("idMal") val idMal: Int?,
+        @JsonProperty("idMal") val idMal: Int?,
-        @JsonProperty("format") @SerialName("format") val format: String?,
+        @JsonProperty("format") val format: String?,
-        @JsonProperty("nextAiringEpisode") @SerialName("nextAiringEpisode") val nextAiringEpisode: SeasonNextAiringEpisode?,
+        @JsonProperty("nextAiringEpisode") val nextAiringEpisode: SeasonNextAiringEpisode?,
-        @JsonProperty("relations") @SerialName("relations") val relations: SeasonEdges?,
+        @JsonProperty("relations") val relations: SeasonEdges?,
-        @JsonProperty("coverImage") @SerialName("coverImage") val coverImage: MediaCoverImage?,
+        @JsonProperty("coverImage") val coverImage: MediaCoverImage?,
-        @JsonProperty("duration") @SerialName("duration") val duration: Int?,
+        @JsonProperty("duration") val duration: Int?,
-        @JsonProperty("episodes") @SerialName("episodes") val episodes: Int?,
+        @JsonProperty("episodes") val episodes: Int?,
-        @JsonProperty("genres") @SerialName("genres") val genres: List<String>?,
+        @JsonProperty("genres") val genres: List<String>?,
-        @JsonProperty("synonyms") @SerialName("synonyms") val synonyms: List<String>?,
+        @JsonProperty("synonyms") val synonyms: List<String>?,
-        @JsonProperty("averageScore") @SerialName("averageScore") val averageScore: Int?,
+        @JsonProperty("averageScore") val averageScore: Int?,
-        @JsonProperty("isAdult") @SerialName("isAdult") val isAdult: Boolean?,
+        @JsonProperty("isAdult") val isAdult: Boolean?,
-        @JsonProperty("trailer") @SerialName("trailer") val trailer: MediaTrailer?,
+        @JsonProperty("trailer") val trailer: MediaTrailer?,
-        @JsonProperty("description") @SerialName("description") val description: String?,
+        @JsonProperty("description") val description: String?,
-        @JsonProperty("characters") @SerialName("characters") val characters: CharacterConnection?,
+        @JsonProperty("characters") val characters: CharacterConnection?,
-        @JsonProperty("recommendations") @SerialName("recommendations") val recommendations: RecommendationConnection?,
+        @JsonProperty("recommendations") val recommendations: RecommendationConnection?,
     )
 
-    @Serializable
     data class RecommendationConnection(
-        @JsonProperty("edges") @SerialName("edges") val edges: List<RecommendationEdge> = emptyList(),
+        @JsonProperty("edges") val edges: List<RecommendationEdge> = emptyList(),
-        @JsonProperty("nodes") @SerialName("nodes") val nodes: List<Recommendation> = 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("name") val first: String?,
-        @JsonProperty("middle") @SerialName("middle") val middle: String?,
+        @JsonProperty("middle") val middle: String?,
-        @JsonProperty("last") @SerialName("last") val last: String?,
+        @JsonProperty("last") val last: String?,
-        @JsonProperty("full") @SerialName("full") val full: String?,
+        @JsonProperty("full") val full: String?,
-        @JsonProperty("native") @SerialName("native") val native: String?,
+        @JsonProperty("native") val native: String?,
-        @JsonProperty("alternative") @SerialName("alternative") val alternative: List<String>?,
+        @JsonProperty("alternative") val alternative: List<String>?,
-        @JsonProperty("alternativeSpoiler") @SerialName("alternativeSpoiler") val alternativeSpoiler: List<String>?,
+        @JsonProperty("alternativeSpoiler") val alternativeSpoiler: List<String>?,
-        @JsonProperty("userPreferred") @SerialName("userPreferred") val userPreferred: String?,
+        @JsonProperty("userPreferred") val userPreferred: String?,
     )
 
-    @Serializable
     data class CharacterImage(
-        @JsonProperty("large") @SerialName("large") val large: String?,
+        @JsonProperty("large") val large: String?,
-        @JsonProperty("medium") @SerialName("medium") val medium: String?,
+        @JsonProperty("medium") val medium: String?,
     )
 
-    @Serializable
     data class Character(
-        @JsonProperty("name") @SerialName("name") val name: CharacterName?,
+        @JsonProperty("name") val name: CharacterName?,
-        @JsonProperty("age") @SerialName("age") val age: String?,
+        @JsonProperty("age") val age: String?,
-        @JsonProperty("image") @SerialName("image") val image: CharacterImage?,
+        @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
+        MAIN
-         * SUPPORTING - A supporting character role in the media
+        A primary character role in the media
-         * BACKGROUND - A background character 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("role") val role: String?,
-        @JsonProperty("name") @SerialName("name") val name: String?,
+        @JsonProperty("name") val name: String?,
-        @JsonProperty("voiceActors") @SerialName("voiceActors") val voiceActors: List<Staff>?,
+        @JsonProperty("voiceActors") val voiceActors: List<Staff>?,
-        @JsonProperty("favouriteOrder") @SerialName("favouriteOrder") val favouriteOrder: Int?,
+        @JsonProperty("favouriteOrder") val favouriteOrder: Int?,
-        @JsonProperty("media") @SerialName("media") val media: List<CharacterMedia>?,
+        @JsonProperty("media") val media: List<SeasonMedia>?,
-        @JsonProperty("node") @SerialName("node") val node: Character?,
+        @JsonProperty("node") val node: Character?,
     )
 
-    @Serializable
     data class StaffImage(
-        @JsonProperty("large") @SerialName("large") val large: String?,
+        @JsonProperty("large") val large: String?,
-        @JsonProperty("medium") @SerialName("medium") val medium: String?,
+        @JsonProperty("medium") val medium: String?,
     )
 
-    @Serializable
     data class StaffName(
-        @JsonProperty("name") @SerialName("name") val first: String?,
+        @JsonProperty("name") val first: String?,
-        @JsonProperty("middle") @SerialName("middle") val middle: String?,
+        @JsonProperty("middle") val middle: String?,
-        @JsonProperty("last") @SerialName("last") val last: String?,
+        @JsonProperty("last") val last: String?,
-        @JsonProperty("full") @SerialName("full") val full: String?,
+        @JsonProperty("full") val full: String?,
-        @JsonProperty("native") @SerialName("native") val native: String?,
+        @JsonProperty("native") val native: String?,
-        @JsonProperty("alternative") @SerialName("alternative") val alternative: List<String>?,
+        @JsonProperty("alternative") val alternative: List<String>?,
-        @JsonProperty("userPreferred") @SerialName("userPreferred") val userPreferred: String?,
+        @JsonProperty("userPreferred") val userPreferred: String?,
     )
 
-    @Serializable
     data class Staff(
-        @JsonProperty("image") @SerialName("image") val image: StaffImage?,
+        @JsonProperty("image") val image: StaffImage?,
-        @JsonProperty("name") @SerialName("name") val name: StaffName?,
+        @JsonProperty("name") val name: StaffName?,
-        @JsonProperty("age") @SerialName("age") val age: Int?,
+        @JsonProperty("age") val age: Int?,
     )
 
-    @Serializable
     data class CharacterConnection(
-        @JsonProperty("edges") @SerialName("edges") val edges: List<CharacterEdge>?,
+        @JsonProperty("edges") val edges: List<CharacterEdge>?,
-        @JsonProperty("nodes") @SerialName("nodes") val nodes: List<Character>?,
+        @JsonProperty("nodes") val nodes: List<Character>?,
+        //@JsonProperty("pageInfo")  pageInfo: PageInfo
     )
 
-    @Serializable
     data class MediaTrailer(
-        @JsonProperty("id") @SerialName("id") val id: String?,
+        @JsonProperty("id") val id: String?,
-        @JsonProperty("site") @SerialName("site") val site: String?,
+        @JsonProperty("site") val site: String?,
-        @JsonProperty("thumbnail") @SerialName("thumbnail") val thumbnail: String?,
+        @JsonProperty("thumbnail") val thumbnail: String?,
     )
 
-    @Serializable
     data class MediaCoverImage(
-        @JsonProperty("extraLarge") @SerialName("extraLarge") val extraLarge: String?,
+        @JsonProperty("extraLarge") val extraLarge: String?,
-        @JsonProperty("large") @SerialName("large") val large: String?,
+        @JsonProperty("large") val large: String?,
-        @JsonProperty("medium") @SerialName("medium") val medium: String?,
+        @JsonProperty("medium") val medium: String?,
-        @JsonProperty("color") @SerialName("color") val color: String?,
+        @JsonProperty("color") val color: String?,
     )
 
-    @Serializable
     data class SeasonNextAiringEpisode(
-        @JsonProperty("episode") @SerialName("episode") val episode: Int?,
+        @JsonProperty("episode") val episode: Int?,
-        @JsonProperty("timeUntilAiring") @SerialName("timeUntilAiring") val timeUntilAiring: 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("id") val id: Int?,
-        @JsonProperty("relationType") @SerialName("relationType") val relationType: String?,
+        @JsonProperty("relationType") val relationType: String?,
-        @JsonProperty("node") @SerialName("node") val node: SeasonNode?,
+        @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("romaji") val romaji: String?,
-        @JsonProperty("english") @SerialName("english") val english: String?,
+        @JsonProperty("english") val english: String?,
-        @JsonProperty("native") @SerialName("native") val native: String?,
+        @JsonProperty("native") val native: String?,
-        @JsonProperty("userPreferred") @SerialName("userPreferred") val userPreferred: String?,
+        @JsonProperty("userPreferred") val userPreferred: String?,
     )
 
-    @Serializable
     data class SeasonNode(
-        @JsonProperty("id") @SerialName("id") val id: Int,
+        @JsonProperty("id") val id: Int,
-        @JsonProperty("format") @SerialName("format") val format: String?,
+        @JsonProperty("format") val format: String?,
-        @JsonProperty("title") @SerialName("title") val title: Title?,
+        @JsonProperty("title") val title: Title?,
-        @JsonProperty("idMal") @SerialName("idMal") val idMal: Int?,
+        @JsonProperty("idMal") val idMal: Int?,
-        @JsonProperty("coverImage") @SerialName("coverImage") val coverImage: CoverImage?,
+        @JsonProperty("coverImage") val coverImage: CoverImage?,
-        @JsonProperty("averageScore") @SerialName("averageScore") val averageScore: Int?,
+        @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("id") val id: Int,
-        @JsonProperty("name") @SerialName("name") val name: String,
+        @JsonProperty("name") val name: String,
-        @JsonProperty("avatar") @SerialName("avatar") val avatar: AniListAvatar?,
+        @JsonProperty("avatar") val avatar: AniListAvatar?,
-        @JsonProperty("favourites") @SerialName("favourites") val favourites: AniListFavourites?,
+        @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("id") val id: Int,
-        @JsonProperty("name") @SerialName("name") val name: String,
+        @JsonProperty("name") val name: String,
-        @JsonProperty("picture") @SerialName("picture") val picture: 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("total") val total: Int?,
-        @JsonProperty("currentPage") @SerialName("currentPage") val currentPage: Int?,
+        @JsonProperty("currentPage") val currentPage: Int?,
-        @JsonProperty("lastPage") @SerialName("lastPage") val lastPage: Int?,
+        @JsonProperty("lastPage") val lastPage: Int?,
-        @JsonProperty("perPage") @SerialName("perPage") val perPage: Int?,
+        @JsonProperty("perPage") val perPage: Int?,
-        @JsonProperty("hasNextPage") @SerialName("hasNextPage") val hasNextPage: Boolean?,
+        @JsonProperty("hasNextPage") val hasNextPage: Boolean?,
     )
 
-    @Serializable
     data class LikeAnime(
-        @JsonProperty("nodes") @SerialName("nodes") val nodes: List<LikeNode>?,
+        @JsonProperty("nodes") val nodes: List<LikeNode>?,
-        @JsonProperty("pageInfo") @SerialName("pageInfo") val pageInfo: LikePageInfo?,
+        @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("title") val title: Title?,
-        @JsonProperty("isFavourite") @SerialName("isFavourite") val isFavourite: Boolean?,
+        @JsonProperty("isFavourite") val isFavourite: Boolean?,
-        @JsonProperty("id") @SerialName("id") val id: Int?,
+        @JsonProperty("id") val id: Int?,
-        @JsonProperty("progress") @SerialName("progress") val progress: Int?,
+        @JsonProperty("progress") val progress: Int?,
-        @JsonProperty("episodes") @SerialName("episodes") val episodes: Int?,
+        @JsonProperty("episodes") val episodes: Int?,
-        @JsonProperty("score") @SerialName("score") val score: Int?,
+        @JsonProperty("score") val score: Int?,
-        @JsonProperty("type") @SerialName("type") val type: AniListStatusType?,
+        @JsonProperty("type") val type: AniListStatusType?,
     )
 
-    @Serializable
     data class GetDataMediaListEntry(
-        @JsonProperty("progress") @SerialName("progress") val progress: Int?,
+        @JsonProperty("progress") val progress: Int?,
-        @JsonProperty("status") @SerialName("status") val status: String?,
+        @JsonProperty("status") val status: String?,
-        @JsonProperty("score") @SerialName("score") val score: Int?,
+        @JsonProperty("score") val score: Int?,
     )
 
-    @Serializable
     data class Nodes(
-        @JsonProperty("id") @SerialName("id") val id: Int?,
+        @JsonProperty("id") val id: Int?,
-        @JsonProperty("mediaRecommendation") @SerialName("mediaRecommendation") val mediaRecommendation: MediaRecommendation?,
+        @JsonProperty("mediaRecommendation") val mediaRecommendation: MediaRecommendation?
     )
 
-    @Serializable
     data class GetDataMedia(
-        @JsonProperty("isFavourite") @SerialName("isFavourite") val isFavourite: Boolean?,
+        @JsonProperty("isFavourite") val isFavourite: Boolean?,
-        @JsonProperty("episodes") @SerialName("episodes") val episodes: Int?,
+        @JsonProperty("episodes") val episodes: Int?,
-        @JsonProperty("title") @SerialName("title") val title: Title?,
+        @JsonProperty("title") val title: Title?,
-        @JsonProperty("mediaListEntry") @SerialName("mediaListEntry") val mediaListEntry: GetDataMediaListEntry?,
+        @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("id") val id: String?,
-        @JsonProperty("thumbnail") @SerialName("thumbnail") val thumbnail: String?,
+        @JsonProperty("thumbnail") val thumbnail: String?,
-        @JsonProperty("site") @SerialName("site") val site: String?,
+        @JsonProperty("site") val site: String?,
     )
 
-    @Serializable
     data class GetSearchMedia(
-        @JsonProperty("id") @SerialName("id") val id: Int,
+        @JsonProperty("id") val id: Int,
-        @JsonProperty("idMal") @SerialName("idMal") val idMal: Int?,
+        @JsonProperty("idMal") val idMal: Int?,
-        @JsonProperty("seasonYear") @SerialName("seasonYear") val seasonYear: Int,
+        @JsonProperty("seasonYear") val seasonYear: Int,
-        @JsonProperty("title") @SerialName("title") val title: GetSearchTitle,
+        @JsonProperty("title") val title: GetSearchTitle,
-        @JsonProperty("startDate") @SerialName("startDate") val startDate: StartedAt,
+        @JsonProperty("startDate") val startDate: StartedAt,
-        @JsonProperty("averageScore") @SerialName("averageScore") val averageScore: Int?,
+        @JsonProperty("averageScore") val averageScore: Int?,
-        @JsonProperty("meanScore") @SerialName("meanScore") val meanScore: Int?,
+        @JsonProperty("meanScore") val meanScore: Int?,
-        @JsonProperty("bannerImage") @SerialName("bannerImage") val bannerImage: String?,
+        @JsonProperty("bannerImage") val bannerImage: String?,
-        @JsonProperty("trailer") @SerialName("trailer") val trailer: TrailerObject?,
+        @JsonProperty("trailer") val trailer: TrailerObject?,
-        @JsonProperty("nextAiringEpisode") @SerialName("nextAiringEpisode") val nextAiringEpisode: SeasonNextAiringEpisode?,
+        @JsonProperty("nextAiringEpisode") val nextAiringEpisode: SeasonNextAiringEpisode?,
-        @JsonProperty("recommendations") @SerialName("recommendations") val recommendations: Recommendations?,
+        @JsonProperty("recommendations") val recommendations: Recommendations?,
-        @JsonProperty("relations") @SerialName("relations") val relations: SeasonEdges?,
+        @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,5 +1,6 @@
 package com.lagradost.cloudstream3.syncproviders.providers
 
+
 import androidx.annotation.StringRes
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.cloudstream3.APIHolder
@@ -22,8 +23,6 @@ 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
@@ -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)
+
         }
     }
 
@@ -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 =
@@ -217,6 +221,7 @@ class KitsuApi: SyncAPI() {
             prevSeason = null,
             actors = null,
         )
+
     }
 
     override suspend fun status(auth : AuthData?, id: String): AbstractSyncStatus? {
@@ -251,13 +256,15 @@ class KitsuApi: SyncAPI() {
             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,6 +453,7 @@ 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 limit = 500
@@ -441,44 +462,49 @@ class KitsuApi: SyncAPI() {
         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("token_type") val tokenType: String,
-        @JsonProperty("expires_in") @SerialName("expires_in") val expiresIn: Int,
+        @JsonProperty("expires_in") val expiresIn: Int,
-        @JsonProperty("access_token") @SerialName("access_token") val accessToken: String,
+        @JsonProperty("access_token") val accessToken: String,
-        @JsonProperty("refresh_token") @SerialName("refresh_token") val refreshToken: String,
+        @JsonProperty("refresh_token") val refreshToken: String,
     )
 
-    @Serializable
     data class KitsuNode(
-        @JsonProperty("id") @SerialName("id") val id: String,
+        @JsonProperty("id") val id: String,
-        @JsonProperty("attributes") @SerialName("attributes") val attributes: KitsuNodeAttributes,
+        @JsonProperty("attributes") val attributes: KitsuNodeAttributes,
         /* User list anime node */
-        @JsonProperty("relationships") @SerialName("relationships") val relationships: KitsuRelationships?,
+        @JsonProperty("relationships") val relationships: KitsuRelationships?,
-        @JsonProperty("anime") @SerialName("anime") var anime: KitsuAnimeData?,
+        var anime: KitsuAnimeData?
     ) {
         fun toLibraryItem(): LibraryItem {
+
             val animeItem = this.anime
 
             val numEpisodes = animeItem?.attributes?.episodeCount
@@ -520,100 +546,93 @@ class KitsuApi: SyncAPI() {
 
     }
 
-    @Serializable
     data class KitsuAnimeAttributes(
-        @JsonProperty("titles") @SerialName("titles") val titles: KitsuTitles?,
+        @JsonProperty("titles") val titles: KitsuTitles?,
-        @JsonProperty("canonicalTitle") @SerialName("canonicalTitle") val canonicalTitle: String?,
+        @JsonProperty("canonicalTitle") val canonicalTitle: String?,
-        @JsonProperty("posterImage") @SerialName("posterImage") val posterImage: KitsuPosterImage?,
+        @JsonProperty("posterImage") val posterImage: KitsuPosterImage?,
-        @JsonProperty("synopsis") @SerialName("synopsis") val synopsis: String?,
+        @JsonProperty("synopsis") val synopsis: String?,
-        @JsonProperty("startDate") @SerialName("startDate") val startDate: String?,
+        @JsonProperty("startDate") val startDate: String?,
-        @JsonProperty("endDate") @SerialName("endDate") val endDate: String?,
+        @JsonProperty("endDate") val endDate: String?,
-        @JsonProperty("episodeCount") @SerialName("episodeCount") val episodeCount: Int?,
+        @JsonProperty("episodeCount") val episodeCount: Int?,
-        @JsonProperty("episodeLength") @SerialName("episodeLength") val episodeLength: Int?,
+        @JsonProperty("episodeLength") val episodeLength: Int?,
     )
 
-    @Serializable
     data class KitsuAnimeData(
-        @JsonProperty("id") @SerialName("id") val id: String,
+        @JsonProperty("id") val id: String,
-        @JsonProperty("attributes") @SerialName("attributes") val attributes: KitsuAnimeAttributes,
+        @JsonProperty("attributes") val attributes: KitsuAnimeAttributes,
     )
 
-    @Serializable
+
     data class KitsuNodeAttributes(
         /* General attributes */
-        @JsonProperty("titles") @SerialName("titles") val titles: KitsuTitles?,
+        @JsonProperty("titles") val titles: KitsuTitles?,
-        @JsonProperty("canonicalTitle") @SerialName("canonicalTitle") val canonicalTitle: String?,
+        @JsonProperty("canonicalTitle") val canonicalTitle: String?,
-        @JsonProperty("posterImage") @SerialName("posterImage") val posterImage: KitsuPosterImage?,
+        @JsonProperty("posterImage") val posterImage: KitsuPosterImage?,
-        @JsonProperty("synopsis") @SerialName("synopsis") val synopsis: String?,
+        @JsonProperty("synopsis") val synopsis: String?,
-        @JsonProperty("startDate") @SerialName("startDate") val startDate: String?,
+        @JsonProperty("startDate") val startDate: String?,
-        @JsonProperty("endDate") @SerialName("endDate") val endDate: String?,
+        @JsonProperty("endDate") val endDate: String?,
-        @JsonProperty("episodeCount") @SerialName("episodeCount") val episodeCount: Int?,
+        @JsonProperty("episodeCount") val episodeCount: Int?,
-        @JsonProperty("episodeLength") @SerialName("episodeLength") val episodeLength: Int?,
+        @JsonProperty("episodeLength") val episodeLength: Int?,
         /* User attributes */
-        @JsonProperty("name") @SerialName("name") val name: String?,
+        @JsonProperty("name") val name: String?,
-        @JsonProperty("location") @SerialName("location") val location: String?,
+        @JsonProperty("location") val location: String?,
-        @JsonProperty("createdAt") @SerialName("createdAt") val createdAt: String?,
+        @JsonProperty("createdAt") val createdAt: String?,
-        @JsonProperty("avatar") @SerialName("avatar") val avatar: KitsuUserAvatar?,
+        @JsonProperty("avatar") val avatar: KitsuUserAvatar?,
         /* User list anime attributes */
-        @JsonProperty("progress") @SerialName("progress") val progress: Int?,
+        @JsonProperty("progress") val progress: Int?,
-        @JsonProperty("ratingTwenty") @SerialName("ratingTwenty") val ratingTwenty: Int?,
+        @JsonProperty("ratingTwenty") val ratingTwenty: Int?,
-        @JsonProperty("updatedAt") @SerialName("updatedAt") val updatedAt: String?,
+        @JsonProperty("updatedAt") val updatedAt: String?,
-        @JsonProperty("status") @SerialName("status") val status: 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("large") val large: String?,
-        @JsonProperty("medium") @SerialName("medium") val medium: String?,
+        @JsonProperty("medium") val medium: String?,
     )
 
-    @Serializable
     data class KitsuTitles(
-        @JsonProperty("en_jp") @SerialName("en_jp") val enJp: String?,
+        @JsonProperty("en_jp") val enJp: String?,
-        @JsonProperty("ja_jp") @SerialName("ja_jp") val jaJp: 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("first") val first: String?,
-        @JsonProperty("next") @SerialName("next") val next: String?,
+        @JsonProperty("next") val next: String?,
-        @JsonProperty("last") @SerialName("last") val last: 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("links") val links: KitsuLinks?,
-        @JsonProperty("data") @SerialName("data") val data: List<KitsuNode>,
+        @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(
                     string ?: return null
                 )?.time?.div(1000)
-            } catch (_: Exception) {
+            } catch (e: Exception) {
                 null
             }
         }
@@ -670,7 +689,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 +771,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,
+            val id: String? = null,
-            @JsonProperty("episodes") @SerialName("episodes") val episodes: Episodes? = 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("number")
-            @JsonProperty("titles") @SerialName("titles") val titles: Titles? = null,
+            val num: Int? = null,
-            @JsonProperty("description") @SerialName("description") val description: Description? = null,
+            val titles: Titles? = null,
-            @JsonProperty("thumbnail") @SerialName("thumbnail") val thumbnail: Thumbnail? = 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

@@ -21,9 +21,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
@@ -52,17 +51,16 @@ class MALApi : SyncAPI() {
         SyncWatchType.PLANTOWATCH,
         SyncWatchType.DROPPED,
         SyncWatchType.ONHOLD,
-        SyncWatchType.NONE,
+        SyncWatchType.NONE
     )
 
-    @Serializable
+    data class PayLoad(
-    data class Payload(
+        val requestId: Int,
-        @JsonProperty("requestId") @SerialName("requestId") val requestId: Int,
+        val codeVerifier: String
-        @JsonProperty("codeVerifier") @SerialName("codeVerifier") 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 +76,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(),
             refreshToken = token.refreshToken,
-            accessToken = token.accessToken,
+            accessToken = token.accessToken
         )
     }
 
@@ -98,7 +96,7 @@ class MALApi : SyncAPI() {
         return AuthUser(
             id = user.id,
             name = user.name,
-            profilePicture = user.picture,
+            profilePicture = user.picture
         )
     }
 
@@ -117,7 +115,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 +137,82 @@ class MALApi : SyncAPI() {
         )
     }
 
-    @Serializable
     data class MalAnime(
-        @JsonProperty("id") @SerialName("id") val id: Int?,
+        @JsonProperty("id") val id: Int?,
-        @JsonProperty("title") @SerialName("title") val title: String?,
+        @JsonProperty("title") val title: String?,
-        @JsonProperty("main_picture") @SerialName("main_picture") val mainPicture: MainPicture?,
+        @JsonProperty("main_picture") val mainPicture: MainPicture?,
-        @JsonProperty("alternative_titles") @SerialName("alternative_titles") val alternativeTitles: AlternativeTitles?,
+        @JsonProperty("alternative_titles") val alternativeTitles: AlternativeTitles?,
-        @JsonProperty("start_date") @SerialName("start_date") val startDate: String?,
+        @JsonProperty("start_date") val startDate: String?,
-        @JsonProperty("end_date") @SerialName("end_date") val endDate: String?,
+        @JsonProperty("end_date") val endDate: String?,
-        @JsonProperty("synopsis") @SerialName("synopsis") val synopsis: String?,
+        @JsonProperty("synopsis") val synopsis: String?,
-        @JsonProperty("mean") @SerialName("mean") val mean: Double?,
+        @JsonProperty("mean") val mean: Double?,
-        @JsonProperty("rank") @SerialName("rank") val rank: Int?,
+        @JsonProperty("rank") val rank: Int?,
-        @JsonProperty("popularity") @SerialName("popularity") val popularity: Int?,
+        @JsonProperty("popularity") val popularity: Int?,
-        @JsonProperty("num_list_users") @SerialName("num_list_users") val numListUsers: Int?,
+        @JsonProperty("num_list_users") val numListUsers: Int?,
-        @JsonProperty("num_scoring_users") @SerialName("num_scoring_users") val numScoringUsers: Int?,
+        @JsonProperty("num_scoring_users") val numScoringUsers: Int?,
-        @JsonProperty("nsfw") @SerialName("nsfw") val nsfw: String?,
+        @JsonProperty("nsfw") val nsfw: String?,
-        @JsonProperty("created_at") @SerialName("created_at") val createdAt: String?,
+        @JsonProperty("created_at") val createdAt: String?,
-        @JsonProperty("updated_at") @SerialName("updated_at") val updatedAt: String?,
+        @JsonProperty("updated_at") val updatedAt: String?,
-        @JsonProperty("media_type") @SerialName("media_type") val mediaType: String?,
+        @JsonProperty("media_type") val mediaType: String?,
-        @JsonProperty("status") @SerialName("status") val status: String?,
+        @JsonProperty("status") val status: String?,
-        @JsonProperty("genres") @SerialName("genres") val genres: ArrayList<Genres>?,
+        @JsonProperty("genres") val genres: ArrayList<Genres>?,
-        @JsonProperty("my_list_status") @SerialName("my_list_status") val myListStatus: MyListStatus?,
+        @JsonProperty("my_list_status") val myListStatus: MyListStatus?,
-        @JsonProperty("num_episodes") @SerialName("num_episodes") val numEpisodes: Int?,
+        @JsonProperty("num_episodes") val numEpisodes: Int?,
-        @JsonProperty("start_season") @SerialName("start_season") val startSeason: StartSeason?,
+        @JsonProperty("start_season") val startSeason: StartSeason?,
-        @JsonProperty("broadcast") @SerialName("broadcast") val broadcast: Broadcast?,
+        @JsonProperty("broadcast") val broadcast: Broadcast?,
-        @JsonProperty("source") @SerialName("source") val source: String?,
+        @JsonProperty("source") val source: String?,
-        @JsonProperty("average_episode_duration") @SerialName("average_episode_duration") val averageEpisodeDuration: Int?,
+        @JsonProperty("average_episode_duration") val averageEpisodeDuration: Int?,
-        @JsonProperty("rating") @SerialName("rating") val rating: String?,
+        @JsonProperty("rating") val rating: String?,
-        @JsonProperty("pictures") @SerialName("pictures") val pictures: ArrayList<MainPicture>?,
+        @JsonProperty("pictures") val pictures: ArrayList<MainPicture>?,
-        @JsonProperty("background") @SerialName("background") val background: String?,
+        @JsonProperty("background") val background: String?,
-        @JsonProperty("related_anime") @SerialName("related_anime") val relatedAnime: ArrayList<RelatedAnime>?,
+        @JsonProperty("related_anime") val relatedAnime: ArrayList<RelatedAnime>?,
-        @JsonProperty("related_manga") @SerialName("related_manga") val relatedManga: ArrayList<String>?,
+        @JsonProperty("related_manga") val relatedManga: ArrayList<String>?,
-        @JsonProperty("recommendations") @SerialName("recommendations") val recommendations: ArrayList<Recommendations>?,
+        @JsonProperty("recommendations") val recommendations: ArrayList<Recommendations>?,
-        @JsonProperty("studios") @SerialName("studios") val studios: ArrayList<Studios>?,
+        @JsonProperty("studios") val studios: ArrayList<Studios>?,
-        @JsonProperty("statistics") @SerialName("statistics") val statistics: Statistics?,
+        @JsonProperty("statistics") val statistics: Statistics?,
     )
 
-    @Serializable
     data class Recommendations(
-        @JsonProperty("node") @SerialName("node") val node: Node? = null,
+        @JsonProperty("node") val node: Node? = null,
-        @JsonProperty("num_recommendations") @SerialName("num_recommendations") val numRecommendations: Int? = null,
+        @JsonProperty("num_recommendations") val numRecommendations: Int? = null
     )
 
-    @Serializable
     data class Studios(
-        @JsonProperty("id") @SerialName("id") val id: Int? = null,
+        @JsonProperty("id") val id: Int? = null,
-        @JsonProperty("name") @SerialName("name") val name: String? = null,
+        @JsonProperty("name") val name: String? = null
     )
 
-    @Serializable
     data class MyListStatus(
-        @JsonProperty("status") @SerialName("status") val status: String? = null,
+        @JsonProperty("status") val status: String? = null,
-        @JsonProperty("score") @SerialName("score") val score: Int? = null,
+        @JsonProperty("score") val score: Int? = null,
-        @JsonProperty("num_episodes_watched") @SerialName("num_episodes_watched") val numEpisodesWatched: Int? = null,
+        @JsonProperty("num_episodes_watched") val numEpisodesWatched: Int? = null,
-        @JsonProperty("is_rewatching") @SerialName("is_rewatching") val isRewatching: Boolean? = null,
+        @JsonProperty("is_rewatching") val isRewatching: Boolean? = null,
-        @JsonProperty("updated_at") @SerialName("updated_at") val updatedAt: String? = null,
+        @JsonProperty("updated_at") val updatedAt: String? = null
     )
 
-    @Serializable
     data class RelatedAnime(
-        @JsonProperty("node") @SerialName("node") val node: Node? = null,
+        @JsonProperty("node") val node: Node? = null,
-        @JsonProperty("relation_type") @SerialName("relation_type") val relationType: String? = null,
+        @JsonProperty("relation_type") val relationType: String? = null,
-        @JsonProperty("relation_type_formatted") @SerialName("relation_type_formatted") val relationTypeFormatted: String? = null,
+        @JsonProperty("relation_type_formatted") val relationTypeFormatted: String? = null
     )
 
-    @Serializable
     data class Status(
-        @JsonProperty("watching") @SerialName("watching") val watching: String? = null,
+        @JsonProperty("watching") val watching: String? = null,
-        @JsonProperty("completed") @SerialName("completed") val completed: String? = null,
+        @JsonProperty("completed") val completed: String? = null,
-        @JsonProperty("on_hold") @SerialName("on_hold") val onHold: String? = null,
+        @JsonProperty("on_hold") val onHold: String? = null,
-        @JsonProperty("dropped") @SerialName("dropped") val dropped: String? = null,
+        @JsonProperty("dropped") val dropped: String? = null,
-        @JsonProperty("plan_to_watch") @SerialName("plan_to_watch") val planToWatch: String? = null,
+        @JsonProperty("plan_to_watch") val planToWatch: String? = null
     )
 
-    @Serializable
     data class Statistics(
-        @JsonProperty("status") @SerialName("status") val status: Status? = null,
+        @JsonProperty("status") val status: Status? = null,
-        @JsonProperty("num_list_users") @SerialName("num_list_users") val numListUsers: Int? = 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 +223,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 +336,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 +346,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 +361,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 = APIHolder.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("data") val data: List<Data>,
-        @JsonProperty("paging") @SerialName("paging") val paging: Paging,
+        @JsonProperty("paging") val paging: Paging
     )
 
-    @Serializable
     data class MainPicture(
-        @JsonProperty("medium") @SerialName("medium") val medium: String,
+        @JsonProperty("medium") val medium: String,
-        @JsonProperty("large") @SerialName("large") val large: String,
+        @JsonProperty("large") val large: String
     )
 
-    @Serializable
     data class Node(
-        @JsonProperty("id") @SerialName("id") val id: Int,
+        @JsonProperty("id") val id: Int,
-        @JsonProperty("title") @SerialName("title") val title: String,
+        @JsonProperty("title") val title: String,
-        @JsonProperty("main_picture") @SerialName("main_picture") val mainPicture: MainPicture?,
+        @JsonProperty("main_picture") val mainPicture: MainPicture?,
-        @JsonProperty("alternative_titles") @SerialName("alternative_titles") val alternativeTitles: AlternativeTitles?,
+        @JsonProperty("alternative_titles") val alternativeTitles: AlternativeTitles?,
-        @JsonProperty("media_type") @SerialName("media_type") val mediaType: String?,
+        @JsonProperty("media_type") val mediaType: String?,
-        @JsonProperty("num_episodes") @SerialName("num_episodes") val numEpisodes: Int?,
+        @JsonProperty("num_episodes") val numEpisodes: Int?,
-        @JsonProperty("status") @SerialName("status") val status: String?,
+        @JsonProperty("status") val status: String?,
-        @JsonProperty("start_date") @SerialName("start_date") val startDate: String?,
+        @JsonProperty("start_date") val startDate: String?,
-        @JsonProperty("end_date") @SerialName("end_date") val endDate: String?,
+        @JsonProperty("end_date") val endDate: String?,
-        @JsonProperty("average_episode_duration") @SerialName("average_episode_duration") val averageEpisodeDuration: Int?,
+        @JsonProperty("average_episode_duration") val averageEpisodeDuration: Int?,
-        @JsonProperty("synopsis") @SerialName("synopsis") val synopsis: String?,
+        @JsonProperty("synopsis") val synopsis: String?,
-        @JsonProperty("mean") @SerialName("mean") val mean: Double?,
+        @JsonProperty("mean") val mean: Double?,
-        @JsonProperty("genres") @SerialName("genres") val genres: List<Genres>?,
+        @JsonProperty("genres") val genres: List<Genres>?,
-        @JsonProperty("rank") @SerialName("rank") val rank: Int?,
+        @JsonProperty("rank") val rank: Int?,
-        @JsonProperty("popularity") @SerialName("popularity") val popularity: Int?,
+        @JsonProperty("popularity") val popularity: Int?,
-        @JsonProperty("num_list_users") @SerialName("num_list_users") val numListUsers: Int?,
+        @JsonProperty("num_list_users") val numListUsers: Int?,
-        @JsonProperty("num_favorites") @SerialName("num_favorites") val numFavorites: Int?,
+        @JsonProperty("num_favorites") val numFavorites: Int?,
-        @JsonProperty("num_scoring_users") @SerialName("num_scoring_users") val numScoringUsers: Int?,
+        @JsonProperty("num_scoring_users") val numScoringUsers: Int?,
-        @JsonProperty("start_season") @SerialName("start_season") val startSeason: StartSeason?,
+        @JsonProperty("start_season") val startSeason: StartSeason?,
-        @JsonProperty("broadcast") @SerialName("broadcast") val broadcast: Broadcast?,
+        @JsonProperty("broadcast") val broadcast: Broadcast?,
-        @JsonProperty("nsfw") @SerialName("nsfw") val nsfw: String?,
+        @JsonProperty("nsfw") val nsfw: String?,
-        @JsonProperty("created_at") @SerialName("created_at") val createdAt: String?,
+        @JsonProperty("created_at") val createdAt: String?,
-        @JsonProperty("updated_at") @SerialName("updated_at") val updatedAt: String?,
+        @JsonProperty("updated_at") val updatedAt: String?
     )
 
-    @Serializable
     data class ListStatus(
-        @JsonProperty("status") @SerialName("status") val status: String?,
+        @JsonProperty("status") val status: String?,
-        @JsonProperty("score") @SerialName("score") val score: Int,
+        @JsonProperty("score") val score: Int,
-        @JsonProperty("num_episodes_watched") @SerialName("num_episodes_watched") val numEpisodesWatched: Int,
+        @JsonProperty("num_episodes_watched") val numEpisodesWatched: Int,
-        @JsonProperty("is_rewatching") @SerialName("is_rewatching") val isRewatching: Boolean,
+        @JsonProperty("is_rewatching") val isRewatching: Boolean,
-        @JsonProperty("updated_at") @SerialName("updated_at") val updatedAt: String,
+        @JsonProperty("updated_at") val updatedAt: String,
     )
 
-    @Serializable
     data class Data(
-        @JsonProperty("node") @SerialName("node") val node: Node,
+        @JsonProperty("node") val node: Node,
-        @JsonProperty("list_status") @SerialName("list_status") val listStatus: ListStatus?,
+        @JsonProperty("list_status") val listStatus: ListStatus?,
     ) {
         fun toLibraryItem(): SyncAPI.LibraryItem {
             return SyncAPI.LibraryItem(
@@ -463,34 +454,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("synonyms") val synonyms: List<String>,
-        @JsonProperty("en") @SerialName("en") val en: String,
+        @JsonProperty("en") val en: String,
-        @JsonProperty("ja") @SerialName("ja") val ja: String,
+        @JsonProperty("ja") val ja: String
     )
 
-    @Serializable
     data class Genres(
-        @JsonProperty("id") @SerialName("id") val id: Int,
+        @JsonProperty("id") val id: Int,
-        @JsonProperty("name") @SerialName("name") val name: String,
+        @JsonProperty("name") val name: String
     )
 
-    @Serializable
     data class StartSeason(
-        @JsonProperty("year") @SerialName("year") val year: Int,
+        @JsonProperty("year") val year: Int,
-        @JsonProperty("season") @SerialName("season") val season: String,
+        @JsonProperty("season") val season: String
     )
 
-    @Serializable
     data class Broadcast(
-        @JsonProperty("day_of_the_week") @SerialName("day_of_the_week") val dayOfTheWeek: String?,
+        @JsonProperty("day_of_the_week") val dayOfTheWeek: String?,
-        @JsonProperty("start_time") @SerialName("start_time") val startTime: String?,
+        @JsonProperty("start_time") val startTime: String?
     )
 
     override suspend fun library(auth: AuthData?): LibraryMetadata? {
@@ -536,7 +522,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 +531,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 +585,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 +597,70 @@ class MALApi : SyncAPI() {
         ).text
     }
 
-    @Serializable
+
     data class ResponseToken(
-        @JsonProperty("token_type") @SerialName("token_type") val tokenType: String,
+        @JsonProperty("token_type") val tokenType: String,
-        @JsonProperty("expires_in") @SerialName("expires_in") val expiresIn: Int,
+        @JsonProperty("expires_in") val expiresIn: Int,
-        @JsonProperty("access_token") @SerialName("access_token") val accessToken: String,
+        @JsonProperty("access_token") val accessToken: String,
-        @JsonProperty("refresh_token") @SerialName("refresh_token") val refreshToken: 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("node") val node: MalNode,
-        @JsonProperty("list_status") @SerialName("list_status") val listStatus: MalStatus,
+        @JsonProperty("list_status") val listStatus: MalStatus,
     )
 
-    @Serializable
     data class MalNode(
-        @JsonProperty("id") @SerialName("id") val id: Int,
+        @JsonProperty("id") val id: Int,
-        @JsonProperty("title") @SerialName("title") val title: String,
+        @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("status") val status: String,
-        @JsonProperty("score") @SerialName("score") val score: Int,
+        @JsonProperty("score") val score: Int,
-        @JsonProperty("num_episodes_watched") @SerialName("num_episodes_watched") val numEpisodesWatched: Int,
+        @JsonProperty("num_episodes_watched") val numEpisodesWatched: Int,
-        @JsonProperty("is_rewatching") @SerialName("is_rewatching") val isRewatching: Boolean,
+        @JsonProperty("is_rewatching") val isRewatching: Boolean,
-        @JsonProperty("updated_at") @SerialName("updated_at") val updatedAt: String,
+        @JsonProperty("updated_at") val updatedAt: String,
     )
 
-    @Serializable
     data class MalUser(
-        @JsonProperty("id") @SerialName("id") val id: Int,
+        @JsonProperty("id") val id: Int,
-        @JsonProperty("name") @SerialName("name") val name: String,
+        @JsonProperty("name") val name: String,
-        @JsonProperty("location") @SerialName("location") val location: String,
+        @JsonProperty("location") val location: String,
-        @JsonProperty("joined_at") @SerialName("joined_at") val joinedAt: String,
+        @JsonProperty("joined_at") val joinedAt: String,
-        @JsonProperty("picture") @SerialName("picture") val picture: String?,
+        @JsonProperty("picture") val picture: String?,
     )
 
-    @Serializable
     data class MalMainPicture(
-        @JsonProperty("large") @SerialName("large") val large: String?,
+        @JsonProperty("large") val large: String?,
-        @JsonProperty("medium") @SerialName("medium") val medium: String?,
+        @JsonProperty("medium") val medium: String?,
     )
 
     // Used for getDataAboutId()
-    @Serializable
     data class SmallMalAnime(
-        @JsonProperty("id") @SerialName("id") val id: Int,
+        @JsonProperty("id") val id: Int,
-        @JsonProperty("title") @SerialName("title") val title: String?,
+        @JsonProperty("title") val title: String?,
-        @JsonProperty("num_episodes") @SerialName("num_episodes") val numEpisodes: Int,
+        @JsonProperty("num_episodes") val numEpisodes: Int,
-        @JsonProperty("my_list_status") @SerialName("my_list_status") val myListStatus: MalStatus?,
+        @JsonProperty("my_list_status") val myListStatus: MalStatus?,
-        @JsonProperty("main_picture") @SerialName("main_picture") val mainPicture: MalMainPicture?,
+        @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

@@ -20,8 +20,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"
@@ -101,7 +99,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 +179,11 @@ class OpenSubtitlesApi : SubtitleAPI() {
         return results
     }
 
-    /**
+    /*
-     * Process data returned from search.
+        Process data returned from search.
-     * Returns string url for the subtitle file.
+        Returns string url for the subtitle file.
     */
+
     override suspend fun load(
         auth : AuthData?,
         subtitle: AbstractSubtitleEntities.SubtitleEntity
@@ -221,64 +220,57 @@ class OpenSubtitlesApi : SubtitleAPI() {
         return null
     }
 
-    @Serializable
     data class OAuthToken(
-        @JsonProperty("token") @SerialName("token") var token: String? = null,
+        @JsonProperty("token") var token: String? = null,
-        @JsonProperty("status") @SerialName("status") var status: Int? = 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("id") var id: String? = null,
-        @JsonProperty("type") @SerialName("type") var type: String? = null,
+        @JsonProperty("type") var type: String? = null,
-        @JsonProperty("attributes") @SerialName("attributes") var attributes: ResultAttributes? = ResultAttributes(),
+        @JsonProperty("attributes") var attributes: ResultAttributes? = ResultAttributes()
     )
 
-    @Serializable
     data class ResultAttributes(
-        @JsonProperty("subtitle_id") @SerialName("subtitle_id") var subtitleId: String? = null,
+        @JsonProperty("subtitle_id") var subtitleId: String? = null,
-        @JsonProperty("language") @SerialName("language") var language: String? = null,
+        @JsonProperty("language") var language: String? = null,
-        @JsonProperty("release") @SerialName("release") var release: String? = null,
+        @JsonProperty("release") var release: String? = null,
-        @JsonProperty("url") @SerialName("url") var url: String? = null,
+        @JsonProperty("url") var url: String? = null,
-        @JsonProperty("files") @SerialName("files") var files: List<ResultFiles>? = listOf(),
+        @JsonProperty("files") var files: List<ResultFiles>? = listOf(),
-        @JsonProperty("feature_details") @SerialName("feature_details") var featDetails: ResultFeatureDetails? = ResultFeatureDetails(),
+        @JsonProperty("feature_details") var featDetails: ResultFeatureDetails? = ResultFeatureDetails(),
-        @JsonProperty("hearing_impaired") @SerialName("hearing_impaired") var hearingImpaired: Boolean? = null,
+        @JsonProperty("hearing_impaired") var hearingImpaired: Boolean? = null,
     )
 
-    @Serializable
     data class ResultFiles(
-        @JsonProperty("file_id") @SerialName("file_id") var fileId: Int? = null,
+        @JsonProperty("file_id") var fileId: Int? = null,
-        @JsonProperty("file_name") @SerialName("file_name") var fileName: String? = null,
+        @JsonProperty("file_name") var fileName: String? = null
     )
 
-    @Serializable
     data class ResultDownloadLink(
-        @JsonProperty("link") @SerialName("link") var link: String? = null,
+        @JsonProperty("link") var link: String? = null,
-        @JsonProperty("file_name") @SerialName("file_name") var fileName: String? = null,
+        @JsonProperty("file_name") var fileName: String? = null,
-        @JsonProperty("requests") @SerialName("requests") var requests: Int? = null,
+        @JsonProperty("requests") var requests: Int? = null,
-        @JsonProperty("remaining") @SerialName("remaining") var remaining: Int? = null,
+        @JsonProperty("remaining") var remaining: Int? = null,
-        @JsonProperty("message") @SerialName("message") var message: String? = null,
+        @JsonProperty("message") var message: String? = null,
-        @JsonProperty("reset_time") @SerialName("reset_time") var resetTime: String? = null,
+        @JsonProperty("reset_time") var resetTime: String? = null,
-        @JsonProperty("reset_time_utc") @SerialName("reset_time_utc") var resetTimeUtc: String? = null,
+        @JsonProperty("reset_time_utc") var resetTimeUtc: String? = null
     )
 
-    @Serializable
     data class ResultFeatureDetails(
-        @JsonProperty("year") @SerialName("year") var year: Int? = null,
+        @JsonProperty("year") var year: Int? = null,
-        @JsonProperty("title") @SerialName("title") var title: String? = null,
+        @JsonProperty("title") var title: String? = null,
-        @JsonProperty("movie_name") @SerialName("movie_name") var movieName: String? = null,
+        @JsonProperty("movie_name") var movieName: String? = null,
-        @JsonProperty("imdb_id") @SerialName("imdb_id") var imdbId: Int? = null,
+        @JsonProperty("imdb_id") var imdbId: Int? = null,
-        @JsonProperty("tmdb_id") @SerialName("tmdb_id") var tmdbId: Int? = null,
+        @JsonProperty("tmdb_id") var tmdbId: Int? = null,
-        @JsonProperty("season_number") @SerialName("season_number") var seasonNumber: Int? = null,
+        @JsonProperty("season_number") var seasonNumber: Int? = null,
-        @JsonProperty("episode_number") @SerialName("episode_number") var episodeNumber: Int? = null,
+        @JsonProperty("episode_number") var episodeNumber: Int? = null,
-        @JsonProperty("parent_imdb_id") @SerialName("parent_imdb_id") var parentImdbId: Int? = null,
+        @JsonProperty("parent_imdb_id") var parentImdbId: Int? = null,
-        @JsonProperty("parent_title") @SerialName("parent_title") var parentTitle: String? = null,
+        @JsonProperty("parent_title") var parentTitle: String? = null,
-        @JsonProperty("parent_tmdb_id") @SerialName("parent_tmdb_id") var parentTmdbId: Int? = null,
+        @JsonProperty("parent_tmdb_id") var parentTmdbId: Int? = null,
-        @JsonProperty("parent_feature_id") @SerialName("parent_feature_id") var parentFeatureId: 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(
+        val searchRes = app.post(
-            url = "$APIURL/movie/search",
+            url = "$APIURL/searchMovie",
-            json = mapOf(
+            data = mapOf(
-                "includeSeasons" to false,
+                "query" to query.imdbId!!
-                "limit" to 15,
+            )
-                "query" to query.imdbId!!,
+        ).parsedSafe<ApiSearch>() ?: return null
-                "signal" to "{}"
-            ),
-            cacheTime = 120,
-            cacheUnit = TimeUnit.MINUTES,
-        ).parsedSafe<SearchRoot>() ?: return null
 
-        val firstResult = searchResponse.results.firstOrNull() ?: return null
+        val postData = if (type == TvType.TvSeries) {
-
+            mapOf(
-        val apiResponse = app.get(
+                "langs" to "[]",
-            url = "$APIURL${firstResult.link.replace("series", "subtitles")}",
+                "movieName" to searchRes.found.first().linkName,
-            cacheTime = 120,
+                "season" to "season-${query.seasonNumber}"
-            cacheUnit = TimeUnit.MINUTES,
+            )
-        ).parsedSafe<ItemRoot>() ?: return null
+        } else {
-
+            mapOf(
-        val filteredSubtitles = apiResponse.subtitles.filter { sub ->
+                "langs" to "[]",
-            sub.releaseType != "trailer" &&
+                "movieName" to searchRes.found.first().linkName,
-                    sub.language.equals(queryLang, true)
+            )
         }
 
+        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) {
+            if (type == TvType.Movie) {
-            filteredSubtitles
+                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.lang == queryLang
-                sub.releaseInfo.contains(
-                    shouldContain
-                )
                 }
             }
+        } ?: return null
 
-        return subtitles.map { subtitle ->
+        return getMovieRes.map { subtitle ->
             AbstractSubtitleEntities.SubtitleEntity(
                 idPrefix = this.idPrefix,
-                name = subtitle.releaseInfo,
+                name = subtitle.releaseName!!,
-                lang = subtitle.language,
+                lang = subtitle.lang!!,
-                data = subtitle.link,
+                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}")
+        val parsedSub = parseJson<SubData>(subtitle.data)
-            .parsedSafe<DownloadRoot>()
+
-            ?: return
+        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
         }
     }
 
-
+    data class ApiSearch(
-    @Serializable
+        @JsonProperty("success") val success: Boolean,
-    data class SearchRoot(
+        @JsonProperty("found") val found: List<Found>,
-        @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()
     )
 
-    @Serializable
+    data class Found(
-    data class Users(
+        @JsonProperty("id") val id: Long,
-
+        @JsonProperty("title") val title: String,
-        @JsonProperty("id") @SerialName("id") var id: Int? = null,
+        @JsonProperty("seasons") val seasons: Long,
-        @JsonProperty("displayname") @SerialName("displayname") var displayname: String? = null,
+        @JsonProperty("type") val type: String,
-        @JsonProperty("avatar") @SerialName("avatar") var avatar: String? = null,
+        @JsonProperty("releaseYear") val releaseYear: Long,
-        @JsonProperty("badges") @SerialName("badges") var badges: ArrayList<String> = arrayListOf()
+        @JsonProperty("linkName") val linkName: String,
-
     )
 
-    @Serializable
+    data class ApiResponse(
-    data class Results(
+        @JsonProperty("success") val success: Boolean,
-        @JsonProperty("id") @SerialName("id") var id: Int? = null,
+        @JsonProperty("movie") val movie: Movie,
-        @JsonProperty("title") @SerialName("title") var title: String? = null,
+        @JsonProperty("subs") val subs: List<Sub>,
-        @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
     )
 
-    @Serializable
+    data class Movie(
-
+        @JsonProperty("id") val id: Long? = null,
-    data class ItemRoot(
+        @JsonProperty("type") val type: String? = null,
-
+        @JsonProperty("year") val year: Long? = null,
-        // @SerialName("media_type" ) var mediaType : String?              = null,
+        @JsonProperty("fullName") val fullName: String? = null,
-        @JsonProperty("subtitles") @SerialName("subtitles") var subtitles: ArrayList<Subtitles>,
-        //@SerialName("movie"      ) var movie     : Movie?               = Movie()
-
     )
 
-    @Serializable
+    data class Sub(
-    data class Subtitles(
+        @JsonProperty("hi") val hi: Int? = null,
-
+        @JsonProperty("fullLink") val fullLink: String? = null,
-        @JsonProperty("id") @SerialName("id") var id: Int? = null,
+        @JsonProperty("linkName") val linkName: String? = null,
-        @JsonProperty("language") @SerialName("language") var language: String,
+        @JsonProperty("lang") val lang: String? = null,
-        @JsonProperty("release_type") @SerialName("release_type") var releaseType: String? = null,
+        @JsonProperty("releaseName") val releaseName: String? = null,
-        @JsonProperty("release_info") @SerialName("release_info") var releaseInfo: String,
+        @JsonProperty("subId") val subId: Long? = null,
-        @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
-
     )
 
-    @Serializable
+    data class SubData(
-    data class DownloadRoot(
+        @JsonProperty("movie") val movie: String,
-        @JsonProperty("subtitle") @SerialName("subtitle") var subtitle: Subtitle,
+        @JsonProperty("lang") val lang: String,
-        //@SerializedName("movie"         ) var movie         : Movie?         = Movie(),
+        @JsonProperty("id") val id: String,
-        //@SerializedName("donationLinks" ) var donationLinks : DonationLinks? = DonationLinks(),
-        //@SerializedName("isDownloaded"  ) var isDownloaded  : Boolean?       = null,
-        //@SerializedName("user_rated"    ) var userRated     : String?        = null
     )
 
-    @Serializable
+    data class SubTitleLink(
-    data class Subtitle(
+        @JsonProperty("sub") val sub: SubToken,
-
+    )
-        @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 SubToken(
+        @JsonProperty("downloadToken") val downloadToken: String,
     )
 }

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

@@ -12,7 +12,6 @@ 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.google.android.gms.cast.MediaLoadOptions
 import com.google.android.gms.cast.MediaQueueItem
 import com.google.android.gms.cast.MediaSeekOptions
@@ -35,24 +34,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 +89,48 @@ class SkipNextEpisodeController(val view: ImageView) : UIController() {
     }
 }
 
-@Serializable
 data class MetadataHolder(
-    @JsonProperty("apiName") @SerialName("apiName") val apiName: String,
+    val apiName: String,
-    @JsonProperty("isMovie") @SerialName("isMovie") val isMovie: Boolean,
+    val isMovie: Boolean,
-    @JsonProperty("title") @SerialName("title") val title: String?,
+    val title: String?,
-    @JsonProperty("poster") @SerialName("poster") val poster: String?,
+    val poster: String?,
-    @JsonProperty("currentEpisodeIndex") @SerialName("currentEpisodeIndex") val currentEpisodeIndex: Int,
+    val currentEpisodeIndex: Int,
-    @JsonProperty("episodes") @SerialName("episodes") val episodes: List<ResultEpisode>,
+    val episodes: List<ResultEpisode>,
-    @JsonProperty("currentLinks") @SerialName("currentLinks") val currentLinks: List<ExtractorLink>,
+    val currentLinks: List<ExtractorLink>,
-    @JsonProperty("currentSubtitles") @SerialName("currentSubtitles") val currentSubtitles: List<SubtitleData>,
+    val currentSubtitles: List<SubtitleData>
 )
 
-class SelectSourceController(val view: ImageView, val activity: ControllerActivity) : UIController() {
+class SelectSourceController(val view: ImageView, val activity: ControllerActivity) :
+    UIController() {
     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()
-
+                    //  bottomSheetDialog.setContentView(R.layout.sort_bottom_sheet)
-                    val providerList = bottomSheetDialog.findViewById<ListView>(R.id.sort_providers)!!
+                    val providerList =
-                    val subtitleList = bottomSheetDialog.findViewById<ListView>(R.id.sort_subtitles)!!
+                        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 +138,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 +153,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 +185,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 +201,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 +214,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 +244,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 +259,8 @@ class SelectSourceController(val view: ImageView, val activity: ControllerActivi
                                 }
                             }
                         }
-
                         loadMirror(which)
+
                         bottomSheetDialog.dismissSafe(activity)
                     }
                 }
@@ -239,19 +270,23 @@ class SelectSourceController(val view: ImageView, val activity: ControllerActivi
 
     private fun getCurrentMetaData(): MetadataHolder? {
         return try {
-            val data = remoteMediaClient?.mediaInfo?.customData?.toString() ?: return null
+            val data = remoteMediaClient?.mediaInfo?.customData?.toString()
-            parseJson<MetadataHolder>(data)
+            data?.toKotlinObject()
-        } catch (_: Exception) {
+        } 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 +303,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 +314,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 +329,7 @@ class SelectSourceController(val view: ImageView, val activity: ControllerActivi
                                     currentSubs.add(it)
                                 },
                                 offset = 0,
-                                isCasting = true,
+                                isCasting = true
                             )
                         }
 
@@ -303,18 +340,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 +374,7 @@ class SelectSourceController(val view: ImageView, val activity: ControllerActivi
                                         )
                                     ) {
                                         println("FAILED TO LOAD NEXT ITEM")
+                                        //  loadIndex(1)
                                     }
                                     isLoadingMore = false
                                 }
@@ -345,7 +397,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()) {
+                    if (url.isNotEmpty()) {
-                        showToast(R.string.edit_profile_image_error_empty, Toast.LENGTH_SHORT)
-                        return@setOnClickListener
-                    }
-                    applyBtt.showProgress()
                         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) {
+    /*fun downloadDeleteEvent(data: Int) {
-        if (data == persistentId) {
+
-            resetView()
+    }*/
-        }
-    }
 
     /*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

@@ -451,14 +451,7 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(
                     arrayAdapter.clear()
                     val sortedApis = validAPIs
                         .filter {
-                            val isPinned = pinnedphashset.contains(it.name)
+                            it.hasMainPage && (pinnedphashset.contains(it.name) || it.supportedTypes.any(
-
-                            // 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(
                                 preSelectedTypes::contains
                             ))
                         }
@@ -672,6 +665,7 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(
                     fromUI = true
                 )
                 showToast(R.string.action_reload, Toast.LENGTH_SHORT)
+                true
             }
 
             homePreviewSearchButton.setOnClickListener { _ ->

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,
+    val openType: LibraryOpenerType,
-    @JsonProperty("providerData") @SerialName("providerData") val providerData: ProviderLibraryData?,
+    val providerData: ProviderLibraryData?,
 )
 
-@Serializable
 data class ProviderLibraryData(
-    @JsonProperty("apiName") @SerialName("apiName") val apiName: String,
+    val apiName: String
 )
 
 class LibraryFragment : BaseFragment<FragmentLibraryBinding>(

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

@@ -719,7 +719,7 @@ class CS3IPlayer : IPlayer {
          **/
         var preferredAudioTrackLanguage: String? = null
             get() {
-                return field ?: getKey<String>(
+                return field ?: getKey(
                     "$currentAccount/$PREFERRED_AUDIO_LANGUAGE_KEY",
                     field
                 )?.also {

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

@@ -267,59 +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
-
+            ObjectAnimator.ofFloat(sView, "translationY", move.toFloat()).apply {
-            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 {
                 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()
-
+        playerBinding?.playerVideoTitleHolder?.let {
-            listOfNotNull(
+            ObjectAnimator.ofFloat(it, "translationY", titleMove).apply {
-                playerVideoTitleHolder,
+                duration = 200
-                playerVideoTitleRez,
+                start()
-                playerVideoInfo,
+            }
-                playerGoBackHolder,
+        }
-            ).forEach {
+        playerBinding?.playerVideoTitleRez?.let {
-                it.animateY(titleMove)
+            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)
+        playerBinding?.bottomPlayerBar?.let {
-
+            ObjectAnimator.ofFloat(it, "translationY", playerBarMove).apply {
-            if (isLayout(PHONE)) {
+                duration = 200
-                playerEpisodesButton.animateX(if (isShowing) 0f else 50.toPx.toFloat())
+                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)
 
@@ -330,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)
@@ -1013,7 +1026,6 @@ open class FullScreenPlayer : AbstractPlayerFragment<FragmentPlayerBinding>(
                 }
                 toggleEpisodesOverlay(true)
             }
-
             else -> return null // Avoid capturing all input
         }
         return true
@@ -1202,10 +1214,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

@@ -117,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
@@ -509,8 +507,7 @@ class GeneratorPlayer : FullScreenPlayer() {
 
         showDownloadProgress(DownloadEvent(0, 0, 0, null))
 
-        // uiReset() // Removed due to UX
+        uiReset()
-        
         currentSelectedLink = link
         //  setEpisodes(viewModel.getAllMeta() ?: emptyList())
         setPlayerDimen(null)
@@ -793,24 +790,11 @@ class GeneratorPlayer : FullScreenPlayer() {
         }
 
         binding.applyBtt.setOnClickListener {
-            val currentSubtitle = currentSubtitle
+            currentSubtitle?.let { currentSubtitle ->
-            if (currentSubtitle == null) {
+                providers.firstOrNull { it.idPrefix == currentSubtitle.idPrefix }?.let { api ->
-                dialog.dismissSafe()
-                return@setOnClickListener
-            }
-
-            val api = providers.firstOrNull { it.idPrefix == currentSubtitle.idPrefix }
-            if (api == null) {
-                dialog.dismissSafe()
-                return@setOnClickListener
-            }
-
-            binding.applyBtt.showProgress()
                     ioSafe {
-                val apiResource =
+                        when (val apiResource =
-                    Resource.fromResult(api.resource(currentSubtitle))
+                            Resource.fromResult(api.resource(currentSubtitle))) {
-                binding.applyBtt.hideProgress()
-                when (apiResource) {
                             is Resource.Success -> {
                                 val subtitles = apiResource.value.getSubtitles().map { resource ->
                                     SubtitleData(
@@ -830,7 +814,6 @@ class GeneratorPlayer : FullScreenPlayer() {
                                     showToast(R.string.no_subtitles)
                                     return@ioSafe
                                 }
-                        dialog.dismissSafe()
                                 runOnMainThread {
                                     addAndSelectSubtitles(*subtitles.toTypedArray())
                                 }
@@ -846,6 +829,9 @@ class GeneratorPlayer : FullScreenPlayer() {
                         }
                     }
                 }
+            }
+            dialog.dismissSafe()
+        }
 
         dialog.setOnDismissListener {
             dismissCallback.invoke()
@@ -1539,7 +1525,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"}, " +
@@ -1598,7 +1584,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(
@@ -1618,7 +1604,7 @@ class GeneratorPlayer : FullScreenPlayer() {
 
         if (!description.isNullOrBlank()) {
             descView.isVisible = true
-            descView.text = description.html()
+            descView.text = description
         } else {
             descView.isVisible = false
 
@@ -1712,12 +1698,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
             }

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,
+    val originalName: String,
-    @SerialName("nameSuffix") val nameSuffix: String,
+    val nameSuffix: String,
-    @SerialName("url") val url: String,
+    val url: String,
-    @SerialName("origin") val origin: SubtitleOrigin,
+    val origin: SubtitleOrigin,
-    @SerialName("mimeType") val mimeType: String,
+    val mimeType: String,
-    @SerialName("headers") val headers: Map<String, String>,
+    val headers: Map<String, String>,
-    @SerialName("languageCode") val languageCode: String?,
+    val languageCode: String?,
 ) {
-    /** Internal ID for media3, unique for each link. */
+    /** Internal ID for exoplayer, unique for each link*/
-    @JsonIgnore
     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("action")
-        @JsonProperty("hash") @SerialName("hash") val hash: String = "",
+        val action: String,
-        @JsonProperty("link") @SerialName("link") val link: String = "",
+        @JsonProperty("hash")
-        @JsonProperty("title") @SerialName("title") val title: String = "",
+        val hash: String = "",
-        @JsonProperty("poster") @SerialName("poster") val poster: String = "",
+        @JsonProperty("link")
-        @JsonProperty("data") @SerialName("data") val data: String = "",
+        val link: String = "",
-        @JsonProperty("save_to_db") @SerialName("save_to_db") val saveToDB: Boolean = false,
+        @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("title")
-        @JsonProperty("poster") @SerialName("poster") var poster: String,
+        var title: String,
-        @JsonProperty("data") @SerialName("data") var data: String?,
+        @JsonProperty("poster")
-        @JsonProperty("timestamp") @SerialName("timestamp") var timestamp: Long,
+        var poster: String,
-        @JsonProperty("name") @SerialName("name") var name: String?,
+        @JsonProperty("data")
-        @JsonProperty("hash") @SerialName("hash") var hash: String?,
+        var data: String?,
-        @JsonProperty("stat") @SerialName("stat") var stat: Int,
+        @JsonProperty("timestamp")
-        @JsonProperty("stat_string") @SerialName("stat_string") var statString: String,
+        var timestamp: Long,
-        @JsonProperty("loaded_size") @SerialName("loaded_size") var loadedSize: Long?,
+        @JsonProperty("name")
-        @JsonProperty("torrent_size") @SerialName("torrent_size") var torrentSize: Long?,
+        var name: String?,
-        @JsonProperty("preloaded_bytes") @SerialName("preloaded_bytes") var preloadedBytes: Long?,
+        @JsonProperty("hash")
-        @JsonProperty("preload_size") @SerialName("preload_size") var preloadSize: Long?,
+        var hash: String?,
-        @JsonProperty("download_speed") @SerialName("download_speed") var downloadSpeed: Double?,
+        @JsonProperty("stat")
-        @JsonProperty("upload_speed") @SerialName("upload_speed") var uploadSpeed: Double?,
+        var stat: Int,
-        @JsonProperty("total_peers") @SerialName("total_peers") var totalPeers: Int?,
+        @JsonProperty("stat_string")
-        @JsonProperty("pending_peers") @SerialName("pending_peers") var pendingPeers: Int?,
+        var statString: String,
-        @JsonProperty("active_peers") @SerialName("active_peers") var activePeers: Int?,
+        @JsonProperty("loaded_size")
-        @JsonProperty("connected_seeders") @SerialName("connected_seeders") var connectedSeeders: Int?,
+        var loadedSize: Long?,
-        @JsonProperty("half_open_peers") @SerialName("half_open_peers") var halfOpenPeers: Int?,
+        @JsonProperty("torrent_size")
-        @JsonProperty("bytes_written") @SerialName("bytes_written") var bytesWritten: Long?,
+        var torrentSize: Long?,
-        @JsonProperty("bytes_written_data") @SerialName("bytes_written_data") var bytesWrittenData: Long?,
+        @JsonProperty("preloaded_bytes")
-        @JsonProperty("bytes_read") @SerialName("bytes_read") var bytesRead: Long?,
+        var preloadedBytes: Long?,
-        @JsonProperty("bytes_read_data") @SerialName("bytes_read_data") var bytesReadData: Long?,
+        @JsonProperty("preload_size")
-        @JsonProperty("bytes_read_useful_data") @SerialName("bytes_read_useful_data") var bytesReadUsefulData: Long?,
+        var preloadSize: Long?,
-        @JsonProperty("chunks_written") @SerialName("chunks_written") var chunksWritten: Long?,
+        @JsonProperty("download_speed")
-        @JsonProperty("chunks_read") @SerialName("chunks_read") var chunksRead: Long?,
+        var downloadSpeed: Double?,
-        @JsonProperty("chunks_read_useful") @SerialName("chunks_read_useful") var chunksReadUseful: Long?,
+        @JsonProperty("upload_speed")
-        @JsonProperty("chunks_read_wasted") @SerialName("chunks_read_wasted") var chunksReadWasted: Long?,
+        var uploadSpeed: Double?,
-        @JsonProperty("pieces_dirtied_good") @SerialName("pieces_dirtied_good") var piecesDirtiedGood: Long?,
+        @JsonProperty("total_peers")
-        @JsonProperty("pieces_dirtied_bad") @SerialName("pieces_dirtied_bad") var piecesDirtiedBad: Long?,
+        var totalPeers: Int?,
-        @JsonProperty("duration_seconds") @SerialName("duration_seconds") var durationSeconds: Double?,
+        @JsonProperty("pending_peers")
-        @JsonProperty("bit_rate") @SerialName("bit_rate") var bitRate: String?,
+        var pendingPeers: Int?,
-        @JsonProperty("file_stats") @SerialName("file_stats") var fileStats: List<TorrentFileStat>?,
+        @JsonProperty("active_peers")
-        @JsonProperty("trackers") @SerialName("trackers") var trackers: List<String>?,
+        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("id")
-        @JsonProperty("path") @SerialName("path") val path: String?,
+        val id: Int?,
-        @JsonProperty("length") @SerialName("length") val length: Long?,
+        @JsonProperty("path")
+        val path: String?,
+        @JsonProperty("length")
+        val length: Long?,
     )
 }

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

@@ -55,7 +55,7 @@ object QualityDataHelper {
 
     fun getSourcePriority(profile: Int, name: String?): Int {
         if (name == null) return DEFAULT_SOURCE_PRIORITY
-        return getKey<Int>(
+        return getKey(
             "$currentAccount/$VIDEO_SOURCE_PRIORITY/$profile",
             name,
             DEFAULT_SOURCE_PRIORITY
@@ -94,7 +94,7 @@ object QualityDataHelper {
     }
 
     fun getQualityPriority(profile: Int, quality: Qualities): Int {
-        return getKey<Int>(
+        return getKey(
             "$currentAccount/$VIDEO_QUALITY_PRIORITY/$profile",
             quality.value.toString(),
             quality.defaultPriority

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,
+    val headerName: String,
-    @SerialName("name") val name: String?,
+    val name: String?,
-    @SerialName("poster") val poster: String?,
+    val poster: String?,
-    @SerialName("episode") val episode: Int,
+    val episode: Int,
-    @SerialName("seasonIndex") val seasonIndex: Int?, // this is the "season" index used season names
+    val seasonIndex: Int?,  // this is the "season" index used season names
-    @SerialName("season") val season: Int?, // this is the display
+    val season: Int?, // this is the display
-    @SerialName("data") val data: String,
+    val data: String,
-    @SerialName("apiName") val apiName: String,
+    val apiName: String,
-    @SerialName("id") val id: Int,
+    val id: Int,
-    @SerialName("index") val index: Int,
+    val index: Int,
-    @SerialName("position") val position: Long, // time in MS
+    val position: Long, // time in MS
-    @SerialName("duration") val duration: Long, // duration in MS
+    val duration: Long, // duration in MS
-    @SerialName("score") val score: Score?,
+    val score: Score?,
-    @SerialName("description") val description: String?,
+    val description: String?,
-    @SerialName("isFiller") val isFiller: Boolean?,
+    val isFiller: Boolean?,
-    @SerialName("tvType") val tvType: TvType,
+    val tvType: TvType,
-    @SerialName("parentId") val parentId: Int,
+    val parentId: Int,
-    /** Conveys if the episode itself is marked as watched. */
+    /**
-    @SerialName("videoWatchState") val videoWatchState: VideoWatchState,
+     * Conveys if the episode itself is marked as watched
-    /** Sum of all previous season episode counts + episode. */
+     **/
-    @SerialName("totalEpisodeIndex") val totalEpisodeIndex: Int? = null,
+    val videoWatchState: VideoWatchState,
-    @SerialName("airDate") val airDate: Long? = null,
+    /** Sum of all previous season episode counts + episode */
-    @SerialName("runTime") val runTime: Int? = null,
+    val totalEpisodeIndex: Int? = null,
-    @SerialName("seasonData") val seasonData: SeasonData? = 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/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("searchedAt") val searchedAt: Long,
-    @JsonProperty("searchText") @SerialName("searchText") val searchText: String,
+    @JsonProperty("searchText") val searchText: String,
-    @JsonProperty("type") @SerialName("type") val type: List<TvType>,
+    @JsonProperty("type") val type: List<TvType>,
-    @JsonProperty("key") @SerialName("key") val key: String,
+    @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("media_type") val mediaType: String?,
-        @JsonProperty("title") @SerialName("title") val title: String?,
+        @JsonProperty("title") val title: String?,
-        @JsonProperty("name") @SerialName("name") val name: String?,
+        @JsonProperty("name") val name: String?,
-        @JsonProperty("original_title") @SerialName("original_title") val originalTitle: String?,
+        @JsonProperty("original_title") val originalTitle: String?,
-        @JsonProperty("original_name") @SerialName("original_name") val originalName: 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/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.
@@ -139,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() {
@@ -150,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")
+        @JsonProperty("parentJavaClass") // javaClass.simpleName
-        @SerialName("parentClassName") @JsonNames("parentJavaClass")
+        val parentJavaClass: String,
-        val parentClassName: String, // ::class.simpleName
+        @JsonProperty("name")
-        @JsonProperty("name") @SerialName("name") val name: String,
+        val name: String,
-        @JsonProperty("url") @SerialName("url") val url: String,
+        @JsonProperty("url")
-        @JsonProperty("lang") @SerialName("lang") val lang: String,
+        val url: String,
+        @JsonProperty("lang")
+        val lang: String,
     )
 
     companion object {
@@ -248,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()) {
-                    if (url.isNullOrBlank() || name.isNullOrBlank() || simpleName == null) {
                         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
@@ -359,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,
+            val players = VideoClickActionHolder.getPlayers(activity)
-            // 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 prefNames = buildList {
-                add(getString(R.string.player_settings_play_in_app)) // built-in player display name
+                add(getString(R.string.player_settings_play_in_app))
-                addAll(players.map { (_, name) -> name })
+                addAll(players.map { it.name.asStringNull(activity) ?: it.javaClass.simpleName })
             }
-
             val prefValues = buildList {
-                add("") // "" = built-in player, matches default
+                add("")
-                addAll(players.map { (player, _) -> player.uniqueId() })
+                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/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(
+                                        RepositoryManager.removeRepository(uiContext.applicationContext, repo)
-                                            uiContext.applicationContext,
-                                            repo
-                                        )
                                         extensionViewModel.loadStats()
                                         extensionViewModel.loadRepositories()
                                     }
@@ -150,11 +145,10 @@ class ExtensionsFragment : BaseFragment<FragmentExtensionsBinding>(
             })
         }
 
-        observe(extensionViewModel.repositories) { repos ->
+        observe(extensionViewModel.repositories) {
-            binding.repoRecyclerView.isVisible = repos.isNotEmpty()
+            binding.repoRecyclerView.isVisible = it.isNotEmpty()
-            binding.blankRepoScreen.isVisible = repos.isEmpty()
+            binding.blankRepoScreen.isVisible = it.isEmpty()
-            (binding.repoRecyclerView.adapter as? RepoAdapter)?.submitList(repos.toList())
+            (binding.repoRecyclerView.adapter as? RepoAdapter)?.submitList(it.toList())
-            pluginViewModel.updatePluginList(binding.root.context, repos.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(
+                    val (name, url) = copiedText.split(RepoAdapter.SHAREABLE_REPO_SEPARATOR, limit = 2)
-                        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 = urlInput?.let { it1 -> RepositoryManager.parseRepoUrl(it1) }
-                        val url = RepositoryManager.parseRepoUrl(urlInput)
                     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(url)
-
-                        val plugins = RepositoryManager.getRepoPlugins(newRepo)
                         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("iconUrl") val iconUrl: String?,
-    @JsonProperty("name") @SerialName("name") val name: String,
+    @JsonProperty("name") val name: String,
-    @JsonProperty("url") @SerialName("url") val url: 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()
+            RepositoryManager.getRepoPlugins(it.url)?.toList() ?: emptyList()
-        }.flatten().distinctBy { it.plugin.url }
+        }.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 ->
+        val outdatedPlugins = getPluginsOnline().map { savedData ->
-            onlinePlugins.filter { onlineData -> savedData.internalName == onlineData.plugin.internalName }
+            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 ->
+        val name = arguments?.getString(PLUGINS_BUNDLE_NAME)
-            tryParseJson<RepositoryData>(data)
+        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())
+                putString(PLUGINS_BUNDLE_NAME, name)
-                putBoolean(PLUGINS_BUNDLE_LOCAL, false)
+                putString(PLUGINS_BUNDLE_URL, url)
-            }
+                putBoolean(PLUGINS_BUNDLE_LOCAL, isLocal)
-        }
-         fun newLocalInstance(name: String): Bundle {
-            return Bundle().apply {
-                putString(PLUGINS_BUNDLE_DATA, RepositoryData("", name, "").toJson())
-                putBoolean(PLUGINS_BUNDLE_LOCAL, true)
             }
         }
+
+//        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,8 +17,8 @@ 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
@@ -26,6 +26,8 @@ import com.lagradost.cloudstream3.utils.Coroutines.runOnMainThread
 import com.lagradost.cloudstream3.utils.Levenshtein
 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> {
+        ): List<Plugin> {
-            Log.i(TAG, "getPlugins = $repository")
+            Log.i(TAG, "getPlugins = $repositoryUrl")
-            if (canUseCache && repositoryCache.containsKey(repository.url)) {
+            if (canUseCache && repositoryCache.containsKey(repositoryUrl)) {
-                repositoryCache[repository.url]?.let {
+                repositoryCache[repositoryUrl]?.let {
                     return it
                 }
             }
-
+            return RepositoryManager.getRepoPlugins(repositoryUrl)
-            return RepositoryManager.getRepoPlugins(repository)
+                ?.also { repositoryCache[repositoryUrl] = it } ?: emptyList()
-                ?.also { repositoryCache[repository.url] = 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,
+                        plugin.second.internalName,
-                        repository.url
+                        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>,
+        repositoryUrl: String,
-        pluginWrapper: PluginWrapper,
+        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,
+            plugin.second.internalName,
-            pluginWrapper.repositoryData.url
+            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 ->
+        val plugins = getPlugins(repositoryUrl)
-            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) ||
+            (it.plugin.second.tvTypes?.any { type -> tvTypes.contains(type) } == true) ||
-                    (tvTypes.contains(TvType.Others.name) && (it.pluginWrapper.plugin.tvTypes
+                    (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 {
+            this.sortedBy {
-                // Try matching name
+                -Levenshtein.partialRatio(
-                val score = Levenshtein.partialRatio(
+                    it.plugin.second.name.lowercase(),
-                    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,
                     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>) =
+    fun updatePluginList(context: Context?, repositoryUrl: String) = viewModelScope.launchSafe {
-        viewModelScope.launchSafe {
         if (context == null) return@launchSafe
-            Log.i(TAG, "updatePluginList = $repositories")
+        Log.i(TAG, "updatePluginList = $repositoryUrl")
-            updatePluginListPrivate(context, repositories)
+        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/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 {

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("fontFamily") var fontFamily: String? = null,
-    @JsonProperty("fontGenericFamily") @SerialName("fontGenericFamily") var fontGenericFamily: Int? = null,
+    @JsonProperty("fontGenericFamily") var fontGenericFamily: Int? = null,
-    @JsonProperty("backgroundColor") @SerialName("backgroundColor") var backgroundColor: Int = 0x00FFFFFF, // transparent
+    @JsonProperty("backgroundColor") var backgroundColor: Int = 0x00FFFFFF, // transparent
-    @JsonProperty("edgeColor") @SerialName("edgeColor") var edgeColor: Int = Color.BLACK, // BLACK
+    @JsonProperty("edgeColor") var edgeColor: Int = Color.BLACK, // BLACK
-    @JsonProperty("edgeType") @SerialName("edgeType") var edgeType: Int = EDGE_TYPE_OUTLINE,
+    @JsonProperty("edgeType") var edgeType: Int = EDGE_TYPE_OUTLINE,
-    @JsonProperty("foregroundColor") @SerialName("foregroundColor") var foregroundColor: Int = Color.WHITE,
+    @JsonProperty("foregroundColor") var foregroundColor: Int = Color.WHITE,
-    @JsonProperty("fontScale") @SerialName("fontScale") var fontScale: Float = 1.05f,
+    @JsonProperty("fontScale") var fontScale: Float = 1.05f,
-    @JsonProperty("windowColor") @SerialName("windowColor") var windowColor: Int = Color.TRANSPARENT,
+    @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("foregroundColor") var foregroundColor: Int,
-    @JsonProperty("backgroundColor") @SerialName("backgroundColor") var backgroundColor: Int,
+    @JsonProperty("backgroundColor") var backgroundColor: Int,
-    @JsonProperty("windowColor") @SerialName("windowColor") var windowColor: Int,
+    @JsonProperty("windowColor") var windowColor: Int,
     @OptIn(UnstableApi::class)
-    @JsonProperty("edgeType") @SerialName("edgeType") var edgeType: @CaptionStyleCompat.EdgeType Int,
+    @JsonProperty("edgeType") var edgeType: @CaptionStyleCompat.EdgeType Int,
-    @JsonProperty("edgeColor") @SerialName("edgeColor") var edgeColor: Int,
+    @JsonProperty("edgeColor") var edgeColor: Int,
-    @FontRes @JsonProperty("typeface") @SerialName("typeface") var typeface: Int?,
+    @FontRes
-    @JsonProperty("typefaceFilePath") @SerialName("typefaceFilePath") var typefaceFilePath: String?,
+    @JsonProperty("typeface") var typeface: Int?,
-    @JsonProperty("elevation") @SerialName("elevation") var elevation: Int, // in dp
+    @JsonProperty("typefaceFilePath") var typefaceFilePath: String?,
-    @JsonProperty("fixedTextSize") @SerialName("fixedTextSize") var fixedTextSize: Float?, // in sp
+    /**in dp**/
-    @Px @JsonProperty("edgeSize") @SerialName("edgeSize") var edgeSize: Float? = null,
+    @JsonProperty("elevation") var elevation: Int,
-    @JsonProperty("removeCaptions") @SerialName("removeCaptions") var removeCaptions: Boolean = false,
+    /**in sp**/
-    @JsonProperty("removeBloat") @SerialName("removeBloat") var removeBloat: Boolean = true,
+    @JsonProperty("fixedTextSize") var fixedTextSize: Float?,
-    /** Apply caps lock to the text */
+    @Px
-    @JsonProperty("upperCase") @SerialName("upperCase") var upperCase: Boolean = false,
+    @JsonProperty("edgeSize") var edgeSize: Float? = null,
-    /** Apply bold to the text */
+    @JsonProperty("removeCaptions") var removeCaptions: Boolean = false,
-    @JsonProperty("bold") @SerialName("bold") var bold: Boolean = false,
+    @JsonProperty("removeBloat") var removeBloat: Boolean = true,
-    /** Apply italic to the text */
+    /** Apply caps lock to the text **/
-    @JsonProperty("italic") @SerialName("italic") var italic: Boolean = false,
+    @JsonProperty("upperCase") var upperCase: Boolean = false,
-    /** in px, background radius, aka how round the background (backgroundColor) on each row is */
+    /** Apply bold to the text **/
-    @JsonProperty("backgroundRadius") @SerialName("backgroundRadius") var backgroundRadius: Float? = null,
+    @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
@@ -261,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),
@@ -293,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,15 @@ 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",
+        return subs.sortedBy { it.name }
-        // 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 })
     }
 
     fun Context.getApiSettings(): HashSet<String> {
         val hashSet = HashSet<String>()
         val activeLangs = getApiProviderLangSettings()
         val hasUniversal = activeLangs.contains(AllLanguagesName)
-        hashSet.addAll(apis.filter { hasUniversal || activeLangs.contains(it.lang) }
+        hashSet.addAll(apis.filter { hasUniversal || activeLangs.contains(it.lang) }.map { it.name })
-            .map { it.name })
         return hashSet
     }
 
@@ -468,8 +463,7 @@ object AppContextUtils {
         } ?: default
         val langs = this.getApiProviderLangSettings()
         val hasUniversal = langs.contains(AllLanguagesName)
-        val allApis =
+        val allApis = apis.filter { api -> (hasUniversal || langs.contains(api.lang)) && (api.hasMainPage || !hasHomePageIsRequired) }
-            apis.filter { api -> (hasUniversal || langs.contains(api.lang)) && (api.hasMainPage || !hasHomePageIsRequired) }
         return if (currentPrefMedia.isEmpty()) {
             allApis
         } else {
@@ -523,12 +517,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 +531,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 +547,9 @@ object AppContextUtils {
                 navigate(
                     R.id.global_to_navigation_settings_plugins,
                     PluginsFragment.newInstance(
-                        repositoryData,
+                        repositoryName,
+                        repositoryURL,
+                        false,
                     )
                 )
             }
@@ -559,7 +557,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 +630,16 @@ object AppContextUtils {
         }
     }
 
-    // Deprecate after next stable
+    fun splitQuery(url: URL): Map<String, String> {
-    /* @Deprecated(
+        val queryPairs: MutableMap<String, String> = LinkedHashMap()
-        message = "Use splitUrlParameters instead.",
+        val query: String = url.query
-        replaceWith = ReplaceWith(
+        val pairs = query.split("&").toTypedArray()
-            expression = "splitUrlParameters(url.toString())",
+        for (pair in pairs) {
-            imports = ["com.lagradost.cloudstream3.splitUrlParameters"],
+            val idx = pair.indexOf("=")
-        ),
+            queryPairs[URLDecoder.decode(pair.substring(0, idx), "UTF-8")] =
-        level = DeprecationLevel.WARNING,
+                URLDecoder.decode(pair.substring(idx + 1), "UTF-8")
-    ) */
+        }
-    fun splitQuery(url: java.net.URL): Map<String, String> {
+        return queryPairs
-        return com.lagradost.cloudstream3.splitUrlParameters(url.toString())
     }
 
     /**| S1:E2 Hello World
@@ -846,8 +843,7 @@ object AppContextUtils {
     }
 
     fun Context.isUsingMobileData(): Boolean {
-        val connectionManager =
+        val connectionManager = getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
-            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

@@ -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,20 +118,18 @@ 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("_Bool") val bool: Map<String, Boolean>?,
-        @JsonProperty("_Int") @SerialName("_Int") val int: Map<String, Int>?,
+        @JsonProperty("_Int") val int: Map<String, Int>?,
-        @JsonProperty("_String") @SerialName("_String") val string: Map<String, String>?,
+        @JsonProperty("_String") val string: Map<String, String>?,
-        @JsonProperty("_Float") @SerialName("_Float") val float: Map<String, Float>?,
+        @JsonProperty("_Float") val float: Map<String, Float>?,
-        @JsonProperty("_Long") @SerialName("_Long") val long: Map<String, Long>?,
+        @JsonProperty("_Long") val long: Map<String, Long>?,
-        @JsonProperty("_StringSet") @SerialName("_StringSet") val stringSet: Map<String, Set<String>?>?,
+        @JsonProperty("_StringSet") val stringSet: Map<String, Set<String>?>?,
     )
 
-    @Serializable
     data class BackupFile(
-        @JsonProperty("datastore") @SerialName("datastore") val datastore: BackupVars,
+        @JsonProperty("datastore") val datastore: BackupVars,
-        @JsonProperty("settings") @SerialName("settings") val settings: BackupVars,
+        @JsonProperty("settings") val settings: BackupVars
     )
 
     @Suppress("UNCHECKED_CAST")
@@ -147,7 +143,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 +152,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 +166,7 @@ object BackupUtils {
         context: Context?,
         backupFile: BackupFile,
         restoreSettings: Boolean,
-        restoreDataStore: Boolean,
+        restoreDataStore: Boolean
     ) {
         if (context == null) return
         if (restoreSettings) {
@@ -199,9 +195,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)
@@ -217,13 +213,17 @@ object BackupUtils {
             fileStream = stream.openNew()
             printStream = PrintWriter(fileStream)
             printStream.print(backupFile.toJson())
-            showToast(R.string.backup_success, Toast.LENGTH_LONG)
+
+            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 +242,7 @@ object BackupUtils {
             name,
             folder = null,
             extension = ext,
-            tryResume = false,
+            tryResume = false
         )
     }
 
@@ -264,7 +264,7 @@ object BackupUtils {
                                 activity,
                                 restoredValue,
                                 restoreSettings = true,
-                                restoreDataStore = true,
+                                restoreDataStore = true
                             )
                             activity.runOnUiThread { activity.recreate() }
                         } catch (e: Exception) {
@@ -305,7 +305,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 +317,21 @@ object BackupUtils {
     }
 
     /**
-     * Copy of [com.lagradost.cloudstream3.utils.downloader.DownloadFileManagement.getDefaultDir],
+     * Copy of [com.lagradost.cloudstream3.utils.downloader.VideoDownloadManager.basePathToFile], [com.lagradost.cloudstream3.utils.downloader.VideoDownloadManager.getDefaultDir] and [com.lagradost.cloudstream3.utils.downloader.VideoDownloadManager.getBasePath]
-     * modified for backup-specific paths.
+     * 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/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 key: String, private val default: T //, private val klass: KClass<T>
-    private val default: 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("keyIndex")
-        @JsonProperty("name") @SerialName("name") val name: String,
+        val keyIndex: Int,
-        @JsonProperty("customImage") @SerialName("customImage") val customImage: String? = null,
+        @JsonProperty("name")
-        @JsonProperty("defaultImageIndex") @SerialName("defaultImageIndex") val defaultImageIndex: Int,
+        val name: String,
-        @JsonProperty("lockPin") @SerialName("lockPin") val lockPin: String? = null,
+        @JsonProperty("customImage")
+        val customImage: String? = null,
+        @JsonProperty("defaultImageIndex")
+        val defaultImageIndex: Int,
+        @JsonProperty("lockPin")
+        val lockPin: String? = null,
     ) {
-        @get:JsonIgnore
+        val image
-        val image get() = customImage?.let { UiImage.Image(it) } ?:
+            get() = customImage?.let { UiImage.Image(it) } ?: profileImages.getOrNull(
-            profileImages.getOrNull(defaultImageIndex)?.let {
+                defaultImageIndex
-                UiImage.Drawable(it)
+            )?.let { UiImage.Drawable(it) } ?: UiImage.Drawable(profileImages.first())
-            } ?: 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("position") val position: Long,
-        @JsonProperty("duration") @SerialName("duration") val duration: Long,
+        @JsonProperty("duration") val duration: Long
     )
 
     fun PosDur.fixVisual(): PosDur {
         if (duration <= 0) return PosDur(0, duration)
         val percentage = position * 100 / duration
-        return when {
+        if (percentage <= 1) return PosDur(0, duration)
-            percentage <= 1 -> PosDur(0, duration)
+        if (percentage <= 5) return PosDur(5 * duration / 100, duration)
-            percentage <= 5 -> PosDur(5 * duration / 100, duration)
+        if (percentage >= 95) return PosDur(duration, duration)
-            percentage >= 95 -> PosDur(duration, duration)
+        return this
-            else -> 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(
-       /**
+        @JsonProperty("id") override var id: Int?,
-        * These fields are marked @Transient because this class is only ever serialized through
+        @JsonProperty("latestUpdatedTime") open val latestUpdatedTime: Long,
-        * through its subclasses, which redeclare each property with their own @SerialName
+        @JsonProperty("name") override val name: String,
-        * annotations. Without @Transient here, kotlinx.serialization would try to
+        @JsonProperty("url") override val url: String,
-        * generate a serializer for the abstract base class itself (or double-serialize
+        @JsonProperty("apiName") override val apiName: String,
-        * these fields), which fails/conflicts since these are meant to be overridden,
+        @JsonProperty("type") override var type: TvType?,
-        * not serialized directly from the parent.
+        @JsonProperty("posterUrl") override var posterUrl: String?,
-        */
+        @JsonProperty("year") open val year: Int?,
-        @Transient override var id: Int? = null,
+        @JsonProperty("syncData") open val syncData: Map<String, String>?,
-        @Transient open val latestUpdatedTime: Long = 0L,
+        @JsonProperty("quality") override var quality: SearchQuality?,
-        @Transient override val name: String = "",
+        @JsonProperty("posterHeaders") override var posterHeaders: Map<String, String>?,
-        @Transient override val url: String = "",
+        @JsonProperty("plot") open val plot: String? = null,
-        @Transient override val apiName: String = "",
+        @JsonProperty("score") override var score: Score? = null,
-        @Transient override var type: TvType? = null,
+        @JsonProperty("tags") open val tags: List<String>? = 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,
     ) : 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("subscribedTime") val subscribedTime: Long,
-        @JsonProperty("lastSeenEpisodeCount") @SerialName("lastSeenEpisodeCount") val lastSeenEpisodeCount: Map<DubStatus, Int?>,
+        @JsonProperty("lastSeenEpisodeCount") val lastSeenEpisodeCount: Map<DubStatus, Int?>,
-        @JsonProperty("id") @SerialName("id") override var id: Int?,
+        override var id: Int?,
-        @JsonProperty("latestUpdatedTime") @SerialName("latestUpdatedTime") override val latestUpdatedTime: Long,
+        override val latestUpdatedTime: Long,
-        @JsonProperty("name") @SerialName("name") override val name: String,
+        override val name: String,
-        @JsonProperty("url") @SerialName("url") override val url: String,
+        override val url: String,
-        @JsonProperty("apiName") @SerialName("apiName") override val apiName: String,
+        override val apiName: String,
-        @JsonProperty("type") @SerialName("type") override var type: TvType?,
+        override var type: TvType?,
-        @JsonProperty("posterUrl") @SerialName("posterUrl") override var posterUrl: String?,
+        override var posterUrl: String?,
-        @JsonProperty("year") @SerialName("year") override val year: Int?,
+        override val year: Int?,
-        @JsonProperty("syncData") @SerialName("syncData") override val syncData: Map<String, String>? = null,
+        override val syncData: Map<String, String>? = null,
-        @JsonProperty("quality") @SerialName("quality") override var quality: SearchQuality? = null,
+        override var quality: SearchQuality? = null,
-        @JsonProperty("posterHeaders") @SerialName("posterHeaders") override var posterHeaders: Map<String, String>? = null,
+        override var posterHeaders: Map<String, String>? = null,
-        @JsonProperty("plot") @SerialName("plot") override val plot: String? = null,
+        override val plot: String? = null,
-        @JsonProperty("score") @SerialName("score") override var score: Score? = null,
+        override var score: Score? = null,
-        @JsonProperty("tags") @SerialName("tags") override val tags: List<String>? = 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("bookmarkedTime") val bookmarkedTime: Long,
-        @JsonProperty("id") @SerialName("id") override var id: Int?,
+        override var id: Int?,
-        @JsonProperty("latestUpdatedTime") @SerialName("latestUpdatedTime") override val latestUpdatedTime: Long,
+        override val latestUpdatedTime: Long,
-        @JsonProperty("name") @SerialName("name") override val name: String,
+        override val name: String,
-        @JsonProperty("url") @SerialName("url") override val url: String,
+        override val url: String,
-        @JsonProperty("apiName") @SerialName("apiName") override val apiName: String,
+        override val apiName: String,
-        @JsonProperty("type") @SerialName("type") override var type: TvType?,
+        override var type: TvType?,
-        @JsonProperty("posterUrl") @SerialName("posterUrl") override var posterUrl: String?,
+        override var posterUrl: String?,
-        @JsonProperty("year") @SerialName("year") override val year: Int?,
+        override val year: Int?,
-        @JsonProperty("syncData") @SerialName("syncData") override val syncData: Map<String, String>? = null,
+        override val syncData: Map<String, String>? = null,
-        @JsonProperty("quality") @SerialName("quality") override var quality: SearchQuality? = null,
+        override var quality: SearchQuality? = null,
-        @JsonProperty("posterHeaders") @SerialName("posterHeaders") override var posterHeaders: Map<String, String>? = null,
+        override var posterHeaders: Map<String, String>? = null,
-        @JsonProperty("plot") @SerialName("plot") override val plot: String? = null,
+        override val plot: String? = null,
-        @JsonProperty("score") @SerialName("score") override var score: Score? = null,
+        override var score: Score? = null,
-        @JsonProperty("tags") @SerialName("tags") override val tags: List<String>? = 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("favoritesTime") val favoritesTime: Long,
-        @JsonProperty("id") @SerialName("id") override var id: Int?,
+        override var id: Int?,
-        @JsonProperty("latestUpdatedTime") @SerialName("latestUpdatedTime") override val latestUpdatedTime: Long,
+        override val latestUpdatedTime: Long,
-        @JsonProperty("name") @SerialName("name") override val name: String,
+        override val name: String,
-        @JsonProperty("url") @SerialName("url") override val url: String,
+        override val url: String,
-        @JsonProperty("apiName") @SerialName("apiName") override val apiName: String,
+        override val apiName: String,
-        @JsonProperty("type") @SerialName("type") override var type: TvType?,
+        override var type: TvType?,
-        @JsonProperty("posterUrl") @SerialName("posterUrl") override var posterUrl: String?,
+        override var posterUrl: String?,
-        @JsonProperty("year") @SerialName("year") override val year: Int?,
+        override val year: Int?,
-        @JsonProperty("syncData") @SerialName("syncData") override val syncData: Map<String, String>? = null,
+        override val syncData: Map<String, String>? = null,
-        @JsonProperty("quality") @SerialName("quality") override var quality: SearchQuality? = null,
+        override var quality: SearchQuality? = null,
-        @JsonProperty("posterHeaders") @SerialName("posterHeaders") override var posterHeaders: Map<String, String>? = null,
+        override var posterHeaders: Map<String, String>? = null,
-        @JsonProperty("plot") @SerialName("plot") override val plot: String? = null,
+        override val plot: String? = null,
-        @JsonProperty("score") @SerialName("score") override var score: Score? = null,
+        override var score: Score? = null,
-        @JsonProperty("tags") @SerialName("tags") override val tags: List<String>? = 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("name") override val name: String,
-        @JsonProperty("url") @SerialName("url") override val url: String,
+        @JsonProperty("url") override val url: String,
-        @JsonProperty("apiName") @SerialName("apiName") override val apiName: String,
+        @JsonProperty("apiName") override val apiName: String,
-        @JsonProperty("type") @SerialName("type") override var type: TvType? = null,
+        @JsonProperty("type") override var type: TvType? = null,
-        @JsonProperty("posterUrl") @SerialName("posterUrl") override var posterUrl: String?,
+        @JsonProperty("posterUrl") override var posterUrl: String?,
-        @JsonProperty("watchPos") @SerialName("watchPos") val watchPos: PosDur?,
+        @JsonProperty("watchPos") val watchPos: PosDur?,
-        @JsonProperty("id") @SerialName("id") override var id: Int?,
+        @JsonProperty("id") override var id: Int?,
-        @JsonProperty("parentId") @SerialName("parentId") val parentId: Int?,
+        @JsonProperty("parentId") val parentId: Int?,
-        @JsonProperty("episode") @SerialName("episode") val episode: Int?,
+        @JsonProperty("episode") val episode: Int?,
-        @JsonProperty("season") @SerialName("season") val season: Int?,
+        @JsonProperty("season") val season: Int?,
-        @JsonProperty("isFromDownload") @SerialName("isFromDownload") val isFromDownload: Boolean,
+        @JsonProperty("isFromDownload") val isFromDownload: Boolean,
-        @JsonProperty("quality") @SerialName("quality") override var quality: SearchQuality? = null,
+        @JsonProperty("quality") override var quality: SearchQuality? = null,
-        @JsonProperty("posterHeaders") @SerialName("posterHeaders") override var posterHeaders: Map<String, String>? = null,
+        @JsonProperty("posterHeaders") override var posterHeaders: Map<String, String>? = null,
-        @JsonProperty("score") @SerialName("score") override var score: Score? = 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,
-     * 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
+     * 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("slug")
-        @JsonProperty("title") @SerialName("title") val title: String,
+        val slug: String,
-        @JsonProperty("filler") @SerialName("filler") val filler: ArrayList<Int>,
+        @JsonProperty("title")
-        @JsonProperty("mixedCanon") @SerialName("mixedCanon") val mixedCanon: ArrayList<Int>,
+        val title: String,
-        @JsonProperty("mangaCanon") @SerialName("mangaCanon") val mangaCanon: ArrayList<Int>,
+        @JsonProperty("filler")
-        @JsonProperty("animeCanon") @SerialName("animeCanon") val animeCanon: ArrayList<Int>,
+        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("type")
-        @JsonProperty("anidb_id") @SerialName("anidb_id") val anidbId: Long?,
+        val type: String?,
-        @JsonProperty("anilist_id") @SerialName("anilist_id") val anilistId: Long?,
+        @JsonProperty("anidb_id")
-        @JsonProperty("animecountdown_id") @SerialName("animecountdown_id") val animecountdownId: Long?,
+        val anidbId: Long?,
-        @JsonProperty("animenewsnetwork_id") @SerialName("animenewsnetwork_id") val animenewsnetworkId: Long?,
+        @JsonProperty("anilist_id")
-        @JsonProperty("anime-planet_id") @SerialName("anime-planet_id") val animePlanetId: String?,
+        val anilistId: Long?,
-        @JsonProperty("anisearch_id") @SerialName("anisearch_id") val anisearchId: Long?,
+        @JsonProperty("animecountdown_id")
-        @JsonProperty("imdb_id") @SerialName("imdb_id") val imdbId: String?,
+        val animecountdownId: Long?,
-        @JsonProperty("kitsu_id") @SerialName("kitsu_id") val kitsuId: Long?,
+        @JsonProperty("animenewsnetwork_id")
-        @JsonProperty("livechart_id") @SerialName("livechart_id") val livechartId: Long?,
+        val animenewsnetworkId: Long?,
-        @JsonProperty("mal_id") @SerialName("mal_id") val malId: Long?,
+        @JsonProperty("anime-planet_id")
-        @JsonProperty("simkl_id") @SerialName("simkl_id") val simklId: Long?,
+        val animePlanetId: String?,
-        @JsonProperty("themoviedb_id") @SerialName("themoviedb_id") val themoviedbId: Long?,
+        @JsonProperty("anisearch_id")
-        @JsonProperty("tvdb_id") @SerialName("tvdb_id") val tvdbId: Long?,
+        val anisearchId: Long?,
-        @JsonProperty("season") @SerialName("season") val season: Season?,
+        @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("tvdb")
-        @JsonProperty("tmdb") @SerialName("tmdb") val tmdb: Long?,
+        val tvdb: Long?,
+        @JsonProperty("tmdb")
+        val tmdb: Long?,
     )
 
-    @Serializable
     data class CombinedMedia(
-        @JsonProperty("mapping") @SerialName("mapping") val mapping: MappingRoot?,
+        @JsonProperty("mapping")
-        @JsonProperty("show") @SerialName("show") val show: Show,
+        val mapping: MappingRoot?,
+        @JsonProperty("show")
+        val show: Show
     )
 
     data class Database(

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("name") val name: String,
-        @JsonProperty("size") @SerialName("size") val size: Int, // Size in bytes
+        @JsonProperty("size") val size: Int, // Size in bytes
-        @JsonProperty("browser_download_url") @SerialName("browser_download_url") val browserDownloadUrl: String,
+        @JsonProperty("browser_download_url") val browserDownloadUrl: String,
-        @JsonProperty("content_type") @SerialName("content_type") val contentType: String, // application/vnd.android.package-archive
+        @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("tag_name") val tagName: String, // Version code
-        @JsonProperty("body") @SerialName("body") val body: String, // Description
+        @JsonProperty("body") val body: String, // Description
-        @JsonProperty("assets") @SerialName("assets") val assets: List<GithubAsset>,
+        @JsonProperty("assets") val assets: List<GithubAsset>,
-        @JsonProperty("target_commitish") @SerialName("target_commitish") val targetCommitish: String, // Branch
+        @JsonProperty("target_commitish") val targetCommitish: String, // Branch
-        @JsonProperty("prerelease") @SerialName("prerelease") val prerelease: Boolean,
+        @JsonProperty("prerelease") val prerelease: Boolean,
-        @JsonProperty("node_id") @SerialName("node_id") val nodeId: String,
+        @JsonProperty("node_id") val nodeId: String,
     )
 
-    @Serializable
     private data class GithubObject(
-        @JsonProperty("sha") @SerialName("sha") val sha: String, // SHA-256 hash
+        @JsonProperty("sha") val sha: String, // SHA-256 hash
-        @JsonProperty("type") @SerialName("type") val type: String,
+        @JsonProperty("type") val type: String,
-        @JsonProperty("url") @SerialName("url") val url: 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("shouldUpdate") val shouldUpdate: Boolean,
-        @JsonProperty("updateURL") @SerialName("updateURL") val updateURL: String?,
+        @JsonProperty("updateURL") val updateURL: String?,
-        @JsonProperty("updateVersion") @SerialName("updateVersion") val updateVersion: String?,
+        @JsonProperty("updateVersion") val updateVersion: String?,
-        @JsonProperty("changelog") @SerialName("changelog") val changelog: String?,
+        @JsonProperty("changelog") val changelog: String?,
-        @JsonProperty("updateNodeId") @SerialName("updateNodeId") val updateNodeId: String?,
+        @JsonProperty("updateNodeId") val updateNodeId: String?,
     )
 
     private suspend fun Activity.getAppUpdate(installPrerelease: Boolean): Update {

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 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,44 +56,43 @@ object SyncUtil {
                 }
             }
         }
-
         return null
     }
 
-    /**
+    /** first. Mal, second. Anilist,
-     * first. Mal, second. Anilist,
+     * valid sites are: Gogoanime, Twistmoe and 9anime*/
-     * 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 = tryParseJson<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
@@ -100,75 +100,71 @@ object SyncUtil {
                 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("9anime") val nineanime: Map<String, ProviderPage> = emptyMap(),
-        @JsonProperty("Gogoanime") @SerialName("Gogoanime") val gogoanime: Map<String, ProviderPage> = emptyMap(),
+        @JsonProperty("Gogoanime") val gogoanime: Map<String, ProviderPage> = emptyMap(),
-        @JsonProperty("Twistmoe") @SerialName("Twistmoe") val twistmoe: 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("identifier") val identifier: String?,
-        @JsonProperty("type") @SerialName("type") val type: String?,
+        @JsonProperty("type") val type: String?,
-        @JsonProperty("page") @SerialName("page") val page: String?,
+        @JsonProperty("page") val page: String?,
-        @JsonProperty("title") @SerialName("title") val title: String?,
+        @JsonProperty("title") val title: String?,
-        @JsonProperty("url") @SerialName("url") val url: String?,
+        @JsonProperty("url") val url: String?,
-        @JsonProperty("image") @SerialName("image") val image: String?,
+        @JsonProperty("image") val image: String?,
-        @JsonProperty("hentai") @SerialName("hentai") val hentai: Boolean?,
+        @JsonProperty("hentai") val hentai: Boolean?,
-        @JsonProperty("sticky") @SerialName("sticky") val sticky: Boolean?,
+        @JsonProperty("sticky") val sticky: Boolean?,
-        @JsonProperty("active") @SerialName("active") val active: Boolean?,
+        @JsonProperty("active") val active: Boolean?,
-        @JsonProperty("actor") @SerialName("actor") val actor: String?,
+        @JsonProperty("actor") val actor: String?,
-        @JsonProperty("malId") @SerialName("malId") val malId: Int?,
+        @JsonProperty("malId") val malId: Int?,
-        @JsonProperty("aniId") @SerialName("aniId") val aniId: Int?,
+        @JsonProperty("aniId") val aniId: Int?,
-        @JsonProperty("createdAt") @SerialName("createdAt") val createdAt: String?,
+        @JsonProperty("createdAt") val createdAt: String?,
-        @JsonProperty("updatedAt") @SerialName("updatedAt") val updatedAt: String?,
+        @JsonProperty("updatedAt") val updatedAt: String?,
-        @JsonProperty("deletedAt") @SerialName("deletedAt") val deletedAt: String?,
+        @JsonProperty("deletedAt") val deletedAt: String?,
-        @JsonProperty("Mal") @SerialName("Mal") val mal: Mal?,
+        @JsonProperty("Mal") val mal: Mal?,
-        @JsonProperty("Anilist") @SerialName("Anilist") val anilist: Anilist?,
+        @JsonProperty("Anilist") val anilist: Anilist?,
-        @JsonProperty("malUrl") @SerialName("malUrl") val malUrl: String?,
+        @JsonProperty("malUrl") val malUrl: String?
     )
 
-    @Serializable
     data class Anilist(
-        @JsonProperty("id") @SerialName("id") val id: Int?,
+//            @JsonProperty("altTitle") val altTitle: List<String>?,
-        @JsonProperty("malId") @SerialName("malId") val malId: Int?,
+//            @JsonProperty("externalLinks") val externalLinks: List<String>?,
-        @JsonProperty("type") @SerialName("type") val type: String?,
+        @JsonProperty("id") val id: Int?,
-        @JsonProperty("title") @SerialName("title") val title: String?,
+        @JsonProperty("malId") val malId: Int?,
-        @JsonProperty("url") @SerialName("url") val url: String?,
+        @JsonProperty("type") val type: String?,
-        @JsonProperty("image") @SerialName("image") val image: String?,
+        @JsonProperty("title") val title: String?,
-        @JsonProperty("category") @SerialName("category") val category: String?,
+        @JsonProperty("url") val url: String?,
-        @JsonProperty("hentai") @SerialName("hentai") val hentai: Boolean?,
+        @JsonProperty("image") val image: String?,
-        @JsonProperty("createdAt") @SerialName("createdAt") val createdAt: String?,
+        @JsonProperty("category") val category: String?,
-        @JsonProperty("updatedAt") @SerialName("updatedAt") val updatedAt: String?,
+        @JsonProperty("hentai") val hentai: Boolean?,
-        @JsonProperty("deletedAt") @SerialName("deletedAt") val deletedAt: String?,
+        @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("altTitle") val altTitle: List<String>?,
-        @JsonProperty("type") @SerialName("type") val type: String?,
+        @JsonProperty("id") val id: Int?,
-        @JsonProperty("title") @SerialName("title") val title: String?,
+        @JsonProperty("type") val type: String?,
-        @JsonProperty("url") @SerialName("url") val url: String?,
+        @JsonProperty("title") val title: String?,
-        @JsonProperty("image") @SerialName("image") val image: String?,
+        @JsonProperty("url") val url: String?,
-        @JsonProperty("category") @SerialName("category") val category: String?,
+        @JsonProperty("image") val image: String?,
-        @JsonProperty("hentai") @SerialName("hentai") val hentai: Boolean?,
+        @JsonProperty("category") val category: String?,
-        @JsonProperty("createdAt") @SerialName("createdAt") val createdAt: String?,
+        @JsonProperty("hentai") val hentai: Boolean?,
-        @JsonProperty("updatedAt") @SerialName("updatedAt") val updatedAt: String?,
+        @JsonProperty("createdAt") val createdAt: String?,
-        @JsonProperty("deletedAt") @SerialName("deletedAt") val deletedAt: String?,
+        @JsonProperty("updatedAt") val updatedAt: String?,
+        @JsonProperty("deletedAt") val deletedAt: String?
     )
 }

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

@@ -200,7 +200,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

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)
     }

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

@@ -1640,11 +1640,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("resumePackage") val resumePackage: DownloadResumePackage?,
-        @JsonProperty("downloadItem") @SerialName("downloadItem") val downloadItem: DownloadQueueItem?,
+        @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("episode") val episode: ResultEpisode,
-        @JsonProperty("isMovie") @SerialName("isMovie") val isMovie: Boolean,
+        @JsonProperty("isMovie") val isMovie: Boolean,
-        @JsonProperty("resultName") @SerialName("resultName") val resultName: String,
+        @JsonProperty("resultName") val resultName: String,
-        @JsonProperty("resultType") @SerialName("resultType") val resultType: TvType,
+        @JsonProperty("resultType") val resultType: TvType,
-        @JsonProperty("resultPoster") @SerialName("resultPoster") val resultPoster: String?,
+        @JsonProperty("resultPoster") val resultPoster: String?,
-        @JsonProperty("apiName") @SerialName("apiName") val apiName: String,
+        @JsonProperty("apiName") val apiName: String,
-        @JsonProperty("resultId") @SerialName("resultId") val resultId: Int,
+        @JsonProperty("resultId") val resultId: Int,
-        @JsonProperty("resultUrl") @SerialName("resultUrl") val resultUrl: String,
+        @JsonProperty("resultUrl") val resultUrl: String,
-        @JsonProperty("links") @SerialName("links") val links: List<ExtractorLink>? = null,
+        @JsonProperty("links") val links: List<ExtractorLink>? = null,
-        @JsonProperty("subs") @SerialName("subs") val subs: List<SubtitleData>? = 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
+    abstract class DownloadCached(
-    @KeepGeneratedSerializer
+        @JsonProperty("id") open val id: Int,
-    @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"),
     )
 
+    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("apiName") val apiName: String,
-        @JsonProperty("url") @SerialName("url") val url: String,
+        @JsonProperty("url") val url: String,
-        @JsonProperty("type") @SerialName("type") val type: TvType,
+        @JsonProperty("type") val type: TvType,
-        @JsonProperty("name") @SerialName("name") val name: String,
+        @JsonProperty("name") val name: String,
-        @JsonProperty("poster") @SerialName("poster") val poster: String?,
+        @JsonProperty("poster") val poster: String?,
-        @JsonProperty("cacheTime") @SerialName("cacheTime") val cacheTime: Long,
+        @JsonProperty("cacheTime") val cacheTime: Long,
-        @JsonProperty("id") @SerialName("id") override val id: Int,
+        override val id: Int,
-    ) : DownloadCached
+    ) : 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("source") val source: String?,
-        @JsonProperty("folder") @SerialName("folder") val folder: String?,
+        @JsonProperty("folder") val folder: String?,
-        @JsonProperty("ep") @SerialName("ep") val ep: DownloadEpisodeMetadata,
+        @JsonProperty("ep") val ep: DownloadEpisodeMetadata,
-        @JsonProperty("links") @SerialName("links") val links: List<ExtractorLink>,
+        @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("id") val id: Int,
-        @JsonProperty("parentId") @SerialName("parentId") val parentId: Int,
+        @JsonProperty("parentId") val parentId: Int,
-        @JsonProperty("mainName") @SerialName("mainName") val mainName: String,
+        @JsonProperty("mainName") val mainName: String,
-        @JsonProperty("sourceApiName") @SerialName("sourceApiName") val sourceApiName: String?,
+        @JsonProperty("sourceApiName") val sourceApiName: String?,
-        @JsonProperty("poster") @SerialName("poster") val poster: String?,
+        @JsonProperty("poster") val poster: String?,
-        @JsonProperty("name") @SerialName("name") val name: String?,
+        @JsonProperty("name") val name: String?,
-        @JsonProperty("season") @SerialName("season") val season: Int?,
+        @JsonProperty("season") val season: Int?,
-        @JsonProperty("episode") @SerialName("episode") val episode: Int?,
+        @JsonProperty("episode") val episode: Int?,
-        @JsonProperty("type") @SerialName("type") val type: TvType?,
+        @JsonProperty("type") val type: TvType?,
     )
 
-    @Serializable
+
     data class DownloadedFileInfo(
-        @JsonProperty("totalBytes") @SerialName("totalBytes") val totalBytes: Long,
+        @JsonProperty("totalBytes") val totalBytes: Long,
-        @JsonProperty("relativePath") @SerialName("relativePath") val relativePath: String,
+        @JsonProperty("relativePath") val relativePath: String,
-        @JsonProperty("displayName") @SerialName("displayName") val displayName: String,
+        @JsonProperty("displayName") val displayName: String,
-        @JsonProperty("extraInfo") @SerialName("extraInfo") val extraInfo: String? = null,
+        @JsonProperty("extraInfo") val extraInfo: String? = null,
-        @JsonProperty("basePath") @SerialName("basePath") val basePath: String? = null, // null is for legacy downloads. See getBasePath()
+        @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("fileLength") val fileLength: Long,
-        @JsonProperty("totalBytes") @SerialName("totalBytes") val totalBytes: Long,
+        @JsonProperty("totalBytes") val totalBytes: Long,
-        @JsonProperty("path") @SerialName("path")
+        @JsonProperty("path") val path: Uri,
-        @Serializable(with = UriSerializer::class)
-        val path: Uri,
     )
 
-    @Serializable
+
     data class ResumeWatching(
-        @JsonProperty("parentId") @SerialName("parentId") val parentId: Int,
+        @JsonProperty("parentId") val parentId: Int,
-        @JsonProperty("episodeId") @SerialName("episodeId") val episodeId: Int?,
+        @JsonProperty("episodeId") val episodeId: Int?,
-        @JsonProperty("episode") @SerialName("episode") val episode: Int?,
+        @JsonProperty("episode") val episode: Int?,
-        @JsonProperty("season") @SerialName("season") val season: Int?,
+        @JsonProperty("season") val season: Int?,
-        @JsonProperty("updateTime") @SerialName("updateTime") val updateTime: Long,
+        @JsonProperty("updateTime") val updateTime: Long,
-        @JsonProperty("isFromDownload") @SerialName("isFromDownload") val isFromDownload: Boolean,
+        @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)
+    /** 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
+     * note that ByteArray is a pointer and therefore cant be stored without cloning it */
-     * without cloning it.
-     */
     data class LazyStreamDownloadResponse(
         val bytes: ByteArray,
         val startByte: Long,

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

@@ -1,7 +1,6 @@
 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
@@ -27,7 +26,6 @@ import kotlinx.serialization.encoding.Encoder
  *       val uri: Uri,
  *   )
  */
-@InternalAPI
 object UriSerializer : KSerializer<Uri> {
     override val descriptor: SerialDescriptor = 
         PrimitiveSerialDescriptor("Uri", PrimitiveKind.STRING)

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,
+        @JsonSerialize val found: Boolean,
-        @JsonProperty("results") @SerialName("results") val results: List<Stamp>?,
+        @JsonSerialize val results: List<Stamp>?,
-        @JsonProperty("message") @SerialName("message") val message: String?,
+        @JsonSerialize val message: String?,
-        @JsonProperty("statusCode") @SerialName("statusCode") val statusCode: Int,
+        @JsonSerialize val statusCode: Int
     )
 
-    @Serializable
     data class Stamp(
-        @JsonProperty("interval") @SerialName("interval") val interval: AniSkipInterval,
+        @JsonSerialize val interval: AniSkipInterval,
-        @JsonProperty("skipType") @SerialName("skipType") val skipType: String,
+        @JsonSerialize val skipType: String,
-        @JsonProperty("skipId") @SerialName("skipId") val skipId: String,
+        @JsonSerialize val skipId: String,
-        @JsonProperty("episodeLength") @SerialName("episodeLength") val episodeLength: Double,
+        @JsonSerialize val episodeLength: Double
     )
 
-    @Serializable
     data class AniSkipInterval(
-        @JsonProperty("startTime") @SerialName("startTime") val startTime: Double,
+        @JsonSerialize val startTime: Double,
-        @JsonProperty("endTime") @SerialName("endTime") val endTime: 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("authToken")
-        @JsonProperty("refreshToken") @SerialName("refreshToken") val refreshToken: String,
+        val authToken: String,
-        @JsonProperty("account") @SerialName("account") val account: Account,
+        @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("profileUrl")
-        @JsonProperty("username") @SerialName("username") val username: String,
+        val profileUrl: String,
-        @JsonProperty("email") @SerialName("email") val email: String,
+        @JsonProperty("username")
+        val username: String,
+        @JsonProperty("email")
+        val email: String,
     )
 
-    @Serializable
     data class Payload(
-        @JsonProperty("profileUrl") @SerialName("profileUrl") val profileUrl: String,
+        @JsonProperty("profileUrl")
-        @JsonProperty("username") @SerialName("username") val username: String,
+        val profileUrl: String,
-        @JsonProperty("email") @SerialName("email") val email: String,
+        @JsonProperty("username")
-        @JsonProperty("clientId") @SerialName("clientId") val clientId: String,
+        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("name")
-        @JsonProperty("originalName") @SerialName("originalName") val originalName: String?,
+        val name: String,
-        @JsonProperty("seasonCount") @SerialName("seasonCount") val seasonCount: Long,
+        @JsonProperty("originalName")
-        @JsonProperty("episodeCount") @SerialName("episodeCount") val episodeCount: Long,
+        val originalName: String?,
-        @JsonProperty("baseDuration") @SerialName("baseDuration") val baseDuration: Double,
+        @JsonProperty("seasonCount")
-        @JsonProperty("episodes") @SerialName("episodes") val episodes: List<Episode>,
+        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("number")
-        @JsonProperty("absoluteNumber") @SerialName("absoluteNumber") val absoluteNumber: String?,
+        val number: String?,
-        @JsonProperty("season") @SerialName("season") val season: String?,
+        @JsonProperty("absoluteNumber")
-        @JsonProperty("timestamps") @SerialName("timestamps") val timestamps: List<Timestamp>,
+        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("at")
-        @JsonProperty("type") @SerialName("type") val type: Type,
+        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("imdb_id") val imdbId: String?,
-        @JsonProperty("season") @SerialName("season") val season: Int?,
+        val season: Int?,
-        @JsonProperty("episode") @SerialName("episode") val episode: Int?,
+        val episode: Int?,
-        @JsonProperty("intro") @SerialName("intro") val intro: Segment?,
+        val intro: Segment?,
-        @JsonProperty("recap") @SerialName("recap") val recap: Segment?,
+        val recap: Segment?,
-        @JsonProperty("outro") @SerialName("outro") val outro: Segment?,
+        val outro: Segment?,
     )
 
-    @Serializable
     data class Segment(
-        @JsonProperty("start_sec") @SerialName("start_sec") val startSec: Double?,
+        @JsonProperty("start_sec") val startSec: Double?,
-        @JsonProperty("end_sec") @SerialName("end_sec") val endSec: Double?,
+        @JsonProperty("end_sec") val endSec: Double?,
-        @JsonProperty("start_ms") @SerialName("start_ms") val startMs: Long?,
+        @JsonProperty("start_ms") val startMs: Long?,
-        @JsonProperty("end_ms") @SerialName("end_ms") val endMs: Long?,
+        @JsonProperty("end_ms") val endMs: Long?,
-        @JsonProperty("confidence") @SerialName("confidence") val confidence: Double?,
+        val confidence: Double?,
-        @JsonProperty("submission_count") @SerialName("submission_count") val submissionCount: Int?,
+        @JsonProperty("submission_count") val submissionCount: Int?,
-        @JsonProperty("updated_at") @SerialName("updated_at") val updatedAt: String?,
+        @JsonProperty("updated_at") val updatedAt: String?,
     )
 }

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

@@ -8,8 +8,6 @@ import com.lagradost.cloudstream3.LoadResponse.Companion.isMovie
 import com.lagradost.cloudstream3.TvType
 import com.lagradost.cloudstream3.ui.result.ResultEpisode
 import com.lagradost.cloudstream3.app
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
 
 /** https://theintrodb.org/docs */
 class TheIntroDBSkip : SkipAPI() {
@@ -54,19 +52,25 @@ class TheIntroDBSkip : SkipAPI() {
         }.flatten()
     }
 
-    @Serializable
     data class Root(
-        @JsonProperty("tmdb_id") @SerialName("tmdb_id") val tmdbId: Long,
+        @JsonProperty("tmdb_id")
-        @JsonProperty("type") @SerialName("type") val type: String,
+        val tmdbId: Long,
-        @JsonProperty("intro") @SerialName("intro") val intro: List<Stamp> = emptyList(),
+        @JsonProperty("type")
-        @JsonProperty("recap") @SerialName("recap") val recap: List<Stamp> = emptyList(),
+        val type: String,
-        @JsonProperty("credits") @SerialName("credits") val credits: List<Stamp> = emptyList(),
+        @JsonProperty("intro")
-        @JsonProperty("preview") @SerialName("preview") val preview: List<Stamp> = emptyList(),
+        val intro: List<Stamp> = emptyList(),
+        @JsonProperty("recap")
+        val recap: List<Stamp> = emptyList(),
+        @JsonProperty("credits")
+        val credits: List<Stamp> = emptyList(),
+        @JsonProperty("preview")
+        val preview: List<Stamp> = emptyList(),
     )
 
-    @Serializable
     data class Stamp(
-        @JsonProperty("start_ms") @SerialName("start_ms") val startMs: Long?,
+        @JsonProperty("start_ms")
-        @JsonProperty("end_ms") @SerialName("end_ms") val endMs: Long?,
+        val startMs: Long?,
+        @JsonProperty("end_ms")
+        val endMs: Long?,
     )
 }

app/src/main/res/layout/cast_item.xml

@@ -47,7 +47,6 @@
             </androidx.cardview.widget.CardView>
 
             <androidx.cardview.widget.CardView
-                android:id="@+id/voice_actor_image_holder2"
                 android:layout_width="70dp"
                 android:layout_height="70dp"
                 android:foreground="@drawable/outline_drawable"

app/src/main/res/layout/fragment_downloads.xml

@@ -261,7 +261,7 @@
                     android:padding="8dp"
 
                     android:src="@drawable/ic_network_stream"
-                    app:tint="?attr/textColor" />
+                    app:tint="?attr/textColor"></ImageView>
             </LinearLayout>
         </LinearLayout>
     </com.google.android.material.appbar.AppBarLayout>
@@ -306,7 +306,7 @@
             android:paddingBottom="100dp"
             android:clipToPadding="false"
             android:descendantFocusability="afterDescendants"
-            android:nextFocusUp="@id/download_stream_button_tv"
+            android:nextFocusUp="@id/download_appbar"
             android:nextFocusLeft="@id/navigation_downloads"
             android:nextFocusDown="@id/download_queue_button"
             android:tag="@string/tv_no_focus_tag"

app/src/main/res/layout/fragment_extensions.xml

@@ -4,39 +4,20 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/extensions_root"
+    android:background="?attr/primaryGrayBackground"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?attr/primaryGrayBackground"
     android:orientation="vertical">
 
-    <com.google.android.material.appbar.AppBarLayout
+    <include layout="@layout/standard_toolbar" />
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@android:color/transparent">
-
-        <com.google.android.material.appbar.MaterialToolbar
-            android:id="@+id/settings_toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="?attr/primaryGrayBackground"
-            android:paddingTop="@dimen/navbar_height"
-            app:layout_scrollFlags="scroll|enterAlways"
-            app:menu="@menu/repository_search"
-            app:navigationIconTint="?attr/iconColor"
-            app:titleTextColor="?attr/textColor"
-            tools:title="Overlord" />
-
-    </com.google.android.material.appbar.AppBarLayout>
-
-    <!--    <include layout="@layout/standard_toolbar" />-->
 
     <androidx.recyclerview.widget.RecyclerView
+        android:clipToPadding="false"
         android:id="@+id/repo_recycler_view"
+        android:background="?attr/primaryBlackBackground"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_marginBottom="80dp"
-        android:background="?attr/primaryBlackBackground"
-        android:clipToPadding="false"
         android:nextFocusUp="@id/settings_toolbar"
         android:nextFocusDown="@id/plugin_storage_appbar"
         app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
@@ -46,25 +27,11 @@
         tools:listitem="@layout/repository_item"
         tools:visibility="visible" />
 
-    <androidx.recyclerview.widget.RecyclerView
-        android:visibility="gone"
-        android:id="@+id/plugin_recycler_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="?attr/primaryBlackBackground"
-        android:clipToPadding="false"
-        android:layout_marginBottom="80dp"
-        android:nextFocusLeft="@id/nav_rail_view"
-        android:nextFocusUp="@id/tvtypes_chips"
-        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior"
-        tools:listitem="@layout/repository_item" />
-
     <LinearLayout
         android:id="@+id/blank_repo_screen"
+        android:background="?attr/primaryBlackBackground"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="?attr/primaryBlackBackground"
         android:gravity="center"
         android:orientation="vertical"
         tools:visibility="gone">
@@ -97,14 +64,14 @@
         android:layout_height="80dp"
         android:layout_gravity="bottom"
         android:background="?attr/primaryGrayBackground"
-        android:baselineAligned="false"
         android:focusable="true"
         android:foreground="@drawable/outline_drawable"
         android:nextFocusRight="@id/add_repo_button_imageview"
         android:nextFocusUp="@id/repo_recycler_view"
         android:orientation="horizontal"
         android:padding="10dp"
-        android:visibility="visible">
+        android:visibility="visible"
+        android:baselineAligned="false">
 
         <LinearLayout
             android:layout_width="0dp"
@@ -241,8 +208,6 @@
                 android:focusable="true"
                 android:nextFocusLeft="@id/plugin_storage_appbar"
                 android:nextFocusUp="@id/repo_recycler_view"
-                android:nextFocusRight="@id/add_repo_button_imageview"
-                android:nextFocusDown="@id/add_repo_button_imageview"
 
                 android:src="@drawable/ic_baseline_add_24"
                 app:tint="?attr/textColor" />

app/src/main/res/layout/repository_item.xml

@@ -80,8 +80,8 @@
                 android:layout_gravity="center_vertical"
                 android:layout_marginEnd="5dp"
                 android:textColor="?attr/grayTextColor"
-                android:visibility="gone"
                 tools:text="Votes: 10K"
+                android:visibility="gone"
                 tools:visibility="visible" />
 
             <TextView
@@ -103,14 +103,6 @@
             android:textColor="?attr/grayTextColor"
             android:textSize="12sp"
             tools:text="https://github.com/..." />
-
-        <com.google.android.material.button.MaterialButton
-            android:layout_marginTop="5dp"
-            tools:visibility="visible"
-            android:visibility="gone"
-            android:id="@+id/repository_name_text"
-            style="@style/SmallBlackButton"
-            tools:text="Repository name" />
     </LinearLayout>
 
     <ImageView

app/src/main/res/layout/repository_item_tv.xml

@@ -106,13 +106,6 @@
             android:textSize="12sp"
             tools:text="https://github.com/..." />
 
-        <com.google.android.material.button.MaterialButton
-            android:layout_marginTop="5dp"
-            tools:visibility="visible"
-            android:visibility="gone"
-            android:id="@+id/repository_name_text"
-            style="@style/SmallBlackButton"
-            tools:text="Repository name" />
     </LinearLayout>
 
     <ImageView
@@ -141,7 +134,6 @@
         android:contentDescription="@string/download"
         android:focusable="true"
         android:nextFocusLeft="@id/action_settings"
-        android:nextFocusRight="@id/add_repo_button_imageview"
         android:padding="12dp"
         tools:src="@drawable/ic_baseline_add_24" />
 

app/src/main/res/menu/repository_search.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:tools="http://schemas.android.com/tools"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item
-        android:id="@+id/search_button"
-        android:title="@string/title_search"
-        android:icon="@drawable/search_icon"
-        android:searchIcon="@drawable/search_icon"
-        app:actionViewClass="androidx.appcompat.widget.SearchView"
-        app:showAsAction="always|collapseActionView"
-        tools:ignore="AppCompatResource" />
-</menu>

app/src/main/res/values-b+bn/strings.xml

@@ -353,5 +353,4 @@
     <string name="play_from_beginning_img_des">শুরু থেকে চালু করুন</string>
     <string name="speech_recognition_unavailable">স্পিচ রিকগনিশন উপলব্ধ নেই</string>
     <string name="begin_speaking">কথা বলা শুরু করুন…</string>
-    <string name="download_queue">ডাউনলোড তালিকা</string>
 </resources>

app/src/main/res/values-b+ja/strings.xml

@@ -729,8 +729,4 @@
     </plurals>
     <string name="source_priority">ソースの優先順位</string>
     <string name="source_priority_help">プレイヤーでのビデオソースの並び順を設定します</string>
-    <string name="show_player_metadata_overlay">プレイヤーメタデータオーバーレイを表示</string>
-    <string name="video_singular">動画</string>
-    <string name="skip_type_preview">プレビュー</string>
-    <string name="player_is_live">ライブ</string>
 </resources>

app/src/main/res/values-b+ko/strings.xml

@@ -56,8 +56,8 @@
     <string name="player_speed">재생 속도</string>
     <string name="subs_text_color">글자 색상</string>
     <string name="subs_outline_color">윤곽선 색상</string>
-    <string name="subs_background_color">자막 배경 색상</string>
+    <string name="subs_background_color">배경 색상</string>
-    <string name="subs_window_color">자막 창 색상</string>
+    <string name="subs_window_color">배경 색상</string>
     <string name="subs_edge_type">윤곽선 유형</string>
     <string name="subs_subtitle_elevation">자막 높이</string>
     <string name="subs_font">폰트</string>
@@ -715,7 +715,7 @@
     </plurals>
     <string name="search_suggestions_des">입력하는 동안 검색어 제안 표시</string>
     <string name="show_cast_in_details">출연진 정보 표시</string>
-    <string name="background_radius">자막 배경 테두리 곡률</string>
+    <string name="background_radius">배경 테두리 곡률</string>
     <string name="reload_provider">공급자 새로고침</string>
     <string name="search_suggestions">검색어 제안</string>
     <string name="clear_suggestions">제안 삭제</string>

app/src/main/res/values-b+lt/strings.xml

@@ -25,18 +25,18 @@
     <string name="sort_copy">Kopijuoti</string>
     <string name="benene_des">Duoti bananai</string>
     <string name="home_more_info">Daugiau informacijos</string>
-    <string name="title_downloads">Atsisiuntimai</string>
+    <string name="title_downloads">Atsiuntimai</string>
     <string name="subs_auto_select_language">Automatiškai pasirinkti kalbą</string>
     <string name="error_loading_links_toast">Klaida kraunant nuorodas</string>
     <string name="go_forward_30">+30</string>
-    <string name="download_done">Atsisiuntimas baigtas</string>
+    <string name="download_done">Atsiuntimas baigtas</string>
     <string name="continue_watching">Tęsti žiūrėjimą</string>
     <string name="new_update_format" formatted="true">Rastas atnaujinimas! \n%1$s -&gt; %2$s</string>
     <string name="subs_download_languages">Atsisiųsti kalbas</string>
     <string name="search_provider_text_providers">Ieškoti naudojant tiekėjus</string>
     <string name="go_back_img_des">Grįžti atgal</string>
     <string name="downloading">Siunčiama</string>
-    <string name="episode_more_options_des">Daugiau parinkčių</string>
+    <string name="episode_more_options_des">Daugiau pasirinkčiu</string>
     <string name="play_episode">Paleisti seriją</string>
     <string name="player_speed">Grotuvo greitis</string>
     <string name="benene_count_text">%d Bananai duoti kūrėjams</string>
@@ -45,7 +45,7 @@
     <string name="result_tags">Žanrai</string>
     <string name="go_back_30">-30</string>
     <string name="episode_poster_img_des">Serijos plakatas</string>
-    <string name="vpn_might_be_needed">Gali reikėti VPN šiam tiekėjui, kad veiktų teisingai</string>
+    <string name="vpn_might_be_needed">Gali reikėti VPN šitam tiekėjui, kad veiktų teisingai</string>
     <string name="search_hint_site" formatted="true">Ieškoti %s…</string>
     <string name="github">Github</string>
     <string name="benene_count_text_none">Nėra duotu bananų</string>
@@ -66,7 +66,7 @@
     <string name="cancel">Atšaukti</string>
     <string name="start">Pradėti</string>
     <string name="cartoons_singular">Filmukas</string>
-    <string name="download_canceled">Atsisiuntimas atšauktas</string>
+    <string name="download_canceled">Atsiuntimas atšauktas</string>
     <string name="advanced_search">Išplėstinė paieška</string>
     <string name="empty_library_logged_in_message">Tuščias sąrašas. Pabandykite pasirinkti kitą sąrašą.</string>
     <string name="chromecast_subtitles_settings">Chromecast subtitrai</string>
@@ -93,10 +93,10 @@
     <string name="type_completed">Užbaigta</string>
     <string name="use_system_brightness_settings_des">Naudoti sistemos ryškumą programos grotuve vietoj tamsumo</string>
     <string name="restore_failed_format" formatted="true">Nepavyko atstatyti duomenis iš failo %s</string>
-    <string name="play_trailer_button">Paleisti anonsą</string>
+    <string name="play_trailer_button">Paleisti anonsa</string>
-    <string name="play_livestream_button">Paleisti gyvą transliaciją</string>
+    <string name="play_livestream_button">Paleisti gyva transliacija</string>
     <string name="no_episodes_found">Nerasta serijų</string>
-    <string name="vpn_torrent">Šis tiekėjas yra iš Torrent\'ų, rekomenduojamas VPN</string>
+    <string name="vpn_torrent">Šis tiekėjas yra iš Torrentų, VPN rekomenduojama naudoti</string>
     <string name="test_failed">Nepavyko</string>
     <string name="result_poster_img_des">Plakatas</string>
     <string name="popup_play_file">Paleisti failą</string>
@@ -108,21 +108,21 @@
     <string name="redo_setup_process">Perdaryti nustatymo procesą</string>
     <string name="episodes_range">%1$d-%2$d</string>
     <string name="benene">Duoti bananą kūrėjams</string>
-    <string name="go_back">Sugrįšti</string>
+    <string name="go_back">Sugryšti</string>
     <string name="copy_link_toast">Nuoroda nukopijuota į iškarpinę</string>
     <string name="search">Paieška</string>
     <string name="settings_info">Informacija</string>
-    <string name="skip_loading">Praleisti įkėlimą</string>
+    <string name="skip_loading">Praleisti įkėlima</string>
     <string name="home_info">Informacija</string>
     <string name="next_episode_format" formatted="true">Serija %d bus išleista</string>
     <string name="sort_save">Išsaugoti</string>
     <string name="clipboard_too_large">Perdaug teksto. Nepavyko išsaugoti i iškarpynę.</string>
-    <string name="download_failed">Atsisiuntimas nepavyko</string>
+    <string name="download_failed">Atsiuntimas nepavyko</string>
     <string name="result_share">Pasidalinti</string>
     <string name="home_main_poster_img_des">Pagrindinis Plakatas</string>
     <string name="pick_source">Šaltiniai</string>
     <string name="title_settings">Nustatymai</string>
-    <string name="title_search">Paieška</string>
+    <string name="title_search">Ieškoti</string>
     <string name="loading">Kraunama…</string>
     <string name="action_remove_watching">Pašalinti</string>
     <string name="action_open_watching">Daugiau informacijos</string>
@@ -138,7 +138,7 @@
     <string name="sort_close">Uždaryti</string>
     <string name="action_add_to_bookmarks">Nustatyti žiūrėjimo statusą</string>
     <string name="play_with_app_name">Paleisti su CloudStream</string>
-    <string name="subs_subtitle_elevation">Subtitrų lygis</string>
+    <string name="subs_subtitle_elevation">Subtitrų iškėlimas</string>
     <string name="episodes">Serijos</string>
     <string name="cast_format" formatted="true">Skleisti: %s</string>
     <string name="season">Sezonas</string>
@@ -248,51 +248,4 @@
     <string name="confirm_exit_dialog">Ar tikrai norite išeiti?</string>
     <string name="action_remove_from_watched">Pašalinti iš žiūrimų</string>
     <string name="audio_tracks">Garso takelis</string>
-    <string name="filler" formatted="true">Užpildymas</string>
-    <string name="duration_format" formatted="true">%d min</string>
-    <string name="title_home">Namai</string>
-    <string name="download_queue">Atsisiuntimų eilė</string>
-    <string name="speech_recognition_unavailable">Balso atpažinimas nepasiekiamas</string>
-    <string name="begin_speaking">Pradėkite kalbėti…</string>
-    <string name="type_dropped">Nežiūrimas</string>
-    <string name="play_full_series_button">Paleisti visą seriją</string>
-    <string name="torrent_info">Šis įrašas yra Torrent\'e, tai reiškia, kad tavo įrašo veikla gali būti sekama. Įsitikinkite, kad suprantate Torrenting prieš tęsiant.</string>
-    <string name="reload_error">Atkurti ryšį…</string>
-    <string name="downloads_delete_select">Pasirinkite elementus, kuriuos norite pašalinti</string>
-    <string name="downloads_empty">Šiuo metu atsisiuntimų nėra.</string>
-    <string name="queue_empty_message">Šiuo metu atsisiuntimų eilėje nėra.</string>
-    <string name="offline_file">Pasiekiama žiūrėti neprisijungus</string>
-    <string name="select_all">Pasirinkti viską</string>
-    <string name="deselect_all">Panaikinti visus pasirinkimus</string>
-    <string name="stream">Tinklo srautas</string>
-    <string name="open_local_video">Atidaryti vietinį video</string>
-    <string name="links_reloaded_toast">Nuorodos perkrautos</string>
-    <string name="app_subbed_text">Subtitrai</string>
-    <string name="repo_copy_label">Repozitorijos pavadinimas ir adresas</string>
-    <string name="toast_copied">nukopijuota!</string>
-    <string name="subscribe_tooltip">Naujos serijos pranešimas</string>
-    <string name="result_search_tooltip">Ieškoti kituose plėtiniuose</string>
-    <string name="recommendations_tooltip">Rodyti rekomendacijas</string>
-    <string name="subs_outline_color">Apvado spalva</string>
-    <string name="subs_edge_type">Rėmelio tipas</string>
-    <string name="search_provider_text_types">Ieškoti naudojant tipus</string>
-    <string name="subs_hold_to_reset_to_default">Laikyti ilgai, kad sugražinti pradinius nustatymus</string>
-    <string name="subs_import_text" formatted="true">Įkelti šriftus sudedant juos į %s</string>
-    <string name="provider_info_meta">Metaduomenys nesuteikiamos svetainės, vaizdo įkėlimas nepavyks, jeigu jo nebus svetainėje.</string>
-    <string name="torrent_plot">Aprašymas</string>
-    <string name="normal_no_plot">Nėra siužeto aprašymo</string>
-    <string name="torrent_no_plot">Aprašymas nerastas</string>
-    <string name="show_log_cat">Rodyti Logcat</string>
-    <string name="picture_in_picture">Vaizdas vaizde</string>
-    <string name="picture_in_picture_des">Tęsia atkūrimą mažame grotuve virš kitų programų</string>
-    <string name="player_size_settings">Grotuvo dydžio pakeitimo mygtukas</string>
-    <string name="player_size_settings_des">Pašalinti juodas paraštes</string>
-    <string name="player_subtitles_settings">Subtitrai</string>
-    <string name="chromecast_subtitles_settings_des">Chromecast subtitrų nustatymai</string>
-    <string name="eigengraumode_settings">Atkūrimo sparta</string>
-    <string name="speed_setting_summary">Prideda greičio pasirinkimą grotuve</string>
-    <string name="swipe_to_seek_settings">Braukite, kas ieškotumėte</string>
-    <string name="swipe_to_seek_settings_des">Braukite į šonus, kad kontroliuotumėte padėtį vaizdo įraše</string>
-    <string name="swipe_to_change_settings">Braukite, kad pakeistumėte nustatymus</string>
-    <string name="swipe_to_change_settings_des">Braukite aukštyn arba žemyn ekrano kairėje arba dešinėje, jei norite pakeisti ryškumą arba garsą</string>
 </resources>

app/src/main/res/values-b+lv/strings.xml

@@ -287,12 +287,12 @@
     <string name="pref_category_defaults">Parasts</string>
     <string name="pref_category_looks">Izskats</string>
     <string name="pref_category_ui_features">Funkcijas</string>
-    <string name="category_general">Vispārīgie</string>
+    <string name="category_general">Ģenerāls</string>
     <string name="random_button_settings">Randomā poga</string>
     <string name="random_button_settings_desc">Rādīt izlases pogu Sākums un Bibliotēka sadaļās</string>
     <string name="provider_lang_settings">Papildinājuma valodas</string>
     <string name="app_layout">Lietotnes izkārtojums</string>
-    <string name="preferred_media_settings">Vēlamie multimediji</string>
+    <string name="preferred_media_settings">Izvēlētā media</string>
     <string name="enable_nsfw_on_providers">Iespējot nepiedienīgu, izaicinošu saturu (NSFW) atbalstītajos papildinājumos</string>
     <string name="subtitles_encoding">Subtitru kodējums</string>
     <string name="category_providers">Devēji</string>
@@ -372,7 +372,7 @@
     <string name="error">Kļūda</string>
     <string name="subtitles_remove_captions">Noņemt slēgtos parakstus no subtitriem</string>
     <string name="subtitles_remove_bloat">Noņemt lieko no subtitriem (piemēram, reklāmu)</string>
-    <string name="subtitles_filter_lang">Atlasīt pēc vēlamās multimediju valodas</string>
+    <string name="subtitles_filter_lang">Filtrēt pēc vēlamās multivides valodas</string>
     <string name="extras">Ekstras</string>
     <string name="trailer">Treileris</string>
     <string name="network_adress_example">https://piemērs.com/piemērs.mp4</string>
@@ -382,7 +382,7 @@
     <string name="previous">Iepriekšējais</string>
     <string name="skip_setup">Izlaist uzstādīšanu</string>
     <string name="app_layout_subtext">Mainiet lietotnes izskatu, lai tā atbilstu savai ierīcei</string>
-    <string name="preferred_media_subtext">Ko jūs vēlētos skatīt</string>
+    <string name="preferred_media_subtext">Ko tu vēlies redzēt</string>
     <string name="setup_done">Pabeigts</string>
     <string name="extensions">Papildinājumi</string>
     <string name="add_repository">Pievienot repozitoriju</string>
@@ -607,11 +607,4 @@
     <string name="delete_message_series_only" formatted="true">Vai tiešām vēlaties neatgriezeniski dzēst visas šī seriāla, raidījuma epizodes?\n\n%s</string>
     <string name="queue_empty_message">Pašlaik nav nevienas rindā ievietotas lejupielādes.</string>
     <string name="open_local_video">Atvērt vietējo video</string>
-    <string name="custom_media_singular">Multimedija</string>
-    <string name="video_info">Multimediju informācija</string>
-    <string name="torrent_preferred_media">Iespējojiet torrentu Iestatījumi/Pakalpojumu sniedzēji/Vēlamie multimediji sadaļā</string>
-    <string name="subscribe_tooltip">Paziņojums par jaunu epizodi</string>
-    <string name="extra_brightness_settings">Papildu spilgtums</string>
-    <string name="extra_brightness_key">Papildu spilgtums iespējots</string>
-    <string name="search_suggestions">Meklēšanas ieteikumi</string>
 </resources>

app/src/main/res/values-b+ml/strings.xml

@@ -83,9 +83,9 @@
     <!-- <string name="player_subtitles_settings">Subtitles</string> -->
     <string name="player_subtitles_settings_des">പ്ലേയർ സബ്‌ടൈറ്റിലുകളുടെ സെറ്റിങ്‌സ്</string>
     <!-- <string name="swipe_to_seek_setthings">Swipe to seek</string> -->
-    <string name="swipe_to_seek_settings_des">വീഡിയോയിൽ ഇരുവശങ്ങളിലേക്കും സ്വൈപ്പ് ചെയ്താൽ സ്ഥാനത്തെ നിയന്ത്രിക്കാം</string>
+    <string name="swipe_to_seek_settings_des">വീഡിയോപ്ലേയറിൽ സമയം നിയന്ത്രിക്കാൻ ഇടത്തോട്ടോ വലത്തോട്ടോ സ്വൈപ്പുചെയ്യുക</string>
     <!-- <string name="swipe_to_change_settings">Swipe to change settings</string> -->
-    <string name="swipe_to_change_settings_des">തെളിച്ചം അല്ലെങ്കിൽ വോളിയം മാറ്റാൻ ഇടത്തോട്ടോ വലത്തോട്ടോ നീക്കുക</string>
+    <string name="swipe_to_change_settings_des">തെളിച്ചം അല്ലെങ്കിൽ വോളിയം മാറ്റാൻ ഇടത്തോട്ടോ വലത്തോട്ടോ സ്വൈപ്പുചെയ്യുക</string>
     <!-- <string name="double_tap_to_seek_setthings">Double tap to seek</string> -->
     <string name="double_tap_to_seek_settings_des">മുന്നോട്ട് അല്ലെങ്കിൽ പിന്നിലേക്ക് നീങ്ങാൻ വലത്തോട്ടോ ഇടത്തോട്ടോ രണ്ടുതവണ ടാപ്പുചെയ്യുക</string>
     <string name="search">തിരയുക</string>
@@ -186,7 +186,7 @@
     <string name="loading">ലോഡിംഗ്…</string>
     <string name="browser">ബ്രൗസർ</string>
     <string name="type_re_watching">വീണ്ടും കാണുക</string>
-    <string name="stream">നെറ്റ്‌വർക്ക് സ്ട്രീം</string>
+    <string name="stream">സ്ട്രീം</string>
     <string name="subs_import_text" formatted="true">%s ൽ ഫോൻ്റ്‌സ് വെച്ചു കൊണ്ട് ഇംപോർട്ട് ചെയ്യുക</string>
     <string name="safe_mode_description">പ്രശ്‌നമുണ്ടാക്കുന്ന ഒന്ന് കണ്ടെത്താൻ നിങ്ങളെ സഹായിക്കുന്നതിന് ഒരു ക്രാഷ് കാരണം എല്ലാ വിപുലീകരണങ്ങളും ഓഫാക്കി.</string>
     <string name="view_public_repositories_button_short">പൊതു പട്ടിക</string>
@@ -267,50 +267,4 @@
     <string name="subs_edge_type">എഡ്ജ് തരം</string>
     <string name="subs_outline_color">ഔട്ട്ലൈൻ നിറം</string>
     <string name="subs_background_color">പശ്ചാത്തല നിറം</string>
-    <string name="next_season_episode_format" formatted="true">സീസൺ %1$d എപ്പിസോഡ് %2$d റിലീസ് ചെയ്യുന്ന സമയം</string>
-    <string name="download_time_left_hour_min_sec_format" formatted="true">%1$dh %2$dm %3$ds</string>
-    <string name="download_time_left_min_sec_format" formatted="true">%1$dm %2$ds</string>
-    <string name="download_time_left_sec_format" formatted="true">%1$ds</string>
-    <string name="play_from_beginning_img_des">തുടക്കം മുതൽ പ്ലേ ചെയ്യുക</string>
-    <string name="download_queue">ഡൗൺലോഡ് ക്യൂ</string>
-    <string name="speech_recognition_unavailable">സ്പീച്ച് റെക്കഗ്നിഷൻ ലഭ്യമല്ല</string>
-    <string name="begin_speaking">സംസാരിക്കാൻ തുടങ്ങുക…</string>
-    <string name="play_full_series_button">മുഴുനീള പരമ്പരയും പ്ലേ ചെയ്യുക</string>
-    <string name="torrent_info">ഈ വീഡിയോ ഒരു ടോറന്റ് ആണ്, അതായത് നിങ്ങളുടെ വീഡിയോ ആക്റ്റിവിറ്റി ട്രാക്ക് ചെയ്യപ്പെടാൻ സാധ്യതയുണ്ട്.\nതുടരുന്നതിന് മുൻപ് ടോറന്റിംഗിനെക്കുറിച്ച് നിങ്ങൾക്ക് കൃത്യമായി അറിയാമെന്ന് ഉറപ്പാക്കുക.</string>
-    <string name="downloads_delete_select">ഡിലീറ്റ് ചെയ്യേണ്ടവ തിരഞ്ഞെടുക്കുക</string>
-    <string name="downloads_empty">നിലവിൽ ഡൗൺലോഡുകൾ ഒന്നും തന്നെയില്ല.</string>
-    <string name="queue_empty_message">നിലവിൽ ക്യൂവിലുള്ള ഡൗൺലോഡുകൾ ഒന്നും തന്നെയില്ല.</string>
-    <string name="offline_file">ഓഫ്‌ലൈനായി കാണാൻ ലഭ്യമാണ്</string>
-    <string name="select_all">എല്ലാം തിരഞ്ഞെടുക്കുക</string>
-    <string name="deselect_all">തിരഞ്ഞെടുത്തവയെല്ലാം ഒഴിവാക്കു</string>
-    <string name="open_local_video">ലോക്കൽ വീഡിയോ തുറക്കുക</string>
-    <string name="sort_save">സേവ് ചെയ്യുക</string>
-    <string name="subs_subtitle_elevation">സബ്‌ടൈറ്റിൽ ഉയരം</string>
-    <string name="subs_font">ഫോണ്ട്</string>
-    <string name="subs_font_size">ഫോണ്ട് വലുപ്പം</string>
-    <string name="subs_auto_select_language">സ്വയം തിരഞ്ഞെടുത്ത ഭാഷ</string>
-    <string name="subs_download_languages">ഭാഷകൾ ഡൗൺലോഡ് ചെയ്യുക</string>
-    <string name="subs_subtitle_languages">സബ്ടൈറ്റിൽ ഭാഷ</string>
-    <string name="provider_info_meta">സൈറ്റിൽ വിവരങ്ങൾ ലഭ്യമല്ല, ആയതിനാൽ വീഡിയോ ലോഡ് ആവുകയില്ല.</string>
-    <string name="player_size_settings">പ്ലേയറിന്റെ വലുപ്പം മാറ്റുന്ന ബട്ടൻ</string>
-    <string name="player_subtitles_settings">സബ്ടൈട്ടിൽസ്</string>
-    <string name="chromecast_subtitles_settings">ക്രോംകാസ്റ്റ് സബ്ടൈട്ടിൽസ്</string>
-    <string name="chromecast_subtitles_settings_des">ക്രോംകാസ്റ്റ് സബ്ടൈട്ടിൽസ് ക്രമീകരണങ്ങൾ</string>
-    <string name="eigengraumode_settings">പ്ലേ ചെയ്യുന്ന വേഗത</string>
-    <string name="speed_setting_summary">പ്ലേയറിൽ വേഗതയ്ക്കുള്ള ഓപ്ഷൻ ചേർക്കുന്നു</string>
-    <string name="swipe_to_seek_settings">മുന്നോട്ടും പിന്നോട്ടും പോകുവാൻ സ്വൈപ്പ് ചെയ്യുക</string>
-    <string name="swipe_to_change_settings">ക്രമീകരണങ്ങൾ മാറ്റുവാൻ സ്വൈപ്പ് ചെയ്യുക</string>
-    <string name="name">നാമം</string>
-    <string name="source_name">ഉറവിട നാമം</string>
-    <string name="resolution_and_name">ദൃശ്യമേന്മയും നാമവും</string>
-    <string name="download_all">എല്ലാം ഡൗൺലോഡ് ചെയ്യുക</string>
-    <string name="autoplay_next_settings">അടുത്ത ഭാഗം സ്വയം പ്ലേ ചെയ്യുക</string>
-    <string name="autoplay_next_settings_des">ഇപ്പോളത്തെ ഭാഗം കഴിഞ്ഞയുടനെ അടുത്തത് ആരംഭിക്കുക</string>
-    <string name="player_is_live">തൽസമയം</string>
-    <string name="action_open_play">@string/home_play</string>
-    <string name="double_tap_to_seek_settings">രണ്ടുവട്ടം ടാപ്പ് ചെയ്താൽ സ്ഥാനം നിയന്ത്രിക്കാം</string>
-    <string name="double_tap_to_pause_settings">രണ്ടുവട്ടം ടാപ്പ് ചെയ്താൽ താൽകാലികമായി നിർത്തിവെക്കാം</string>
-    <string name="double_tap_to_seek_amount_settings">പ്ലേയറിലെ സ്ഥാനനിയന്ത്രണ അളവ് (സെക്കണ്ടസ്)</string>
-    <string name="double_tap_to_pause_settings_des">നടുവിൽ രണ്ട് തവണ ടാപ്പ് ചെയ്താൽ താൽകാലികമായി നിർത്തിവെക്കാം</string>
-    <string name="use_system_brightness_settings">സിസ്റ്റത്തിന്റെ വെളിച്ചക്രമീകരണം ഉപയോഗിക്കുക</string>
 </resources>

app/src/main/res/values-b+nl/strings.xml

@@ -677,9 +677,4 @@
     <string name="confirm_before_exiting_title">Bevestig voor afsluiten</string>
     <string name="confirm_before_exiting_desc">Toon dialoogvenster voordat de app wordt afgesloten</string>
     <string name="subs_edge_size">Randgrote</string>
-    <string name="show_player_metadata_overlay">Laat Speler Metadata Overlay zien</string>
-    <string name="device_pin_error_message">Kon de apparaat PIN niet vinden, probeer locale authenticatie</string>
-    <string name="torrent_preferred_media">Zet torrent aan in Instellingen/Providers/Media voorkeur</string>
-    <string name="torrent_not_accepted">Herstart de app en accepteer de Stream Torrent pop-up om verder te gaan.</string>
-    <string name="update_plugins_manually">Handmatige Update Knop</string>
 </resources>

app/src/main/res/values-b+vi/strings.xml

@@ -553,7 +553,7 @@
     <string name="duplicate_add">Thêm vào</string>
     <string name="action_subscribe">Đăng ký</string>
     <string name="action_remove_from_favorites">Xóa khỏi mục yêu thích</string>
-    <string name="select_an_account">Chọn hồ sơ của bạn</string>
+    <string name="select_an_account">Chọn một Hồ sơ</string>
     <string name="duplicate_message_single">Có vẻ như một mục có khả năng trùng lặp đã tồn tại trong thư viện của bạn: \'%s.\' \n \nBạn vẫn muốn thêm mục này, thay thế mục hiện có hay hủy hành động?</string>
     <string name="enter_pin">Nhập mã PIN</string>
     <string name="pin">PIN</string>

app/src/main/res/values/styles.xml

@@ -472,9 +472,6 @@
     </style>
 
     <style name="AppBottomSheetDialogTheme">
-        <item name="android:windowIsFloating">true</item>
-        <!-- To remove the background dim of bottom sheets use android:backgroundDimEnabled -->
-        <!-- <item name="android:backgroundDimEnabled">false</item> -->
         <item name="android:navigationBarColor">?attr/boxItemBackground</item>
         <item name="android:windowCloseOnTouchOutside">true</item>
         <item name="android:windowBackground">@android:color/transparent</item>

app/src/test/java/com/lagradost/cloudstream3/ProviderTests.kt

@@ -0,0 +1,220 @@
+package com.lagradost.cloudstream3
+
+// import com.lagradost.cloudstream3.APIHolder.allProviders
+// import com.lagradost.cloudstream3.mvvm.logError
+// import com.lagradost.cloudstream3.utils.Qualities
+// import com.lagradost.cloudstream3.utils.SubtitleHelper
+// import kotlinx.coroutines.runBlocking
+// import org.junit.Assert
+// import org.junit.Test
+
+class ProviderTests {
+//     private fun getAllProviders(): List<MainAPI> {
+//         return allProviders.filter { !it.usesWebView }
+//     }
+
+//     private suspend fun loadLinks(api: MainAPI, url: String?): Boolean {
+//         Assert.assertNotNull("Api ${api.name} has invalid url on episode", url)
+//         if (url == null) return true
+//         var linksLoaded = 0
+//         try {
+//             val success = api.loadLinks(url, false, {}) { link ->
+//                 Assert.assertTrue(
+//                     "Api ${api.name} returns link with invalid Quality",
+//                     Qualities.values().map { it.value }.contains(link.quality)
+//                 )
+//                 Assert.assertTrue(
+//                     "Api ${api.name} returns link with invalid url",
+//                     link.url.length > 4
+//                 )
+//                 linksLoaded++
+//             }
+//             if (success) {
+//                 return linksLoaded > 0
+//             }
+//             Assert.assertTrue("Api ${api.name} has returns false on .loadLinks", success)
+//         } catch (e: Exception) {
+//             if (e.cause is NotImplementedError) {
+//                 Assert.fail("Provider has not implemented .loadLinks")
+//             }
+//             logError(e)
+//         }
+//         return true
+//     }
+
+//     private suspend fun testSingleProviderApi(api: MainAPI): Boolean {
+//         val searchQueries = listOf("over", "iron", "guy")
+//         var correctResponses = 0
+//         var searchResult: List<SearchResponse>? = null
+//         for (query in searchQueries) {
+//             val response = try {
+//                 api.search(query, 1)
+//             } catch (e: Exception) {
+//                 if (e.cause is NotImplementedError) {
+//                     Assert.fail("Provider has not implemented .search")
+//                 }
+//                 logError(e)
+//                 null
+//             }?.items
+//             if (!response.isNullOrEmpty()) {
+//                 correctResponses++
+//                 if (searchResult == null) {
+//                     searchResult = response
+//                 }
+//             }
+//         }
+
+//         if (correctResponses == 0 || searchResult == null) {
+//             System.err.println("Api ${api.name} did not return any valid search responses")
+//             return false
+//         }
+
+//         try {
+//             var validResults = false
+//             for (result in searchResult) {
+//                 Assert.assertEquals(
+//                     "Invalid apiName on response on ${api.name}",
+//                     result.apiName,
+//                     api.name
+//                 )
+//                 val load = api.load(result.url) ?: continue
+//                 Assert.assertEquals(
+//                     "Invalid apiName on load on ${api.name}",
+//                     load.apiName,
+//                     result.apiName
+//                 )
+//                 Assert.assertTrue(
+//                     "Api ${api.name} on load does not contain any of the supportedTypes",
+//                     api.supportedTypes.contains(load.type)
+//                 )
+//                 when (load) {
+//                     is AnimeLoadResponse -> {
+//                         val gotNoEpisodes =
+//                             load.episodes.keys.isEmpty() || load.episodes.keys.any { load.episodes[it].isNullOrEmpty() }
+
+//                         if (gotNoEpisodes) {
+//                             println("Api ${api.name} got no episodes on ${load.url}")
+//                             continue
+//                         }
+
+//                         val url = (load.episodes[load.episodes.keys.first()])?.first()?.data
+//                         validResults = loadLinks(api, url)
+//                         if (!validResults) continue
+//                     }
+//                     is MovieLoadResponse -> {
+//                         val gotNoEpisodes = load.dataUrl.isBlank()
+//                         if (gotNoEpisodes) {
+//                             println("Api ${api.name} got no movie on ${load.url}")
+//                             continue
+//                         }
+
+//                         validResults = loadLinks(api, load.dataUrl)
+//                         if (!validResults) continue
+//                     }
+//                     is TvSeriesLoadResponse -> {
+//                         val gotNoEpisodes = load.episodes.isEmpty()
+//                         if (gotNoEpisodes) {
+//                             println("Api ${api.name} got no episodes on ${load.url}")
+//                             continue
+//                         }
+
+//                         validResults = loadLinks(api, load.episodes.first().data)
+//                         if (!validResults) continue
+//                     }
+//                 }
+//                 break
+//             }
+
+//             Assert.assertTrue("Api ${api.name} did not load on any}", validResults)
+//         } catch (e: Exception) {
+//             if (e.cause is NotImplementedError) {
+//                 Assert.fail("Provider has not implemented .load")
+//             }
+//             logError(e)
+//             return false
+//         }
+//         return true
+//     }
+
+//     @Test
+//     fun providersExist() {
+//         Assert.assertTrue(getAllProviders().isNotEmpty())
+//     }
+
+//     @Test
+//     fun providerCorrectData() {
+//         val langTagsIETF = SubtitleHelper.languages.map { it.IETF_tag }
+//         Assert.assertFalse("langTagsIETF does not contain any languages", langTagsIETF.isNullOrEmpty())
+//         for (api in getAllProviders()) {
+//             Assert.assertTrue("Api does not contain a mainUrl", api.mainUrl != "NONE")
+//             Assert.assertTrue("Api does not contain a name", api.name != "NONE")
+//             Assert.assertTrue(
+//                 "Api ${api.name} does not contain a valid language code",
+//                 langTagsIETF.contains(api.lang)
+//             )
+//             Assert.assertTrue(
+//                 "Api ${api.name} does not contain any supported types",
+//                 api.supportedTypes.isNotEmpty()
+//             )
+//         }
+//     }
+
+//     @Test
+//     fun providerCorrectHomepage() {
+//         runBlocking {
+//             getAllProviders().amap { api ->
+//                 if (api.hasMainPage) {
+//                     try {
+//                         val homepage = api.getMainPage()
+//                         when {
+//                             homepage == null -> {
+//                                 Assert.fail("Homepage provider ${api.name} did not correctly load homepage!")
+//                             }
+//                             homepage.items.isEmpty() -> {
+//                                 Assert.fail("Homepage provider ${api.name} does not contain any items!")
+//                             }
+//                             homepage.items.any { it.list.isEmpty() } -> {
+//                                 Assert.fail("Homepage provider ${api.name} does not have any items on result!")
+//                             }
+//                         }
+//                     } catch (e: Exception) {
+//                         if (e.cause is NotImplementedError) {
+//                             Assert.fail("Provider marked as hasMainPage, while in reality is has not been implemented")
+//                         }
+//                         logError(e)
+//                     }
+//                 }
+//             }
+//         }
+//     }
+
+// //    @Test
+// //    fun testSingleProvider() {
+// //        testSingleProviderApi(ThenosProvider())
+// //    }
+
+//     @Test
+//     suspend fun providerCorrect() {
+//         val invalidProvider = ArrayList<Pair<MainAPI, Exception?>>()
+//         val providers = getAllProviders()
+//         providers.amap { api ->
+//             try {
+//                 println("Trying $api")
+//                 if (testSingleProviderApi(api)) {
+//                     println("Success $api")
+//                 } else {
+//                     System.err.println("Error $api")
+//                     invalidProvider.add(Pair(api, null))
+//                 }
+//             } catch (e: Exception) {
+//                 logError(e)
+//                 invalidProvider.add(Pair(api, e))
+//             }
+//         }
+
+//         println("Invalid providers are: ")
+//         for (provider in invalidProvider) {
+//             println("${provider.first}")
+//         }
+//     }
+}

build.gradle.kts

@@ -8,3 +8,10 @@ plugins {
     alias(libs.plugins.kotlin.multiplatform) apply false
     alias(libs.plugins.kotlin.serialization) apply false
 }
+
+allprojects {
+    // https://docs.gradle.org/current/userguide/upgrading_major_version_9.html#test_task_fails_when_no_tests_are_discovered
+    tasks.withType<AbstractTestTask>().configureEach {
+        failOnNoDiscoveredTests = false
+    }
+}

fastlane/metadata/android/ar-SA/title.txt

@@ -1 +1 @@
-CloudStream
+كلاودستريم

gradle/libs.versions.toml

@@ -13,7 +13,6 @@ colorpicker = "6b46b49"
 conscryptAndroid = { strictly = "2.5.2" } # 2.5.3 crashes everything
 constraintlayout = "2.2.1"
 coreKtx = "1.18.0"
-cryptography = "0.6.0"
 desugar_jdk_libs_nio = "2.1.5"
 dokkaGradlePlugin = "2.2.0"
 espressoCore = "3.7.0"
@@ -26,13 +25,12 @@ junit = "4.13.2"
 junitKtx = "1.3.0"
 junitVersion = "1.3.0"
 juniversalchardet = "2.5.0"
-kotlinGradlePlugin = "2.4.0"
+kotlinGradlePlugin = "2.3.20"
 kotlinxAtomicfu = "0.33.0"
 kotlinxCollectionsImmutable = "0.4.0"
-kotlinxCoroutines = "1.11.0"
+kotlinxCoroutinesCore = "1.11.0"
 kotlinxDatetime = "0.8.0"
 kotlinxSerializationJson = "1.11.0"
-ksoup = "0.2.6"
 ktor = "3.5.0"
 lifecycleKtx = "2.10.0"
 material = "1.14.0"
@@ -59,11 +57,11 @@ zipline = "1.27.0"
 jvmTarget = "1.8"
 jdkToolchain = "17"
 minSdk = "23"
-compileSdk = "37"
+compileSdk = "36"
 targetSdk = "36"
 
 versionCode = "68"
-versionName = "4.8.0"
+versionName = "4.7.0"
 
 [libraries]
 activity-ktx = { module = "androidx.activity:activity-ktx", version.ref = "activityKtx" }
@@ -78,8 +76,6 @@ conscrypt-android = { module = "org.conscrypt:conscrypt-android", version.ref =
 constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "constraintlayout" }
 core = { module = "androidx.test:core" }
 core-ktx = { module = "androidx.core:core-ktx", version.ref = "coreKtx" }
-cryptography-core = { module = "dev.whyoleg.cryptography:cryptography-core", version.ref = "cryptography" }
-cryptography-provider-optimal = { module = "dev.whyoleg.cryptography:cryptography-provider-optimal", version.ref = "cryptography" }
 databinding = { module = "androidx.databinding:viewbinding", version.ref = "androidGradlePlugin" }
 desugar_jdk_libs_nio = { module = "com.android.tools:desugar_jdk_libs_nio", version.ref = "desugar_jdk_libs_nio" }
 espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "espressoCore" }
@@ -92,15 +88,12 @@ jsoup = { module = "org.jsoup:jsoup", version.ref = "jsoup" }
 junit = { module = "junit:junit", version.ref = "junit" }
 junit-ktx = { module = "androidx.test.ext:junit-ktx", version.ref = "junitKtx" }
 juniversalchardet = { module = "com.github.albfernandez:juniversalchardet", version.ref = "juniversalchardet" }
-kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlinGradlePlugin" }
 kotlin-test = { group = "org.jetbrains.kotlin", name = "kotlin-test", version.ref = "kotlinGradlePlugin" }
 kotlinx-atomicfu = { module = "org.jetbrains.kotlinx:atomicfu", version.ref = "kotlinxAtomicfu" }
 kotlinx-collections-immutable = { module = "org.jetbrains.kotlinx:kotlinx-collections-immutable", version.ref = "kotlinxCollectionsImmutable" }
-kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinxCoroutines" }
+kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinxCoroutinesCore" }
-kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinxCoroutines" }
 kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "kotlinxDatetime" }
 kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinxSerializationJson" }
-ksoup = { module = "com.fleeksoft.ksoup:ksoup", version.ref = "ksoup" }
 ktor-http = { module = "io.ktor:ktor-http", version.ref = "ktor" }
 lifecycle-livedata-ktx = { module = "androidx.lifecycle:lifecycle-livedata-ktx", version.ref = "lifecycleKtx" }
 lifecycle-viewmodel-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "lifecycleKtx" }
@@ -148,7 +141,6 @@ kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", versi
 
 [bundles]
 coil = ["coil", "coil-network-okhttp"]
-cryptography = ["cryptography-core", "cryptography-provider-optimal"]
 lifecycle = ["lifecycle-livedata-ktx", "lifecycle-viewmodel-ktx"]
 media3 = ["media3-cast", "media3-common", "media3-container", "media3-datasource-cronet", "media3-datasource-okhttp", "media3-exoplayer", "media3-exoplayer-dash", "media3-exoplayer-hls", "media3-session", "media3-ui"]
 navigation = ["navigation-fragment-ktx", "navigation-ui-ktx"]

library/README.md

@@ -1,15 +0,0 @@
-## CloudStream extension library
-
-This is the official API surface for all CloudStream plugins.
-
-To ensure that all plugins work on both the stable release and pre-release we must have
-binary compatibility on all changes. All new changes must be marked with `@Prerelease` to
-prevent accidental usage among extension developers.
-
-We use Kotlin binary compatibility validation using:
-
-``./gradlew checkKotlinAbi``
-
-If you for some reason must update the binary compatibility then manually edit `api/jvm/library.api` or use:
-
-``./gradlew updateKotlinAbi``

library/build.gradle.kts

@@ -20,8 +20,6 @@ val javaTarget = JvmTarget.fromTarget(libs.versions.jvmTarget.get())
 kotlin {
     version = "1.0.1"
 
-    applyDefaultHierarchyTemplate()
-
     android {
         // If this is the same com.lagradost.cloudstream3.R stops working
         namespace = "com.lagradost.api"
@@ -41,7 +39,10 @@ kotlin {
     jvm()
 
     compilerOptions {
-        freeCompilerArgs.add("-Xexpect-actual-classes")
+        freeCompilerArgs.addAll(
+            "-Xexpect-actual-classes",
+            "-Xannotation-default-target=param-property"
+        )
     }
 
     sourceSets {
@@ -54,45 +55,33 @@ kotlin {
 
         commonMain.dependencies {
             implementation(libs.annotation) // Annotations
+            implementation(libs.nicehttp) // HTTP Lib
             implementation(libs.jackson.module.kotlin) // JSON Parser
-            implementation(libs.jsoup) // HTML Parser
             implementation(libs.kotlinx.atomicfu)
             implementation(libs.kotlinx.coroutines.core)
             implementation(libs.kotlinx.datetime)
             implementation(libs.kotlinx.serialization.json) // JSON Parser
-            implementation(libs.ksoup) // HTML Parser
             implementation(libs.ktor.http)
-            implementation(libs.nicehttp) // HTTP Library
+            implementation(libs.jsoup) // HTML Parser
             implementation(libs.rhino) // Run JavaScript
             implementation(libs.tmdb.java) // TMDB API v3 Wrapper Made with RetroFit
-            implementation(libs.bundles.cryptography) // Cryptography
+
+            // Deprecated; will be removed once extensions have time to migrate from using it
+            implementation("me.xdrop:fuzzywuzzy:1.4.0")
         }
 
         commonTest.dependencies {
             implementation(libs.kotlin.test)
-            implementation(libs.kotlinx.coroutines.test)
         }
 
-        val jvmCommonMain by creating {
+        // We will eventually add a new jvmCommonMain source set
-            dependsOn(commonMain.get())
+        // for things shared between Android and JVM.
-            dependencies {
+        androidMain.dependencies {
-                implementation(libs.kotlin.reflect)
             implementation(libs.newpipeextractor)
         }
-        }
 
-        androidMain { dependsOn(jvmCommonMain) }
+        jvmMain.dependencies {
-        jvmMain { dependsOn(jvmCommonMain) }
+            implementation(libs.newpipeextractor)
-    }
-
-    @OptIn(org.jetbrains.kotlin.gradle.dsl.abi.ExperimentalAbiValidation::class)
-    // https://kotlinlang.org/docs/gradle-binary-compatibility-validation.html
-    abiValidation {
-        filters {
-            exclude {
-                annotatedWith.add("com.lagradost.cloudstream3.Prerelease")
-                annotatedWith.add("com.lagradost.cloudstream3.InternalAPI")
-            }
         }
     }
 }

library/src/androidMain/kotlin/com/lagradost/api/ContextHelper.android.kt

@@ -3,14 +3,19 @@ package com.lagradost.api
 import android.content.Context
 import java.lang.ref.WeakReference
 
-private var contextRef: WeakReference<Context>? = null
+var ctx: WeakReference<Context>? = null
 
 /**
  * Helper function for Android specific context. Not usable in JVM.
  * Do not use this unless absolutely necessary.
  */
-actual fun getContext(): Any? = contextRef?.get()
+actual fun getContext(): Any? {
-
+    return ctx?.get()
-actual fun setContext(context: Any?) {
+}
-    contextRef = (context as? Context)?.let { WeakReference(it) }
+
+actual fun setContext(context: WeakReference<Any>) {
+    val actualContext = context.get() as? Context
+    if (actualContext != null) {
+        ctx = WeakReference(actualContext)
+    }
 }

library/src/androidMain/kotlin/com/lagradost/cloudstream3/utils/Coroutines.android.kt

@@ -1,20 +1,14 @@
 package com.lagradost.cloudstream3.utils
 
-import android.annotation.SuppressLint
 import android.os.Handler
 import android.os.Looper
 import androidx.annotation.AnyThread
 import androidx.annotation.MainThread
 
-@SuppressLint("ThreadConstraint") // mainLooper.isCurrentThread does not switch the context
 @AnyThread
 actual fun runOnMainThreadNative(@MainThread work: () -> Unit) {
-    val mainLooper = Looper.getMainLooper()
+    val mainHandler = Handler(Looper.getMainLooper())
-    if (mainLooper.isCurrentThread) {
+    mainHandler.post {
-        // Do the work directly if we already are on the main thread, no need to enqueue it
         work()
-    } else {
-        // Otherwise post it to the other main thread
-        Handler(mainLooper).post(work)
     }
 }

library/src/androidMain/kotlin/com/lagradost/cloudstream3/utils/SubtitleHelperPlatform.android.kt

@@ -1,24 +0,0 @@
-package com.lagradost.cloudstream3.utils
-
-import java.util.Locale
-
-// TODO: add androidMain actual using LocaleListCompat.getAdjustedDefault() to respect
-// per-app language preferences set via AppCompatDelegate.setApplicationLocales()
-
-actual fun getCurrentLocale(): String =
-    Locale.getDefault().toLanguageTag()
-
-actual fun localizedLanguageName(ietfTag: String, localizedTo: String): String? {
-    val localeOfLangCode = Locale.forLanguageTag(ietfTag)
-    val localeOfLocalizeTo = Locale.forLanguageTag(localizedTo)
-    val displayName = localeOfLangCode.getDisplayName(localeOfLocalizeTo)
-
-    // Locale.getDisplayName() falls back to the raw tag or "language (country)" form
-    // when it doesn't know how to render the name.
-    val langCodeWithCountry = "${localeOfLangCode.language} ("
-    val failed =
-        displayName.equals(ietfTag, ignoreCase = true) ||
-        displayName.contains(langCodeWithCountry, ignoreCase = true)
-
-    return if (failed) null else displayName
-}