fixed merge errors

Merge branch 'master' into master
Fixed PiP aspect ratio and removed duplicated code.
2024-08-15 01:53:11 +00:00 · 2023-08-01 00:55:51 +02:00 · 2023-08-01 00:44:01 +02:00 · 2023-07-18 21:46:34 +02:00 · 2023-07-14 20:16:23 +02:00
643 changed files with 11767 additions and 33996 deletions
--- a/.github/ISSUE_TEMPLATE/application-bug.yml
+++ b/.github/ISSUE_TEMPLATE/application-bug.yml
@ -80,13 +80,13 @@ body:
      label: Acknowledgements
      description: Your issue will be closed if you haven't done these steps.
      options:
-        - label: I am sure my issue is related to the app and **NOT some extension**.
-          required: true
        - label: I have searched the existing issues and this is a new ticket, **NOT** a duplicate or related to another open issue.
          required: true
        - label: I have written a short but informative title.
          required: true
        - label: I have updated the app to pre-release version **[Latest](https://github.com/recloudstream/cloudstream/releases)**.
          required: true
+        - label: If related to a provider, I have checked the site and it works, but not the app. 
+          required: true
        - label: I will fill out all of the requested information in this form.
          required: true
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@ -2,7 +2,7 @@ blank_issues_enabled: false
 contact_links:
  - name: Request a new provider or report bug with an existing provider
    url: https://github.com/recloudstream
-    about: EXTREMELY IMPORTANT - Please do not report any provider bugs here or request new providers. This repository does not contain any providers. Please find the appropriate repository and report your issue there or join the discord.
+    about: Please do not report any provider bugs here or request new providers. This repository does not contain any providers. Please find the appropriate repository and report your issue there or join the discord.
  - name: Discord
    url: https://discord.gg/5Hus6fM
    about: Join our discord for faster support on smaller issues.
--- a/.github/ISSUE_TEMPLATE/feature-request.yml
+++ b/.github/ISSUE_TEMPLATE/feature-request.yml
@ -27,7 +27,9 @@ body:
      label: Acknowledgements
      description: Your issue will be closed if you haven't done these steps.
      options:
-        - label: My suggestion is **NOT** about adding a new provider
-          required: true
        - label: I have searched the existing issues and this is a new ticket, **NOT** a duplicate or related to another open issue.
          required: true
+        - label: I have written a short but informative title.
+          required: true
+        - label: I will fill out all of the requested information in this form.
+          required: true
--- a/.github/locales.py
+++ b/.github/locales.py
@ -1,7 +1,6 @@
 import re
 import glob
 import requests
-import os
 import lxml.etree as ET  # builtin library doesn't preserve comments


@ -54,16 +53,11 @@ for file in glob.glob(f"{XML_NAME}*/strings.xml"):
    try:
        tree = ET.parse(file)
        for child in tree.getroot():
-            if not child.text:
-                continue
            if child.text.startswith("\\@string/"):
                print(f"[{file}] fixing {child.attrib['name']}")
                child.text = child.text.replace("\\@string/", "@string/")
        with open(file, 'wb') as fp:
            fp.write(b'<?xml version="1.0" encoding="utf-8"?>\n')
            tree.write(fp, encoding="utf-8", method="xml", pretty_print=True, xml_declaration=False)
-            # Remove trailing new line to be consistent with weblate
-            fp.seek(-1, os.SEEK_END)
-            fp.truncate()
    except ET.ParseError as ex:
        print(f"[{file}] {ex}")
--- a/.github/workflows/build_to_archive.yml
+++ b/.github/workflows/build_to_archive.yml
@ -19,21 +19,21 @@ jobs:
    steps:
    - name: Generate access token
      id: generate_token
-      uses: tibdex/github-app-token@v2
+      uses: tibdex/github-app-token@v1
      with:
        app_id: ${{ secrets.GH_APP_ID }}
        private_key: ${{ secrets.GH_APP_KEY }}
        repository: "recloudstream/secrets"
    - name: Generate access token (archive)
      id: generate_archive_token
-      uses: tibdex/github-app-token@v2
+      uses: tibdex/github-app-token@v1
      with:
        app_id: ${{ secrets.GH_APP_ID }}
        private_key: ${{ secrets.GH_APP_KEY }}
        repository: "recloudstream/cloudstream-archive"
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v2
    - name: Set up JDK 17
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@v2
      with:
        java-version: '17'
        distribution: 'adopt'
@ -56,9 +56,7 @@ jobs:
        SIGNING_KEY_ALIAS: "key0"
        SIGNING_KEY_PASSWORD: ${{ steps.fetch_keystore.outputs.key_pwd }}
        SIGNING_STORE_PASSWORD: ${{ steps.fetch_keystore.outputs.key_pwd }}
-        SIMKL_CLIENT_ID: ${{ secrets.SIMKL_CLIENT_ID }}
-        SIMKL_CLIENT_SECRET: ${{ secrets.SIMKL_CLIENT_SECRET }}
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v3
      with:
        repository: "recloudstream/cloudstream-archive"
        token: ${{ steps.generate_archive_token.outputs.token }}
--- a/.github/workflows/generate_dokka.yml
+++ b/.github/workflows/generate_dokka.yml
@ -20,7 +20,7 @@ jobs:
    steps:
      - name: Generate access token
        id: generate_token
-        uses: tibdex/github-app-token@v2
+        uses: tibdex/github-app-token@v1
        with:
          app_id: ${{ secrets.GH_APP_ID }}
          private_key: ${{ secrets.GH_APP_KEY }}
@ -43,13 +43,12 @@ jobs:
          rm -rf "./-cloudstream"

      - name: Setup JDK 17
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v1
        with:
          java-version: 17
-          distribution: 'adopt'

      - name: Setup Android SDK
-        uses: android-actions/setup-android@v3
+        uses: android-actions/setup-android@v2

      - name: Generate Dokka
        run: |
--- a/.github/workflows/issue_action.yml
+++ b/.github/workflows/issue_action.yml
@ -10,7 +10,7 @@ jobs:
    steps:
      - name: Generate access token
        id: generate_token
-        uses: tibdex/github-app-token@v2
+        uses: tibdex/github-app-token@v1
        with:
          app_id: ${{ secrets.GH_APP_ID }}
          private_key: ${{ secrets.GH_APP_KEY }}
@ -27,7 +27,7 @@ jobs:
          comment-body: '${index}. ${similarity} #${number}'
      - name: Label if possible duplicate
        if: steps.similarity.outputs.similar-issues-found =='true'
-        uses: actions/github-script@v7
+        uses: actions/github-script@v6
        with:
          github-token: ${{ steps.generate_token.outputs.token }}
          script: |
@ -37,7 +37,7 @@ jobs:
              repo: context.repo.repo,
              labels: ["possible duplicate"]
            })
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2
      - name: Automatically close issues that dont follow the issue template
        uses: lucasbento/auto-close-issues@v1.0.2
        with:
@ -68,7 +68,7 @@ jobs:
            Found provider name: `${{ steps.provider_check.outputs.name }}`
      - name: Label if mentions provider
        if: steps.provider_check.outputs.name != 'none'
-        uses: actions/github-script@v7
+        uses: actions/github-script@v6
        with:
          github-token: ${{ steps.generate_token.outputs.token }}
          script: |
--- a/.github/workflows/prerelease.yml
+++ b/.github/workflows/prerelease.yml
@ -18,14 +18,14 @@ jobs:
    steps:
    - name: Generate access token
      id: generate_token
-      uses: tibdex/github-app-token@v2
+      uses: tibdex/github-app-token@v1
      with:
        app_id: ${{ secrets.GH_APP_ID }}
        private_key: ${{ secrets.GH_APP_KEY }}
        repository: "recloudstream/secrets"
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v2
    - name: Set up JDK 17
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@v2
      with:
        java-version: '17'
        distribution: 'adopt'
@ -43,14 +43,11 @@ jobs:
        echo "key_pwd=$KEY_PWD" >> $GITHUB_OUTPUT
    - name: Run Gradle
      run: |
-        ./gradlew assemblePrerelease build androidSourcesJar
-        ./gradlew makeJar # for classes.jar, has to be done after assemblePrerelease
+        ./gradlew assemblePrerelease makeJar androidSourcesJar
      env:
        SIGNING_KEY_ALIAS: "key0"
        SIGNING_KEY_PASSWORD: ${{ steps.fetch_keystore.outputs.key_pwd }}
        SIGNING_STORE_PASSWORD: ${{ steps.fetch_keystore.outputs.key_pwd }}
-        SIMKL_CLIENT_ID: ${{ secrets.SIMKL_CLIENT_ID }}
-        SIMKL_CLIENT_SECRET: ${{ secrets.SIMKL_CLIENT_SECRET }}
    - name: Create pre-release
      uses: "marvinpinto/action-automatic-releases@latest"
      with:
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@ -6,9 +6,9 @@ jobs:
  build:
    runs-on: ubuntu-latest
    steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v2
    - name: Set up JDK 17
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@v2
      with:
        java-version: '17'
        distribution: 'adopt'
@ -17,7 +17,7 @@ jobs:
    - name: Run Gradle
      run: ./gradlew assemblePrereleaseDebug
    - name: Upload Artifact
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v2
      with:
        name: pull-request-build
        path: "app/build/outputs/apk/prerelease/debug/*.apk"
--- a/.github/workflows/update_locales.yml
+++ b/.github/workflows/update_locales.yml
@ -18,12 +18,12 @@ jobs:
    steps:
    - name: Generate access token
      id: generate_token
-      uses: tibdex/github-app-token@v2
+      uses: tibdex/github-app-token@v1
      with:
        app_id: ${{ secrets.GH_APP_ID }}
        private_key: ${{ secrets.GH_APP_KEY }}
        repository: "recloudstream/cloudstream"
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v2
      with:
        token: ${{ steps.generate_token.outputs.token }}
    - name: Install dependencies
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@ -4,16 +4,16 @@
  <component name="GradleSettings">
    <option name="linkedExternalProjectsSettings">
      <GradleProjectSettings>
+        <option name="delegatedBuild" value="true" />
+        <option name="testRunner" value="GRADLE" />
+        <option name="distributionType" value="DEFAULT_WRAPPED" />
        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
        <option name="modules">
          <set>
            <option value="$PROJECT_DIR$" />
            <option value="$PROJECT_DIR$/app" />
-            <option value="$PROJECT_DIR$/library" />
          </set>
        </option>
-        <option name="resolveExternalAnnotations" value="false" />
      </GradleProjectSettings>
    </option>
  </component>
--- a/README.md
+++ b/README.md
@ -9,9 +9,8 @@
 + **AdFree**, No ads whatsoever
 + No tracking/analytics
 + Bookmarks
-+ Phone and TV support
+ Download and stream movies, tv-shows and anime
 + Chromecast
-+ Extension system for personal customization

 ### Supported languages:
 <a href="https://hosted.weblate.org/engage/cloudstream/">
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@ -1,6 +0,0 @@
-# Set this to the minimum version your project supports.
-cmake_minimum_required(VERSION 3.18)
-project(CrashHandler)
-find_library(log-lib log)
-add_library(native-lib SHARED src/main/cpp/native-lib.cpp)
-target_link_libraries(native-lib ${log-lib})
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@ -1,14 +1,12 @@
-import com.android.build.gradle.internal.cxx.configure.gradleLocalProperties
+import com.android.build.gradle.api.BaseVariantOutput
 import org.jetbrains.dokka.gradle.DokkaTask
-import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.util.archivesName
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import java.io.ByteArrayOutputStream
 import java.net.URL

 plugins {
    id("com.android.application")
-    id("com.google.devtools.ksp")
    id("kotlin-android")
+    id("kotlin-kapt")
    id("org.jetbrains.dokka")
 }

@ -34,16 +32,9 @@ android {
        enable = true
    }

-    /* disable this for now
-    externalNativeBuild {
-        cmake {
-            path("CMakeLists.txt")
-        }
-    }*/
-
    signingConfigs {
-        if (prereleaseStoreFile != null) {
        create("prerelease") {
+            if (prereleaseStoreFile != null) {
                storeFile = file(prereleaseStoreFile)
                storePassword = System.getenv("SIGNING_STORE_PASSWORD")
                keyAlias = System.getenv("SIGNING_KEY_ALIAS")
@ -52,44 +43,33 @@ android {
        }
    }

-    compileSdk = 34
-    buildToolsVersion = "34.0.0"
+    compileSdk = 33
+    buildToolsVersion = "30.0.3"

    defaultConfig {
        applicationId = "com.lagradost.cloudstream3"
        minSdk = 21
-        targetSdk = 33 /* Android 14 is Fu*ked
-        ^ https://developer.android.com/about/versions/14/behavior-changes-14#safer-dynamic-code-loading*/
-        versionCode = 64
-        versionName = "4.4.0"
+        targetSdk = 33
+
+        versionCode = 59
+        versionName = "4.1.1"

        resValue("string", "app_version", "${defaultConfig.versionName}${versionNameSuffix ?: ""}")
+
        resValue("string", "commit_hash", "git rev-parse --short HEAD".execute() ?: "")
+
        resValue("bool", "is_prerelease", "false")

-        // Reads local.properties
-        val localProperties = gradleLocalProperties(rootDir)
+        buildConfigField(
+            "String",
+            "BUILDDATE",
+            "new java.text.SimpleDateFormat(\"yyyy-MM-dd HH:mm\").format(new java.util.Date(" + System.currentTimeMillis() + "L));"
+        )

-        buildConfigField(
-            "long",
-            "BUILD_DATE",
-            "${System.currentTimeMillis()}"
-        )
-        buildConfigField(
-            "String",
-            "SIMKL_CLIENT_ID",
-            "\"" + (System.getenv("SIMKL_CLIENT_ID") ?: localProperties["simkl.id"]) + "\""
-        )
-        buildConfigField(
-            "String",
-            "SIMKL_CLIENT_SECRET",
-            "\"" + (System.getenv("SIMKL_CLIENT_SECRET") ?: localProperties["simkl.secret"]) + "\""
-        )
        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"

-        ksp {
-            arg("room.schemaLocation", "$projectDir/schemas")
-            arg("exportSchema", "true")
+        kapt {
+            includeCompileClasspath = true
        }
    }

@ -112,7 +92,6 @@ android {
            )
        }
    }
-
    flavorDimensions.add("state")
    productFlavors {
        create("stable") {
@ -124,31 +103,25 @@ android {
            resValue("bool", "is_prerelease", "true")
            buildConfigField("boolean", "BETA", "true")
            applicationIdSuffix = ".prerelease"
-            if (signingConfigs.names.contains("prerelease")) {
            signingConfig = signingConfigs.getByName("prerelease")
-            } else {
-                logger.warn("No prerelease signing config!")
-            }
            versionNameSuffix = "-PRE"
            versionCode = (System.currentTimeMillis() / 60000).toInt()
        }
    }
-
    compileOptions {
        isCoreLibraryDesugaringEnabled = true
+
        sourceCompatibility = JavaVersion.VERSION_1_8
        targetCompatibility = JavaVersion.VERSION_1_8
    }
-
+    kotlinOptions {
+        jvmTarget = "1.8"
+        freeCompilerArgs = listOf("-Xjvm-default=compatibility")
+    }
    lint {
        abortOnError = false
        checkReleaseBuilds = false
    }
-
-    buildFeatures {
-        buildConfig = true
-    }
-
    namespace = "com.lagradost.cloudstream3"
 }

@ -157,132 +130,131 @@ repositories {
 }

 dependencies {
-    // Testing
-    testImplementation("junit:junit:4.13.2")
-    testImplementation("org.json:json:20240303")
-    androidTestImplementation("androidx.test:core")
-    implementation("androidx.test.ext:junit-ktx:1.2.1")
-    androidTestImplementation("androidx.test.ext:junit:1.2.1")
-    androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1")
+    implementation("com.google.android.mediahome:video:1.0.0")
+    implementation("androidx.test.ext:junit-ktx:1.1.3")
+    testImplementation("org.json:json:20180813")

-    // Android Core & Lifecycle
-    implementation("androidx.core:core-ktx:1.13.1")
-    implementation("androidx.appcompat:appcompat:1.7.0")
-    implementation("androidx.navigation:navigation-ui-ktx:2.7.7")
-    implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.8.3")
-    implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.3")
-    implementation("androidx.navigation:navigation-fragment-ktx:2.7.7")
+    implementation("androidx.core:core-ktx:1.8.0")
+    implementation("androidx.appcompat:appcompat:1.4.2") // need target 32 for 1.5.0

-    // Design & UI
-    implementation("jp.wasabeef:glide-transformations:4.3.0")
-    implementation("androidx.preference:preference-ktx:1.2.1")
-    implementation("com.google.android.material:material:1.12.0")
+    // dont change this to 1.6.0 it looks ugly af
+    implementation("com.google.android.material:material:1.5.0")
    implementation("androidx.constraintlayout:constraintlayout:2.1.4")
+    implementation("androidx.navigation:navigation-fragment-ktx:2.5.1")
+    implementation("androidx.navigation:navigation-ui-ktx:2.5.1")
+    implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.5.1")
+    implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1")
+    testImplementation("junit:junit:4.13.2")
+    androidTestImplementation("androidx.test.ext:junit:1.1.3")
+    androidTestImplementation("androidx.test.espresso:espresso-core:3.4.0")
+    androidTestImplementation("androidx.test:core")
+
+    //implementation("io.karn:khttp-android:0.1.2") //okhttp instead
+//    implementation("org.jsoup:jsoup:1.13.1")
+    implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.13.1")
+
+    implementation("androidx.preference:preference-ktx:1.2.0")
+
+    implementation("com.github.bumptech.glide:glide:4.13.1")
+    kapt("com.github.bumptech.glide:compiler:4.13.1")
+    implementation("com.github.bumptech.glide:okhttp3-integration:4.13.0")
+
+    implementation("jp.wasabeef:glide-transformations:4.3.0")
+
    implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")

-    // Glide Module
-    ksp("com.github.bumptech.glide:ksp:4.16.0")
-    implementation("com.github.bumptech.glide:glide:4.16.0")
-    implementation("com.github.bumptech.glide:okhttp3-integration:4.16.0")
+    // implementation("androidx.leanback:leanback-paging:1.1.0-alpha09")

-    // For KSP -> Official Annotation Processors are Not Yet Supported for KSP
-    ksp("dev.zacsweers.autoservice:auto-service-ksp:1.2.0")
-    implementation("com.google.guava:guava:33.2.1-android")
-    implementation("dev.zacsweers.autoservice:auto-service-ksp:1.2.0")
+    // Exoplayer
+    implementation("androidx.media3:media3-common:1.1.0")
+    implementation("androidx.media3:media3-exoplayer:1.1.0")
+    implementation("androidx.media3:media3-datasource-okhttp:1.1.0")
+    implementation("androidx.media3:media3-ui:1.1.0")
+    implementation("androidx.media3:media3-session:1.1.0")
+    implementation("androidx.media3:media3-cast:1.1.0")
+    implementation("androidx.media3:media3-exoplayer-hls:1.1.0")
+    implementation("androidx.media3:media3-exoplayer-dash:1.1.0")

-    // Media 3 (ExoPlayer)
-    implementation("androidx.media3:media3-ui:1.1.1")
-    implementation("androidx.media3:media3-cast:1.1.1")
-    implementation("androidx.media3:media3-common:1.1.1")
-    implementation("androidx.media3:media3-session:1.1.1")
-    implementation("androidx.media3:media3-exoplayer:1.1.1")
-    implementation("com.google.android.mediahome:video:1.0.0")
-    implementation("androidx.media3:media3-exoplayer-hls:1.1.1")
-    implementation("androidx.media3:media3-exoplayer-dash:1.1.1")
-    implementation("androidx.media3:media3-datasource-okhttp:1.1.1")

-    // PlayBack
-    implementation("com.jaredrummler:colorpicker:1.1.0") // Subtitle Color Picker
-    implementation("com.github.recloudstream:media-ffmpeg:1.1.0") // Custom FF-MPEG Lib for Audio Codecs
-    implementation("com.github.teamnewpipe:NewPipeExtractor:176da72") /* For Trailers
-    ^ Update to Latest Commits if Trailers Misbehave, github.com/TeamNewPipe/NewPipeExtractor/commits/dev */
-    implementation("com.github.albfernandez:juniversalchardet:2.5.0") // Subtitle Decoding
+    // Use the Jellyfin ffmpeg extension for easy ffmpeg audio decoding in exoplayer. Thank you Jellyfin <3
+//    implementation("org.jellyfin.exoplayer:exoplayer-ffmpeg-extension:2.18.2+1")

-    // Crash Reports (AcraApplication.kt)
-    implementation("ch.acra:acra-core:5.11.3")
-    implementation("ch.acra:acra-toast:5.11.3")
+    //implementation("com.google.android.exoplayer:extension-leanback:2.14.0")
+
+    // Bug reports
+    implementation("ch.acra:acra-core:5.8.4")
+    implementation("ch.acra:acra-toast:5.8.4")
+
+    compileOnly("com.google.auto.service:auto-service-annotations:1.0")
+    //either for java sources:
+    annotationProcessor("com.google.auto.service:auto-service:1.0")
+    //or for kotlin sources (requires kapt gradle plugin):
+    kapt("com.google.auto.service:auto-service:1.0")
+
+    // subtitle color picker
+    implementation("com.jaredrummler:colorpicker:1.1.0")
+
+    //run JS
+    // do not upgrade to 1.7.14, since in 1.7.14 Rhino uses the `SourceVersion` class, which is not
+    // available on Android (even when using desugaring), and `NoClassDefFoundError` is thrown
+    implementation("org.mozilla:rhino:1.7.13")
+
+    // TorrentStream
+    //implementation("com.github.TorrentStream:TorrentStream-Android:2.7.0")
+
+    // Downloading
+    implementation("androidx.work:work-runtime:2.8.0")
+    implementation("androidx.work:work-runtime-ktx:2.8.0")
+
+    // Networking
+//    implementation("com.squareup.okhttp3:okhttp:4.9.2")
+//    implementation("com.squareup.okhttp3:okhttp-dnsoverhttps:4.9.1")
+    implementation("com.github.Blatzar:NiceHttp:0.4.2")
+    // To fix SSL fuckery on android 9
+    implementation("org.conscrypt:conscrypt-android:2.2.1")
+    // Util to skip the URI file fuckery 🙏
+    implementation("com.github.tachiyomiorg:unifile:17bec43")
+
+    // API because cba maintaining it myself
+    implementation("com.uwetrottmann.tmdb2:tmdb-java:2.6.0")
+
+    implementation("com.github.discord:OverlappingPanels:0.1.3")
+    // debugImplementation because LeakCanary should only run in debug builds.
+    //debugImplementation("com.squareup.leakcanary:leakcanary-android:2.12")
+
+    // for shimmer when loading
+    implementation("com.facebook.shimmer:shimmer:0.5.0")

-    // UI Stuff
-    implementation("com.facebook.shimmer:shimmer:0.5.0") // Shimmering Effect (Loading Skeleton)
-    implementation("androidx.palette:palette-ktx:1.0.0") // Palette For Images -> Colors
    implementation("androidx.tvprovider:tvprovider:1.0.0")
-    implementation("com.github.discord:OverlappingPanels:0.1.5") // Gestures
-    implementation("androidx.biometric:biometric:1.2.0-alpha05") // Fingerprint Authentication
-    implementation("com.github.rubensousa:previewseekbar-media3:1.1.1.0") // SeekBar Preview
-    implementation("io.github.g0dkar:qrcode-kotlin:4.2.0") // QR code for PIN Auth on TV

-    // Extensions & Other Libs
-    implementation("org.mozilla:rhino:1.7.15") // run JavaScript
-    implementation("me.xdrop:fuzzywuzzy:1.4.0") // Library/Ext Searching with Levenshtein Distance
-    implementation("com.github.LagradOst:SafeFile:0.0.6") // To Prevent the URI File Fu*kery
-    implementation("org.conscrypt:conscrypt-android:2.5.2") // To Fix SSL Fu*kery on Android 9
-    implementation("com.uwetrottmann.tmdb2:tmdb-java:2.11.0") // TMDB API v3 Wrapper Made with RetroFit
-    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs_nio:2.0.4") //nio flavor needed for NewPipeExtractor
-    implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.13.1") /* JSON Parser
-    ^ Don't Bump Jackson above 2.13.1 , Crashes on Android TV's and FireSticks that have Min API
-    Level 25 or Less. */
+    // used for subtitle decoding https://github.com/albfernandez/juniversalchardet
+    implementation("com.github.albfernandez:juniversalchardet:2.4.0")

-    // Downloading & Networking
-    implementation("androidx.work:work-runtime:2.9.0")
-    implementation("androidx.work:work-runtime-ktx:2.9.0")
-    implementation("com.github.Blatzar:NiceHttp:0.4.11") // HTTP Lib
+    // slow af yt
+    //implementation("com.github.HaarigerHarald:android-youtubeExtractor:master-SNAPSHOT")

-    implementation(project(":library") {
-        // There does not seem to be a good way of getting the android flavor.
-        val isDebug = gradle.startParameter.taskRequests.any { task ->
-            task.args.any { arg ->
-                arg.contains("debug", true)
-            }
-        }
+    // newpipe yt taken from https://github.com/TeamNewPipe/NewPipe/blob/dev/app/build.gradle#L204
+    implementation("com.github.TeamNewPipe:NewPipeExtractor:8495ad619e")
+    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.1.6")

-        this.extra.set("isDebug", isDebug)
-    })
+    // Library/extensions searching with Levenshtein distance
+    implementation("me.xdrop:fuzzywuzzy:1.4.0")
+
+    // color palette for images -> colors
+    implementation("androidx.palette:palette-ktx:1.0.0")
 }

-tasks.register<Jar>("androidSourcesJar") {
+tasks.register("androidSourcesJar", Jar::class) {
    archiveClassifier.set("sources")
-    from(android.sourceSets.getByName("main").java.srcDirs) // Full Sources
+    from(android.sourceSets.getByName("main").java.srcDirs) //full sources
 }

-tasks.register<Copy>("copyJar") {
-    from(
-        "build/intermediates/compile_app_classes_jar/prereleaseDebug",
-        "../library/build/libs"
-    )
-    into("build/app-classes")
-    include("classes.jar", "library-jvm*.jar")
-    // Remove the version
-    rename("library-jvm.*.jar", "library-jvm.jar")
-}
-
-// Merge the app classes and the library classes into classes.jar
-tasks.register<Jar>("makeJar") {
-    // Duplicates cause hard to catch errors, better to fail at compile time.
-    duplicatesStrategy = DuplicatesStrategy.FAIL
-    dependsOn(tasks.getByName("copyJar"))
-    from(
-        zipTree("build/app-classes/classes.jar"),
-        zipTree("build/app-classes/library-jvm.jar")
-    )
-    destinationDirectory.set(layout.buildDirectory)
-    archivesName = "classes"
-}
-
-tasks.withType<KotlinCompile> {
-    kotlinOptions {
-        jvmTarget = "1.8"
-        freeCompilerArgs = listOf("-Xjvm-default=all-compatibility")
-    }
+// this is used by the gradlew plugin
+tasks.register("makeJar", Copy::class) {
+    from("build/intermediates/compile_app_classes_jar/prereleaseDebug")
+    into("build")
+    include("classes.jar")
+    dependsOn("build")
 }

 tasks.withType<DokkaTask>().configureEach {
@ -295,7 +267,6 @@ tasks.withType<DokkaTask>().configureEach {

                // URL showing where the source code can be accessed through the web browser
                remoteUrl.set(URL("https://github.com/recloudstream/cloudstream/tree/master/app/src/main/java"))
-
                // Suffix which is used to append the line number to the URL. Use #L for GitHub
                remoteLineSuffix.set("#L")
            }
--- a/app/src/androidTest/java/com/lagradost/cloudstream3/ExampleInstrumentedTest.kt
+++ b/app/src/androidTest/java/com/lagradost/cloudstream3/ExampleInstrumentedTest.kt
@ -9,8 +9,6 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.viewbinding.ViewBinding
 import com.lagradost.cloudstream3.databinding.FragmentHomeBinding
 import com.lagradost.cloudstream3.databinding.FragmentHomeTvBinding
-import com.lagradost.cloudstream3.databinding.FragmentLibraryBinding
-import com.lagradost.cloudstream3.databinding.FragmentLibraryTvBinding
 import com.lagradost.cloudstream3.databinding.FragmentPlayerBinding
 import com.lagradost.cloudstream3.databinding.FragmentPlayerTvBinding
 import com.lagradost.cloudstream3.databinding.FragmentResultBinding
@ -19,7 +17,6 @@ import com.lagradost.cloudstream3.databinding.FragmentSearchBinding
 import com.lagradost.cloudstream3.databinding.FragmentSearchTvBinding
 import com.lagradost.cloudstream3.databinding.HomeResultGridBinding
 import com.lagradost.cloudstream3.databinding.HomepageParentBinding
-import com.lagradost.cloudstream3.databinding.HomepageParentEmulatorBinding
 import com.lagradost.cloudstream3.databinding.HomepageParentTvBinding
 import com.lagradost.cloudstream3.databinding.PlayerCustomLayoutBinding
 import com.lagradost.cloudstream3.databinding.PlayerCustomLayoutTvBinding
@ -120,12 +117,9 @@ class ExampleInstrumentedTest {
               // testAllLayouts<HomeScrollViewBinding>(activity, R.layout.home_scroll_view, R.layout.home_scroll_view_tv)
               // testAllLayouts<HomeScrollViewTvBinding>(activity, R.layout.home_scroll_view, R.layout.home_scroll_view_tv)

-                testAllLayouts<HomepageParentTvBinding>(activity, R.layout.homepage_parent_tv, R.layout.homepage_parent_emulator, R.layout.homepage_parent)
-                testAllLayouts<HomepageParentEmulatorBinding>(activity, R.layout.homepage_parent_tv, R.layout.homepage_parent_emulator, R.layout.homepage_parent)
-                testAllLayouts<HomepageParentBinding>(activity, R.layout.homepage_parent_tv, R.layout.homepage_parent_emulator, R.layout.homepage_parent)
+                testAllLayouts<HomepageParentTvBinding>(activity, R.layout.homepage_parent_tv, R.layout.homepage_parent)
+                testAllLayouts<HomepageParentBinding>(activity, R.layout.homepage_parent_tv, R.layout.homepage_parent)

-                testAllLayouts<FragmentLibraryTvBinding>(activity, R.layout.fragment_library_tv, R.layout.fragment_library)
-                testAllLayouts<FragmentLibraryBinding>(activity, R.layout.fragment_library_tv, R.layout.fragment_library)
            }
        }
    }
@ -154,7 +148,7 @@ class ExampleInstrumentedTest {
    fun providerCorrectHomepage() {
        runBlocking {
            getAllProviders().toList().amap { api ->
-                TestingUtils.testHomepage(api, TestingUtils.Logger())
+                TestingUtils.testHomepage(api, ::println)
            }
        }
        println("Done providerCorrectHomepage")
@ -166,6 +160,7 @@ class ExampleInstrumentedTest {
            TestingUtils.getDeferredProviderTests(
                this,
                getAllProviders(),
+                ::println
            ) { _, _ -> }
        }
    }
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@ -6,7 +6,7 @@
    <uses-permission android:name="android.permission.INTERNET" /> <!-- unless you only use cs3 as a player for downloaded stuff, you need this -->
    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> <!-- Downloads -->
    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <!-- Downloads on low api devices -->
-    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" tools:ignore="ScopedStorage" /> <!-- Plugin API -->
+    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" /> <!-- Plugin API -->
    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" /> <!-- some dependency needs this -->
    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" /> <!-- Used for player vertical slide -->
    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" /> <!-- Used for app update -->
@ -14,14 +14,8 @@
    <uses-permission android:name="com.android.providers.tv.permission.WRITE_EPG_DATA" /> <!-- Used for Android TV watch next -->
    <uses-permission android:name="android.permission.UPDATE_PACKAGES_WITHOUT_USER_ACTION" /> <!-- Used for updates without prompt -->
    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" /> <!-- Used for update service -->
-    <uses-permission android:name="android.permission.USE_BIOMETRIC" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
-
-    <!-- Required for getting arbitrary Aniyomi packages  -->
-    <uses-permission
-        android:name="android.permission.QUERY_ALL_PACKAGES"
-        tools:ignore="QueryAllPackagesPermission" />

+    <!-- <permission android:name="android.permission.QUERY_ALL_PACKAGES" /> &lt;!&ndash; Used for getting if vlc is installed &ndash;&gt; -->
    <!-- Fixes android tv fuckery -->
    <uses-feature
        android:name="android.hardware.touchscreen"
@ -41,11 +35,9 @@
    <application
        android:name=".AcraApplication"
        android:allowBackup="true"
-        android:enableOnBackInvokedCallback="true"
        android:appCategory="video"
        android:banner="@mipmap/ic_banner"
        android:fullBackupContent="@xml/backup_descriptor"
-        android:dataExtractionRules="@xml/data_extraction_rules"
        android:icon="@mipmap/ic_launcher"
        android:label="@string/app_name"
        android:largeHeap="true"
@ -53,7 +45,7 @@
        android:supportsRtl="true"
        android:theme="@style/AppTheme"
        android:usesCleartextTraffic="true"
-        tools:targetApi="tiramisu">
+        tools:targetApi="o">

        <meta-data
            android:name="com.google.android.gms.cast.framework.OPTIONS_PROVIDER_CLASS_NAME"
@ -69,9 +61,7 @@
            android:exported="true"
            android:resizeableActivity="true"
            android:screenOrientation="userLandscape"
-            android:supportsPictureInPicture="true"
-            android:taskAffinity="com.lagradost.cloudstream3.downloadedplayer"
-            android:launchMode="singleTask">
+            android:supportsPictureInPicture="true">
            <intent-filter>
                <action android:name="android.intent.action.VIEW" />

@ -97,11 +87,17 @@
        -->
        <activity
            android:name=".MainActivity"
-            android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout|keyboard|keyboardHidden|navigation|uiMode"
+            android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout|keyboard|keyboardHidden|navigation"
            android:exported="true"
            android:launchMode="singleTask"
            android:resizeableActivity="true"
            android:supportsPictureInPicture="true">
+            <intent-filter android:exported="true">
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+                <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
+            </intent-filter>

            <!-- cloudstreamplayer://encodedUrl?name=Dune -->
            <intent-filter>
@ -165,21 +161,6 @@
            </intent-filter>
        </activity>

-        <activity
-            android:name=".ui.account.AccountSelectActivity"
-            android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout|keyboard|keyboardHidden"
-            android:exported="true">
-            <intent-filter android:exported="true">
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-                <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-
        <activity
            android:name=".ui.EasterEggMonke"
            android:exported="true" />
@ -187,14 +168,13 @@
        <receiver
            android:name=".receivers.VideoDownloadRestartReceiver"
            android:enabled="false"
-            android:exported="false">
-            <intent-filter android:exported="false">
+            android:exported="true">
+            <intent-filter android:exported="true">
                <action android:name="restart_service" />
            </intent-filter>
        </receiver>

        <service
-            android:foregroundServiceType="dataSync"
            android:name=".services.VideoDownloadService"
            android:enabled="true"
            android:exported="false" />
@ -204,7 +184,6 @@
            android:exported="false" />

        <service
-            android:foregroundServiceType="dataSync"
            android:name=".utils.PackageInstallerService"
            android:exported="false" />

--- a/app/src/main/cpp/native-lib.cpp
+++ b/app/src/main/cpp/native-lib.cpp
@ -1,28 +0,0 @@
-#include <jni.h>
-#include <csignal>
-#include <android/log.h>
-
-#define TAG "CloudStream Crash Handler"
-volatile sig_atomic_t gSignalStatus = 0;
-void handleNativeCrash(int signal) {
-    gSignalStatus = signal;
-}
-
-extern "C" JNIEXPORT void JNICALL
-Java_com_lagradost_cloudstream3_NativeCrashHandler_initNativeCrashHandler(JNIEnv *env, jobject) {
-    #define REGISTER_SIGNAL(X) signal(X, handleNativeCrash);
-    REGISTER_SIGNAL(SIGSEGV)
-    #undef REGISTER_SIGNAL
-}
-
-//extern "C" JNIEXPORT void JNICALL
-//Java_com_lagradost_cloudstream3_NativeCrashHandler_triggerNativeCrash(JNIEnv *env, jobject thiz) {
-//    int *p = nullptr;
-//    *p = 0;
-//}
-
-extern "C" JNIEXPORT int JNICALL
-Java_com_lagradost_cloudstream3_NativeCrashHandler_getSignalStatus(JNIEnv *env, jobject) {
-    //__android_log_print(ANDROID_LOG_INFO, TAG, "Got signal status %d", gSignalStatus);
-    return gSignalStatus;
-}
--- a/app/src/main/java/com/lagradost/cloudstream3/AcraApplication.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/AcraApplication.kt
@ -8,14 +8,12 @@ import android.content.Intent
 import android.widget.Toast
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
-import com.lagradost.api.setContext
+import com.google.auto.service.AutoService
 import com.lagradost.cloudstream3.mvvm.normalSafeApiCall
 import com.lagradost.cloudstream3.mvvm.suspendSafeApiCall
 import com.lagradost.cloudstream3.plugins.PluginManager
-import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR
-import com.lagradost.cloudstream3.ui.settings.Globals.TV
-import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
-import com.lagradost.cloudstream3.utils.AppContextUtils.openBrowser
+import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTvSettings
+import com.lagradost.cloudstream3.utils.AppUtils.openBrowser
 import com.lagradost.cloudstream3.utils.Coroutines.runOnMainThread
 import com.lagradost.cloudstream3.utils.DataStore.getKey
 import com.lagradost.cloudstream3.utils.DataStore.getKeys
@ -34,19 +32,20 @@ import org.acra.sender.ReportSenderFactory
 import java.io.File
 import java.io.FileNotFoundException
 import java.io.PrintStream
+import java.lang.Exception
 import java.lang.ref.WeakReference
-import java.util.Locale
 import kotlin.concurrent.thread
 import kotlin.system.exitProcess

+
 class CustomReportSender : ReportSender {
    // Sends all your crashes to google forms
    override fun send(context: Context, errorContent: CrashReportData) {
        println("Sending report")
        val url =
-            "https://docs.google.com/forms/d/e/1FAIpQLSfO4r353BJ79TTY_-t5KWSIJT2xfqcQWY81xjAA1-1N0U2eSg/formResponse"
+            "https://docs.google.com/forms/d/e/1FAIpQLSdOlbgCx7NeaxjvEGyEQlqdh2nCvwjm2vwpP1VwW7REj9Ri3Q/formResponse"
        val data = mapOf(
-            "entry.1993829403" to errorContent.toJSON()
+            "entry.753293084" to errorContent.toJSON()
        )

        thread { // to not run it on main thread
@ -66,6 +65,7 @@ class CustomReportSender : ReportSender {
    }
 }

+@AutoService(ReportSenderFactory::class)
 class CustomSenderFactory : ReportSenderFactory {
    override fun create(context: Context, config: CoreConfiguration): ReportSender {
        return CustomReportSender()
@ -82,8 +82,14 @@ class ExceptionHandler(val errorFile: File, val onError: (() -> Unit)) :
        ACRA.errorReporter.handleException(error)
        try {
            PrintStream(errorFile).use { ps ->
-                ps.println("Currently loading extension: ${PluginManager.currentlyLoading ?: "none"}")
-                ps.println("Fatal exception on thread ${thread.name} (${thread.id})")
+                ps.println(String.format("Currently loading extension: ${PluginManager.currentlyLoading ?: "none"}"))
+                ps.println(
+                    String.format(
+                        "Fatal exception on thread %s (%d)",
+                        thread.name,
+                        thread.id
+                    )
+                )
                error.printStackTrace(ps)
            }
        } catch (ignored: FileNotFoundException) {
@ -98,16 +104,12 @@ class ExceptionHandler(val errorFile: File, val onError: (() -> Unit)) :
 }

 class AcraApplication : Application() {
-
    override fun onCreate() {
        super.onCreate()
-        ExceptionHandler(filesDir.resolve("last_error")) {
+        Thread.setDefaultUncaughtExceptionHandler(ExceptionHandler(filesDir.resolve("last_error")) {
            val intent = context!!.packageManager.getLaunchIntentForPackage(context!!.packageName)
            startActivity(Intent.makeRestartActivityTask(intent!!.component))
-        }.also {
-            exceptionHandler = it
-            Thread.setDefaultUncaughtExceptionHandler(it)
-        }
+        })
    }

    override fun attachBaseContext(base: Context?) {
@ -119,10 +121,10 @@ class AcraApplication : Application() {
            buildConfigClass = BuildConfig::class.java
            reportFormat = StringFormat.JSON

-            reportContent = listOf(
+            reportContent = arrayOf(
                ReportField.BUILD_CONFIG, ReportField.USER_CRASH_DATE,
                ReportField.ANDROID_VERSION, ReportField.PHONE_MODEL,
-                ReportField.STACK_TRACE,
+                ReportField.STACK_TRACE
            )

            // removed this due to bug when starting the app, moved it to when it actually crashes
@ -135,8 +137,6 @@ class AcraApplication : Application() {
    }

    companion object {
-        var exceptionHandler: ExceptionHandler? = null
-
        /** Use to get activity from Context */
        tailrec fun Context.getActivity(): Activity? = this as? Activity
            ?: (this as? ContextWrapper)?.baseContext?.getActivity()
@ -146,15 +146,6 @@ class AcraApplication : Application() {
            get() = _context?.get()
            private set(value) {
                _context = WeakReference(value)
-                setContext(WeakReference(value))
-            }
-
-        fun <T : Any> getKeyClass(path: String, valueType: Class<T>): T? {
-            return context?.getKey(path, valueType)
-        }
-
-        fun <T : Any> setKeyClass(path: String, value: T) {
-            context?.setKey(path, value)
            }

        fun removeKeys(folder: String): Int? {
@ -208,9 +199,10 @@ class AcraApplication : Application() {
        fun openBrowser(url: String, activity: FragmentActivity?) {
            openBrowser(
                url,
-                isLayout(TV or EMULATOR),
+                isTvSettings(),
                activity?.supportFragmentManager?.fragments?.lastOrNull()
            )
        }
+
    }
 }
--- a/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt
@ -5,16 +5,12 @@ import android.app.Activity
 import android.app.PictureInPictureParams
 import android.content.Context
 import android.content.pm.PackageManager
-import android.content.res.Configuration
 import android.content.res.Resources
 import android.os.Build
-import android.util.DisplayMetrics
 import android.util.Log
-import android.view.Gravity
-import android.view.KeyEvent
-import android.view.View
+import android.view.*
 import android.view.View.NO_ID
-import android.view.ViewGroup
+import android.widget.TextView
 import android.widget.Toast
 import androidx.activity.ComponentActivity
 import androidx.activity.result.contract.ActivityResultContracts
@ -23,21 +19,16 @@ import androidx.annotation.StringRes
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.SearchView
 import androidx.core.content.ContextCompat
-import androidx.core.view.children
 import androidx.preference.PreferenceManager
 import com.google.android.gms.cast.framework.CastSession
-import com.google.android.material.chip.ChipGroup
-import com.google.android.material.navigationrail.NavigationRailView
 import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
 import com.lagradost.cloudstream3.AcraApplication.Companion.removeKey
-import com.lagradost.cloudstream3.MainActivity.Companion.resumeApps
-import com.lagradost.cloudstream3.databinding.ToastBinding
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.ui.player.PlayerEventType
 import com.lagradost.cloudstream3.ui.result.ResultFragment
 import com.lagradost.cloudstream3.ui.result.UiText
-import com.lagradost.cloudstream3.ui.settings.Globals.updateTv
-import com.lagradost.cloudstream3.utils.AppContextUtils.isRtl
+import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.updateTv
+import com.lagradost.cloudstream3.utils.AppUtils.isRtl
 import com.lagradost.cloudstream3.utils.DataStoreHelper
 import com.lagradost.cloudstream3.utils.Event
 import com.lagradost.cloudstream3.utils.UIHelper
@ -46,16 +37,7 @@ import com.lagradost.cloudstream3.utils.UIHelper.shouldShowPIPMode
 import com.lagradost.cloudstream3.utils.UIHelper.toPx
 import org.schabi.newpipe.extractor.NewPipe
 import java.lang.ref.WeakReference
-import java.util.Locale
-import kotlin.math.max
-import kotlin.math.min
-
-enum class FocusDirection {
-    Start,
-    End,
-    Up,
-    Down,
-}
+import java.util.*

 object CommonActivity {

@ -66,29 +48,11 @@ object CommonActivity {
            _activity = WeakReference(value)
        }

-    @MainThread
-    fun setActivityInstance(newActivity: Activity?) {
-        activity = newActivity
-    }
-
    @MainThread
    fun Activity?.getCastSession(): CastSession? {
        return (this as MainActivity?)?.mSessionManager?.currentCastSession
    }

-    val displayMetrics: DisplayMetrics = Resources.getSystem().displayMetrics
-
-    // screenWidth and screenHeight does always
-    // refer to the screen while in landscape mode
-    val screenWidth: Int
-        get() {
-            return max(displayMetrics.widthPixels, displayMetrics.heightPixels)
-        }
-    val screenHeight: Int
-        get() {
-            return min(displayMetrics.widthPixels, displayMetrics.heightPixels)
-        }
-

    var canEnterPipMode: Boolean = false
    var canShowPipMode: Boolean = false
@ -100,7 +64,8 @@ object CommonActivity {
    var playerEventListener: ((PlayerEventType) -> Unit)? = null
    var keyEventListener: ((Pair<KeyEvent?, Boolean>) -> Boolean)? = null

-    private var currentToast: Toast? = null
+
+    var currentToast: Toast? = null

    fun showToast(@StringRes message: Int, duration: Int? = null) {
        val act = activity ?: return
@ -156,19 +121,25 @@ object CommonActivity {
        } catch (e: Exception) {
            logError(e)
        }
-
        try {
-            val binding = ToastBinding.inflate(act.layoutInflater)
-            binding.text.text = message.trim()
+            val inflater =
+                act.getSystemService(AppCompatActivity.LAYOUT_INFLATER_SERVICE) as LayoutInflater
+
+            val layout: View = inflater.inflate(
+                R.layout.toast,
+                act.findViewById<View>(R.id.toast_layout_root) as ViewGroup?
+            )
+
+            val text = layout.findViewById(R.id.text) as TextView
+            text.text = message.trim()

-            // custom toasts are deprecated and won't appear when cs3 sets minSDK to api30 (A11)
            val toast = Toast(act)
-            toast.duration = duration ?: Toast.LENGTH_SHORT
            toast.setGravity(Gravity.CENTER_HORIZONTAL or Gravity.BOTTOM, 0, 5.toPx)
-            toast.view = binding.root //fixme Find an alternative using default Toasts since custom toasts are deprecated and won't appear with api30 set as minSDK version.
-            currentToast = toast
+            toast.duration = duration ?: Toast.LENGTH_SHORT
+            toast.view = layout
+            //https://github.com/PureWriter/ToastCompat
            toast.show()
-
+            currentToast = toast
        } catch (e: Exception) {
            logError(e)
        }
@ -202,25 +173,23 @@ object CommonActivity {
        setLocale(this, localeCode)
    }

-    fun init(act: Activity) {
-        setActivityInstance(act)
-
-        val componentActivity = activity as? ComponentActivity ?: return
-
+    fun init(act: ComponentActivity?) {
+        if (act == null) return
+        activity = act
        //https://stackoverflow.com/questions/52594181/how-to-know-if-user-has-disabled-picture-in-picture-feature-permission
        //https://developer.android.com/guide/topics/ui/picture-in-picture
        canShowPipMode =
            Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && // OS SUPPORT
-                    componentActivity.packageManager.hasSystemFeature(PackageManager.FEATURE_PICTURE_IN_PICTURE) && // HAS FEATURE, MIGHT BE BLOCKED DUE TO POWER DRAIN
-                    componentActivity.hasPIPPermission() // CHECK IF FEATURE IS ENABLED IN SETTINGS
+                    act.packageManager.hasSystemFeature(PackageManager.FEATURE_PICTURE_IN_PICTURE) && // HAS FEATURE, MIGHT BE BLOCKED DUE TO POWER DRAIN
+                    act.hasPIPPermission() // CHECK IF FEATURE IS ENABLED IN SETTINGS

-        componentActivity.updateLocale()
-        componentActivity.updateTv()
+        act.updateLocale()
+        act.updateTv()
        NewPipe.init(DownloaderTestImpl.getInstance())

        for (resumeApp in resumeApps) {
            resumeApp.launcher =
-                componentActivity.registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
+                act.registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
                    val resultCode = result.resultCode
                    val data = result.data
                    if (resultCode == AppCompatActivity.RESULT_OK && data != null && resumeApp.position != null && resumeApp.duration != null) {
@ -237,11 +206,11 @@ object CommonActivity {
        // Ask for notification permissions on Android 13
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU &&
            ContextCompat.checkSelfPermission(
-                componentActivity,
+                act,
                Manifest.permission.POST_NOTIFICATIONS
            ) != PackageManager.PERMISSION_GRANTED
        ) {
-            val requestPermissionLauncher = componentActivity.registerForActivityResult(
+            val requestPermissionLauncher = act.registerForActivityResult(
                ActivityResultContracts.RequestPermission()
            ) { isGranted: Boolean ->
                Log.d(TAG, "Notification permission: $isGranted")
@ -277,35 +246,12 @@ object CommonActivity {
        }
    }

-    fun updateTheme(act: Activity) {
-        val settingsManager = PreferenceManager.getDefaultSharedPreferences(act)
-        if (settingsManager
-            .getString(act.getString(R.string.app_theme_key), "AmoledLight") == "System"
-            && Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            loadThemes(act)
-        }
-    }
-
-    private fun mapSystemTheme(act: Activity): Int {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            val currentNightMode =
-                act.resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK
-            return when (currentNightMode) {
-                Configuration.UI_MODE_NIGHT_NO -> R.style.LightMode // Night mode is not active, we're using the light theme
-                else -> R.style.AppTheme // Night mode is active, we're using dark theme
-            }
-        } else {
-            return R.style.AppTheme
-        }
-    }
-
    fun loadThemes(act: Activity?) {
        if (act == null) return
        val settingsManager = PreferenceManager.getDefaultSharedPreferences(act)

        val currentTheme =
            when (settingsManager.getString(act.getString(R.string.app_theme_key), "AmoledLight")) {
-                "System" -> mapSystemTheme(act)
                "Black" -> R.style.AppTheme
                "Light" -> R.style.LightMode
                "Amoled" -> R.style.AmoledMode
@ -319,15 +265,12 @@ object CommonActivity {
        val currentOverlayTheme =
            when (settingsManager.getString(act.getString(R.string.primary_color_key), "Normal")) {
                "Normal" -> R.style.OverlayPrimaryColorNormal
-                "DandelionYellow" -> R.style.OverlayPrimaryColorDandelionYellow
                "CarnationPink" -> R.style.OverlayPrimaryColorCarnationPink
-                "Orange" -> R.style.OverlayPrimaryColorOrange
                "DarkGreen" -> R.style.OverlayPrimaryColorDarkGreen
                "Maroon" -> R.style.OverlayPrimaryColorMaroon
                "NavyBlue" -> R.style.OverlayPrimaryColorNavyBlue
                "Grey" -> R.style.OverlayPrimaryColorGrey
                "White" -> R.style.OverlayPrimaryColorWhite
-                "CoolBlue" -> R.style.OverlayPrimaryColorCoolBlue
                "Brown" -> R.style.OverlayPrimaryColorBrown
                "Purple" -> R.style.OverlayPrimaryColorPurple
                "Green" -> R.style.OverlayPrimaryColorGreen
@ -336,7 +279,6 @@ object CommonActivity {
                "Banana" -> R.style.OverlayPrimaryColorBanana
                "Party" -> R.style.OverlayPrimaryColorParty
                "Pink" -> R.style.OverlayPrimaryColorPink
-                "Lavender" -> R.style.OverlayPrimaryColorLavender
                "Monet" -> if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S)
                    R.style.OverlayPrimaryColorMonet else R.style.OverlayPrimaryColorNormal

@ -359,8 +301,7 @@ object CommonActivity {
    private fun localLook(from: View, id: Int): View? {
        if (id == NO_ID) return null
        var currentLook: View = from
-        // limit to 15 look depth
-        for (i in 0..15) {
+        while (true) {
            currentLook.findViewById<View?>(id)?.let { return it }
            currentLook = (currentLook.parent as? View) ?: break
        }
@ -376,79 +317,17 @@ object CommonActivity {
        currentLook = currentLook.parent as? View ?: break
    }*/

-    private fun View.hasContent(): Boolean {
-        return isShown && when (this) {
-            //is RecyclerView -> this.childCount > 0
-            is ViewGroup -> this.childCount > 0
-            else -> true
-        }
-    }
-
-    /** skips the initial stage of searching for an id using the view, see getNextFocus for specification */
-    fun continueGetNextFocus(
-        root: Any?,
-        view: View,
-        direction: FocusDirection,
-        nextId: Int,
-        depth: Int = 0
-    ): View? {
-        if (nextId == NO_ID) return null
-
-        // do an initial search for the view, in case the localLook is too deep we can use this as
-        // an early break and backup view
-        var next =
-            when (root) {
-                is Activity -> root.findViewById(nextId)
-                is View -> root.rootView.findViewById<View?>(nextId)
-                else -> null
-            } ?: return null
-
-        next = localLook(view, nextId) ?: next
-        val shown = next.hasContent()
-
-        // if cant focus but visible then break and let android decide
-        // the exception if is the view is a parent and has children that wants focus
-        val hasChildrenThatWantsFocus = (next as? ViewGroup)?.let { parent ->
-            parent.descendantFocusability == ViewGroup.FOCUS_AFTER_DESCENDANTS && parent.childCount > 0
-        } ?: false
-        if (!next.isFocusable && shown && !hasChildrenThatWantsFocus) return null
-
-        // if not shown then continue because we will "skip" over views to get to a replacement
-        if (!shown) {
-            // we don't want a while true loop, so we let android decide if we find a recursive view
-            if (next == view) return null
-            return getNextFocus(root, next, direction, depth + 1)
-        }
-
-        (when (next) {
-            is ChipGroup -> {
-                next.children.firstOrNull { it.isFocusable && it.isShown }
-            }
-
-            is NavigationRailView -> {
-                next.findViewById(next.selectedItemId) ?: next.findViewById(R.id.navigation_home)
-            }
-
-            else -> null
-        })?.let {
-            return it
-        }
-
-        // nothing wrong with the view found, return it
-        return next
-    }
-
    /** recursively looks for a next focus up to a depth of 10,
     * this is used to override the normal shit focus system
     * because this application has a lot of invisible views that messes with some tv devices*/
-    fun getNextFocus(
-        root: Any?,
+    private fun getNextFocus(
+        act: Activity?,
        view: View?,
        direction: FocusDirection,
        depth: Int = 0
    ): View? {
        // if input is invalid let android decide + depth test to not crash if loop is found
-        if (view == null || depth >= 10 || root == null) {
+        if (view == null || depth >= 10 || act == null) {
            return null
        }

@ -480,14 +359,50 @@ object CommonActivity {
            // if not specified then use forward id
            nextId = view.nextFocusForwardId
            // if view is still not found to next focus then return and let android decide
-            if (nextId == NO_ID)
-                return null
-        }
-        return continueGetNextFocus(root, view, direction, nextId, depth)
+            if (nextId == NO_ID) return null
        }

+        var next = act.findViewById<View?>(nextId) ?: return null
+
+        next = localLook(view, nextId) ?: next
+
+        var currentLook: View = view
+        while (currentLook.findViewById<View?>(nextId)?.also { next = it } == null) {
+            currentLook = (currentLook.parent as? View) ?: break
+        }
+
+        // if cant focus but visible then break and let android decide
+        if (!next.isFocusable && next.isShown) return null
+
+        // if not shown then continue because we will "skip" over views to get to a replacement
+        if (!next.isShown) return getNextFocus(act, next, direction, depth + 1)
+
+        // nothing wrong with the view found, return it
+        return next
+    }
+
+    private enum class FocusDirection {
+        Start,
+        End,
+        Up,
+        Down,
+    }

    fun onKeyDown(act: Activity?, keyCode: Int, event: KeyEvent?) {
+        //println("Keycode: $keyCode")
+        //showToast(
+        //    this,
+        //    "Got Keycode $keyCode | ${KeyEvent.keyCodeToString(keyCode)} \n ${event?.action}",
+        //    Toast.LENGTH_LONG
+        //)
+
+        // Tested keycodes on remote:
+        // KeyEvent.KEYCODE_MEDIA_FAST_FORWARD
+        // KeyEvent.KEYCODE_MEDIA_REWIND
+        // KeyEvent.KEYCODE_MENU
+        // KeyEvent.KEYCODE_MEDIA_NEXT
+        // KeyEvent.KEYCODE_MEDIA_PREVIOUS
+        // KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE

        // 149 keycode_numpad 5
        when (keyCode) {
@ -601,7 +516,7 @@ object CommonActivity {

                else -> null
            }
-            // println("NEXT FOCUS : $nextView")
+
            if (nextView != null) {
                nextView.requestFocus()
                keyEventListener?.invoke(Pair(event, true))
--- a/app/src/main/java/com/lagradost/cloudstream3/DownloaderTestImpl.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/DownloaderTestImpl.kt
@ -2,7 +2,6 @@ package com.lagradost.cloudstream3

 import okhttp3.OkHttpClient
 import okhttp3.RequestBody
-import okhttp3.RequestBody.Companion.toRequestBody
 import org.schabi.newpipe.extractor.downloader.Downloader
 import org.schabi.newpipe.extractor.downloader.Request
 import org.schabi.newpipe.extractor.downloader.Response
@ -11,7 +10,7 @@ import java.util.concurrent.TimeUnit


 class DownloaderTestImpl private constructor(builder: OkHttpClient.Builder) : Downloader() {
-    private val client: OkHttpClient = builder.readTimeout(30, TimeUnit.SECONDS).build()
+    private val client: OkHttpClient
    override fun execute(request: Request): Response {
        val httpMethod: String = request.httpMethod()
        val url: String = request.url()
@ -19,7 +18,7 @@ class DownloaderTestImpl private constructor(builder: OkHttpClient.Builder) : Do
        val dataToSend: ByteArray? = request.dataToSend()
        var requestBody: RequestBody? = null
        if (dataToSend != null) {
-            requestBody = dataToSend.toRequestBody(null, 0, dataToSend.size)
+            requestBody = RequestBody.create(null, dataToSend)
        }
        val requestBuilder: okhttp3.Request.Builder = okhttp3.Request.Builder()
            .method(httpMethod, requestBody).url(url)
@ -51,7 +50,7 @@ class DownloaderTestImpl private constructor(builder: OkHttpClient.Builder) : Do

    companion object {
        private const val USER_AGENT =
-            "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/116.0.0.0 Safari/537.36"
+            "Mozilla/5.0 (Windows NT 10.0; rv:91.0) Gecko/20100101 Firefox/91.0"
        private var instance: DownloaderTestImpl? = null

        /**
@ -74,4 +73,8 @@ class DownloaderTestImpl private constructor(builder: OkHttpClient.Builder) : Do
            return instance
        }
    }
+
+    init {
+        client = builder.readTimeout(30, TimeUnit.SECONDS).build()
+    }
 }
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainAPI.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainAPI.kt
--- a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/ParCollections.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/ParCollections.kt
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/AStreamHub.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/AStreamHub.kt
@ -1,6 +1,6 @@
 package com.lagradost.cloudstream3.extractors

-import com.lagradost.api.Log
+import android.util.Log
 import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/Acefile.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/Acefile.kt
@ -0,0 +1,39 @@
+package com.lagradost.cloudstream3.extractors
+
+import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.base64Decode
+import com.lagradost.cloudstream3.utils.*
+
+open class Acefile : ExtractorApi() {
+    override val name = "Acefile"
+    override val mainUrl = "https://acefile.co"
+    override val requiresReferer = false
+
+    override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink> {
+        val sources = mutableListOf<ExtractorLink>()
+        app.get(url).document.select("script").map { script ->
+            if (script.data().contains("eval(function(p,a,c,k,e,d)")) {
+                val data = getAndUnpack(script.data())
+                val id = data.substringAfter("{\"id\":\"").substringBefore("\",")
+                val key = data.substringAfter("var nfck=\"").substringBefore("\";")
+                app.get("https://acefile.co/local/$id?key=$key").text.let {
+                    base64Decode(
+                        it.substringAfter("JSON.parse(atob(\"").substringBefore("\"))")
+                    ).let { res ->
+                        sources.add(
+                            ExtractorLink(
+                                name,
+                                name,
+                                res.substringAfter("\"file\":\"").substringBefore("\","),
+                                "$mainUrl/",
+                                Qualities.Unknown.value,
+                            )
+                        )
+                    }
+                }
+            }
+        }
+        return sources
+    }
+
+}
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/AsianLoad.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/AsianLoad.kt
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Blogger.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Blogger.kt
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/BullStream.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/BullStream.kt
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/ByteShare.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/ByteShare.kt
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Cda.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Cda.kt
@ -1,11 +1,13 @@
 package com.lagradost.cloudstream3.extractors

-import com.lagradost.cloudstream3.USER_AGENT
-import com.lagradost.cloudstream3.app
-import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
+import com.lagradost.cloudstream3.*
+import com.lagradost.cloudstream3.utils.Qualities
 import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
-import com.lagradost.cloudstream3.utils.Qualities
+import com.lagradost.cloudstream3.utils.M3u8Helper.Companion.generateM3u8
+import com.fasterxml.jackson.annotation.JsonProperty
+import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
+import android.util.Log
 import java.net.URLDecoder

 open class Cda: ExtractorApi() {
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/Chillx.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/Chillx.kt
@ -0,0 +1,140 @@
+package com.lagradost.cloudstream3.extractors
+
+import com.fasterxml.jackson.annotation.JsonProperty
+import com.lagradost.cloudstream3.*
+import com.lagradost.cloudstream3.utils.AppUtils
+import com.lagradost.cloudstream3.utils.ExtractorApi
+import com.lagradost.cloudstream3.utils.ExtractorLink
+import com.lagradost.cloudstream3.utils.Qualities
+import javax.crypto.Cipher
+import javax.crypto.SecretKeyFactory
+import javax.crypto.spec.IvParameterSpec
+import javax.crypto.spec.PBEKeySpec
+import javax.crypto.spec.SecretKeySpec
+
+class Moviesapi : Chillx() {
+    override val name = "Moviesapi"
+    override val mainUrl = "https://w1.moviesapi.club"
+}
+
+class Bestx : Chillx() {
+    override val name = "Bestx"
+    override val mainUrl = "https://bestx.stream"
+}
+
+class Watchx : Chillx() {
+    override val name = "Watchx"
+    override val mainUrl = "https://watchx.top"
+}
+open class Chillx : ExtractorApi() {
+    override val name = "Chillx"
+    override val mainUrl = "https://chillx.top"
+    override val requiresReferer = true
+
+    companion object {
+        private const val KEY = "11x&W5UBrcqn\$9Yl"
+    }
+
+    override suspend fun getUrl(
+        url: String,
+        referer: String?,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
+        val master = Regex("MasterJS\\s*=\\s*'([^']+)").find(
+            app.get(
+                url,
+                referer = referer
+            ).text
+        )?.groupValues?.get(1)
+        val encData = AppUtils.tryParseJson<AESData>(base64Decode(master ?: return))
+        val decrypt = cryptoAESHandler(encData ?: return, KEY, false)
+
+        val source = Regex(""""?file"?:\s*"([^"]+)""").find(decrypt)?.groupValues?.get(1)
+        val tracks = Regex("""tracks:\s*\[(.+)]""").find(decrypt)?.groupValues?.get(1)
+
+        // required
+        val headers = mapOf(
+            "Accept" to "*/*",
+            "Connection" to "keep-alive",
+            "Sec-Fetch-Dest" to "empty",
+            "Sec-Fetch-Mode" to "cors",
+            "Sec-Fetch-Site" to "cross-site",
+            "Origin" to mainUrl,
+        )
+
+        callback.invoke(
+            ExtractorLink(
+                name,
+                name,
+                source ?: return,
+                "$mainUrl/",
+                Qualities.P1080.value,
+                headers = headers,
+                isM3u8 = true
+            )
+        )
+
+        AppUtils.tryParseJson<List<Tracks>>("[$tracks]")
+            ?.filter { it.kind == "captions" }?.map { track ->
+                subtitleCallback.invoke(
+                    SubtitleFile(
+                        track.label ?: "",
+                        track.file ?: return@map null
+                    )
+                )
+            }
+    }
+
+    private fun cryptoAESHandler(
+        data: AESData,
+        pass: String,
+        encrypt: Boolean = true
+    ): String {
+        val factory = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA512")
+        val spec = PBEKeySpec(
+            pass.toCharArray(),
+            data.salt?.hexToByteArray(),
+            data.iterations?.toIntOrNull() ?: 1,
+            256
+        )
+        val key = factory.generateSecret(spec)
+        val cipher = Cipher.getInstance("AES/CBC/PKCS5Padding")
+        return if (!encrypt) {
+            cipher.init(
+                Cipher.DECRYPT_MODE,
+                SecretKeySpec(key.encoded, "AES"),
+                IvParameterSpec(data.iv?.hexToByteArray())
+            )
+            String(cipher.doFinal(base64DecodeArray(data.ciphertext.toString())))
+        } else {
+            cipher.init(
+                Cipher.ENCRYPT_MODE,
+                SecretKeySpec(key.encoded, "AES"),
+                IvParameterSpec(data.iv?.hexToByteArray())
+            )
+            base64Encode(cipher.doFinal(data.ciphertext?.toByteArray()))
+        }
+    }
+
+    private fun String.hexToByteArray(): ByteArray {
+        check(length % 2 == 0) { "Must have an even length" }
+        return chunked(2)
+            .map { it.toInt(16).toByte() }
+
+            .toByteArray()
+    }
+
+    data class AESData(
+        @JsonProperty("ciphertext") val ciphertext: String? = null,
+        @JsonProperty("iv") val iv: String? = null,
+        @JsonProperty("salt") val salt: String? = null,
+        @JsonProperty("iterations") val iterations: String? = null,
+    )
+
+    data class Tracks(
+        @JsonProperty("file") val file: String? = null,
+        @JsonProperty("label") val label: String? = null,
+        @JsonProperty("kind") val kind: String? = null,
+    )
+}
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Dailymotion.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Dailymotion.kt
@ -7,18 +7,13 @@ import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
 import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.M3u8Helper.Companion.generateM3u8
+import com.lagradost.cloudstream3.utils.Qualities
 import java.net.URL

-class Geodailymotion : Dailymotion() {
-    override val name = "GeoDailymotion"
-    override val mainUrl = "https://geo.dailymotion.com"
-}
-
 open class Dailymotion : ExtractorApi() {
    override val mainUrl = "https://www.dailymotion.com"
    override val name = "Dailymotion"
    override val requiresReferer = false
-    private val baseUrl = "https://www.dailymotion.com"

    @Suppress("RegExpSimplifiable")
    private val videoIdRegex = "^[kx][a-zA-Z0-9]+\$".toRegex()
@ -32,16 +27,21 @@ open class Dailymotion : ExtractorApi() {
        callback: (ExtractorLink) -> Unit
    ) {
        val embedUrl = getEmbedUrl(url) ?: return
-        val req = app.get(embedUrl)
+        val doc = app.get(embedUrl).document
        val prefix = "window.__PLAYER_CONFIG__ = "
-        val configStr = req.document.selectFirst("script:containsData($prefix)")?.data() ?: return
-        val config = tryParseJson<Config>(configStr.substringAfter(prefix).substringBefore(";").trim()) ?: return
+        val configStr = doc.selectFirst("script:containsData($prefix)")?.data() ?: return
+        val config = tryParseJson<Config>(configStr.substringAfter(prefix)) ?: return
        val id = getVideoId(embedUrl) ?: return
        val dmV1st = config.dmInternalData.v1st
        val dmTs = config.dmInternalData.ts
-        val embedder = config.context.embedder
-        val metaDataUrl = "$baseUrl/player/metadata/video/$id?embedder=$embedder&locale=en-US&dmV1st=$dmV1st&dmTs=$dmTs&is_native_app=0"
-        val metaData = app.get(metaDataUrl, referer = embedUrl, cookies = req.cookies)
+        val metaDataUrl =
+            "$mainUrl/player/metadata/video/$id?locale=en&dmV1st=$dmV1st&dmTs=$dmTs&is_native_app=0"
+        val cookies = mapOf(
+            "v1st" to dmV1st,
+            "dmvk" to config.context.dmvk,
+            "ts" to dmTs.toString()
+        )
+        val metaData = app.get(metaDataUrl, referer = embedUrl, cookies = cookies)
            .parsedSafe<MetaData>() ?: return
        metaData.qualities.forEach { (_, video) ->
            video.forEach {
@ -51,19 +51,16 @@ open class Dailymotion : ExtractorApi() {
    }

    private fun getEmbedUrl(url: String): String? {
-		if (url.contains("/embed/") || url.contains("/video/")) {
+        if (url.contains("/embed/")) {
            return url
        }
-		if (url.contains("geo.dailymotion.com")) {
-			val videoId = url.substringAfter("video=")
-			return "$baseUrl/embed/video/$videoId"
-		}
-		return null
+        val vid = getVideoId(url) ?: return null
+        return "$mainUrl/embed/video/$vid"
    }

    private fun getVideoId(url: String): String? {
        val path = URL(url).path
-        val id = path.substringAfter("/video/")
+        val id = path.substringAfter("video/")
        if (id.matches(videoIdRegex)) {
            return id
        }
@ -87,13 +84,13 @@ open class Dailymotion : ExtractorApi() {
    )

    data class InternalData(
-        val ts: Long,
+        val ts: Int,
        val v1st: String
    )

    data class Context(
        @JsonProperty("access_token") val accessToken: String?,
-        val embedder: String?,
+        val dmvk: String,
    )

    data class MetaData(
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/DoodExtractor.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/DoodExtractor.kt
@ -7,18 +7,6 @@ import com.lagradost.cloudstream3.utils.Qualities
 import com.lagradost.cloudstream3.utils.getQualityFromName
 import kotlinx.coroutines.delay

-class D0000d : DoodLaExtractor() {
-    override var mainUrl = "https://d0000d.com"
-}
-
-class D000dCom : DoodLaExtractor() {
-    override var mainUrl = "https://d000d.com"
-}
-
-class DoodstreamCom : DoodLaExtractor() {
-    override var mainUrl = "https://doodstream.com"
-}
-
 class Dooood : DoodLaExtractor() {
    override var mainUrl = "https://dooood.com"
 }
@ -68,10 +56,9 @@ open class DoodLaExtractor : ExtractorApi() {
    }

    override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink>? {
-        val newUrl= url.replace(mainUrl, "https://d0000d.com")
-        val response0 = app.get(newUrl).text // html of DoodStream page to look for /pass_md5/...
-        val md5 ="https://d0000d.com"+(Regex("/pass_md5/[^']*").find(response0)?.value ?: return null)  // get https://dood.ws/pass_md5/...
-        val trueUrl = app.get(md5, referer = newUrl).text + "zUEJeL3mUN?token=" + md5.substringAfterLast("/")   //direct link to extract  (zUEJeL3mUN is random)
+        val response0 = app.get(url).text // html of DoodStream page to look for /pass_md5/...
+        val md5 =mainUrl+(Regex("/pass_md5/[^']*").find(response0)?.value ?: return null)  // get https://dood.ws/pass_md5/...
+        val trueUrl = app.get(md5, referer = url).text + "zUEJeL3mUN?token=" + md5.substringAfterLast("/")   //direct link to extract  (zUEJeL3mUN is random)
        val quality = Regex("\\d{3,4}p").find(response0.substringAfter("<title>").substringBefore("</title>"))?.groupValues?.get(0)
        return listOf(
            ExtractorLink(
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Embedgram.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Embedgram.kt
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Evolaod.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Evolaod.kt
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Fastream.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Fastream.kt
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Filesim.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Filesim.kt
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/GMPlayer.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/GMPlayer.kt
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Gdriveplayer.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Gdriveplayer.kt
@ -2,10 +2,14 @@ package com.lagradost.cloudstream3.extractors

 import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.cloudstream3.*
-import com.lagradost.cloudstream3.extractors.helper.AesHelper.cryptoAESHandler
 import com.lagradost.cloudstream3.utils.*
 import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
 import org.jsoup.nodes.Element
+import java.security.DigestException
+import java.security.MessageDigest
+import javax.crypto.Cipher
+import javax.crypto.spec.IvParameterSpec
+import javax.crypto.spec.SecretKeySpec

 class DatabaseGdrive2 : Gdriveplayer() {
    override var mainUrl = "https://databasegdriveplayer.co"
@ -61,6 +65,78 @@ open class Gdriveplayer : ExtractorApi() {
            ?.data()?.let { getAndUnpack(it) }
    }

+    private fun String.decodeHex(): ByteArray {
+        check(length % 2 == 0) { "Must have an even length" }
+        return chunked(2)
+            .map { it.toInt(16).toByte() }
+            .toByteArray()
+    }
+
+    // https://stackoverflow.com/a/41434590/8166854
+    private fun GenerateKeyAndIv(
+        password: ByteArray,
+        salt: ByteArray,
+        hashAlgorithm: String = "MD5",
+        keyLength: Int = 32,
+        ivLength: Int = 16,
+        iterations: Int = 1
+    ): List<ByteArray>? {
+
+        val md = MessageDigest.getInstance(hashAlgorithm)
+        val digestLength = md.digestLength
+        val targetKeySize = keyLength + ivLength
+        val requiredLength = (targetKeySize + digestLength - 1) / digestLength * digestLength
+        val generatedData = ByteArray(requiredLength)
+        var generatedLength = 0
+
+        try {
+            md.reset()
+
+            while (generatedLength < targetKeySize) {
+                if (generatedLength > 0)
+                    md.update(
+                        generatedData,
+                        generatedLength - digestLength,
+                        digestLength
+                    )
+
+                md.update(password)
+                md.update(salt, 0, 8)
+                md.digest(generatedData, generatedLength, digestLength)
+
+                for (i in 1 until iterations) {
+                    md.update(generatedData, generatedLength, digestLength)
+                    md.digest(generatedData, generatedLength, digestLength)
+                }
+
+                generatedLength += digestLength
+            }
+            return listOf(
+                generatedData.copyOfRange(0, keyLength),
+                generatedData.copyOfRange(keyLength, targetKeySize)
+            )
+        } catch (e: DigestException) {
+            return null
+        }
+    }
+
+    private fun cryptoAESHandler(
+        data: AesData,
+        pass: ByteArray,
+        encrypt: Boolean = true
+    ): String? {
+        val (key, iv) = GenerateKeyAndIv(pass, data.s.decodeHex()) ?: return null
+        val cipher = Cipher.getInstance("AES/CBC/NoPadding")
+        return if (!encrypt) {
+            cipher.init(Cipher.DECRYPT_MODE, SecretKeySpec(key, "AES"), IvParameterSpec(iv))
+            String(cipher.doFinal(base64DecodeArray(data.ct)))
+        } else {
+            cipher.init(Cipher.DECRYPT_MODE, SecretKeySpec(key, "AES"), IvParameterSpec(iv))
+            base64Encode(cipher.doFinal(data.ct.toByteArray()))
+
+        }
+    }
+
    private fun Regex.first(str: String): String? {
        return find(str)?.groupValues?.getOrNull(1)
    }
@ -78,14 +154,14 @@ open class Gdriveplayer : ExtractorApi() {
        val document = app.get(url).document

        val eval = unpackJs(document)?.replace("\\", "") ?: return
-        val data = Regex("data='(\\S+?)'").first(eval) ?: return
+        val data = tryParseJson<AesData>(Regex("data='(\\S+?)'").first(eval)) ?: return
        val password = Regex("null,['|\"](\\w+)['|\"]").first(eval)
            ?.split(Regex("\\D+"))
            ?.joinToString("") {
                Char(it.toInt()).toString()
            }.let { Regex("var pass = \"(\\S+?)\"").first(it ?: return)?.toByteArray() }
            ?: throw ErrorLoadingException("can't find password")
-        val decryptedData = cryptoAESHandler(data, password, false, "AES/CBC/NoPadding")?.let { getAndUnpack(it) }?.replace("\\", "")
+        val decryptedData = cryptoAESHandler(data, password, false)?.let { getAndUnpack(it) }?.replace("\\", "")

        val sourceData = decryptedData?.substringAfter("sources:[")?.substringBefore("],")
        val subData = decryptedData?.substringAfter("tracks:[")?.substringBefore("],")
@ -118,6 +194,12 @@ open class Gdriveplayer : ExtractorApi() {

    }

+    data class AesData(
+        @JsonProperty("ct") val ct: String,
+        @JsonProperty("iv") val iv: String,
+        @JsonProperty("s") val s: String
+    )
+
    data class Tracks(
        @JsonProperty("file") val file: String,
        @JsonProperty("kind") val kind: String,
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/GenericM3U8.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/GenericM3U8.kt
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Gofile.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Gofile.kt
@ -19,12 +19,9 @@ open class Gofile : ExtractorApi() {
        subtitleCallback: (SubtitleFile) -> Unit,
        callback: (ExtractorLink) -> Unit
    ) {
-        val id = Regex("/(?:\\?c=|d/)([\\da-zA-Z-]+)").find(url)?.groupValues?.get(1)
+        val id = Regex("/(?:\\?c=|d/)([\\da-zA-Z]+)").find(url)?.groupValues?.get(1)
        val token = app.get("$mainApi/createAccount").parsedSafe<Account>()?.data?.get("token")
-        val websiteToken = app.get("$mainUrl/dist/js/alljs.js").text.let {
-            Regex("fetchData.wt\\s*=\\s*\"([^\"]+)").find(it)?.groupValues?.get(1)
-        }
-        app.get("$mainApi/getContent?contentId=$id&token=$token&wt=$websiteToken")
+        app.get("$mainApi/getContent?contentId=$id&token=$token&websiteToken=12345")
            .parsedSafe<Source>()?.data?.contents?.forEach {
                callback.invoke(
                    ExtractorLink(
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/GuardareStream.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/GuardareStream.kt
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Hxfile.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Hxfile.kt
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/JWPlayer.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/JWPlayer.kt
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Jawcloud.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Jawcloud.kt
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Jeniusplay.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Jeniusplay.kt
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Krakenfiles.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Krakenfiles.kt
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Linkbox.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Linkbox.kt
@ -18,8 +18,7 @@ open class Linkbox : ExtractorApi() {
        subtitleCallback: (SubtitleFile) -> Unit,
        callback: (ExtractorLink) -> Unit
    ) {
-        val token = Regex("""(?:/f/|/file/|\?id=)(\w+)""").find(url)?.groupValues?.get(1)
-        val id = app.get("$mainUrl/api/file/share_out_list/?sortField=utime&sortAsc=0&pageNo=1&pageSize=50&shareToken=$token").parsedSafe<Responses>()?.data?.itemId
+        val id = Regex("""(?:/f/|/file/|\?id=)(\w+)""").find(url)?.groupValues?.get(1)
        app.get("$mainUrl/api/file/detail?itemId=$id", referer = url)
            .parsedSafe<Responses>()?.data?.itemInfo?.resolutionList?.map { link ->
                callback.invoke(
@ -45,7 +44,6 @@ open class Linkbox : ExtractorApi() {

    data class Data(
        @JsonProperty("itemInfo") val itemInfo: ItemInfo? = null,
-        @JsonProperty("itemId") val itemId: String? = null,
    )

    data class Responses(
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/M3u8Manifest.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/M3u8Manifest.kt
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Maxstream.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Maxstream.kt
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/MixDrop.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/MixDrop.kt
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Moviehab.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Moviehab.kt
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/Mp4Upload.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/Mp4Upload.kt
@ -0,0 +1,34 @@
+package com.lagradost.cloudstream3.extractors
+
+import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.utils.ExtractorApi
+import com.lagradost.cloudstream3.utils.ExtractorLink
+import com.lagradost.cloudstream3.utils.Qualities
+import com.lagradost.cloudstream3.utils.getAndUnpack
+
+open class Mp4Upload : ExtractorApi() {
+    override var name = "Mp4Upload"
+    override var mainUrl = "https://www.mp4upload.com"
+    private val srcRegex = Regex("""player\.src\("(.*?)"""")
+    override val requiresReferer = true
+
+    override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink>? {
+        with(app.get(url)) {
+            getAndUnpack(this.text).let { unpackedText ->
+                val quality = unpackedText.lowercase().substringAfter(" height=").substringBefore(" ").toIntOrNull()
+                srcRegex.find(unpackedText)?.groupValues?.get(1)?.let { link ->
+                    return listOf(
+                        ExtractorLink(
+                            name,
+                            name,
+                            link,
+                            url,
+                            quality ?: Qualities.Unknown.value,
+                        )
+                    )
+                }
+            }
+        }
+        return null
+    }
+}
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/MultiQuality.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/MultiQuality.kt
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Mvidoo.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Mvidoo.kt
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/OkRuExtractor.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/OkRuExtractor.kt
@ -0,0 +1,67 @@
+package com.lagradost.cloudstream3.extractors
+
+import com.fasterxml.jackson.annotation.JsonProperty
+import com.lagradost.cloudstream3.utils.*
+import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.utils.AppUtils.parseJson
+
+data class DataOptionsJson (
+    @JsonProperty("flashvars") var flashvars : Flashvars? = Flashvars(),
+)
+data class Flashvars (
+    @JsonProperty("metadata") var metadata : String? = null,
+    @JsonProperty("hlsManifestUrl") var hlsManifestUrl : String? = null, //m3u8
+)
+
+data class MetadataOkru (
+    @JsonProperty("videos") var videos: ArrayList<Videos> = arrayListOf(),
+)
+
+data class Videos (
+    @JsonProperty("name") var name : String,
+    @JsonProperty("url") var url : String,
+    @JsonProperty("seekSchema") var seekSchema : Int? = null,
+    @JsonProperty("disallowed") var disallowed : Boolean? = null
+)
+
+class OkRuHttps: OkRu(){
+    override var mainUrl = "https://ok.ru"
+}
+
+open class OkRu : ExtractorApi() {
+    override var name = "Okru"
+    override var mainUrl = "http://ok.ru"
+    override val requiresReferer = false
+
+    override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink>? {
+        val doc = app.get(url).document
+        val sources = ArrayList<ExtractorLink>()
+        val datajson = doc.select("div[data-options]").attr("data-options")
+        if (datajson.isNotBlank()) {
+            val main = parseJson<DataOptionsJson>(datajson)
+            val metadatajson = parseJson<MetadataOkru>(main.flashvars?.metadata!!)
+            val servers = metadatajson.videos
+            servers.forEach {
+                val quality = it.name.uppercase()
+                    .replace("MOBILE","144p")
+                    .replace("LOWEST","240p")
+                    .replace("LOW","360p")
+                    .replace("SD","480p")
+                    .replace("HD","720p")
+                    .replace("FULL","1080p")
+                    .replace("QUAD","1440p")
+                    .replace("ULTRA","4k")
+                val extractedurl = it.url.replace("\\\\u0026", "&")
+                sources.add(ExtractorLink(
+                    name,
+                    name = this.name,
+                    extractedurl,
+                    url,
+                    getQualityFromName(quality),
+                    isM3u8 = false
+                ))
+            }
+        }
+        return sources
+    }
+}
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Okrulink.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Okrulink.kt
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Pelisplus.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Pelisplus.kt
@ -5,7 +5,6 @@ import com.lagradost.cloudstream3.amap
 import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.mvvm.suspendSafeApiCall
 import com.lagradost.cloudstream3.utils.ExtractorLink
-import com.lagradost.cloudstream3.utils.INFER_TYPE
 import com.lagradost.cloudstream3.utils.extractorApis
 import com.lagradost.cloudstream3.utils.getQualityFromName
 import com.lagradost.cloudstream3.utils.loadExtractor
@ -67,7 +66,7 @@ open class Pelisplus(val mainUrl: String) {
                                href,
                                page.url,
                                getQualityFromName(qual),
-                                type = INFER_TYPE
+                                element.attr("href").contains(".m3u8")
                            )
                        )
                    }
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/Pixeldrain.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/Pixeldrain.kt
@ -0,0 +1,30 @@
+package com.lagradost.cloudstream3.extractors
+
+import com.lagradost.cloudstream3.SubtitleFile
+import com.lagradost.cloudstream3.utils.ExtractorApi
+import com.lagradost.cloudstream3.utils.ExtractorLink
+import com.lagradost.cloudstream3.utils.Qualities
+
+open class Pixeldrain : ExtractorApi() {
+    override val name = "Pixeldrain"
+    override val mainUrl = "https://pixeldrain.com"
+    override val requiresReferer = false
+    override suspend fun getUrl(
+        url: String,
+        referer: String?,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
+        val mId = Regex("/([ul]/[\\da-zA-Z\\-]+)").find(url)?.groupValues?.get(1)?.split("/")
+        callback.invoke(
+            ExtractorLink(
+                this.name,
+                this.name,
+                "$mainUrl/api/file/${mId?.last() ?: return}?download",
+                url,
+                Qualities.Unknown.value,
+            )
+        )
+    }
+
+}
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/PlayLtXyz.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/PlayLtXyz.kt
@ -1,6 +1,6 @@
 package com.lagradost.cloudstream3.extractors

-import com.lagradost.api.Log
+import android.util.Log
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.utils.*
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/PlayerVoxzer.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/PlayerVoxzer.kt
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/SBPlay.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/SBPlay.kt
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Sendvid.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Sendvid.kt
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Solidfiles.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Solidfiles.kt
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Minoplres.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Minoplres.kt
@ -7,12 +7,14 @@ import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.M3u8Helper

-open class Minoplres : ExtractorApi() {
+class SpeedoStream1 : SpeedoStream() {
+    override val mainUrl = "https://speedostream.pm"
+}

-    override val name = "Minoplres" // formerly SpeedoStream
+open class SpeedoStream : ExtractorApi() {
+    override val name = "SpeedoStream"
+    override val mainUrl = "https://speedostream.com"
    override val requiresReferer = true
-    override val mainUrl = "https://minoplres.xyz" // formerly speedostream.bond
-    private val hostUrl = "https://minoplres.xyz"

    override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink> {
        val sources = mutableListOf<ExtractorLink>()
@ -24,7 +26,7 @@ open class Minoplres : ExtractorApi() {
                    M3u8Helper.generateM3u8(
                        name,
                        it.file,
-                        "$hostUrl/",
+                        "$mainUrl/",
                    ).forEach { m3uData -> sources.add(m3uData) }
                }
            }
@ -35,4 +37,6 @@ open class Minoplres : ExtractorApi() {
    private data class File(
        @JsonProperty("file") val file: String,
    )
+
+
 }
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/StreamSB.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/StreamSB.kt
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/StreamTape.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/StreamTape.kt
@ -9,10 +9,6 @@ class StreamTapeNet : StreamTape() {
    override var mainUrl = "https://streamtape.net"
 }

-class StreamTapeXyz : StreamTape() {
-    override var mainUrl = "https://streamtape.xyz"
-}
-
 class ShaveTape : StreamTape(){
    override var mainUrl = "https://shavetape.cash"
 }
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Streamhub.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Streamhub.kt
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Streamlare.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Streamlare.kt
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/StreamoUpload.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/StreamoUpload.kt
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Streamplay.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Streamplay.kt
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Supervideo.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Supervideo.kt
@ -13,7 +13,7 @@ data class Files(

 open class Supervideo : ExtractorApi() {
    override var name = "Supervideo"
-    override var mainUrl = "https://supervideo.cc"
+    override var mainUrl = "https://supervideo.tv"
    override val requiresReferer = false
    override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink>? {
        val extractedLinksList: MutableList<ExtractorLink> = mutableListOf()
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Tantifilm.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Tantifilm.kt
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Tomatomatela.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Tomatomatela.kt
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/UpstreamExtractor.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/UpstreamExtractor.kt
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Uqload.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Uqload.kt
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Userload.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Userload.kt
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Uservideo.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Uservideo.kt
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vicloud.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vicloud.kt
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/VidSrcExtractor.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/VidSrcExtractor.kt
@ -0,0 +1,100 @@
+package com.lagradost.cloudstream3.extractors
+
+import com.lagradost.cloudstream3.SubtitleFile
+import com.lagradost.cloudstream3.amap
+import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.utils.*
+import kotlinx.coroutines.delay
+import java.net.URI
+
+class VidSrcExtractor2 : VidSrcExtractor() {
+    override val mainUrl = "https://vidsrc.me/embed"
+    override suspend fun getUrl(
+        url: String,
+        referer: String?,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
+        val newUrl = url.lowercase().replace(mainUrl, super.mainUrl)
+        super.getUrl(newUrl, referer, subtitleCallback, callback)
+    }
+}
+
+open class VidSrcExtractor : ExtractorApi() {
+    override val name = "VidSrc"
+    private val absoluteUrl = "https://v2.vidsrc.me"
+    override val mainUrl = "$absoluteUrl/embed"
+    override val requiresReferer = false
+
+    companion object {
+        /** Infinite function to validate the vidSrc pass */
+        suspend fun validatePass(url: String) {
+            val uri = URI(url)
+            val host = uri.host
+
+            // Basically turn https://tm3p.vidsrc.stream/ -> https://vidsrc.stream/
+            val referer = host.split(".").let {
+                val size = it.size
+                "https://" + it.subList(maxOf(0, size - 2), size).joinToString(".") + "/"
+            }
+
+            while (true) {
+                app.get(url, referer = referer)
+                delay(60_000)
+            }
+        }
+    }
+
+    override suspend fun getUrl(
+        url: String,
+        referer: String?,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
+        val iframedoc = app.get(url).document
+
+        val serverslist =
+            iframedoc.select("div#sources.button_content div#content div#list div").map {
+                val datahash = it.attr("data-hash")
+                if (datahash.isNotBlank()) {
+                    val links = try {
+                        app.get(
+                            "$absoluteUrl/srcrcp/$datahash",
+                            referer = "https://rcp.vidsrc.me/"
+                        ).url
+                    } catch (e: Exception) {
+                        ""
+                    }
+                    links
+                } else ""
+            }
+
+        serverslist.amap { server ->
+            val linkfixed = server.replace("https://vidsrc.xyz/", "https://embedsito.com/")
+            if (linkfixed.contains("/prorcp")) {
+                val srcresponse = app.get(server, referer = absoluteUrl).text
+                val m3u8Regex = Regex("((https:|http:)//.*\\.m3u8)")
+                val srcm3u8 = m3u8Regex.find(srcresponse)?.value ?: return@amap
+                val passRegex = Regex("""['"](.*set_pass[^"']*)""")
+                val pass = passRegex.find(srcresponse)?.groupValues?.get(1)?.replace(
+                    Regex("""^//"""), "https://"
+                )
+
+                callback.invoke(
+                    ExtractorLink(
+                        this.name,
+                        this.name,
+                        srcm3u8,
+                        "https://vidsrc.stream/",
+                        Qualities.Unknown.value,
+                        extractorData = pass,
+                        isM3u8 = true
+                    )
+                )
+            } else {
+                loadExtractor(linkfixed, url, subtitleCallback, callback)
+            }
+        }
+    }
+
+}
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/VideoVard.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/VideoVard.kt
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vidmoly.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vidmoly.kt
@ -25,13 +25,9 @@ open class Vidmoly : ExtractorApi() {
        subtitleCallback: (SubtitleFile) -> Unit,
        callback: (ExtractorLink) -> Unit
    ) {
-        val headers  = mapOf(
-            "User-Agent"     to "Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.0.0 Mobile Safari/537.36",
-            "Sec-Fetch-Dest" to "iframe"
-        )
+
        val script = app.get(
            url,
-            headers = headers,
            referer = referer,
        ).document.select("script")
            .find { it.data().contains("sources:") }?.data()
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vido.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vido.kt
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vidstream.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vidstream.kt
@ -5,7 +5,6 @@ import com.lagradost.cloudstream3.amap
 import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.argamap
 import com.lagradost.cloudstream3.utils.ExtractorLink
-import com.lagradost.cloudstream3.utils.INFER_TYPE
 import com.lagradost.cloudstream3.utils.extractorApis
 import com.lagradost.cloudstream3.utils.getQualityFromName
 import com.lagradost.cloudstream3.utils.loadExtractor
@ -71,7 +70,7 @@ class Vidstream(val mainUrl: String) {
                                href,
                                page.url,
                                getQualityFromName(qual),
-                                type = INFER_TYPE
+                                element.attr("href").contains(".m3u8")
                            )
                        )
                    }
--- a/app/src/main/java/com/lagradost/cloudstream3/extractors/Voe.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/Voe.kt
@ -0,0 +1,36 @@
+package com.lagradost.cloudstream3.extractors
+
+import com.lagradost.cloudstream3.SubtitleFile
+import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.utils.ExtractorApi
+import com.lagradost.cloudstream3.utils.ExtractorLink
+import com.lagradost.cloudstream3.utils.M3u8Helper
+
+class Tubeless : Voe() {
+    override var mainUrl = "https://tubelessceliolymph.com"
+}
+
+open class Voe : ExtractorApi() {
+    override val name = "Voe"
+    override val mainUrl = "https://voe.sx"
+    override val requiresReferer = true
+
+    override suspend fun getUrl(
+        url: String,
+        referer: String?,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
+        val res = app.get(url, referer = referer).document
+        val script = res.select("script").find { it.data().contains("sources =") }?.data()
+        val link = Regex("[\"']hls[\"']:\\s*[\"'](.*)[\"']").find(script ?: return)?.groupValues?.get(1)
+
+        M3u8Helper.generateM3u8(
+            name,
+            link ?: return,
+            "$mainUrl/",
+            headers = mapOf("Origin" to "$mainUrl/")
+        ).forEach(callback)
+
+    }
+}
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/WatchSB.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/WatchSB.kt
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/WcoStream.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/WcoStream.kt
@ -7,7 +7,6 @@ import com.lagradost.cloudstream3.extractors.helper.NineAnimeHelper.encrypt
 import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
-import com.lagradost.cloudstream3.utils.INFER_TYPE
 import com.lagradost.cloudstream3.utils.Qualities

 class Vidstreamz : WcoStream() {
@ -127,7 +126,8 @@ open class WcoStream : ExtractorApi() {

        if (!response.text.startsWith("{")) throw ErrorLoadingException("Seems like 9Anime kiddies changed stuff again, Go touch some grass for bout an hour Or use a different Server")
        return response.parsed<Response>().data.media.sources.map {
-            ExtractorLink(name, it.file, it.file, host, Qualities.Unknown.value, type = INFER_TYPE)
+            ExtractorLink(name, it.file,it.file,host,Qualities.Unknown.value,it.file.contains(".m3u8"))
        }
+
    }
 }
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Wibufile.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Wibufile.kt
@ -4,8 +4,8 @@ import com.lagradost.cloudstream3.SubtitleFile
 import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
-import com.lagradost.cloudstream3.utils.INFER_TYPE
 import com.lagradost.cloudstream3.utils.Qualities
+import java.net.URI

 open class Wibufile : ExtractorApi() {
    override val name: String = "Wibufile"
@ -28,8 +28,10 @@ open class Wibufile : ExtractorApi() {
                video ?: return,
                "$mainUrl/",
                Qualities.Unknown.value,
-                type = INFER_TYPE
+                URI(url).path.endsWith(".m3u8")
            )
        )
+
    }
+
 }
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/XStreamCdn.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/XStreamCdn.kt
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/YourUpload.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/YourUpload.kt
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/YoutubeExtractor.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/YoutubeExtractor.kt
@ -70,18 +70,19 @@ open class YoutubeExtractor : ExtractorApi() {
            }
        }
        ytVideos[url]?.mapNotNull {
-            if (it.isVideoOnly() || it.height <= 0) return@mapNotNull null
+            if (it.isVideoOnly || it.height <= 0) return@mapNotNull null

            ExtractorLink(
                this.name,
                this.name,
-                it.content ?: return@mapNotNull null,
+                it.url ?: return@mapNotNull null,
                "",
                it.height
            )
        }?.forEach(callback)
        ytVideosSubtitles[url]?.mapNotNull {
-            SubtitleFile(it.languageTag ?: return@mapNotNull null, it.content ?: return@mapNotNull null)
+            SubtitleFile(it.languageTag ?: return@mapNotNull null, it.url ?: return@mapNotNull null)
        }?.forEach(subtitleCallback)
    }
+
 }
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Zorofile.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Zorofile.kt
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Zplayer.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Zplayer.kt
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/helper/AsianEmbedHelper.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/helper/AsianEmbedHelper.kt
@ -1,6 +1,6 @@
 package com.lagradost.cloudstream3.extractors.helper

-import com.lagradost.api.Log
+import android.util.Log
 import com.lagradost.cloudstream3.SubtitleFile
 import com.lagradost.cloudstream3.amap
 import com.lagradost.cloudstream3.app
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/helper/GogoHelper.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/helper/GogoHelper.kt
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/helper/NineAnimeHelper.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/helper/NineAnimeHelper.kt
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/helper/VstreamhubHelper.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/helper/VstreamhubHelper.kt
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/helper/WcoHelper.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/helper/WcoHelper.kt
@ -1,6 +1,8 @@
 package com.lagradost.cloudstream3.extractors.helper

 import com.fasterxml.jackson.annotation.JsonProperty
+import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
+import com.lagradost.cloudstream3.AcraApplication.Companion.setKey
 import com.lagradost.cloudstream3.app

 class WcoHelper {
@ -28,7 +30,9 @@ class WcoHelper {
        private suspend fun getKeys() {
            keys = keys
                ?: app.get("https://raw.githubusercontent.com/reduplicated/Cloudstream/master/docs/keys.json")
-                    .parsedSafe<ExternalKeys>()
+                    .parsedSafe<ExternalKeys>()?.also { setKey(BACKUP_KEY_DATA, it) } ?: getKey(
+                    BACKUP_KEY_DATA
+                )
        }

        suspend fun getWcoKey(): ExternalKeys? {
@ -39,7 +43,9 @@ class WcoHelper {
        private suspend fun getNewKeys() {
            newKeys = newKeys
                ?: app.get("https://raw.githubusercontent.com/chekaslowakiya/BruhFlow/main/keys.json")
-                    .parsedSafe<NewExternalKeys>()
+                    .parsedSafe<NewExternalKeys>()?.also { setKey(BACKUP_KEY_DATA, it) } ?: getKey(
+                    BACKUP_KEY_DATA
+                )
        }

        suspend fun getNewWcoKey(): NewExternalKeys? {
--- a/app/src/main/java/com/lagradost/cloudstream3/metaproviders/MultiAnimeProvider.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/metaproviders/MultiAnimeProvider.kt
@ -0,0 +1,73 @@
+package com.lagradost.cloudstream3.metaproviders
+
+import com.lagradost.cloudstream3.*
+import com.lagradost.cloudstream3.LoadResponse.Companion.addAniListId
+import com.lagradost.cloudstream3.LoadResponse.Companion.addTrailer
+import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.aniListApi
+import com.lagradost.cloudstream3.syncproviders.SyncAPI
+import com.lagradost.cloudstream3.syncproviders.providers.AniListApi
+import com.lagradost.cloudstream3.syncproviders.providers.MALApi
+import com.lagradost.cloudstream3.utils.SyncUtil
+
+// wont be implemented
+class MultiAnimeProvider : MainAPI() {
+    override var name = "MultiAnime"
+    override var lang = "en"
+    override val usesWebView = true
+    override val supportedTypes = setOf(TvType.Anime)
+    private val syncApi: SyncAPI = aniListApi
+
+    private val syncUtilType by lazy {
+        when (syncApi) {
+            is AniListApi -> "anilist"
+            is MALApi -> "myanimelist"
+            else -> throw ErrorLoadingException("Invalid Api")
+        }
+    }
+
+    private val validApis
+        get() =
+            synchronized(APIHolder.apis) {
+                APIHolder.apis.filter {
+                    it.lang == this.lang && it::class.java != this::class.java && it.supportedTypes.contains(
+                        TvType.Anime
+                    )
+                }
+            }
+
+
+    private fun filterName(name: String): String {
+        return Regex("""[^a-zA-Z0-9-]""").replace(name, "")
+    }
+
+    override suspend fun search(query: String): List<SearchResponse>? {
+        return syncApi.search(query)?.map {
+            AnimeSearchResponse(it.name, it.url, this.name, TvType.Anime, it.posterUrl)
+        }
+    }
+
+    override suspend fun load(url: String): LoadResponse? {
+        return syncApi.getResult(url)?.let { res ->
+            val data = SyncUtil.getUrlsFromId(res.id, syncUtilType).amap { url ->
+                validApis.firstOrNull { api -> url.startsWith(api.mainUrl) }?.load(url)
+            }.filterNotNull()
+
+            val type =
+                if (data.any { it.type == TvType.AnimeMovie }) TvType.AnimeMovie else TvType.Anime
+
+            newAnimeLoadResponse(
+                res.title ?: throw ErrorLoadingException("No Title found"),
+                url,
+                type
+            ) {
+                posterUrl = res.posterUrl
+                plot = res.synopsis
+                tags = res.genres
+                rating = res.publicScore
+                addTrailer(res.trailers)
+                addAniListId(res.id.toIntOrNull())
+                recommendations = res.recommendations
+            }
+        }
+    }
+}
--- a/app/src/main/java/com/lagradost/cloudstream3/metaproviders/SyncRedirector.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/metaproviders/SyncRedirector.kt
@ -2,13 +2,15 @@ package com.lagradost.cloudstream3.metaproviders

 import com.lagradost.cloudstream3.MainAPI
 import com.lagradost.cloudstream3.mvvm.suspendSafeApiCall
+import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.SyncApis
 import com.lagradost.cloudstream3.syncproviders.SyncIdName

 object SyncRedirector {
+    val syncApis = SyncApis
    private val syncIds =
        listOf(
-            SyncIdName.MyAnimeList to Regex("""myanimelist\.net/anime/(\d+)"""),
-            SyncIdName.Anilist to Regex("""anilist\.co/anime/(\d+)""")
+            SyncIdName.MyAnimeList to Regex("""myanimelist\.net\/anime\/(\d+)"""),
+            SyncIdName.Anilist to Regex("""anilist\.co\/anime\/(\d+)""")
        )

    suspend fun redirect(
--- a/Show more
+++ b/Show more
Author	SHA1	Message	Date
LagradOst	c1e87b3fd0	fixed merge errors	2023-08-01 00:55:51 +02:00
Osten	a0c112ad3c	Merge branch 'master' into master	2023-08-01 00:44:01 +02:00
self-similarity	5d8617e8e7	Fixed PiP aspect ratio and removed duplicated code.	2023-07-18 21:46:34 +02:00
self-similarity	a14f23063d	Migrated to Media3	2023-07-14 20:16:23 +02:00