Merge branch 'recloudstream:master' into master

(may fix building)

.github/workflows/build_to_archive.yml

@@ -1,78 +0,0 @@
-name: Archive build
-
-on:
-  push:
-    branches: [ master ]
-    paths-ignore:
-      - '*.md'
-      - '*.json'
-      - '**/wcokey.txt'
-  workflow_dispatch:
-
-concurrency: 
-  group: "Archive-build"
-  cancel-in-progress: true
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Generate access token
-      id: generate_token
-      uses: tibdex/github-app-token@v2
-      with:
-        app_id: ${{ secrets.GH_APP_ID }}
-        private_key: ${{ secrets.GH_APP_KEY }}
-        repository: "recloudstream/secrets"
-    - name: Generate access token (archive)
-      id: generate_archive_token
-      uses: tibdex/github-app-token@v2
-      with:
-        app_id: ${{ secrets.GH_APP_ID }}
-        private_key: ${{ secrets.GH_APP_KEY }}
-        repository: "recloudstream/cloudstream-archive"
-    - uses: actions/checkout@v4
-    - name: Set up JDK 17
-      uses: actions/setup-java@v4
-      with:
-        java-version: '17'
-        distribution: 'adopt'
-    - name: Grant execute permission for gradlew
-      run: chmod +x gradlew
-    - name: Fetch keystore
-      id: fetch_keystore
-      run: |
-        TMP_KEYSTORE_FILE_PATH="${RUNNER_TEMP}"/keystore
-        mkdir -p "${TMP_KEYSTORE_FILE_PATH}"
-        curl -H "Authorization: token ${{ steps.generate_token.outputs.token }}" -o "${TMP_KEYSTORE_FILE_PATH}/prerelease_keystore.keystore" "https://raw.githubusercontent.com/recloudstream/secrets/master/keystore.jks"
-        curl -H "Authorization: token ${{ steps.generate_token.outputs.token }}" -o "keystore_password.txt" "https://raw.githubusercontent.com/recloudstream/secrets/master/keystore_password.txt"
-        KEY_PWD="$(cat keystore_password.txt)"
-        echo "::add-mask::${KEY_PWD}"
-        echo "key_pwd=$KEY_PWD" >> $GITHUB_OUTPUT
-    - name: Run Gradle
-      run: |
-        ./gradlew assemblePrerelease
-      env:
-        SIGNING_KEY_ALIAS: "key0"
-        SIGNING_KEY_PASSWORD: ${{ steps.fetch_keystore.outputs.key_pwd }}
-        SIGNING_STORE_PASSWORD: ${{ steps.fetch_keystore.outputs.key_pwd }}
-        SIMKL_CLIENT_ID: ${{ secrets.SIMKL_CLIENT_ID }}
-        SIMKL_CLIENT_SECRET: ${{ secrets.SIMKL_CLIENT_SECRET }}
-    - uses: actions/checkout@v4
-      with:
-        repository: "recloudstream/cloudstream-archive"
-        token: ${{ steps.generate_archive_token.outputs.token }}
-        path: "archive"
-
-    - name: Move build
-      run: |
-        cp app/build/outputs/apk/prerelease/release/*.apk "archive/$(git rev-parse --short HEAD).apk"
-    
-    - name: Push archive
-      run: |
-        cd $GITHUB_WORKSPACE/archive
-        git config --local user.email "actions@github.com"
-        git config --local user.name "GitHub Actions"
-        git add .
-        git commit --amend -m "Build $GITHUB_SHA" || exit 0   # do not error if nothing to commit
-        git push --force

.github/workflows/generate_dokka.yml

@@ -1,72 +0,0 @@
-name: Dokka
-
-# https://docs.github.com/en/actions/learn-github-actions/workflow-syntax-for-github-actions#concurrency
-concurrency: 
-  group: "dokka"
-  cancel-in-progress: true
-
-on:
-  push:
-    branches:
-      # choose your default branch
-      - master
-      - main
-    paths-ignore:
-      - '*.md'
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Generate access token
-        id: generate_token
-        uses: tibdex/github-app-token@v2
-        with:
-          app_id: ${{ secrets.GH_APP_ID }}
-          private_key: ${{ secrets.GH_APP_KEY }}
-          repository: "recloudstream/dokka"
-      - name: Checkout
-        uses: actions/checkout@master
-        with:
-          path: "src"
-
-      - name: Checkout dokka
-        uses: actions/checkout@master
-        with:
-          repository: "recloudstream/dokka"
-          path: "dokka"
-          token: ${{ steps.generate_token.outputs.token }}
-      
-      - name: Clean old builds
-        run: |
-          cd $GITHUB_WORKSPACE/dokka/
-          rm -rf "./-cloudstream"
-
-      - name: Setup JDK 17
-        uses: actions/setup-java@v4
-        with:
-          java-version: 17
-          distribution: 'adopt'
-
-      - name: Setup Android SDK
-        uses: android-actions/setup-android@v3
-
-      - name: Generate Dokka
-        run: |
-          cd $GITHUB_WORKSPACE/src/
-          chmod +x gradlew
-          ./gradlew app:dokkaHtml
-
-      - name: Copy Dokka
-        run: |
-          cp -r $GITHUB_WORKSPACE/src/app/build/dokka/html/* $GITHUB_WORKSPACE/dokka/
-
-      - name: Push builds
-        run: |
-          cd $GITHUB_WORKSPACE/dokka
-          touch .nojekyll
-          git config --local user.email "111277985+recloudstream[bot]@users.noreply.github.com"
-          git config --local user.name "recloudstream[bot]"
-          git add .
-          git commit --amend -m "Generate dokka for recloudstream/cloudstream@${GITHUB_SHA}" || exit 0   # do not error if nothing to commit
-          git push --force

.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: |

.github/workflows/prerelease.yml

@@ -8,7 +8,7 @@ on:
       - '*.json'
       - '**/wcokey.txt'
 
-concurrency: 
+concurrency:
   group: "pre-release"
   cancel-in-progress: true
 
@@ -16,49 +16,39 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - name: Generate access token
-      id: generate_token
-      uses: tibdex/github-app-token@v2
-      with:
-        app_id: ${{ secrets.GH_APP_ID }}
-        private_key: ${{ secrets.GH_APP_KEY }}
-        repository: "recloudstream/secrets"
-    - uses: actions/checkout@v4
-    - name: Set up JDK 17
-      uses: actions/setup-java@v4
-      with:
-        java-version: '17'
-        distribution: 'adopt'
-    - name: Grant execute permission for gradlew
-      run: chmod +x gradlew
-    - name: Fetch keystore
-      id: fetch_keystore
-      run: |
-        TMP_KEYSTORE_FILE_PATH="${RUNNER_TEMP}"/keystore
-        mkdir -p "${TMP_KEYSTORE_FILE_PATH}"
-        curl -H "Authorization: token ${{ steps.generate_token.outputs.token }}" -o "${TMP_KEYSTORE_FILE_PATH}/prerelease_keystore.keystore" "https://raw.githubusercontent.com/recloudstream/secrets/master/keystore.jks"
-        curl -H "Authorization: token ${{ steps.generate_token.outputs.token }}" -o "keystore_password.txt" "https://raw.githubusercontent.com/recloudstream/secrets/master/keystore_password.txt"
-        KEY_PWD="$(cat keystore_password.txt)"
-        echo "::add-mask::${KEY_PWD}"
-        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
-      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:
-        repo_token: "${{ secrets.GITHUB_TOKEN }}"
-        automatic_release_tag: "pre-release"
-        prerelease: true
-        title: "Pre-release Build"
-        files: |
-          app/build/outputs/apk/prerelease/release/*.apk
-          app/build/libs/app-sources.jar
-          app/build/classes.jar
+      - uses: actions/checkout@v2
+      - name: Set up JDK 11
+        uses: actions/setup-java@v2
+        with:
+          java-version: '11'
+          distribution: 'adopt'
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+      - name: Fetch keystore
+        id: fetch_keystore
+        run: |
+          TMP_KEYSTORE_FILE_PATH="${RUNNER_TEMP}"/keystore
+          mkdir -p "${TMP_KEYSTORE_FILE_PATH}"
+          curl -H "Authorization: token ${{ secrets.PAT }}" -o "${TMP_KEYSTORE_FILE_PATH}/prerelease_keystore.keystore" "https://raw.githubusercontent.com/KillerDogeEmpire/secrets/master/keystore.jks"
+          curl -H "Authorization: token ${{ secrets.PAT }}" -o "keystore_password.txt" "https://raw.githubusercontent.com/KillerDogeEmpire/secrets/master/keystore_password.txt"
+          KEY_PWD="$(cat keystore_password.txt)"
+          echo "::add-mask::${KEY_PWD}"
+          echo "::set-output name=key_pwd::$KEY_PWD"
+      - name: Run Gradle
+        run: |
+          ./gradlew assemblePrerelease makeJar androidSourcesJar
+        env:
+          SIGNING_KEY_ALIAS: "key10"
+          SIGNING_KEY_PASSWORD: ${{ steps.fetch_keystore.outputs.key_pwd }}
+          SIGNING_STORE_PASSWORD: ${{ steps.fetch_keystore.outputs.key_pwd }}
+      - name: Create pre-release
+        uses: "marvinpinto/action-automatic-releases@latest"
+        with:
+          repo_token: "${{ secrets.GITHUB_TOKEN }}"
+          automatic_release_tag: "pre-release"
+          prerelease: true
+          title: "Pre-release Build"
+          files: |
+            app/build/outputs/apk/prerelease/release/*.apk
+            app/build/libs/app-sources.jar
+            app/build/classes.jar

.github/workflows/pull_request.yml

@@ -6,18 +6,18 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
-    - name: Set up JDK 17
-      uses: actions/setup-java@v4
+    - uses: actions/checkout@v2
+    - name: Set up JDK 11
+      uses: actions/setup-java@v2
       with:
-        java-version: '17'
+        java-version: '11'
         distribution: 'adopt'
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
     - 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"

.github/workflows/update_locales.yml

@@ -1,42 +0,0 @@
-name: Fix locale issues
-
-on:
-  workflow_dispatch:
-  push:
-    paths:
-      - '**.xml'
-    branches:
-      - master
-
-concurrency: 
-  group: "locale"
-  cancel-in-progress: true
-
-jobs:
-  create:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Generate access token
-      id: generate_token
-      uses: tibdex/github-app-token@v2
-      with:
-        app_id: ${{ secrets.GH_APP_ID }}
-        private_key: ${{ secrets.GH_APP_KEY }}
-        repository: "recloudstream/cloudstream"
-    - uses: actions/checkout@v4
-      with:
-        token: ${{ steps.generate_token.outputs.token }}
-    - name: Install dependencies
-      run: |
-        pip3 install lxml
-    - name: Edit files
-      run: |
-        python3 .github/locales.py
-    - name: Commit to the repo
-      run: |
-        git config --local user.email "111277985+recloudstream[bot]@users.noreply.github.com"
-        git config --local user.name "recloudstream[bot]"
-        git add .
-        # "echo" returns true so the build succeeds, even if no changed files
-        git commit -m 'chore(locales): fix locale issues' || echo
-        git push

.idea/.name

@@ -1 +0,0 @@
-CloudStream

.idea/gradle.xml

@@ -8,7 +8,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="jbr-17" />
+        <option name="gradleJvm" value="Embedded JDK" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />

README.md

@@ -1,17 +1,16 @@
-# CloudStream
+# AquaStream
 
 **⚠️ Warning: By default this app doesn't provide any video sources, you have to install extensions in order to add functionality to the app.**
 
 
-[![Discord](https://invidget.switchblade.xyz/5Hus6fM)](https://discord.gg/5Hus6fM)
+[![Discord](https://invidget.switchblade.xyz/4uAZXt97pG)](https://discord.gg/4uAZXt97pG)
 
 ### Features:
 + **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/">

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

app/build.gradle.kts

@@ -1,13 +1,13 @@
-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.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("kotlin-android-extensions")
     id("org.jetbrains.dokka")
 }
 
@@ -28,18 +28,6 @@ android {
     testOptions {
         unitTests.isReturnDefaultValues = true
     }
-
-    viewBinding {
-        enable = true
-    }
-
-    /* disable this for now
-    externalNativeBuild {
-        cmake {
-            path("CMakeLists.txt")
-        }
-    }*/
-
     signingConfigs {
         create("prerelease") {
             if (prereleaseStoreFile != null) {
@@ -51,44 +39,33 @@ android {
         }
     }
 
-    compileSdk = 34
-    buildToolsVersion = "34.0.0"
+    compileSdk = 33
+    buildToolsVersion = "30.0.3"
 
     defaultConfig {
-        applicationId = "com.lagradost.cloudstream3"
+        applicationId = "com.killerdogeempire.aquastream"
         minSdk = 21
-        targetSdk = 33 /* Android 14 is Fu*ked
-        ^ https://developer.android.com/about/versions/14/behavior-changes-14#safer-dynamic-code-loading*/
-        versionCode = 63
-        versionName = "4.3.1"
+        targetSdk = 33
+
+        versionCode = 59
+        versionName = "1.0.7"
 
         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)
+        resValue("string", "commit_hash", "git rev-parse --short HEAD".execute() ?: "")
+
+        resValue("bool", "is_prerelease", "false")
 
         buildConfigField(
             "String",
             "BUILDDATE",
             "new java.text.SimpleDateFormat(\"yyyy-MM-dd HH:mm\").format(new java.util.Date(" + System.currentTimeMillis() + "L));"
         )
-        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
         }
     }
 
@@ -97,21 +74,14 @@ android {
             isDebuggable = false
             isMinifyEnabled = false
             isShrinkResources = false
-            proguardFiles(
-                getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro"
-            )
+            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
         }
         debug {
             isDebuggable = true
             applicationIdSuffix = ".debug"
-            proguardFiles(
-                getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro"
-            )
+            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
         }
     }
-
     flavorDimensions.add("state")
     productFlavors {
         create("stable") {
@@ -128,22 +98,20 @@ android {
             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"
 }
 
@@ -152,104 +120,124 @@ repositories {
 }
 
 dependencies {
-    // Testing
-    testImplementation("junit:junit:4.13.2")
-    testImplementation("org.json:json:20231013")
-    androidTestImplementation("androidx.test:core")
-    implementation("androidx.test.ext:junit-ktx:1.1.5")
-    androidTestImplementation("androidx.test.ext:junit:1.1.5")
-    androidTestImplementation("androidx.test.espresso:espresso-core:3.5.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.12.0")
-    implementation("androidx.appcompat:appcompat:1.6.1")
-    implementation("androidx.navigation:navigation-ui-ktx:2.7.6")
-    implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.7.0")
-    implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0")
-    implementation("androidx.navigation:navigation-fragment-ktx:2.7.6")
+    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.10.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")
+
+    //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.1.0")
-    implementation("com.google.guava:guava:32.1.3-android")
-    implementation("dev.zacsweers.autoservice:auto-service-ksp:1.1.0")
+    // Exoplayer
+    implementation("com.google.android.exoplayer:exoplayer:2.18.2")
+    implementation("com.google.android.exoplayer:extension-cast:2.18.2")
+    implementation("com.google.android.exoplayer:extension-mediasession:2.18.2")
+    implementation("com.google.android.exoplayer:extension-okhttp:2.18.2")
+    // 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")
 
-    // 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")
+    //implementation("com.google.android.exoplayer:extension-leanback:2.14.0")
 
-    // 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:6dc25f7") /* For Trailers
-    ^ Update to Latest Commits if Trailers Misbehave, github.com/TeamNewPipe/NewPipeExtractor/commits/dev */
-    implementation("com.github.albfernandez:juniversalchardet:2.4.0") // Subtitle Decoding
+    // Bug reports
+    implementation("ch.acra:acra-core:5.8.4")
+    implementation("ch.acra:acra-toast:5.8.4")
 
-    // Crash Reports (AcraApplication.kt)
-    implementation("ch.acra:acra-core:5.11.3")
-    implementation("ch.acra:acra-toast:5.11.3")
+    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.7'
+
+    // 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("com.github.rubensousa:previewseekbar-media3:1.1.1.0") // SeekBar Preview
 
-    // Extensions & Other Libs
-    implementation("org.mozilla:rhino:1.7.13") /* run JavaScript
-    ^ Don't Bump RhinoJS to 1.7.14,`NoClassDefFoundError` Occurs and Trailers won't play (even with Desugaring)
-     NewPipeExtractor Issue */
-    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.10.0") // TMDB API v3 Wrapper Made with RetroFit
-    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.4")
-    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.5") // HTTP Lib
+    // slow af yt
+    //implementation("com.github.HaarigerHarald:android-youtubeExtractor:master-SNAPSHOT")
+
+    // newpipe yt taken from https://github.com/TeamNewPipe/NewPipe/blob/dev/app/build.gradle#L204
+    implementation("com.github.TeamNewPipe:NewPipeExtractor:master-SNAPSHOT")
+    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.1.6")
+
+    // Library/extensions searching with Levenshtein distance
+    implementation("me.xdrop:fuzzywuzzy:1.4.0")
+
+    // color pallette for images -> colors
+    implementation("androidx.palette:palette-ktx:1.0.0")
 }
 
 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
 }
 
-// For GradLew Plugin
+// 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")
-}
-
-tasks.withType<KotlinCompile> {
-    kotlinOptions {
-        jvmTarget = "1.8"
-        freeCompilerArgs = listOf("-Xjvm-default=all-compatibility")
-    }
+    dependsOn("build")
 }
 
 tasks.withType<DokkaTask>().configureEach {
@@ -262,10 +250,9 @@ 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")
             }
         }
     }
-}
+}

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

@@ -1,33 +1,6 @@
 package com.lagradost.cloudstream3
 
-import android.app.Activity
-import android.os.Bundle
-import android.os.PersistableBundle
-import android.view.LayoutInflater
-import androidx.test.core.app.ActivityScenario
 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
-import com.lagradost.cloudstream3.databinding.FragmentResultTvBinding
-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
-import com.lagradost.cloudstream3.databinding.RepositoryItemBinding
-import com.lagradost.cloudstream3.databinding.RepositoryItemTvBinding
-import com.lagradost.cloudstream3.databinding.SearchResultGridBinding
-import com.lagradost.cloudstream3.databinding.SearchResultGridExpandedBinding
-import com.lagradost.cloudstream3.databinding.TrailerCustomLayoutBinding
 import com.lagradost.cloudstream3.utils.SubtitleHelper
 import com.lagradost.cloudstream3.utils.TestingUtils
 import kotlinx.coroutines.runBlocking
@@ -35,23 +8,16 @@ import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
 
-
 /**
  * Instrumented test, which will execute on an Android device.
  *
  * See [testing documentation](http://d.android.com/tools/testing).
  */
-class TestApplication : Activity() {
-    override fun onCreate(savedInstanceState: Bundle?, persistentState: PersistableBundle?) {
-        super.onCreate(savedInstanceState, persistentState)
-    }
-}
-
 @RunWith(AndroidJUnit4::class)
 class ExampleInstrumentedTest {
-    private fun getAllProviders(): Array<MainAPI> {
+    private fun getAllProviders(): List<MainAPI> {
         println("Providers: ${APIHolder.allProviders.size}")
-        return APIHolder.allProviders.toTypedArray() //.filter { !it.usesWebView }
+        return APIHolder.allProviders //.filter { !it.usesWebView }
     }
 
     @Test
@@ -60,76 +26,6 @@ class ExampleInstrumentedTest {
         println("Done providersExist")
     }
 
-    @Throws
-    private inline fun <reified T : ViewBinding> testAllLayouts(
-        activity: Activity,
-       vararg layouts: Int
-    ) {
-
-        val bind = T::class.java.methods.first { it.name == "bind" }
-        val inflater = LayoutInflater.from(activity)
-        for (layout in layouts) {
-            val root = inflater.inflate(layout, null, false)
-            bind.invoke(null, root)
-        }
-    }
-
-    @Test
-    @Throws
-    fun layoutTest() {
-        ActivityScenario.launch(MainActivity::class.java).use { scenario ->
-            scenario.onActivity { activity: MainActivity ->
-                // FragmentHomeHeadBinding and FragmentHomeHeadTvBinding CANT be the same
-                //testAllLayouts<FragmentHomeHeadBinding>(activity, R.layout.fragment_home_head, R.layout.fragment_home_head_tv)
-                //testAllLayouts<FragmentHomeHeadTvBinding>(activity, R.layout.fragment_home_head, R.layout.fragment_home_head_tv)
-
-                // main cant be tested
-               // testAllLayouts<ActivityMainTvBinding>(activity,R.layout.activity_main, R.layout.activity_main_tv)
-               // testAllLayouts<ActivityMainBinding>(activity,R.layout.activity_main, R.layout.activity_main_tv)
-                //testAllLayouts<ActivityMainBinding>(activity, R.layout.activity_main_tv)
-
-                testAllLayouts<FragmentPlayerBinding>(activity, R.layout.fragment_player,R.layout.fragment_player_tv)
-                testAllLayouts<FragmentPlayerTvBinding>(activity, R.layout.fragment_player,R.layout.fragment_player_tv)
-
-               // testAllLayouts<FragmentResultBinding>(activity, R.layout.fragment_result,R.layout.fragment_result_tv)
-               // testAllLayouts<FragmentResultTvBinding>(activity, R.layout.fragment_result,R.layout.fragment_result_tv)
-
-                testAllLayouts<PlayerCustomLayoutBinding>(activity, R.layout.player_custom_layout,R.layout.player_custom_layout_tv, R.layout.trailer_custom_layout)
-                testAllLayouts<PlayerCustomLayoutTvBinding>(activity, R.layout.player_custom_layout,R.layout.player_custom_layout_tv, R.layout.trailer_custom_layout)
-                testAllLayouts<TrailerCustomLayoutBinding>(activity, R.layout.player_custom_layout,R.layout.player_custom_layout_tv, R.layout.trailer_custom_layout)
-
-                testAllLayouts<RepositoryItemBinding>(activity, R.layout.repository_item_tv, R.layout.repository_item)
-                testAllLayouts<RepositoryItemTvBinding>(activity, R.layout.repository_item_tv, R.layout.repository_item)
-
-                testAllLayouts<RepositoryItemBinding>(activity, R.layout.repository_item_tv, R.layout.repository_item)
-                testAllLayouts<RepositoryItemTvBinding>(activity, R.layout.repository_item_tv, R.layout.repository_item)
-
-                testAllLayouts<FragmentHomeBinding>(activity, R.layout.fragment_home_tv, R.layout.fragment_home)
-                testAllLayouts<FragmentHomeTvBinding>(activity, R.layout.fragment_home_tv, R.layout.fragment_home)
-
-                testAllLayouts<FragmentSearchBinding>(activity, R.layout.fragment_search_tv, R.layout.fragment_search)
-                testAllLayouts<FragmentSearchTvBinding>(activity, R.layout.fragment_search_tv, R.layout.fragment_search)
-
-                testAllLayouts<HomeResultGridBinding>(activity, R.layout.home_result_grid_expanded, R.layout.home_result_grid)
-                //testAllLayouts<HomeResultGridExpandedBinding>(activity, R.layout.home_result_grid_expanded, R.layout.home_result_grid) ??? fails ???
-
-                testAllLayouts<SearchResultGridExpandedBinding>(activity, R.layout.search_result_grid, R.layout.search_result_grid_expanded)
-                testAllLayouts<SearchResultGridBinding>(activity, R.layout.search_result_grid, R.layout.search_result_grid_expanded)
-
-
-               // 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<FragmentLibraryTvBinding>(activity, R.layout.fragment_library_tv, R.layout.fragment_library)
-                testAllLayouts<FragmentLibraryBinding>(activity, R.layout.fragment_library_tv, R.layout.fragment_library)
-            }
-        }
-    }
-
     @Test
     @Throws(AssertionError::class)
     fun providerCorrectData() {
@@ -153,7 +49,7 @@ class ExampleInstrumentedTest {
     @Test
     fun providerCorrectHomepage() {
         runBlocking {
-            getAllProviders().toList().amap { api ->
+            getAllProviders().amap { api ->
                 TestingUtils.testHomepage(api, ::println)
             }
         }

app/src/debug/res/values/strings.xml

@@ -1,3 +1,3 @@
 <resources>
-    <string name="app_name">CloudStream Debug</string>
+    <string name="app_name">AquaStream Debug</string>
 </resources>

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 -->
@@ -15,13 +15,7 @@
     <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.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" />
 
@@ -102,6 +92,12 @@
             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" />
 

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

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

@@ -8,6 +8,7 @@ import android.content.Intent
 import android.widget.Toast
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
+import com.google.auto.service.AutoService
 import com.lagradost.cloudstream3.mvvm.normalSafeApiCall
 import com.lagradost.cloudstream3.mvvm.suspendSafeApiCall
 import com.lagradost.cloudstream3.plugins.PluginManager
@@ -36,21 +37,22 @@ import java.lang.ref.WeakReference
 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
             runBlocking {
                 suspendSafeApiCall {
-                    app.post(url, data = data)
-                    //println("Report response: $post")
+                    val post = app.post(url, data = data)
+                    println("Report response: $post")
                 }
             }
         }
@@ -63,6 +65,7 @@ class CustomReportSender : ReportSender {
     }
 }
 
+@AutoService(ReportSenderFactory::class)
 class CustomSenderFactory : ReportSenderFactory {
     override fun create(context: Context, config: CoreConfiguration): ReportSender {
         return CustomReportSender()
@@ -101,17 +104,12 @@ class ExceptionHandler(val errorFile: File, val onError: (() -> Unit)) :
 }
 
 class AcraApplication : Application() {
-
     override fun onCreate() {
         super.onCreate()
-        //NativeCrashHandler.initCrashHandler()
-        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?) {
@@ -123,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
@@ -139,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()
@@ -152,14 +148,6 @@ class AcraApplication : Application() {
                 _context = 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? {
             return context?.removeKeys(folder)
         }
@@ -215,5 +203,6 @@ class AcraApplication : Application() {
                 activity?.supportFragmentManager?.fragments?.lastOrNull()
             )
         }
+
     }
-}
+}

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

@@ -7,14 +7,8 @@ import android.content.Context
 import android.content.pm.PackageManager
 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.LayoutInflater
-import android.view.View
-import android.view.View.NO_ID
-import android.view.ViewGroup
+import android.view.*
 import android.widget.TextView
 import android.widget.Toast
 import androidx.activity.ComponentActivity
@@ -24,11 +18,8 @@ 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.mvvm.logError
@@ -36,7 +27,6 @@ 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.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
@@ -44,50 +34,14 @@ import com.lagradost.cloudstream3.utils.UIHelper.hasPIPPermission
 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 {
-
-    private var _activity: WeakReference<Activity>? = null
-    var activity
-        get() = _activity?.get()
-        private set(value) {
-            _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
@@ -102,30 +56,6 @@ object CommonActivity {
 
     var currentToast: Toast? = null
 
-    fun showToast(@StringRes message: Int, duration: Int? = null) {
-        val act = activity ?: return
-        act.runOnUiThread {
-            showToast(act, act.getString(message), duration)
-        }
-    }
-
-    fun showToast(message: String?, duration: Int? = null) {
-        val act = activity ?: return
-        act.runOnUiThread {
-            showToast(act, message, duration)
-        }
-    }
-
-    fun showToast(message: UiText?, duration: Int? = null) {
-        val act = activity ?: return
-        if (message == null) return
-        act.runOnUiThread {
-            showToast(act, message.asString(act), duration)
-        }
-    }
-
-
-    @MainThread
     fun showToast(act: Activity?, text: UiText, duration: Int) {
         if (act == null) return
         text.asStringNull(act)?.let {
@@ -208,25 +138,22 @@ 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
         //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) {
@@ -243,11 +170,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")
@@ -295,7 +222,6 @@ object CommonActivity {
                 "AmoledLight" -> R.style.AmoledModeLight
                 "Monet" -> if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S)
                     R.style.MonetMode else R.style.AppTheme
-
                 else -> R.style.AppTheme
             }
 
@@ -309,9 +235,9 @@ object CommonActivity {
                 "Maroon" -> R.style.OverlayPrimaryColorMaroon
                 "NavyBlue" -> R.style.OverlayPrimaryColorNavyBlue
                 "Grey" -> R.style.OverlayPrimaryColorGrey
-                "White" -> R.style.OverlayPrimaryColorWhite
                 "CoolBlue" -> R.style.OverlayPrimaryColorCoolBlue
                 "Brown" -> R.style.OverlayPrimaryColorBrown
+                "Blue" -> R.style.OverlayPrimaryColorBlue
                 "Purple" -> R.style.OverlayPrimaryColorPurple
                 "Green" -> R.style.OverlayPrimaryColorGreen
                 "GreenApple" -> R.style.OverlayPrimaryColorGreenApple
@@ -321,10 +247,8 @@ object CommonActivity {
                 "Pink" -> R.style.OverlayPrimaryColorPink
                 "Monet" -> if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S)
                     R.style.OverlayPrimaryColorMonet else R.style.OverlayPrimaryColorNormal
-
                 "Monet2" -> if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S)
                     R.style.OverlayPrimaryColorMonetTwo else R.style.OverlayPrimaryColorNormal
-
                 else -> R.style.OverlayPrimaryColorNormal
             }
         act.theme.applyStyle(currentTheme, true)
@@ -336,138 +260,55 @@ object CommonActivity {
         ) // THEME IS SET BEFORE VIEW IS CREATED TO APPLY THE THEME TO THE MAIN VIEW
     }
 
-    /** because we want closes find, aka when multiple have the same id, we go to parent
-    until the correct one is found */
-    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) {
-            currentLook.findViewById<View?>(id)?.let { return it }
-            currentLook = (currentLook.parent as? View) ?: break
-        }
-        return null
-    }
-    /*var currentLook: View = view
-    while (true) {
-        val tmpNext = currentLook.findViewById<View?>(nextId)
-        if (tmpNext != null) {
-            next = tmpNext
-            break
-        }
-        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) {
+    ): Int? {
+        if (view == null || depth >= 10 || act == null) {
             return null
         }
 
-        var nextId = when (direction) {
-            FocusDirection.Start -> {
-                if (view.isRtl())
-                    view.nextFocusRightId
-                else
-                    view.nextFocusLeftId
+        val nextId = when (direction) {
+            FocusDirection.Left -> {
+                view.nextFocusLeftId
             }
-
             FocusDirection.Up -> {
                 view.nextFocusUpId
             }
-
-            FocusDirection.End -> {
-                if (view.isRtl())
-                    view.nextFocusLeftId
-                else
-                    view.nextFocusRightId
+            FocusDirection.Right -> {
+                view.nextFocusRightId
             }
-
             FocusDirection.Down -> {
                 view.nextFocusDownId
             }
         }
 
-        if (nextId == NO_ID) {
-            // 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 if (nextId != -1) {
+            val next = act.findViewById<View?>(nextId)
+            //println("NAME: ${next.accessibilityClassName} | ${next?.isShown}" )
+
+            if (next?.isShown == false) {
+                getNextFocus(act, next, direction, depth + 1)
+            } else {
+                if (depth == 0) {
+                    null
+                } else {
+                    nextId
+                }
+            }
+        } else {
+            null
         }
-        return continueGetNextFocus(root, view, direction, nextId, depth)
     }
 
+    enum class FocusDirection {
+        Left,
+        Right,
+        Up,
+        Down,
+    }
 
     fun onKeyDown(act: Activity?, keyCode: Int, event: KeyEvent?) {
         //println("Keycode: $keyCode")
@@ -490,39 +331,30 @@ object CommonActivity {
             KeyEvent.KEYCODE_FORWARD, KeyEvent.KEYCODE_D, KeyEvent.KEYCODE_MEDIA_SKIP_FORWARD, KeyEvent.KEYCODE_MEDIA_FAST_FORWARD -> {
                 PlayerEventType.SeekForward
             }
-
             KeyEvent.KEYCODE_A, KeyEvent.KEYCODE_MEDIA_SKIP_BACKWARD, KeyEvent.KEYCODE_MEDIA_REWIND -> {
                 PlayerEventType.SeekBack
             }
-
             KeyEvent.KEYCODE_MEDIA_NEXT, KeyEvent.KEYCODE_BUTTON_R1, KeyEvent.KEYCODE_N -> {
                 PlayerEventType.NextEpisode
             }
-
             KeyEvent.KEYCODE_MEDIA_PREVIOUS, KeyEvent.KEYCODE_BUTTON_L1, KeyEvent.KEYCODE_B -> {
                 PlayerEventType.PrevEpisode
             }
-
             KeyEvent.KEYCODE_MEDIA_PAUSE -> {
                 PlayerEventType.Pause
             }
-
             KeyEvent.KEYCODE_MEDIA_PLAY, KeyEvent.KEYCODE_BUTTON_START -> {
                 PlayerEventType.Play
             }
-
             KeyEvent.KEYCODE_L, KeyEvent.KEYCODE_NUMPAD_7, KeyEvent.KEYCODE_7 -> {
                 PlayerEventType.Lock
             }
-
             KeyEvent.KEYCODE_H, KeyEvent.KEYCODE_MENU -> {
                 PlayerEventType.ToggleHide
             }
-
             KeyEvent.KEYCODE_M, KeyEvent.KEYCODE_VOLUME_MUTE -> {
                 PlayerEventType.ToggleMute
             }
-
             KeyEvent.KEYCODE_S, KeyEvent.KEYCODE_NUMPAD_9, KeyEvent.KEYCODE_9 -> {
                 PlayerEventType.ShowMirrors
             }
@@ -530,27 +362,21 @@ object CommonActivity {
             KeyEvent.KEYCODE_O, KeyEvent.KEYCODE_NUMPAD_8, KeyEvent.KEYCODE_8 -> {
                 PlayerEventType.SearchSubtitlesOnline
             }
-
             KeyEvent.KEYCODE_E, KeyEvent.KEYCODE_NUMPAD_3, KeyEvent.KEYCODE_3 -> {
                 PlayerEventType.ShowSpeed
             }
-
             KeyEvent.KEYCODE_R, KeyEvent.KEYCODE_NUMPAD_0, KeyEvent.KEYCODE_0 -> {
                 PlayerEventType.Resize
             }
-
             KeyEvent.KEYCODE_C, KeyEvent.KEYCODE_NUMPAD_4, KeyEvent.KEYCODE_4 -> {
                 PlayerEventType.SkipOp
             }
-
             KeyEvent.KEYCODE_V, KeyEvent.KEYCODE_NUMPAD_5, KeyEvent.KEYCODE_5 -> {
                 PlayerEventType.SkipCurrentChapter
             }
-
             KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE, KeyEvent.KEYCODE_P, KeyEvent.KEYCODE_SPACE, KeyEvent.KEYCODE_NUMPAD_ENTER, KeyEvent.KEYCODE_ENTER -> { // space is not captured due to navigation
                 PlayerEventType.PlayPauseToggle
             }
-
             else -> null
         }?.let { playerEvent ->
             playerEventListener?.invoke(playerEvent)
@@ -563,64 +389,64 @@ object CommonActivity {
         //}
     }
 
-    /** overrides focus and custom key events */
     fun dispatchKeyEvent(act: Activity?, event: KeyEvent?): Boolean? {
         if (act == null) return null
-        val currentFocus = act.currentFocus
-
         event?.keyCode?.let { keyCode ->
-            if (currentFocus == null || event.action != KeyEvent.ACTION_DOWN) return@let
-            val nextView = when (keyCode) {
-                KeyEvent.KEYCODE_DPAD_LEFT -> getNextFocus(
-                    act,
-                    currentFocus,
-                    FocusDirection.Start
-                )
+            when (event.action) {
+                KeyEvent.ACTION_DOWN -> {
+                    if (act.currentFocus != null) {
+                        val next = when (keyCode) {
+                            KeyEvent.KEYCODE_DPAD_LEFT -> getNextFocus(
+                                act,
+                                act.currentFocus,
+                                FocusDirection.Left
+                            )
+                            KeyEvent.KEYCODE_DPAD_RIGHT -> getNextFocus(
+                                act,
+                                act.currentFocus,
+                                FocusDirection.Right
+                            )
+                            KeyEvent.KEYCODE_DPAD_UP -> getNextFocus(
+                                act,
+                                act.currentFocus,
+                                FocusDirection.Up
+                            )
+                            KeyEvent.KEYCODE_DPAD_DOWN -> getNextFocus(
+                                act,
+                                act.currentFocus,
+                                FocusDirection.Down
+                            )
 
-                KeyEvent.KEYCODE_DPAD_RIGHT -> getNextFocus(
-                    act,
-                    currentFocus,
-                    FocusDirection.End
-                )
+                            else -> null
+                        }
 
-                KeyEvent.KEYCODE_DPAD_UP -> getNextFocus(
-                    act,
-                    currentFocus,
-                    FocusDirection.Up
-                )
+                        if (next != null && next != -1) {
+                            val nextView = act.findViewById<View?>(next)
+                            if (nextView != null) {
+                                nextView.requestFocus()
+                                keyEventListener?.invoke(Pair(event, true))
+                                return true
+                            }
+                        }
 
-                KeyEvent.KEYCODE_DPAD_DOWN -> getNextFocus(
-                    act,
-                    currentFocus,
-                    FocusDirection.Down
-                )
-
-                else -> null
+                        when (keyCode) {
+                            KeyEvent.KEYCODE_DPAD_CENTER -> {
+                                if (act.currentFocus is SearchView || act.currentFocus is SearchView.SearchAutoComplete) {
+                                    UIHelper.showInputMethod(act.currentFocus?.findFocus())
+                                }
+                            }
+                        }
+                    }
+                    //println("Keycode: $keyCode")
+                    //showToast(
+                    //    this,
+                    //    "Got Keycode $keyCode | ${KeyEvent.keyCodeToString(keyCode)} \n ${event?.action}",
+                    //    Toast.LENGTH_LONG
+                    //)
+                }
             }
-            // println("NEXT FOCUS : $nextView")
-            if (nextView != null) {
-                nextView.requestFocus()
-                keyEventListener?.invoke(Pair(event, true))
-                return true
-            }
-
-            if (keyCode == KeyEvent.KEYCODE_DPAD_CENTER &&
-                (act.currentFocus is SearchView || act.currentFocus is SearchView.SearchAutoComplete)
-            ) {
-                UIHelper.showInputMethod(act.currentFocus?.findFocus())
-            }
-
-            //println("Keycode: $keyCode")
-            //showToast(
-            //    this,
-            //    "Got Keycode $keyCode | ${KeyEvent.keyCodeToString(keyCode)} \n ${event?.action}",
-            //    Toast.LENGTH_LONG
-            //)
-
         }
 
-        // if someone else want to override the focus then don't handle the event as it is already
-        // consumed. used in video player
         if (keyEventListener?.invoke(Pair(event, false)) == true) {
             return true
         }

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

@@ -50,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
 
         /**

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

@@ -9,32 +9,27 @@ import androidx.preference.PreferenceManager
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.fasterxml.jackson.databind.DeserializationFeature
 import com.fasterxml.jackson.databind.json.JsonMapper
-import com.fasterxml.jackson.module.kotlin.kotlinModule
+import com.fasterxml.jackson.module.kotlin.KotlinModule
 import com.lagradost.cloudstream3.mvvm.logError
-import com.lagradost.cloudstream3.mvvm.normalSafeApiCall
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.aniListApi
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.malApi
-import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.simklApi
 import com.lagradost.cloudstream3.syncproviders.SyncIdName
-import com.lagradost.cloudstream3.syncproviders.providers.SimklApi
 import com.lagradost.cloudstream3.ui.player.SubtitleData
 import com.lagradost.cloudstream3.utils.*
 import com.lagradost.cloudstream3.utils.AppUtils.toJson
 import com.lagradost.cloudstream3.utils.Coroutines.mainWork
 import com.lagradost.cloudstream3.utils.Coroutines.threadSafeListOf
-import com.lagradost.nicehttp.RequestBodyTypes
 import okhttp3.Interceptor
-import okhttp3.MediaType.Companion.toMediaTypeOrNull
-import okhttp3.RequestBody.Companion.toRequestBody
+import org.mozilla.javascript.Scriptable
 import java.text.SimpleDateFormat
 import java.util.*
 import kotlin.math.absoluteValue
 
 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; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36"
 
 //val baseHeader = mapOf("User-Agent" to USER_AGENT)
-val mapper = JsonMapper.builder().addModule(kotlinModule())
+val mapper = JsonMapper.builder().addModule(KotlinModule())
     .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false).build()!!
 
 /**
@@ -55,10 +50,8 @@ object APIHolder {
     val allProviders = threadSafeListOf<MainAPI>()
 
     fun initAll() {
-        synchronized(allProviders) {
-            for (api in allProviders) {
-                api.init()
-            }
+        for (api in allProviders) {
+            api.init()
         }
         apiMap = null
     }
@@ -71,35 +64,27 @@ object APIHolder {
     var apiMap: Map<String, Int>? = null
 
     fun addPluginMapping(plugin: MainAPI) {
-        synchronized(apis) {
-            apis = apis + plugin
-        }
+        apis = apis + plugin
         initMap(true)
     }
 
     fun removePluginMapping(plugin: MainAPI) {
-        synchronized(apis) {
-            apis = apis.filter { it != plugin }
-        }
+        apis = apis.filter { it != plugin }
         initMap(true)
     }
 
     private fun initMap(forcedUpdate: Boolean = false) {
-        synchronized(apis) {
-            if (apiMap == null || forcedUpdate)
-                apiMap = apis.mapIndexed { index, api -> api.name to index }.toMap()
-        }
+        if (apiMap == null || forcedUpdate)
+            apiMap = apis.mapIndexed { index, api -> api.name to index }.toMap()
     }
 
     fun getApiFromNameNull(apiName: String?): MainAPI? {
         if (apiName == null) return null
         synchronized(allProviders) {
             initMap()
-            synchronized(apis) {
-                return apiMap?.get(apiName)?.let { apis.getOrNull(it) }
-                // Leave the ?. null check, it can crash regardless
-                    ?: allProviders.firstOrNull { it.name == apiName }
-            }
+            return apiMap?.get(apiName)?.let { apis.getOrNull(it) }
+            // Leave the ?. null check, it can crash regardless
+                ?: allProviders.firstOrNull { it.name == apiName }
         }
     }
 
@@ -179,17 +164,10 @@ object APIHolder {
 
     private var trackerCache: HashMap<String, AniSearch> = hashMapOf()
 
-    /** backwards compatibility, use getTracker4 instead */
-    suspend fun getTracker(
-        titles: List<String>,
-        types: Set<TrackerType>?,
-        year: Int?,
-    ): Tracker? = getTracker(titles, types, year, false)
-
     /**
      * Get anime tracker information based on title, year and type.
      * Both titles are attempted to be matched with both Romaji and English title.
-     * Uses the anilist api.
+     * Uses the consumet api.
      *
      * @param titles uses first index to search, but if you have multiple titles and want extra guarantee to match you can also have that
      * @param types Optional parameter to narrow down the scope to Movies, TV, etc. See TrackerType.getTypes()
@@ -198,8 +176,7 @@ object APIHolder {
     suspend fun getTracker(
         titles: List<String>,
         types: Set<TrackerType>?,
-        year: Int?,
-        lessAccurate: Boolean
+        year: Int?
     ): Tracker? {
         return try {
             require(titles.isNotEmpty()) { "titles must no be empty when calling getTracker" }
@@ -207,70 +184,30 @@ object APIHolder {
             val mainTitle = titles[0]
             val search =
                 trackerCache[mainTitle]
-                    ?: searchAnilist(mainTitle)?.also {
-                        trackerCache[mainTitle] = it
-                    } ?: return null
+                    ?: app.get("https://api.consumet.org/meta/anilist/$mainTitle")
+                        .parsedSafe<AniSearch>()?.also {
+                            trackerCache[mainTitle] = it
+                        } ?: return null
 
-            val res = search.data?.page?.media?.find { media ->
-                val matchingYears = year == null || media.seasonYear == year
+            val res = search.results?.find { media ->
+                val matchingYears = year == null || media.releaseDate == year
                 val matchingTitles = media.title?.let { title ->
                     titles.any { userTitle ->
                         title.isMatchingTitles(userTitle)
                     }
                 } ?: false
 
-                val matchingTypes = types?.any { it.name.equals(media.format, true) } == true
-                if(lessAccurate) matchingTitles || matchingTypes && matchingYears else matchingTitles && matchingTypes && matchingYears
+                val matchingTypes = types?.any { it.name.equals(media.type, true) } == true
+                matchingTitles && matchingTypes && matchingYears
             } ?: return null
 
-            Tracker(res.idMal, res.id.toString(), res.coverImage?.extraLarge ?: res.coverImage?.large, res.bannerImage)
+            Tracker(res.malId, res.aniId, res.image, res.cover)
         } catch (t: Throwable) {
             logError(t)
             null
         }
     }
 
-    private suspend fun searchAnilist(
-        title: String?,
-    ): AniSearch? {
-        val query = """
-        query (
-          ${'$'}page: Int = 1
-          ${'$'}search: String
-          ${'$'}sort: [MediaSort] = [POPULARITY_DESC, SCORE_DESC]
-          ${'$'}type: MediaType
-        ) {
-          Page(page: ${'$'}page, perPage: 20) {
-            media(
-              search: ${'$'}search
-              sort: ${'$'}sort
-              type: ${'$'}type
-            ) {
-              id
-              idMal
-              title { romaji english }
-              coverImage { extraLarge large }
-              bannerImage
-              seasonYear
-              format
-            }
-          }
-        }
-    """.trimIndent().trim()
-
-        val data = mapOf(
-            "query" to query,
-            "variables" to mapOf(
-                "search" to title,
-                "sort" to "SEARCH_MATCH",
-                "type" to "ANIME",
-            )
-        ).toJson().toRequestBody(RequestBodyTypes.JSON.toMediaTypeOrNull())
-
-        return app.post("https://graphql.anilist.co", requestBody = data)
-            .parsedSafe()
-    }
-
 
     fun Context.getApiSettings(): HashSet<String> {
         //val settingsManager = PreferenceManager.getDefaultSharedPreferences(this)
@@ -278,7 +215,7 @@ object APIHolder {
         val hashSet = HashSet<String>()
         val activeLangs = getApiProviderLangSettings()
         val hasUniversal = activeLangs.contains(AllLanguagesName)
-        hashSet.addAll(synchronized(apis) { apis.filter { hasUniversal || activeLangs.contains(it.lang) } }
+        hashSet.addAll(apis.filter { hasUniversal || activeLangs.contains(it.lang) }
             .map { it.name })
 
         /*val set = settingsManager.getStringSet(
@@ -377,9 +314,8 @@ object APIHolder {
         } ?: default
         val langs = this.getApiProviderLangSettings()
         val hasUniversal = langs.contains(AllLanguagesName)
-        val allApis = synchronized(apis) {
-            apis.filter { api -> (hasUniversal || langs.contains(api.lang)) && (api.hasMainPage || !hasHomePageIsRequired) }
-        }
+        val allApis = apis.filter { hasUniversal || langs.contains(it.lang) }
+            .filter { api -> api.hasMainPage || !hasHomePageIsRequired }
         return if (currentPrefMedia.isEmpty()) {
             allApis
         } else {
@@ -800,7 +736,6 @@ fun fixTitle(str: String): String {
             .replaceFirstChar { char -> if (char.isLowerCase()) char.titlecase(Locale.getDefault()) else it }
     }
 }
-
 /**
  * Get rhino context in a safe way as it needs to be initialized on the main thread.
  * Make sure you get the scope using: val scope: Scriptable = rhino.initSafeStandardObjects()
@@ -866,19 +801,6 @@ enum class TvType(value: Int?) {
     Others(12)
 }
 
-public enum class AutoDownloadMode(val value: Int) {
-    Disable(0),
-    FilterByLang(1),
-    All(2),
-    NsfwOnly(3)
-    ;
-
-    companion object {
-        infix fun getEnum(value: Int): AutoDownloadMode? =
-            AutoDownloadMode.values().firstOrNull { it.value == value }
-    }
-}
-
 // IN CASE OF FUTURE ANIME MOVIE OR SMTH
 fun TvType.isMovieType(): Boolean {
     return this == TvType.Movie || this == TvType.AnimeMovie || this == TvType.Torrent || this == TvType.Live
@@ -1193,16 +1115,14 @@ interface LoadResponse {
     var syncData: MutableMap<String, String>
     var posterHeaders: Map<String, String>?
     var backgroundPosterUrl: String?
-    var contentRating: String?
 
     companion object {
         private val malIdPrefix = malApi.idPrefix
         private val aniListIdPrefix = aniListApi.idPrefix
-        private val simklIdPrefix = simklApi.idPrefix
         var isTrailersEnabled = true
 
         fun LoadResponse.isMovie(): Boolean {
-            return this.type.isMovieType() || this is MovieLoadResponse
+            return this.type.isMovieType()
         }
 
         @JvmName("addActorNames")
@@ -1220,20 +1140,6 @@ interface LoadResponse {
             this.actors = actors?.map { (actor, role) -> ActorData(actor, role = role) }
         }
 
-        /**
-         * Internal helper function to add simkl ids from other databases.
-         */
-        private fun LoadResponse.addSimklId(
-            database: SimklApi.Companion.SyncServices,
-            id: String?
-        ) {
-            normalSafeApiCall {
-                this.syncData[simklIdPrefix] =
-                    SimklApi.addIdToString(this.syncData[simklIdPrefix], database, id.toString())
-                        ?: return@normalSafeApiCall
-            }
-        }
-
         @JvmName("addActorsOnly")
         fun LoadResponse.addActors(actors: List<Actor>?) {
             this.actors = actors?.map { actor -> ActorData(actor) }
@@ -1247,30 +1153,12 @@ interface LoadResponse {
             return this.syncData[aniListIdPrefix]
         }
 
-        fun LoadResponse.getImdbId(): String? {
-            return normalSafeApiCall {
-                SimklApi.readIdFromString(this.syncData[simklIdPrefix])?.get(SimklApi.Companion.SyncServices.Imdb)
-            }
-        }
-
-        fun LoadResponse.getTMDbId(): String? {
-            return normalSafeApiCall {
-                SimklApi.readIdFromString(this.syncData[simklIdPrefix])?.get(SimklApi.Companion.SyncServices.Tmdb)
-            }
-        }
-
         fun LoadResponse.addMalId(id: Int?) {
             this.syncData[malIdPrefix] = (id ?: return).toString()
-            this.addSimklId(SimklApi.Companion.SyncServices.Mal, id.toString())
         }
 
         fun LoadResponse.addAniListId(id: Int?) {
             this.syncData[aniListIdPrefix] = (id ?: return).toString()
-            this.addSimklId(SimklApi.Companion.SyncServices.AniList, id.toString())
-        }
-
-        fun LoadResponse.addSimklId(id: Int?) {
-            this.addSimklId(SimklApi.Companion.SyncServices.Simkl, id.toString())
         }
 
         fun LoadResponse.addImdbUrl(url: String?) {
@@ -1352,7 +1240,6 @@ interface LoadResponse {
 
         fun LoadResponse.addImdbId(id: String?) {
             // TODO add imdb sync
-            this.addSimklId(SimklApi.Companion.SyncServices.Imdb, id)
         }
 
         fun LoadResponse.addTrackId(id: String?) {
@@ -1365,7 +1252,6 @@ interface LoadResponse {
 
         fun LoadResponse.addTMDbId(id: String?) {
             // TODO add TMDb sync
-            this.addSimklId(SimklApi.Companion.SyncServices.Tmdb, id)
         }
 
         fun LoadResponse.addRating(text: String?) {
@@ -1466,15 +1352,6 @@ interface EpisodeResponse {
     var nextAiring: NextAiring?
     var seasonNames: List<SeasonData>?
     fun getLatestEpisodes(): Map<DubStatus, Int?>
-
-    /** Count all episodes in all previous seasons up until this episode to get a total count.
-     * Example:
-     *      Season 1: 10 episodes.
-     *      Season 2: 6 episodes.
-     *
-     * getTotalEpisodeIndex(episode = 3, season = 2) -> 10 + 3 = 13
-     * */
-    fun getTotalEpisodeIndex(episode: Int, season: Int): Int
 }
 
 @JvmName("addSeasonNamesString")
@@ -1512,37 +1389,7 @@ data class TorrentLoadResponse(
     override var syncData: MutableMap<String, String> = mutableMapOf(),
     override var posterHeaders: Map<String, String>? = null,
     override var backgroundPosterUrl: String? = null,
-    override var contentRating: String? = null,
-) : LoadResponse {
-    /**
-     * Secondary constructor for backwards compatibility without contentRating.
-     * Remove this constructor after there is a new stable release and extensions are updated to support contentRating.
-     */
-    constructor(
-        name: String,
-        url: String,
-        apiName: String,
-        magnet: String?,
-        torrent: String?,
-        plot: String?,
-        type: TvType = TvType.Torrent,
-        posterUrl: String? = null,
-        year: Int? = null,
-        rating: Int? = null,
-        tags: List<String>? = null,
-        duration: Int? = null,
-        trailers: MutableList<TrailerData> = mutableListOf(),
-        recommendations: List<SearchResponse>? = null,
-        actors: List<ActorData>? = null,
-        comingSoon: Boolean = false,
-        syncData: MutableMap<String, String> = mutableMapOf(),
-        posterHeaders: Map<String, String>? = null,
-        backgroundPosterUrl: String? = null,
-    ) : this(
-        name, url, apiName, magnet, torrent, plot, type, posterUrl, year, rating, tags, duration, trailers,
-        recommendations, actors, comingSoon, syncData, posterHeaders, backgroundPosterUrl, null
-    )
-}
+) : LoadResponse
 
 data class AnimeLoadResponse(
     var engName: String? = null,
@@ -1573,7 +1420,6 @@ data class AnimeLoadResponse(
     override var nextAiring: NextAiring? = null,
     override var seasonNames: List<SeasonData>? = null,
     override var backgroundPosterUrl: String? = null,
-    override var contentRating: String? = null,
 ) : LoadResponse, EpisodeResponse {
     override fun getLatestEpisodes(): Map<DubStatus, Int?> {
         return episodes.map { (status, episodes) ->
@@ -1585,54 +1431,6 @@ data class AnimeLoadResponse(
                 .takeUnless { it == Int.MIN_VALUE }
         }.toMap()
     }
-
-    override fun getTotalEpisodeIndex(episode: Int, season: Int): Int {
-        val displayMap = this.seasonNames?.associate { it.season to it.displaySeason } ?: emptyMap()
-
-        return this.episodes.maxOf { (_, episodes) ->
-            episodes.count { episodeData ->
-                // Prioritize display season as actual season may be something random to fit multiple seasons into one.
-                val episodeSeason = displayMap[episodeData.season] ?: episodeData.season ?: Int.MIN_VALUE
-                // Count all episodes from season 1 to below the current season.
-                episodeSeason in 1..<season
-            }
-        } + episode
-    }
-
-    /**
-     * Secondary constructor for backwards compatibility without contentRating.
-     * Remove this constructor after there is a new stable release and extensions are updated to support contentRating.
-     */
-    constructor(
-        engName: String? = null,
-        japName: String? = null,
-        name: String,
-        url: String,
-        apiName: String,
-        type: TvType,
-        posterUrl: String? = null,
-        year: Int? = null,
-        episodes: MutableMap<DubStatus, List<Episode>> = mutableMapOf(),
-        showStatus: ShowStatus? = null,
-        plot: String? = null,
-        tags: List<String>? = null,
-        synonyms: List<String>? = null,
-        rating: Int? = null,
-        duration: Int? = null,
-        trailers: MutableList<TrailerData> = mutableListOf(),
-        recommendations: List<SearchResponse>? = null,
-        actors: List<ActorData>? = null,
-        comingSoon: Boolean = false,
-        syncData: MutableMap<String, String> = mutableMapOf(),
-        posterHeaders: Map<String, String>? = null,
-        nextAiring: NextAiring? = null,
-        seasonNames: List<SeasonData>? = null,
-        backgroundPosterUrl: String? = null,
-    ) : this(
-        engName, japName, name, url, apiName, type, posterUrl, year, episodes, showStatus, plot, tags,
-        synonyms, rating, duration, trailers, recommendations, actors, comingSoon, syncData, posterHeaders,
-        nextAiring, seasonNames, backgroundPosterUrl, null
-    )
 }
 
 /**
@@ -1684,36 +1482,7 @@ data class LiveStreamLoadResponse(
     override var syncData: MutableMap<String, String> = mutableMapOf(),
     override var posterHeaders: Map<String, String>? = null,
     override var backgroundPosterUrl: String? = null,
-    override var contentRating: String? = null,
-) : LoadResponse {
-    /**
-     * Secondary constructor for backwards compatibility without contentRating.
-     * Remove this constructor after there is a new stable release and extensions are updated to support contentRating.
-     */
-    constructor(
-        name: String,
-        url: String,
-        apiName: String,
-        dataUrl: String,
-        posterUrl: String? = null,
-        year: Int? = null,
-        plot: String? = null,
-        type: TvType = TvType.Live,
-        rating: Int? = null,
-        tags: List<String>? = null,
-        duration: Int? = null,
-        trailers: MutableList<TrailerData> = mutableListOf(),
-        recommendations: List<SearchResponse>? = null,
-        actors: List<ActorData>? = null,
-        comingSoon: Boolean = false,
-        syncData: MutableMap<String, String> = mutableMapOf(),
-        posterHeaders: Map<String, String>? = null,
-        backgroundPosterUrl: String? = null,
-    ) : this(
-        name, url, apiName, dataUrl, posterUrl, year, plot, type, rating, tags, duration, trailers,
-        recommendations, actors, comingSoon, syncData, posterHeaders, backgroundPosterUrl, null
-    )
-}
+) : LoadResponse
 
 data class MovieLoadResponse(
     override var name: String,
@@ -1736,36 +1505,7 @@ data class MovieLoadResponse(
     override var syncData: MutableMap<String, String> = mutableMapOf(),
     override var posterHeaders: Map<String, String>? = null,
     override var backgroundPosterUrl: String? = null,
-    override var contentRating: String? = null,
-) : LoadResponse {
-    /**
-     * Secondary constructor for backwards compatibility without contentRating.
-     * Remove this constructor after there is a new stable release and extensions are updated to support contentRating.
-     */
-    constructor(
-        name: String,
-        url: String,
-        apiName: String,
-        type: TvType,
-        dataUrl: String,
-        posterUrl: String? = null,
-        year: Int? = null,
-        plot: String? = null,
-        rating: Int? = null,
-        tags: List<String>? = null,
-        duration: Int? = null,
-        trailers: MutableList<TrailerData> = mutableListOf(),
-        recommendations: List<SearchResponse>? = null,
-        actors: List<ActorData>? = null,
-        comingSoon: Boolean = false,
-        syncData: MutableMap<String, String> = mutableMapOf(),
-        posterHeaders: Map<String, String>? = null,
-        backgroundPosterUrl: String? = null,
-    ) : this(
-        name, url, apiName, type, dataUrl, posterUrl, year, plot, rating, tags, duration, trailers,
-        recommendations, actors, comingSoon, syncData, posterHeaders, backgroundPosterUrl,null
-    )
-}
+) : LoadResponse
 
 suspend fun <T> MainAPI.newMovieLoadResponse(
     name: String,
@@ -1889,7 +1629,6 @@ data class TvSeriesLoadResponse(
     override var nextAiring: NextAiring? = null,
     override var seasonNames: List<SeasonData>? = null,
     override var backgroundPosterUrl: String? = null,
-    override var contentRating: String? = null,
 ) : LoadResponse, EpisodeResponse {
     override fun getLatestEpisodes(): Map<DubStatus, Int?> {
         val maxSeason =
@@ -1900,49 +1639,6 @@ data class TvSeriesLoadResponse(
             .takeUnless { it == Int.MIN_VALUE }
         return mapOf(DubStatus.None to max)
     }
-
-    override fun getTotalEpisodeIndex(episode: Int, season: Int): Int {
-        val displayMap = this.seasonNames?.associate { it.season to it.displaySeason } ?: emptyMap()
-
-        return episodes.count { episodeData ->
-            // Prioritize display season as actual season may be something random to fit multiple seasons into one.
-            val episodeSeason = displayMap[episodeData.season] ?: episodeData.season ?: Int.MIN_VALUE
-            // Count all episodes from season 1 to below the current season.
-            episodeSeason in 1..<season
-        } + episode
-    }
-
-    /**
-     * Secondary constructor for backwards compatibility without contentRating.
-     * Remove this constructor after there is a new stable release and extensions are updated to support contentRating.
-     */
-    constructor(
-        name: String,
-        url: String,
-        apiName: String,
-        type: TvType,
-        episodes: List<Episode>,
-        posterUrl: String? = null,
-        year: Int? = null,
-        plot: String? = null,
-        showStatus: ShowStatus? = null,
-        rating: Int? = null,
-        tags: List<String>? = null,
-        duration: Int? = null,
-        trailers: MutableList<TrailerData> = mutableListOf(),
-        recommendations: List<SearchResponse>? = null,
-        actors: List<ActorData>? = null,
-        comingSoon: Boolean = false,
-        syncData: MutableMap<String, String> = mutableMapOf(),
-        posterHeaders: Map<String, String>? = null,
-        nextAiring: NextAiring? = null,
-        seasonNames: List<SeasonData>? = null,
-        backgroundPosterUrl: String? = null,
-    ) : this(
-        name, url, apiName, type, episodes, posterUrl, year, plot, showStatus, rating, tags, duration,
-        trailers, recommendations, actors, comingSoon, syncData, posterHeaders, nextAiring, seasonNames,
-        backgroundPosterUrl, null
-    )
 }
 
 suspend fun MainAPI.newTvSeriesLoadResponse(
@@ -1983,42 +1679,30 @@ data class Tracker(
     val cover: String? = null,
 )
 
-data class AniSearch(
-    @JsonProperty("data") var data: Data? = Data()
+data class Title(
+    @JsonProperty("romaji") val romaji: String? = null,
+    @JsonProperty("english") val english: String? = null,
 ) {
-    data class Data(
-        @JsonProperty("Page") var page: Page? = Page()
-    ) {
-        data class Page(
-            @JsonProperty("media") var media: ArrayList<Media> = arrayListOf()
-        ) {
-            data class Media(
-                @JsonProperty("title") var title: Title? = null,
-                @JsonProperty("id") var id: Int? = null,
-                @JsonProperty("idMal") var idMal: Int? = null,
-                @JsonProperty("seasonYear") var seasonYear: Int? = null,
-                @JsonProperty("format") var format: String? = null,
-                @JsonProperty("coverImage") var coverImage: CoverImage? = null,
-                @JsonProperty("bannerImage") var bannerImage: String? = null,
-            ) {
-                data class CoverImage(
-                    @JsonProperty("extraLarge") var extraLarge: String? = null,
-                    @JsonProperty("large") var large: String? = null,
-                )
-                data class Title(
-                    @JsonProperty("romaji") var romaji: String? = null,
-                    @JsonProperty("english") var english: String? = null,
-                ) {
-                    fun isMatchingTitles(title: String?): Boolean {
-                        if (title == null) return false
-                        return english.equals(title, true) || romaji.equals(title, true)
-                    }
-                }
-            }
-        }
+    fun isMatchingTitles(title: String?): Boolean {
+        if (title == null) return false
+        return english.equals(title, true) || romaji.equals(title, true)
     }
 }
 
+data class Results(
+    @JsonProperty("id") val aniId: String? = null,
+    @JsonProperty("malId") val malId: Int? = null,
+    @JsonProperty("title") val title: Title? = null,
+    @JsonProperty("releaseDate") val releaseDate: Int? = null,
+    @JsonProperty("type") val type: String? = null,
+    @JsonProperty("image") val image: String? = null,
+    @JsonProperty("cover") val cover: String? = null,
+)
+
+data class AniSearch(
+    @JsonProperty("results") val results: ArrayList<Results>? = arrayListOf()
+)
+
 /**
  * used for the getTracker() method
  **/

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

@@ -1,53 +0,0 @@
-package com.lagradost.cloudstream3
-
-import com.lagradost.cloudstream3.MainActivity.Companion.lastError
-import com.lagradost.cloudstream3.mvvm.logError
-import com.lagradost.cloudstream3.plugins.PluginManager.checkSafeModeFile
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
-
-object NativeCrashHandler {
-    // external fun triggerNativeCrash()
-    /*private external fun initNativeCrashHandler()
-    private external fun getSignalStatus(): Int
-
-    private fun initSignalPolling() = CoroutineScope(Dispatchers.IO).launch {
-
-        //launch {
-        //    delay(10000)
-        //    triggerNativeCrash()
-        //}
-
-        while (true) {
-            delay(10_000)
-            val signal = getSignalStatus()
-            // Signal is initialized to zero
-            if (signal == 0) continue
-
-            // Do not crash in safe mode!
-            if (lastError != null) continue
-            if (checkSafeModeFile()) continue
-
-            AcraApplication.exceptionHandler?.uncaughtException(
-                Thread.currentThread(),
-                RuntimeException("Native crash with code: $signal. Try uninstalling extensions.\n")
-            )
-        }
-    }
-
-    fun initCrashHandler() {
-        try {
-            System.loadLibrary("native-lib")
-            initNativeCrashHandler()
-        } catch (t: Throwable) {
-            // Make debug crash.
-            if (BuildConfig.DEBUG) throw t
-            logError(t)
-            return
-        }
-
-        initSignalPolling()
-    }*/
-}

app/src/main/java/com/lagradost/cloudstream3/extractors/Acefile.kt

@@ -1,7 +1,7 @@
 package com.lagradost.cloudstream3.extractors
 
-import com.lagradost.cloudstream3.SubtitleFile
 import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.base64Decode
 import com.lagradost.cloudstream3.utils.*
 
 open class Acefile : ExtractorApi() {
@@ -9,35 +9,31 @@ open class Acefile : ExtractorApi() {
     override val mainUrl = "https://acefile.co"
     override val requiresReferer = false
 
-    override suspend fun getUrl(
-        url: String,
-        referer: String?,
-        subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit
-    ) {
-        val id = "/(?:d|download|player|f|file)/(\\w+)".toRegex().find(url)?.groupValues?.get(1)
-        val script = getAndUnpack(app.get("$mainUrl/player/${id ?: return}").text)
-        val service = """service\s*=\s*['"]([^'"]+)""".toRegex().find(script)?.groupValues?.get(1)
-        val serverUrl = """['"](\S+check&id\S+?)['"]""".toRegex().find(script)?.groupValues?.get(1)
-            ?.replace("\"+service+\"", service ?: return)
-
-        val video = app.get(serverUrl ?: return, referer = "$mainUrl/").parsedSafe<Source>()?.data
-
-        callback.invoke(
-            ExtractorLink(
-                this.name,
-                this.name,
-                video ?: return,
-                "",
-                Qualities.Unknown.value,
-                INFER_TYPE
-            )
-        )
-
+    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
     }
 
-    data class Source(
-        val data: String? = null,
-    )
-
 }

app/src/main/java/com/lagradost/cloudstream3/extractors/AsianLoad.kt

@@ -9,7 +9,7 @@ import java.net.URI
 
 open class AsianLoad : ExtractorApi() {
     override var name = "AsianLoad"
-    override var mainUrl = "https://asianhdplay.pro"
+    override var mainUrl = "https://asianembed.io"
     override val requiresReferer = true
 
     private val sourceRegex = Regex("""sources:[\W\w]*?file:\s*?["'](.*?)["']""")
@@ -43,4 +43,4 @@ open class AsianLoad : ExtractorApi() {
             return extractedLinksList
         }
     }
-}
+}

app/src/main/java/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() {

app/src/main/java/com/lagradost/cloudstream3/extractors/Chillx.kt

@@ -2,17 +2,15 @@ package com.lagradost.cloudstream3.extractors
 
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.cloudstream3.*
-import com.lagradost.cloudstream3.extractors.helper.*
-import com.lagradost.cloudstream3.extractors.helper.AesHelper.cryptoAESHandler
 import com.lagradost.cloudstream3.utils.AppUtils
 import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
-import com.lagradost.cloudstream3.utils.M3u8Helper
-
-class Moviesapi : Chillx() {
-    override val name = "Moviesapi"
-    override val mainUrl = "https://w1.moviesapi.club"
-}
+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 Bestx : Chillx() {
     override val name = "Bestx"
@@ -23,12 +21,14 @@ 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
-    private var key: String? = null
+
+    companion object {
+        private const val KEY = "4VqE3#N7zt&HEP^a"
+    }
 
     override suspend fun getUrl(
         url: String,
@@ -36,36 +36,18 @@ open class Chillx : ExtractorApi() {
         subtitleCallback: (SubtitleFile) -> Unit,
         callback: (ExtractorLink) -> Unit
     ) {
-        val master = Regex("\\s*=\\s*'([^']+)").find(
+        val master = Regex("MasterJS\\s*=\\s*'([^']+)").find(
             app.get(
                 url,
-                referer = referer ?: "",
-                headers = mapOf(
-                    "Accept" to "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,*/*;q=0.8",
-                    "Accept-Language" to "en-US,en;q=0.5",
-                )
+                referer = referer
             ).text
         )?.groupValues?.get(1)
-        val decrypt = cryptoAESHandler(master ?: return, getKey().toByteArray(), false)?.replace("\\", "") ?: throw ErrorLoadingException("failed to decrypt")
+        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 source = Regex("""sources:\s*\[\{"file":"([^"]+)""").find(decrypt)?.groupValues?.get(1)
+        val tracks = Regex("""tracks:\s*\[(.+)]""").find(decrypt)?.groupValues?.get(1)
 
-        val subtitles = Regex("""subtitle"?:\s*"([^"]+)""").find(decrypt)?.groupValues?.get(1)
-        val subtitlePattern = """\[(.*?)\](https?://[^\s,]+)""".toRegex()
-        val matches = subtitlePattern.findAll(subtitles ?: "")
-        val languageUrlPairs = matches.map { matchResult ->
-            val (language, url) = matchResult.destructured
-            decodeUnicodeEscape(language) to url
-        }.toList()
-
-        languageUrlPairs.forEach{ (name, file) ->
-            subtitleCallback.invoke(
-                SubtitleFile(
-                    name,
-                    file
-                )
-            )
-        }
         // required
         val headers = mapOf(
             "Accept" to "*/*",
@@ -76,27 +58,75 @@ open class Chillx : ExtractorApi() {
             "Origin" to mainUrl,
         )
 
-        M3u8Helper.generateM3u8(
-            name,
-            source ?: return,
-            "$mainUrl/",
-            headers = headers
-        ).forEach(callback)
+        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 decodeUnicodeEscape(input: String): String {
-        val regex = Regex("u([0-9a-fA-F]{4})")
-        return regex.replace(input) {
-            it.groupValues[1].toInt(16).toChar().toString()
+
+    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()))
         }
     }
-    
-    suspend fun getKey() = key ?: fetchKey().also { key = it }
 
-    private suspend fun fetchKey(): String {
-        return app.get("https://raw.githubusercontent.com/Sofie99/Resources/main/chillix_key.json").parsed()
+    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,

app/src/main/java/com/lagradost/cloudstream3/extractors/ContentXExtractor.kt

@@ -1,69 +0,0 @@
-// ! Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
-
-package com.lagradost.cloudstream3.extractors
-
-import android.util.Log
-import com.lagradost.cloudstream3.*
-import com.lagradost.cloudstream3.utils.*
-
-open class ContentX : ExtractorApi() {
-    override val name            = "ContentX"
-    override val mainUrl         = "https://contentx.me"
-    override val requiresReferer = true
-
-    override suspend fun getUrl(url: String, referer: String?, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
-        val ext_ref   = referer ?: ""
-        Log.d("Kekik_${this.name}", "url » ${url}")
-
-        val i_source  = app.get(url, referer=ext_ref).text
-        val i_extract = Regex("""window\.openPlayer\('([^']+)'""").find(i_source)!!.groups[1]?.value ?: throw ErrorLoadingException("i_extract is null")
-
-		val sub_urls = mutableSetOf<String>()
-        Regex("""\"file\":\"([^\"]+)\",\"label\":\"([^\"]+)\"""").findAll(i_source).forEach {
-            val (sub_url, sub_lang) = it.destructured
-
-			if (sub_url in sub_urls) { return@forEach }
- 			sub_urls.add(sub_url)
-
-            subtitleCallback.invoke(
-                SubtitleFile(
-                    lang = sub_lang.replace("\\u0131", "ı").replace("\\u0130", "İ").replace("\\u00fc", "ü").replace("\\u00e7", "ç"),
-                    url  = fixUrl(sub_url.replace("\\", ""))
-                )
-            )
-        }
-
-        val vid_source  = app.get("${mainUrl}/source2.php?v=${i_extract}", referer=ext_ref).text
-        val vid_extract = Regex("""file\":\"([^\"]+)""").find(vid_source)!!.groups[1]?.value ?: throw ErrorLoadingException("vid_extract is null")
-        val m3u_link    = vid_extract.replace("\\", "")
-
-        callback.invoke(
-            ExtractorLink(
-                source  = this.name,
-                name    = this.name,
-                url     = m3u_link,
-                referer = url,
-                quality = Qualities.Unknown.value,
-                isM3u8  = true
-            )
-        )
-
-        val i_dublaj = Regex(""",\"([^']+)\",\"Türkçe""").find(i_source)!!.groups[1]?.value
-        if (i_dublaj != null) {
-            val dublaj_source  = app.get("${mainUrl}/source2.php?v=${i_dublaj}", referer=ext_ref).text
-            val dublaj_extract = Regex("""file\":\"([^\"]+)""").find(dublaj_source)!!.groups[1]?.value ?: throw ErrorLoadingException("dublaj_extract is null")
-            val dublaj_link    = dublaj_extract.replace("\\", "")
-
-            callback.invoke(
-                ExtractorLink(
-                    source  = "${this.name} Türkçe Dublaj",
-                    name    = "${this.name} Türkçe Dublaj",
-                    url     = dublaj_link,
-                    referer = url,
-                    quality = Qualities.Unknown.value,
-                    isM3u8  = true
-                )
-            )
-        }
-    }
-}

app/src/main/java/com/lagradost/cloudstream3/extractors/Dailymotion.kt

@@ -7,6 +7,7 @@ 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
 
 open class Dailymotion : ExtractorApi() {
@@ -26,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 = "$mainUrl/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 {
@@ -78,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(

app/src/main/java/com/lagradost/cloudstream3/extractors/DoodExtractor.kt

@@ -7,10 +7,6 @@ import com.lagradost.cloudstream3.utils.Qualities
 import com.lagradost.cloudstream3.utils.getQualityFromName
 import kotlinx.coroutines.delay
 
-class Dooood : DoodLaExtractor() {
-    override var mainUrl = "https://dooood.com"
-}
-
 class DoodWfExtractor : DoodLaExtractor() {
     override var mainUrl = "https://dood.wf"
 }

app/src/main/java/com/lagradost/cloudstream3/extractors/EmturbovidExtractor.kt

@@ -1,39 +0,0 @@
-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
-
-open class EmturbovidExtractor : ExtractorApi() {
-    override var name = "Emturbovid"
-    override var mainUrl = "https://emturbovid.com"
-    override val requiresReferer = false
-
-    override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink>? {
-        val response = app.get(
-            url, referer = referer ?: "$mainUrl/"
-        )
-        val playerScript =
-            response.document.selectXpath("//script[contains(text(),'var urlPlay')]")
-                .html()
-
-        val sources = mutableListOf<ExtractorLink>()
-        if (playerScript.isNotBlank()) {
-            val m3u8Url =
-                playerScript.substringAfter("var urlPlay = '").substringBefore("'")
-
-            sources.add(
-                ExtractorLink(
-                    source = name,
-                    name = name,
-                    url = m3u8Url,
-                    referer = "$mainUrl/",
-                    quality = Qualities.Unknown.value,
-                    isM3u8 = true
-                )
-            )
-        }
-        return sources
-    }
-}

app/src/main/java/com/lagradost/cloudstream3/extractors/Filesim.kt

@@ -5,16 +5,6 @@ import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.utils.*
 import com.lagradost.cloudstream3.utils.M3u8Helper.Companion.generateM3u8
 
-class Guccihide : Filesim() {
-    override val name = "Guccihide"
-    override var mainUrl = "https://guccihide.com"
-}
-
-class Ahvsh : Filesim() {
-    override val name = "Ahvsh"
-    override var mainUrl = "https://ahvsh.com"
-}
-
 class Moviesm4u : Filesim() {
     override val mainUrl = "https://moviesm4u.com"
     override val name = "Moviesm4u"
@@ -25,11 +15,6 @@ class FileMoonIn : Filesim() {
     override val name = "FileMoon"
 }
 
-class StreamhideTo : Filesim() {
-    override val mainUrl = "https://streamhide.to"
-    override val name = "Streamhide"
-}
-
 class StreamhideCom : Filesim() {
     override var name: String = "Streamhide"
     override var mainUrl: String = "https://streamhide.com"
@@ -57,7 +42,7 @@ class FileMoonSx : Filesim() {
 open class Filesim : ExtractorApi() {
     override val name = "Filesim"
     override val mainUrl = "https://files.im"
-    override val requiresReferer = true
+    override val requiresReferer = false
 
     override suspend fun getUrl(
         url: String,
@@ -65,19 +50,27 @@ open class Filesim : ExtractorApi() {
         subtitleCallback: (SubtitleFile) -> Unit,
         callback: (ExtractorLink) -> Unit
     ) {
-        val response = app.get(url, referer = referer)
-        val script = if (!getPacked(response.text).isNullOrEmpty()) {
-            getAndUnpack(response.text)
-        } else {
-            response.document.selectFirst("script:containsData(sources:)")?.data()
+        val response = app.get(url, referer = mainUrl).document
+        response.select("script[type=text/javascript]").map { script ->
+            if (script.data().contains(Regex("eval\\(function\\(p,a,c,k,e,[rd]"))) {
+                val unpackedscript = getAndUnpack(script.data())
+                val m3u8Regex = Regex("file.\"(.*?m3u8.*?)\"")
+                val m3u8 = m3u8Regex.find(unpackedscript)?.destructured?.component1() ?: ""
+                if (m3u8.isNotEmpty()) {
+                    generateM3u8(
+                        name,
+                        m3u8,
+                        mainUrl
+                    ).forEach(callback)
+                }
+            }
         }
-        val m3u8 =
-            Regex("file:\\s*\"(.*?m3u8.*?)\"").find(script ?: return)?.groupValues?.getOrNull(1)
-        generateM3u8(
-            name,
-            m3u8 ?: return,
-            mainUrl
-        ).forEach(callback)
     }
 
+   /* private data class ResponseSource(
+        @JsonProperty("file") val file: String,
+        @JsonProperty("type") val type: String?,
+        @JsonProperty("label") val label: String?
+    ) */
+
 }

app/src/main/java/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,

app/src/main/java/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(
@@ -59,4 +56,4 @@ open class Gofile : ExtractorApi() {
         @JsonProperty("data") val data: Data? = null,
     )
 
-}
+}

app/src/main/java/com/lagradost/cloudstream3/extractors/HDMomPlayerExtractor.kt

@@ -1,71 +0,0 @@
-// ! Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
-
-package com.lagradost.cloudstream3.extractors
-
-import android.util.Log
-import com.lagradost.cloudstream3.*
-import com.lagradost.cloudstream3.utils.*
-import com.lagradost.cloudstream3.extractors.helper.AesHelper
-import com.fasterxml.jackson.annotation.JsonProperty
-import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
-import com.fasterxml.jackson.module.kotlin.readValue
-
-open class HDMomPlayer : ExtractorApi() {
-    override val name            = "HDMomPlayer"
-    override val mainUrl         = "https://hdmomplayer.com"
-    override val requiresReferer = true
-
-    override suspend fun getUrl(url: String, referer: String?, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
-        val m3u_link:String?
-        val ext_ref  = referer ?: ""
-        val i_source = app.get(url, referer=ext_ref).text
-
-        val bePlayer = Regex("""bePlayer\('([^']+)',\s*'(\{[^\}]+\})'\);""").find(i_source)?.groupValues
-        if (bePlayer != null) {
-            val bePlayerPass = bePlayer.get(1)
-            val bePlayerData = bePlayer.get(2)
-            val encrypted    = AesHelper.cryptoAESHandler(bePlayerData, bePlayerPass.toByteArray(), false)?.replace("\\", "") ?: throw ErrorLoadingException("failed to decrypt")
-            Log.d("Kekik_${this.name}", "encrypted » ${encrypted}")
-
-            m3u_link = Regex("""video_location\":\"([^\"]+)""").find(encrypted)?.groupValues?.get(1)
-        } else {
-            m3u_link = Regex("""file:\"([^\"]+)""").find(i_source)?.groupValues?.get(1)
-
-            val track_str = Regex("""tracks:\[([^\]]+)""").find(i_source)?.groupValues?.get(1)
-            if (track_str != null) {
-                val tracks:List<Track> = jacksonObjectMapper().readValue("[${track_str}]")
-
-                for (track in tracks) {
-                    if (track.file == null || track.label == null) continue
-                    if (track.label.contains("Forced")) continue
-
-                    subtitleCallback.invoke(
-                        SubtitleFile(
-                            lang = track.label,
-                            url  = fixUrl(mainUrl + track.file)
-                        )
-                    )
-                }
-            }
-        }
-
-        callback.invoke(
-            ExtractorLink(
-                source  = this.name,
-                name    = this.name,
-                url     = m3u_link ?: throw ErrorLoadingException("m3u link not found"),
-                referer = url,
-                quality = Qualities.Unknown.value,
-                isM3u8  = true
-            )
-        )
-    }
-
-    data class Track(
-        @JsonProperty("file")     val file: String?,
-        @JsonProperty("label")    val label: String?,
-        @JsonProperty("kind")     val kind: String?,
-        @JsonProperty("language") val language: String?,
-        @JsonProperty("default")  val default: String?
-    )
-}

app/src/main/java/com/lagradost/cloudstream3/extractors/HDPlayerSystemExtractor.kt

@@ -1,59 +0,0 @@
-// ! Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
-
-package com.lagradost.cloudstream3.extractors
-
-import android.util.Log
-import com.lagradost.cloudstream3.*
-import com.lagradost.cloudstream3.utils.*
-import com.fasterxml.jackson.annotation.JsonProperty
-
-open class HDPlayerSystem : ExtractorApi() {
-    override val name            = "HDPlayerSystem"
-    override val mainUrl         = "https://hdplayersystem.live"
-    override val requiresReferer = true
-
-    override suspend fun getUrl(url: String, referer: String?, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
-        val ext_ref  = referer ?: ""
-        val vid_id   = if (url.contains("video/")) {
-            url.substringAfter("video/")
-        } else {
-            url.substringAfter("?data=")
-        }
-        val post_url = "${mainUrl}/player/index.php?data=${vid_id}&do=getVideo"
-        Log.d("Kekik_${this.name}", "post_url » ${post_url}")
-
-        val response = app.post(
-            post_url,
-            data = mapOf(
-                "hash" to vid_id,
-                "r"    to ext_ref
-            ),
-            referer = ext_ref,
-            headers = mapOf(
-                "Content-Type"     to "application/x-www-form-urlencoded; charset=UTF-8",
-                "X-Requested-With" to "XMLHttpRequest"
-            )
-        )
-
-        val video_response = response.parsedSafe<SystemResponse>() ?: throw ErrorLoadingException("failed to parse response")
-        val m3u_link       = video_response.securedLink
-
-        callback.invoke(
-            ExtractorLink(
-                source  = this.name,
-                name    = this.name,
-                url     = m3u_link,
-                referer = ext_ref,
-                quality = Qualities.Unknown.value,
-                type    = INFER_TYPE
-            )
-        )
-    }
-
-    data class SystemResponse(
-        @JsonProperty("hls")         val hls: String,
-        @JsonProperty("videoImage")  val videoImage: String? = null,
-        @JsonProperty("videoSource") val videoSource: String,
-        @JsonProperty("securedLink") val securedLink: String
-    )
-}

app/src/main/java/com/lagradost/cloudstream3/extractors/HDStreamAbleExtractor.kt

@@ -1,8 +0,0 @@
-// ! Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
-
-package com.lagradost.cloudstream3.extractors
-
-class HDStreamAble : PeaceMakerst() {
-    override var name    = "HDStreamAble"
-    override var mainUrl = "https://hdstreamable.com"
-}

app/src/main/java/com/lagradost/cloudstream3/extractors/HotlingerExtractor.kt

@@ -1,23 +0,0 @@
-// ! Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
-
-package com.lagradost.cloudstream3.extractors
-
-class Hotlinger : ContentX() {
-    override var name    = "Hotlinger"
-    override var mainUrl = "https://hotlinger.com"
-}
-
-class FourCX : ContentX() {
-    override var name    = "FourCX"
-    override var mainUrl = "https://four.contentx.me"
-}
-
-class PlayRu : ContentX() {
-    override var name    = "PlayRu"
-    override var mainUrl = "https://playru.net"
-}
-
-class FourPlayRu : ContentX() {
-    override var name    = "FourPlayRu"
-    override var mainUrl = "https://four.playru.net"
-}

app/src/main/java/com/lagradost/cloudstream3/extractors/Hxfile.kt

@@ -7,7 +7,7 @@ import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
 
 class Neonime7n : Hxfile() {
     override val name = "Neonime7n"
-    override val mainUrl = "https://neonime.fun"
+    override val mainUrl = "https://7njctn.neonime.watch"
     override val redirect = false
 }
 
@@ -19,7 +19,7 @@ class Neonime8n : Hxfile() {
 
 class KotakAnimeid : Hxfile() {
     override val name = "KotakAnimeid"
-    override val mainUrl = "https://nontonanimeid.bio"
+    override val mainUrl = "https://kotakanimeid.com"
     override val requiresReferer = true
 }
 
@@ -97,4 +97,4 @@ open class Hxfile : ExtractorApi() {
         @JsonProperty("label") val label: String?
     )
 
-}
+}

app/src/main/java/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(

app/src/main/java/com/lagradost/cloudstream3/extractors/MailRuExtractor.kt

@@ -1,54 +0,0 @@
-// ! Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
-
-package com.lagradost.cloudstream3.extractors
-
-import android.util.Log
-import com.lagradost.cloudstream3.*
-import com.lagradost.cloudstream3.utils.*
-import com.fasterxml.jackson.annotation.JsonProperty
-
-open class MailRu : ExtractorApi() {
-    override val name            = "MailRu"
-    override val mainUrl         = "https://my.mail.ru"
-    override val requiresReferer = false
-
-    override suspend fun getUrl(url: String, referer: String?, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
-        val ext_ref = referer ?: ""
-        Log.d("Kekik_${this.name}", "url » ${url}")
-
-        val vid_id     = url.substringAfter("video/embed/").trim()
-        val video_req  = app.get("${mainUrl}/+/video/meta/${vid_id}", referer=url)
-        val video_key  = video_req.cookies["video_key"].toString()
-        Log.d("Kekik_${this.name}", "video_key » ${video_key}")
-
-        val video_data = AppUtils.tryParseJson<MailRuData>(video_req.text) ?: throw ErrorLoadingException("Video not found")
-
-        for (video in video_data.videos) {
-            Log.d("Kekik_${this.name}", "video » ${video}")
-
-            val video_url = if (video.url.startsWith("//")) "https:${video.url}" else video.url
-
-            callback.invoke(
-                ExtractorLink(
-                    source  = this.name,
-                    name    = this.name,
-                    url     = video_url,
-                    referer = url,
-                    headers = mapOf("Cookie" to "video_key=${video_key}"),
-                    quality = getQualityFromName(video.key),
-                    isM3u8  = false
-                )
-            )
-        }
-    }
-
-    data class MailRuData(
-        @JsonProperty("provider") val provider: String,
-        @JsonProperty("videos")   val videos: List<MailRuVideoData>
-    )
-
-    data class MailRuVideoData(
-        @JsonProperty("url") val url: String,
-        @JsonProperty("key") val key: String
-    )
-}

app/src/main/java/com/lagradost/cloudstream3/extractors/Mediafire.kt

@@ -1,43 +0,0 @@
-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.INFER_TYPE
-import com.lagradost.cloudstream3.utils.Qualities
-
-open class Mediafire : ExtractorApi() {
-    override val name = "Mediafire"
-    override val mainUrl = "https://www.mediafire.com"
-    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 title = res.select("div.dl-btn-label").text()
-        val video = res.selectFirst("a#downloadButton")?.attr("href")
-
-        callback.invoke(
-            ExtractorLink(
-                this.name,
-                this.name,
-                video ?: return,
-                "",
-                getQuality(title),
-                INFER_TYPE
-            )
-        )
-
-    }
-
-    private fun getQuality(str: String?): Int {
-        return Regex("(\\d{3,4})[pP]").find(str ?: "")?.groupValues?.getOrNull(1)?.toIntOrNull()
-            ?: Qualities.Unknown.value
-    }
-
-}

app/src/main/java/com/lagradost/cloudstream3/extractors/Moviehab.kt

@@ -7,7 +7,7 @@ import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.M3u8Helper
 
 class MoviehabNet : Moviehab() {
-    override var mainUrl = "https://play.moviehab.asia"
+    override var mainUrl = "https://play.moviehab.net"
 }
 
 open class Moviehab : ExtractorApi() {
@@ -41,4 +41,4 @@ open class Moviehab : ExtractorApi() {
             }
         }
     }
-}
+}

app/src/main/java/com/lagradost/cloudstream3/extractors/Mp4Upload.kt

@@ -10,39 +10,24 @@ open class Mp4Upload : ExtractorApi() {
     override var name = "Mp4Upload"
     override var mainUrl = "https://www.mp4upload.com"
     private val srcRegex = Regex("""player\.src\("(.*?)"""")
-    private val srcRegex2 = Regex("""player\.src\([\w\W]*src: "(.*?)"""")
-
     override val requiresReferer = true
-    private val idMatch = Regex("""mp4upload\.com/(embed-|)([A-Za-z0-9]*)""")
+
     override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink>? {
-        val realUrl = idMatch.find(url)?.groupValues?.get(2)?.let { id ->
-            "$mainUrl/embed-$id.html"
-        } ?: url
-        val response = app.get(realUrl)
-        val unpackedText = getAndUnpack(response.text)
-        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,
-                )
-            )
-        }
-        srcRegex2.find(unpackedText)?.groupValues?.get(1)?.let { link ->
-            return listOf(
-                ExtractorLink(
-                    name,
-                    name,
-                    link,
-                    url,
-                    quality ?: Qualities.Unknown.value,
-                )
-            )
+        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
     }

app/src/main/java/com/lagradost/cloudstream3/extractors/MultiQuality.kt

@@ -9,7 +9,7 @@ import java.net.URI
 
 open class MultiQuality : ExtractorApi() {
     override var name = "MultiQuality"
-    override var mainUrl = "https://anihdplay.com"
+    override var mainUrl = "https://gogo-play.net"
     private val sourceRegex = Regex("""file:\s*['"](.*?)['"],label:\s*['"](.*?)['"]""")
     private val m3u8Regex = Regex(""".*?(\d*).m3u8""")
     private val urlRegex = Regex("""(.*?)([^/]+$)""")
@@ -56,4 +56,4 @@ open class MultiQuality : ExtractorApi() {
             return extractedLinksList
         }
     }
-}
+}

app/src/main/java/com/lagradost/cloudstream3/extractors/OdnoklassnikiExtractor.kt

@@ -1,61 +0,0 @@
-// ! Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
-
-package com.lagradost.cloudstream3.extractors
-
-import android.util.Log
-import com.lagradost.cloudstream3.*
-import com.lagradost.cloudstream3.utils.*
-import com.fasterxml.jackson.annotation.JsonProperty
-
-open class Odnoklassniki : ExtractorApi() {
-    override val name            = "Odnoklassniki"
-    override val mainUrl         = "https://odnoklassniki.ru"
-    override val requiresReferer = false
-
-    override suspend fun getUrl(url: String, referer: String?, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
-        val ext_ref    = referer ?: ""
-        Log.d("Kekik_${this.name}", "url » ${url}")
-
-        val user_agent = 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")
-
-        val video_req  = app.get(url, headers=user_agent).text.replace("\\"", "\"").replace("\\\\", "\\")
-            .replace(Regex("\\\\u([0-9A-Fa-f]{4})")) { matchResult ->
-                Integer.parseInt(matchResult.groupValues[1], 16).toChar().toString()
-            }
-        val videos_str = Regex("""\"videos\":(\[[^\]]*\])""").find(video_req)?.groupValues?.get(1) ?: throw ErrorLoadingException("Video not found")
-        val videos     = AppUtils.tryParseJson<List<OkRuVideo>>(videos_str) ?: throw ErrorLoadingException("Video not found")
-
-        for (video in videos) {
-            Log.d("Kekik_${this.name}", "video » ${video}")
-
-            val video_url = if (video.url.startsWith("//")) "https:${video.url}" else video.url
-
-            val quality   = video.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")
-
-            callback.invoke(
-                ExtractorLink(
-                    source  = this.name,
-                    name    = this.name,
-                    url     = video_url,
-                    referer = url,
-                    quality = getQualityFromName(quality),
-                    headers = user_agent,
-                    isM3u8  = false
-                )
-            )
-        }
-    }
-
-    data class OkRuVideo(
-        @JsonProperty("name") val name: String,
-        @JsonProperty("url")  val url: String,
-    )
-}

app/src/main/java/com/lagradost/cloudstream3/extractors/OkRuExtractor.kt

@@ -1,13 +1,67 @@
-// ! Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
-
 package com.lagradost.cloudstream3.extractors
 
-class OkRuSSL : Odnoklassniki() {
-    override var name    = "OkRuSSL"
+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"
 }
 
-class OkRuHTTP : Odnoklassniki() {
-    override var name    = "OkRuHTTP"
+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
+    }
+}

app/src/main/java/com/lagradost/cloudstream3/extractors/PeaceMakerstExtractor.kt

@@ -1,89 +0,0 @@
-// ! Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
-
-package com.lagradost.cloudstream3.extractors
-
-import android.util.Log
-import com.lagradost.cloudstream3.*
-import com.lagradost.cloudstream3.utils.*
-import com.fasterxml.jackson.annotation.JsonProperty
-
-open class PeaceMakerst : ExtractorApi() {
-    override val name            = "PeaceMakerst"
-    override val mainUrl         = "https://peacemakerst.com"
-    override val requiresReferer = true
-
-    override suspend fun getUrl(url: String, referer: String?, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
-        val m3u_link:String?
-        val ext_ref  = referer ?: ""
-        val post_url = "${url}?do=getVideo"
-        Log.d("Kekik_${this.name}", "post_url » ${post_url}")
-
-        val response = app.post(
-            post_url,
-            data = mapOf(
-                "hash" to url.substringAfter("video/"),
-                "r"    to ext_ref,
-                "s"    to ""
-            ),
-            referer = ext_ref,
-            headers = mapOf(
-                "Content-Type"     to "application/x-www-form-urlencoded; charset=UTF-8",
-                "X-Requested-With" to "XMLHttpRequest"
-            )
-        )
-        if (response.text.contains("teve2.com.tr\\/embed\\/")) {
-            val teve2_id       = response.text.substringAfter("teve2.com.tr\\/embed\\/").substringBefore("\"")
-            val teve2_response = app.get(
-                "https://www.teve2.com.tr/action/media/${teve2_id}",
-                referer = "https://www.teve2.com.tr/embed/${teve2_id}"
-            ).parsedSafe<Teve2ApiResponse>() ?: throw ErrorLoadingException("teve2 response is null")
-
-            m3u_link           = teve2_response.media.link.serviceUrl + "//" + teve2_response.media.link.securePath
-        } else {
-            val video_response = response.parsedSafe<PeaceResponse>() ?: throw ErrorLoadingException("peace response is null")
-            val video_sources  = video_response.videoSources
-            if (video_sources.isNotEmpty()) {
-                m3u_link = video_sources.lastOrNull()?.file
-            } else {
-                m3u_link = null
-            }
-        }
-
-        callback.invoke(
-            ExtractorLink(
-                source  = this.name,
-                name    = this.name,
-                url     = m3u_link ?: throw ErrorLoadingException("m3u link not found"),
-                referer = ext_ref,
-                quality = Qualities.Unknown.value,
-                type    = INFER_TYPE
-            )
-        )
-    }
-
-    data class PeaceResponse(
-        @JsonProperty("videoImage")   val videoImage: String?,
-        @JsonProperty("videoSources") val videoSources: List<VideoSource>,
-        @JsonProperty("sIndex")       val sIndex: String,
-        @JsonProperty("sourceList")   val sourceList: Map<String, String>
-    )
-
-    data class VideoSource(
-        @JsonProperty("file")  val file: String,
-        @JsonProperty("label") val label: String,
-        @JsonProperty("type")  val type: String
-    )
-
-    data class Teve2ApiResponse(
-        @JsonProperty("Media") val media: Teve2Media
-    )
-
-    data class Teve2Media(
-        @JsonProperty("Link") val link: Teve2Link
-    )
-
-    data class Teve2Link(
-        @JsonProperty("ServiceUrl") val serviceUrl: String,
-        @JsonProperty("SecurePath") val securePath: String
-    )
-}

app/src/main/java/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")
                             )
                         )
                     }

app/src/main/java/com/lagradost/cloudstream3/extractors/PixelDrainExtractor.kt

@@ -1,25 +0,0 @@
-// ! Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
-
-package com.lagradost.cloudstream3.extractors
-
-import com.lagradost.cloudstream3.*
-import com.lagradost.cloudstream3.utils.*
-
-open class PixelDrain : ExtractorApi() {
-    override val name            = "PixelDrain"
-    override val mainUrl         = "https://pixeldrain.com"
-    override val requiresReferer = true
-
-    override suspend fun getUrl(url: String, referer: String?, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
-        val mId = Regex("/([ul]/[\\da-zA-Z\\-]+)(?:\\?download)?").find(url)?.groupValues?.get(1)?.split("/")
-        callback.invoke(
-            ExtractorLink(
-                this.name,
-                this.name,
-                "$mainUrl/api/file/${mId?.last() ?: return}?download",
-                url,
-                Qualities.Unknown.value,
-            )
-        )
-    }
-}

app/src/main/java/com/lagradost/cloudstream3/extractors/Rabbitstream.kt

@@ -1,199 +0,0 @@
-package com.lagradost.cloudstream3.extractors
-
-import com.fasterxml.jackson.annotation.JsonProperty
-import com.lagradost.cloudstream3.ErrorLoadingException
-import com.lagradost.cloudstream3.SubtitleFile
-import com.lagradost.cloudstream3.app
-import com.lagradost.cloudstream3.base64DecodeArray
-import com.lagradost.cloudstream3.base64Encode
-import com.lagradost.cloudstream3.utils.AppUtils
-import com.lagradost.cloudstream3.utils.AppUtils.parseJson
-import com.lagradost.cloudstream3.utils.ExtractorApi
-import com.lagradost.cloudstream3.utils.ExtractorLink
-import com.lagradost.cloudstream3.utils.M3u8Helper
-import java.nio.charset.StandardCharsets
-import java.security.MessageDigest
-import javax.crypto.Cipher
-import javax.crypto.spec.IvParameterSpec
-import javax.crypto.spec.SecretKeySpec
-
-class Megacloud : Rabbitstream() {
-    override val name = "Megacloud"
-    override val mainUrl = "https://megacloud.tv"
-    override val embed = "embed-2/ajax/e-1"
-    private val scriptUrl = "$mainUrl/js/player/a/prod/e1-player.min.js"
-
-    override suspend fun extractRealKey(sources: String): Pair<String, String> {
-        val rawKeys = getKeys()
-        val sourcesArray = sources.toCharArray()
-
-        var extractedKey = ""
-        var currentIndex = 0
-        for (index in rawKeys) {
-            val start = index[0] + currentIndex
-            val end = start + index[1]
-            for (i in start until end) {
-                extractedKey += sourcesArray[i].toString()
-                sourcesArray[i] = ' '
-            }
-            currentIndex += index[1]
-        }
-
-        return extractedKey to sourcesArray.joinToString("").replace(" ", "")
-    }
-
-    private suspend fun getKeys(): List<List<Int>> {
-        val script = app.get(scriptUrl).text
-        fun matchingKey(value: String): String {
-            return Regex(",$value=((?:0x)?([0-9a-fA-F]+))").find(script)?.groupValues?.get(1)
-                ?.removePrefix("0x") ?: throw ErrorLoadingException("Failed to match the key")
-        }
-
-        val regex = Regex("case\\s*0x[0-9a-f]+:(?![^;]*=partKey)\\s*\\w+\\s*=\\s*(\\w+)\\s*,\\s*\\w+\\s*=\\s*(\\w+);")
-        val indexPairs = regex.findAll(script).toList().map { match ->
-            val matchKey1 = matchingKey(match.groupValues[1])
-            val matchKey2 = matchingKey(match.groupValues[2])
-            try {
-                listOf(matchKey1.toInt(16), matchKey2.toInt(16))
-            } catch (e: NumberFormatException) {
-                emptyList()
-            }
-        }.filter { it.isNotEmpty() }
-
-        return indexPairs
-    }
-
-}
-
-class Dokicloud : Rabbitstream() {
-    override val name = "Dokicloud"
-    override val mainUrl = "https://dokicloud.one"
-}
-
-// Code found in https://github.com/eatmynerds/key
-// special credits to @eatmynerds for providing key
-open class Rabbitstream : ExtractorApi() {
-    override val name = "Rabbitstream"
-    override val mainUrl = "https://rabbitstream.net"
-    override val requiresReferer = false
-    open val embed = "ajax/embed-4"
-    open val key = "https://raw.githubusercontent.com/eatmynerds/key/e4/key.txt"
-
-    override suspend fun getUrl(
-        url: String,
-        referer: String?,
-        subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit
-    ) {
-        val id = url.substringAfterLast("/").substringBefore("?")
-
-        val response = app.get(
-            "$mainUrl/$embed/getSources?id=$id",
-            referer = mainUrl,
-            headers = mapOf("X-Requested-With" to "XMLHttpRequest")
-        )
-
-        val encryptedMap = response.parsedSafe<SourcesEncrypted>()
-        val sources = encryptedMap?.sources
-        val decryptedSources = if (sources == null || encryptedMap.encrypted == false) {
-            response.parsedSafe()
-        } else {
-            val (key, encData) = extractRealKey(sources)
-            val decrypted = decryptMapped<List<Sources>>(encData, key)
-            SourcesResponses(
-                sources = decrypted,
-                tracks = encryptedMap.tracks
-            )
-        }
-
-        decryptedSources?.sources?.map { source ->
-            M3u8Helper.generateM3u8(
-                name,
-                source?.file ?: return@map,
-                "$mainUrl/",
-            ).forEach(callback)
-        }
-
-        decryptedSources?.tracks?.map { track ->
-            subtitleCallback.invoke(
-                SubtitleFile(
-                    track?.label ?: return@map,
-                    track.file ?: return@map
-                )
-            )
-        }
-
-
-    }
-
-    open suspend fun extractRealKey(sources: String): Pair<String, String> {
-        val rawKeys = parseJson<List<Int>>(app.get(key).text)
-        val extractedKey = base64Encode(rawKeys.map { it.toByte() }.toByteArray())
-        return extractedKey to sources
-    }
-
-    private inline fun <reified T> decryptMapped(input: String, key: String): T? {
-        val decrypt = decrypt(input, key)
-        return AppUtils.tryParseJson(decrypt)
-    }
-
-    private fun decrypt(input: String, key: String): String {
-        return decryptSourceUrl(
-            generateKey(
-                base64DecodeArray(input).copyOfRange(8, 16),
-                key.toByteArray()
-            ), input
-        )
-    }
-
-    private fun generateKey(salt: ByteArray, secret: ByteArray): ByteArray {
-        var key = md5(secret + salt)
-        var currentKey = key
-        while (currentKey.size < 48) {
-            key = md5(key + secret + salt)
-            currentKey += key
-        }
-        return currentKey
-    }
-
-    private fun md5(input: ByteArray): ByteArray {
-        return MessageDigest.getInstance("MD5").digest(input)
-    }
-
-    private fun decryptSourceUrl(decryptionKey: ByteArray, sourceUrl: String): String {
-        val cipherData = base64DecodeArray(sourceUrl)
-        val encrypted = cipherData.copyOfRange(16, cipherData.size)
-        val aesCBC = Cipher.getInstance("AES/CBC/PKCS5Padding")
-        aesCBC.init(
-            Cipher.DECRYPT_MODE,
-            SecretKeySpec(decryptionKey.copyOfRange(0, 32), "AES"),
-            IvParameterSpec(decryptionKey.copyOfRange(32, decryptionKey.size))
-        )
-        val decryptedData = aesCBC?.doFinal(encrypted) ?: throw ErrorLoadingException("Cipher not found")
-        return String(decryptedData, StandardCharsets.UTF_8)
-    }
-
-    data class Tracks(
-        @JsonProperty("file") val file: String? = null,
-        @JsonProperty("label") val label: String? = null,
-        @JsonProperty("kind") val kind: String? = null,
-    )
-
-    data class Sources(
-        @JsonProperty("file") val file: String? = null,
-        @JsonProperty("type") val type: String? = null,
-        @JsonProperty("label") val label: String? = null,
-    )
-
-    data class SourcesResponses(
-        @JsonProperty("sources") val sources: List<Sources?>? = emptyList(),
-        @JsonProperty("tracks") val tracks: List<Tracks?>? = emptyList(),
-    )
-
-    data class SourcesEncrypted(
-        @JsonProperty("sources") val sources: String? = null,
-        @JsonProperty("encrypted") val encrypted: Boolean? = null,
-        @JsonProperty("tracks") val tracks: List<Tracks?>? = emptyList(),
-    )
-
-}

app/src/main/java/com/lagradost/cloudstream3/extractors/RapidVidExtractor.kt

@@ -1,50 +0,0 @@
-// ! Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
-
-package com.lagradost.cloudstream3.extractors
-
-import android.util.Log
-import com.lagradost.cloudstream3.*
-import com.lagradost.cloudstream3.utils.*
-
-open class RapidVid : ExtractorApi() {
-    override val name            = "RapidVid"
-    override val mainUrl         = "https://rapidvid.net"
-    override val requiresReferer = true
-
-    override suspend fun getUrl(url: String, referer: String?, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
-        val ext_ref   = referer ?: ""
-        val video_req = app.get(url, referer=ext_ref).text
-
-		val sub_urls = mutableSetOf<String>()
-        Regex("""captions\",\"file\":\"([^\"]+)\",\"label\":\"([^\"]+)\"""").findAll(video_req).forEach {
-            val (sub_url, sub_lang) = it.destructured
-
-			if (sub_url in sub_urls) { return@forEach }
- 			sub_urls.add(sub_url)
-
-            subtitleCallback.invoke(
-                SubtitleFile(
-                    lang = sub_lang.replace("\\u0131", "ı").replace("\\u0130", "İ").replace("\\u00fc", "ü").replace("\\u00e7", "ç"),
-                    url  = fixUrl(sub_url.replace("\\", ""))
-                )
-            )
-        }
-
-        val extracted_value = Regex("""file": "(.*)",""").find(video_req)?.groupValues?.get(1) ?: throw ErrorLoadingException("File not found")
-
-        val bytes   = extracted_value.split("\\x").filter { it.isNotEmpty() }.map { it.toInt(16).toByte() }.toByteArray()
-        val decoded = String(bytes, Charsets.UTF_8)
-        Log.d("Kekik_${this.name}", "decoded » ${decoded}")
-
-        callback.invoke(
-            ExtractorLink(
-                source  = this.name,
-                name    = this.name,
-                url     = decoded,
-                referer = ext_ref,
-                quality = Qualities.Unknown.value,
-                isM3u8  = true
-            )
-        )
-    }
-}

app/src/main/java/com/lagradost/cloudstream3/extractors/SibNetExtractor.kt

@@ -1,33 +0,0 @@
-// ! Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
-
-package com.lagradost.cloudstream3.extractors
-
-import android.util.Log
-import com.lagradost.cloudstream3.*
-import com.lagradost.cloudstream3.utils.*
-
-open class SibNet : ExtractorApi() {
-    override val name            = "SibNet"
-    override val mainUrl         = "https://video.sibnet.ru"
-    override val requiresReferer = true
-
-    override suspend fun getUrl(url: String, referer: String?, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
-        val ext_ref   = referer ?: ""
-        val i_source  = app.get(url, referer=ext_ref).text
-        var m3u_link  = Regex("""player.src\(\[\{src: \"([^\"]+)""").find(i_source)?.groupValues?.get(1) ?: throw ErrorLoadingException("m3u link not found")
-
-        m3u_link = "${mainUrl}${m3u_link}"
-        Log.d("Kekik_${this.name}", "m3u_link » ${m3u_link}")
-
-        callback.invoke(
-            ExtractorLink(
-                source  = this.name,
-                name    = this.name,
-                url     = m3u_link,
-                referer = url,
-                quality = Qualities.Unknown.value,
-                type    = INFER_TYPE
-            )
-        )
-    }
-}

app/src/main/java/com/lagradost/cloudstream3/extractors/SpeedoStream.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,
     )
+
+
 }

app/src/main/java/com/lagradost/cloudstream3/extractors/StreamSB.kt

@@ -8,31 +8,6 @@ import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.M3u8Helper
 import kotlin.random.Random
 
-class Sblona : StreamSB() {
-    override var name = "Sblona"
-    override var mainUrl = "https://sblona.com"
-}
-
-class Lvturbo : StreamSB() {
-    override var name = "Lvturbo"
-    override var mainUrl = "https://lvturbo.com"
-}
-
-class Sbrapid : StreamSB() {
-    override var name = "Sbrapid"
-    override var mainUrl = "https://sbrapid.com"
-}
-
-class Sbface : StreamSB() {
-    override var name = "Sbface"
-    override var mainUrl = "https://sbface.com"
-}
-
-class Sbsonic : StreamSB() {
-    override var name = "Sbsonic"
-    override var mainUrl = "https://sbsonic.com"
-}
-
 class Vidgomunimesb : StreamSB() {
     override var mainUrl = "https://vidgomunimesb.xyz"
 }

app/src/main/java/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"
 }

app/src/main/java/com/lagradost/cloudstream3/extractors/StreamWishExtractor.kt

@@ -1,34 +0,0 @@
-package com.lagradost.cloudstream3.extractors
-
-import com.lagradost.cloudstream3.app
-import com.lagradost.cloudstream3.network.WebViewResolver
-import com.lagradost.cloudstream3.utils.ExtractorApi
-import com.lagradost.cloudstream3.utils.ExtractorLink
-import com.lagradost.cloudstream3.utils.Qualities
-
-open class StreamWishExtractor : ExtractorApi() {
-    override var name = "StreamWish"
-    override var mainUrl = "https://streamwish.to"
-    override val requiresReferer = false
-
-    override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink>? {
-        val response = app.get(
-            url, referer = referer ?: "$mainUrl/", interceptor = WebViewResolver(
-                Regex("""master\.m3u8""")
-            )
-        )
-        val sources = mutableListOf<ExtractorLink>()
-        if (response.url.contains("m3u8"))
-            sources.add(
-                ExtractorLink(
-                    source = name,
-                    name = name,
-                    url = response.url,
-                    referer = referer ?: "$mainUrl/",
-                    quality = Qualities.Unknown.value,
-                    isM3u8 = true
-                )
-            )
-        return sources
-    }
-}

app/src/main/java/com/lagradost/cloudstream3/extractors/StreamoUpload.kt

@@ -1,42 +0,0 @@
-package com.lagradost.cloudstream3.extractors
-
-import com.fasterxml.jackson.annotation.JsonProperty
-import com.lagradost.cloudstream3.app
-import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
-import com.lagradost.cloudstream3.utils.ExtractorApi
-import com.lagradost.cloudstream3.utils.ExtractorLink
-import com.lagradost.cloudstream3.utils.getAndUnpack
-import com.lagradost.cloudstream3.utils.Qualities
-import com.lagradost.cloudstream3.utils.M3u8Helper
-
-open class StreamoUpload : ExtractorApi() {
-    override val name = "StreamoUpload"
-    override val mainUrl = "https://streamoupload.xyz"
-    override val requiresReferer = true
-
-    override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink> {
-        val sources = mutableListOf<ExtractorLink>()
-        val response = app.get(url, referer = referer)
-        val scriptElements = response.document.select("script").map { script ->
-            if (script.data().contains("eval(function(p,a,c,k,e,d)")) {
-                val data = getAndUnpack(script.data())
-                    .substringAfter("sources:[")
-                    .substringBefore("],")
-                    .replace("file", "\"file\"")
-                    .trim()
-                tryParseJson<File>(data)?.let {
-                    M3u8Helper.generateM3u8(
-                        name,
-                        it.file,
-                        "$mainUrl/",
-                    ).forEach { m3uData -> sources.add(m3uData) }
-                }
-            }
-        }
-        return sources
-    }
-
-    private data class File(
-        @JsonProperty("file") val file: String,
-    )
-}

app/src/main/java/com/lagradost/cloudstream3/extractors/TRsTXExtractor.kt

@@ -1,73 +0,0 @@
-// ! Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
-
-package com.lagradost.cloudstream3.extractors
-
-import android.util.Log
-import com.lagradost.cloudstream3.*
-import com.lagradost.cloudstream3.utils.*
-import com.fasterxml.jackson.annotation.JsonProperty
-
-open class TRsTX : ExtractorApi() {
-    override val name            = "TRsTX"
-    override val mainUrl         = "https://trstx.org"
-    override val requiresReferer = true
-
-    override suspend fun getUrl(url: String, referer: String?, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
-        val ext_ref = referer ?: ""
-
-        val video_req = app.get(url, referer=ext_ref).text
-
-        val file     = Regex("""file\":\"([^\"]+)""").find(video_req)?.groupValues?.get(1) ?: throw ErrorLoadingException("File not found")
-        val postLink = "${mainUrl}/" + file.replace("\\", "")
-        val rawList  = app.post(postLink, referer=ext_ref).parsedSafe<List<Any>>() ?: throw ErrorLoadingException("Post link not found")
-
-        val postJson: List<TrstxVideoData> = rawList.drop(1).map { item ->
-            val mapItem = item as Map<*, *>
-            TrstxVideoData(
-                title = mapItem["title"] as? String,
-                file  = mapItem["file"]  as? String
-            )
-        }
-        Log.d("Kekik_${this.name}", "postJson » ${postJson}")
-
-		val vid_links = mutableSetOf<String>()
-        val vid_map   = mutableListOf<Map<String, String>>()
-        for (item in postJson) {
-            if (item.file == null || item.title == null) continue
-
-            val fileUrl   = "${mainUrl}/playlist/" + item.file.substring(1) + ".txt"
-            val videoData = app.post(fileUrl, referer=ext_ref).text
-
-			if (videoData in vid_links) { continue }
- 			vid_links.add(videoData)
-
-            vid_map.add(mapOf(
-                "title"     to item.title,
-                "videoData" to videoData
-            ))
-        }
-
-
-        for (mapEntry in vid_map) {
-            Log.d("Kekik_${this.name}", "mapEntry » ${mapEntry}")
-            val title    = mapEntry["title"] ?: continue
-            val m3u_link = mapEntry["videoData"] ?: continue
-
-	        callback.invoke(
-                ExtractorLink(
-                    source  = this.name,
-                    name    = "${this.name} - ${title}",
-                    url     = m3u_link,
-                    referer = ext_ref,
-                    quality = Qualities.Unknown.value,
-                    type    = INFER_TYPE
-                )
-            )
-        }
-    }
-
-    data class TrstxVideoData(
-        @JsonProperty("title") val title: String? = null,
-        @JsonProperty("file")  val file: String?  = null
-    )
-}

app/src/main/java/com/lagradost/cloudstream3/extractors/TauVideoExtractor.kt

@@ -1,45 +0,0 @@
-// ! Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
-
-package com.lagradost.cloudstream3.extractors
-
-import android.util.Log
-import com.lagradost.cloudstream3.*
-import com.lagradost.cloudstream3.utils.*
-import com.fasterxml.jackson.annotation.JsonProperty
-
-open class TauVideo : ExtractorApi() {
-    override val name            = "TauVideo"
-    override val mainUrl         = "https://tau-video.xyz"
-    override val requiresReferer = true
-
-    override suspend fun getUrl(url: String, referer: String?, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
-        val ext_ref   = referer ?: ""
-        val video_key = url.split("/").last()
-        val video_url = "${mainUrl}/api/video/${video_key}"
-        Log.d("Kekik_${this.name}", "video_url » ${video_url}")
-
-        val api = app.get(video_url).parsedSafe<TauVideoUrls>() ?: throw ErrorLoadingException("TauVideo")
-
-        for (video in api.urls) {
-            callback.invoke(
-                ExtractorLink(
-                    source  = this.name,
-                    name    = this.name,
-                    url     = video.url,
-                    referer = ext_ref,
-                    quality = getQualityFromName(video.label),
-                    type    = INFER_TYPE
-                )
-            )
-        }
-    }
-
-    data class TauVideoUrls(
-        @JsonProperty("urls") val urls: List<TauVideoData>
-    )
-
-    data class TauVideoData(
-        @JsonProperty("url")   val url: String,
-        @JsonProperty("label") val label: String,
-    )
-}

app/src/main/java/com/lagradost/cloudstream3/extractors/Userscloud.kt

@@ -1,45 +0,0 @@
-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.Qualities
-
-open class Userscloud : ExtractorApi() {
-    override val name = "Userscloud"
-    override val mainUrl = "https://userscloud.com"
-    override val requiresReferer = false
-
-    override suspend fun getUrl(
-        url: String,
-        referer: String?,
-        subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit
-    ) {
-        val res = app.get(url).document
-        val video = res.selectFirst("video#vjsplayer source")?.attr("src")
-        val quality = res.selectFirst("div.innerTB h2 b")?.text()
-        callback.invoke(
-            ExtractorLink(
-                this.name,
-                this.name,
-                video ?: return,
-                "$mainUrl/",
-                getQuality(quality),
-                headers = mapOf(
-                    "Accept" to "video/webm,video/ogg,video/*;q=0.9,application/ogg;q=0.7,audio/*;q=0.6,*/*;q=0.5",
-                    "Range" to "bytes=0-",
-                    "Sec-Fetch-Dest" to "video",
-                    "Sec-Fetch-Mode" to "no-cors",
-                )
-            )
-        )
-    }
-
-    private fun getQuality(str: String?): Int {
-        return Regex("(\\d{3,4})[pP]").find(str ?: "")?.groupValues?.getOrNull(1)?.toIntOrNull()
-            ?: Qualities.Unknown.value
-    }
-
-}

app/src/main/java/com/lagradost/cloudstream3/extractors/VidMoxyExtractor.kt

@@ -1,50 +0,0 @@
-// ! Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
-
-package com.lagradost.cloudstream3.extractors
-
-import android.util.Log
-import com.lagradost.cloudstream3.*
-import com.lagradost.cloudstream3.utils.*
-
-open class VidMoxy : ExtractorApi() {
-    override val name            = "VidMoxy"
-    override val mainUrl         = "https://vidmoxy.com"
-    override val requiresReferer = true
-
-    override suspend fun getUrl(url: String, referer: String?, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
-        val ext_ref   = referer ?: ""
-        val video_req = app.get(url, referer=ext_ref).text
-
-		val sub_urls = mutableSetOf<String>()
-        Regex("""captions\",\"file\":\"([^\"]+)\",\"label\":\"([^\"]+)\"""").findAll(video_req).forEach {
-            val (sub_url, sub_lang) = it.destructured
-
-			if (sub_url in sub_urls) { return@forEach }
- 			sub_urls.add(sub_url)
-
-            subtitleCallback.invoke(
-                SubtitleFile(
-                    lang = sub_lang.replace("\\u0131", "ı").replace("\\u0130", "İ").replace("\\u00fc", "ü").replace("\\u00e7", "ç"),
-                    url  = fixUrl(sub_url.replace("\\", ""))
-                )
-            )
-        }
-
-        val extracted_value = Regex("""file": "(.*)",""").find(video_req)?.groupValues?.get(1) ?: throw ErrorLoadingException("File not found")
-
-        val bytes   = extracted_value.split("\\x").filter { it.isNotEmpty() }.map { it.toInt(16).toByte() }.toByteArray()
-        val decoded = String(bytes, Charsets.UTF_8)
-        Log.d("Kekik_${this.name}", "decoded » ${decoded}")
-
-        callback.invoke(
-            ExtractorLink(
-                source  = this.name,
-                name    = this.name,
-                url     = decoded,
-                referer = ext_ref,
-                quality = Qualities.Unknown.value,
-                isM3u8  = true
-            )
-        )
-    }
-}

app/src/main/java/com/lagradost/cloudstream3/extractors/VideoSeyredExtractor.kt

@@ -1,72 +0,0 @@
-// ! Bu araç @keyiflerolsun tarafından | @KekikAkademi için yazılmıştır.
-
-package com.lagradost.cloudstream3.extractors
-
-import android.util.Log
-import com.lagradost.cloudstream3.*
-import com.lagradost.cloudstream3.utils.*
-import com.fasterxml.jackson.annotation.JsonProperty
-import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
-import com.fasterxml.jackson.module.kotlin.readValue
-
-open class VideoSeyred : ExtractorApi() {
-    override val name            = "VideoSeyred"
-    override val mainUrl         = "https://videoseyred.in"
-    override val requiresReferer = true
-
-    override suspend fun getUrl(url: String, referer: String?, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
-        val ext_ref   = referer ?: ""
-        val video_id  = url.substringAfter("embed/").substringBefore("?")
-        val video_url = "${mainUrl}/playlist/${video_id}.json"
-        Log.d("Kekik_${this.name}", "video_url » ${video_url}")
-
-        val response_raw                          = app.get(video_url)
-        val response_list:List<VideoSeyredSource> = jacksonObjectMapper().readValue(response_raw.text) ?: throw ErrorLoadingException("VideoSeyred")
-        val response                              = response_list[0] ?: throw ErrorLoadingException("VideoSeyred")
-
-        for (track in response.tracks) {
-            if (track.label != null && track.kind == "captions") {
-                subtitleCallback.invoke(
-                    SubtitleFile(
-                        lang = track.label,
-                        url  = fixUrl(track.file)
-                    )
-                )
-            }
-        }
-
-        for (source in response.sources) {
-            callback.invoke(
-                ExtractorLink(
-                    source  = this.name,
-                    name    = this.name,
-                    url     = source.file,
-                    referer = ext_ref,
-                    quality = Qualities.Unknown.value,
-                    type    = INFER_TYPE
-                )
-            )
-        }
-    }
-
-    data class VideoSeyredSource(
-        @JsonProperty("image")   val image: String,
-        @JsonProperty("title")   val title: String,
-        @JsonProperty("sources") val sources: List<VSSource>,
-        @JsonProperty("tracks")  val tracks: List<VSTrack>
-    )
-
-    data class VSSource(
-        @JsonProperty("file")    val file: String,
-        @JsonProperty("type")    val type: String,
-        @JsonProperty("default") val default: String
-    )
-
-    data class VSTrack(
-        @JsonProperty("file")     val file: String,
-        @JsonProperty("kind")     val kind: String,
-        @JsonProperty("language") val language: String? = null,
-        @JsonProperty("label")    val label: String?    = null,
-        @JsonProperty("default")  val default: String?  = null
-    )
-}

app/src/main/java/com/lagradost/cloudstream3/extractors/VidhideExtractor.kt

@@ -1,34 +0,0 @@
-package com.lagradost.cloudstream3.extractors
-
-import com.lagradost.cloudstream3.app
-import com.lagradost.cloudstream3.network.WebViewResolver
-import com.lagradost.cloudstream3.utils.ExtractorApi
-import com.lagradost.cloudstream3.utils.ExtractorLink
-import com.lagradost.cloudstream3.utils.Qualities
-
-open class VidhideExtractor : ExtractorApi() {
-    override var name = "VidHide"
-    override var mainUrl = "https://vidhide.com"
-    override val requiresReferer = false
-
-    override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink>? {
-        val response = app.get(
-            url, referer = referer ?: "$mainUrl/", interceptor = WebViewResolver(
-                Regex("""master\.m3u8""")
-            )
-        )
-        val sources = mutableListOf<ExtractorLink>()
-        if (response.url.contains("m3u8"))
-            sources.add(
-                ExtractorLink(
-                    source = name,
-                    name = name,
-                    url = response.url,
-                    referer = referer ?: "$mainUrl/",
-                    quality = Qualities.Unknown.value,
-                    isM3u8 = true
-                )
-            )
-        return sources
-    }
-}

app/src/main/java/com/lagradost/cloudstream3/extractors/Vidplay.kt

@@ -1,116 +0,0 @@
-package com.lagradost.cloudstream3.extractors
-
-import com.fasterxml.jackson.annotation.JsonProperty
-import com.lagradost.cloudstream3.SubtitleFile
-import com.lagradost.cloudstream3.app
-import com.lagradost.cloudstream3.base64Encode
-import com.lagradost.cloudstream3.utils.ExtractorApi
-import com.lagradost.cloudstream3.utils.ExtractorLink
-import com.lagradost.cloudstream3.utils.M3u8Helper
-import javax.crypto.Cipher
-import javax.crypto.spec.SecretKeySpec
-
-// Code found in https://github.com/KillerDogeEmpire/vidplay-keys
-// special credits to @KillerDogeEmpire for providing key
-
-class MyCloud : Vidplay() {
-    override val name = "MyCloud"
-    override val mainUrl = "https://mcloud.bz"
-}
-
-class VidplayOnline : Vidplay() {
-    override val mainUrl = "https://vidplay.online"
-}
-
-open class Vidplay : ExtractorApi() {
-    override val name = "Vidplay"
-    override val mainUrl = "https://vidplay.site"
-    override val requiresReferer = true
-    open val key =
-        "https://raw.githubusercontent.com/KillerDogeEmpire/vidplay-keys/keys/keys.json"
-
-    override suspend fun getUrl(
-        url: String,
-        referer: String?,
-        subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit
-    ) {
-        val id = url.substringBefore("?").substringAfterLast("/")
-        val encodeId = encodeId(id, getKeys())
-        val mediaUrl = callFutoken(encodeId, url)
-        val res = app.get(
-            "$mediaUrl", headers = mapOf(
-                "Accept" to "application/json, text/javascript, */*; q=0.01",
-                "X-Requested-With" to "XMLHttpRequest",
-            ), referer = url
-        ).parsedSafe<Response>()?.result
-
-        res?.sources?.map {
-            M3u8Helper.generateM3u8(
-                this.name,
-                it.file ?: return@map,
-                "$mainUrl/"
-            ).forEach(callback)
-        }
-
-        res?.tracks?.filter { it.kind == "captions" }?.map {
-            subtitleCallback.invoke(
-                SubtitleFile(it.label ?: return@map, it.file ?: return@map)
-            )
-        }
-
-    }
-
-    private suspend fun getKeys(): List<String> {
-        return app.get(key).parsed()
-    }
-
-    private suspend fun callFutoken(id: String, url: String): String? {
-        val script = app.get("$mainUrl/futoken").text
-        val k = "k='(\\S+)'".toRegex().find(script)?.groupValues?.get(1) ?: return null
-        val a = mutableListOf(k)
-        for (i in id.indices) {
-            a.add((k[i % k.length].code + id[i].code).toString())
-        }
-        return "$mainUrl/mediainfo/${a.joinToString(",")}?${url.substringAfter("?")}"
-    }
-
-    private fun encodeId(id: String, keyList: List<String>): String {
-        val cipher1 = Cipher.getInstance("RC4")
-        val cipher2 = Cipher.getInstance("RC4")
-        cipher1.init(
-            Cipher.DECRYPT_MODE,
-            SecretKeySpec(keyList[0].toByteArray(), "RC4"),
-            cipher1.parameters
-        )
-        cipher2.init(
-            Cipher.DECRYPT_MODE,
-            SecretKeySpec(keyList[1].toByteArray(), "RC4"),
-            cipher2.parameters
-        )
-        var input = id.toByteArray()
-        input = cipher1.doFinal(input)
-        input = cipher2.doFinal(input)
-        return base64Encode(input).replace("/", "_")
-    }
-
-    data class Tracks(
-        @JsonProperty("file") val file: String? = null,
-        @JsonProperty("label") val label: String? = null,
-        @JsonProperty("kind") val kind: String? = null,
-    )
-
-    data class Sources(
-        @JsonProperty("file") val file: String? = null,
-    )
-
-    data class Result(
-        @JsonProperty("sources") val sources: ArrayList<Sources>? = arrayListOf(),
-        @JsonProperty("tracks") val tracks: ArrayList<Tracks>? = arrayListOf(),
-    )
-
-    data class Response(
-        @JsonProperty("result") val result: Result? = null,
-    )
-
-}

app/src/main/java/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")
                             )
                         )
                     }

app/src/main/java/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"))
         }
+
     }
 }

app/src/main/java/com/lagradost/cloudstream3/extractors/Wibufile.kt

@@ -1,35 +0,0 @@
-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.INFER_TYPE
-import com.lagradost.cloudstream3.utils.Qualities
-
-open class Wibufile : ExtractorApi() {
-    override val name: String = "Wibufile"
-    override val mainUrl: String = "https://wibufile.com"
-    override val requiresReferer = false
-
-    override suspend fun getUrl(
-        url: String,
-        referer: String?,
-        subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit
-    ) {
-        val res = app.get(url).text
-        val video = Regex("src: ['\"](.*?)['\"]").find(res)?.groupValues?.get(1)
-
-        callback.invoke(
-            ExtractorLink(
-                name,
-                name,
-                video ?: return,
-                "$mainUrl/",
-                Qualities.Unknown.value,
-                type = INFER_TYPE
-            )
-        )
-    }
-}

app/src/main/java/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)
     }
+
 }

app/src/main/java/com/lagradost/cloudstream3/extractors/helper/AesHelper.kt

@@ -1,100 +0,0 @@
-package com.lagradost.cloudstream3.extractors.helper
-
-import com.fasterxml.jackson.annotation.JsonProperty
-import com.lagradost.cloudstream3.base64DecodeArray
-import com.lagradost.cloudstream3.base64Encode
-import com.lagradost.cloudstream3.utils.AppUtils
-import java.security.DigestException
-import java.security.MessageDigest
-import javax.crypto.Cipher
-import javax.crypto.spec.IvParameterSpec
-import javax.crypto.spec.SecretKeySpec
-
-object AesHelper {
-
-    private const val HASH = "AES/CBC/PKCS5PADDING"
-    private const val KDF = "MD5"
-
-    fun cryptoAESHandler(
-        data: String,
-        pass: ByteArray,
-        encrypt: Boolean = true,
-        padding: String = HASH,
-    ): String? {
-        val parse = AppUtils.tryParseJson<AesData>(data) ?: return null
-        val (key, iv) = generateKeyAndIv(
-            pass,
-            parse.s.hexToByteArray(),
-            ivLength = parse.iv.length / 2,
-            saltLength = parse.s.length / 2
-        ) ?: return null
-        val cipher = Cipher.getInstance(padding)
-        return if (!encrypt) {
-            cipher.init(Cipher.DECRYPT_MODE, SecretKeySpec(key, "AES"), IvParameterSpec(iv))
-            String(cipher.doFinal(base64DecodeArray(parse.ct)))
-        } else {
-            cipher.init(Cipher.ENCRYPT_MODE, SecretKeySpec(key, "AES"), IvParameterSpec(iv))
-            base64Encode(cipher.doFinal(parse.ct.toByteArray()))
-        }
-    }
-
-    // https://stackoverflow.com/a/41434590/8166854
-    fun generateKeyAndIv(
-        password: ByteArray,
-        salt: ByteArray,
-        hashAlgorithm: String = KDF,
-        keyLength: Int = 32,
-        ivLength: Int,
-        saltLength: Int,
-        iterations: Int = 1
-    ): Pair<ByteArray,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, saltLength)
-                md.digest(generatedData, generatedLength, digestLength)
-
-                for (i in 1 until iterations) {
-                    md.update(generatedData, generatedLength, digestLength)
-                    md.digest(generatedData, generatedLength, digestLength)
-                }
-
-                generatedLength += digestLength
-            }
-            return generatedData.copyOfRange(0, keyLength) to generatedData.copyOfRange(keyLength, targetKeySize)
-        } catch (e: DigestException) {
-            return null
-        }
-    }
-
-    fun String.hexToByteArray(): ByteArray {
-        check(length % 2 == 0) { "Must have an even length" }
-        return chunked(2)
-            .map { it.toInt(16).toByte() }
-            .toByteArray()
-    }
-
-    private data class AesData(
-        @JsonProperty("ct") val ct: String,
-        @JsonProperty("iv") val iv: String,
-        @JsonProperty("s") val s: String
-    )
-
-}

app/src/main/java/com/lagradost/cloudstream3/metaproviders/CrossTmdbProvider.kt

@@ -21,11 +21,10 @@ class CrossTmdbProvider : TmdbProvider() {
         return Regex("""[^a-zA-Z0-9-]""").replace(name, "")
     }
 
-    private val validApis
-        get() =
-            synchronized(apis) { apis.filter { it.lang == this.lang && it::class.java != this::class.java } }
-    //.distinctBy { it.uniqueId }
-
+    private val validApis by lazy {
+        apis.filter { it.lang == this.lang && it::class.java != this::class.java }
+            //.distinctBy { it.uniqueId }
+    }
 
     data class CrossMetaData(
         @JsonProperty("isSuccess") val isSuccess: Boolean,
@@ -61,8 +60,7 @@ class CrossTmdbProvider : TmdbProvider() {
 
     override suspend fun load(url: String): LoadResponse? {
         val base = super.load(url)?.apply {
-            this.recommendations =
-                this.recommendations?.filterIsInstance<MovieSearchResponse>() // TODO REMOVE
+            this.recommendations = this.recommendations?.filterIsInstance<MovieSearchResponse>() // TODO REMOVE
             val matchName = filterName(this.name)
             when (this) {
                 is MovieLoadResponse -> {
@@ -100,7 +98,6 @@ class CrossTmdbProvider : TmdbProvider() {
                     this.dataUrl =
                         CrossMetaData(true, data.map { it.apiName to it.dataUrl }).toJson()
                 }
-
                 else -> {
                     throw ErrorLoadingException("Nothing besides movies are implemented for this provider")
                 }

app/src/main/java/com/lagradost/cloudstream3/metaproviders/MultiAnimeProvider.kt

@@ -0,0 +1,70 @@
+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 by lazy {
+        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
+            }
+        }
+    }
+}

app/src/main/java/com/lagradost/cloudstream3/metaproviders/TmdbProvider.kt

@@ -151,8 +151,6 @@ open class TmdbProvider : MainAPI() {
             recommendations = (this@toLoadResponse.recommendations
                 ?: this@toLoadResponse.similar)?.results?.map { it.toSearchResponse() }
             addActors(credits?.cast?.toList().toActors())
-
-            contentRating = fetchContentRating(id, "US")
         }
     }
 
@@ -195,8 +193,6 @@ open class TmdbProvider : MainAPI() {
             recommendations = (this@toLoadResponse.recommendations
                 ?: this@toLoadResponse.similar)?.results?.map { it.toSearchResponse() }
             addActors(credits?.cast?.toList().toActors())
-
-            contentRating = fetchContentRating(id, "US")
         }
     }
 
@@ -268,26 +264,6 @@ open class TmdbProvider : MainAPI() {
         return null
     }
 
-    open suspend fun fetchContentRating(id: Int?, country: String): String? {
-        id ?: return null
-
-        val contentRatings = tmdb.tvService().content_ratings(id).awaitResponse().body()?.results
-        return if (!contentRatings.isNullOrEmpty()) {
-            contentRatings.firstOrNull { it: ContentRating ->
-                it.iso_3166_1 == country
-            }?.rating
-        } else {
-            val releaseDates = tmdb.moviesService().releaseDates(id).awaitResponse().body()?.results
-            val certification = releaseDates?.firstOrNull { it: ReleaseDatesResult ->
-                it.iso_3166_1 == country
-            }?.release_dates?.firstOrNull { it: ReleaseDate ->
-                !it.certification.isNullOrBlank()
-            }?.certification
-
-            certification
-        }
-    }
-
     // Possible to add recommendations and such here.
     override suspend fun load(url: String): LoadResponse? {
         // https://www.themoviedb.org/movie/7445-brothers

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

@@ -57,6 +57,32 @@ fun <T> LifecycleOwner.observeNullable(liveData: LiveData<T>, action: (t: T) ->
     liveData.observe(this) { action(it) }
 }
 
+inline fun <reified T : Any> some(value: T?): Some<T> {
+    return if (value == null) {
+        Some.None
+    } else {
+        Some.Success(value)
+    }
+}
+
+sealed class Some<out T> {
+    data class Success<out T>(val value: T) : Some<T>()
+    object None : Some<Nothing>()
+
+    override fun toString(): String {
+        return when (this) {
+            is None -> "None"
+            is Success -> "Some(${value.toString()})"
+        }
+    }
+}
+
+sealed class ResourceSome<out T> {
+    data class Success<out T>(val value: T) : ResourceSome<T>()
+    object None : ResourceSome<Nothing>()
+    data class Loading(val data: Any? = null) : ResourceSome<Nothing>()
+}
+
 sealed class Resource<out T> {
     data class Success<out T>(val value: T) : Resource<T>()
     data class Failure(
@@ -129,70 +155,6 @@ fun CoroutineScope.launchSafe(
     return this.launch(context, start, obj)
 }
 
-fun<T> throwAbleToResource(
-    throwable: Throwable
-): Resource<T> {
-    return when (throwable) {
-        is NullPointerException -> {
-            for (line in throwable.stackTrace) {
-                if (line?.fileName?.endsWith("provider.kt", ignoreCase = true) == true) {
-                    return Resource.Failure(
-                        false,
-                        null,
-                        null,
-                        "NullPointerException at ${line.fileName} ${line.lineNumber}\nSite might have updated or added Cloudflare/DDOS protection"
-                    )
-                }
-            }
-            safeFail(throwable)
-        }
-        is SocketTimeoutException, is InterruptedIOException -> {
-            Resource.Failure(
-                true,
-                null,
-                null,
-                "Connection Timeout\nPlease try again later."
-            )
-        }
-        is HttpException -> {
-            Resource.Failure(
-                false,
-                throwable.statusCode,
-                null,
-                throwable.message ?: "HttpException"
-            )
-        }
-        is UnknownHostException -> {
-            Resource.Failure(true, null, null, "Cannot connect to server, try again later.\n${throwable.message}")
-        }
-        is ErrorLoadingException -> {
-            Resource.Failure(
-                true,
-                null,
-                null,
-                throwable.message ?: "Error loading, try again later."
-            )
-        }
-        is NotImplementedError -> {
-            Resource.Failure(false, null, null, "This operation is not implemented.")
-        }
-        is SSLHandshakeException -> {
-            Resource.Failure(
-                true,
-                null,
-                null,
-                (throwable.message ?: "SSLHandshakeException") + "\nTry a VPN or DNS."
-            )
-        }
-        is CancellationException -> {
-            throwable.cause?.let {
-                throwAbleToResource(it)
-            } ?: safeFail(throwable)
-        }
-        else -> safeFail(throwable)
-    }
-}
-
 suspend fun <T> safeApiCall(
     apiCall: suspend () -> T,
 ): Resource<T> {
@@ -201,7 +163,60 @@ suspend fun <T> safeApiCall(
             Resource.Success(apiCall.invoke())
         } catch (throwable: Throwable) {
             logError(throwable)
-            throwAbleToResource(throwable)
+            when (throwable) {
+                is NullPointerException -> {
+                    for (line in throwable.stackTrace) {
+                        if (line?.fileName?.endsWith("provider.kt", ignoreCase = true) == true) {
+                            return@withContext Resource.Failure(
+                                false,
+                                null,
+                                null,
+                                "NullPointerException at ${line.fileName} ${line.lineNumber}\nSite might have updated or added Cloudflare/DDOS protection"
+                            )
+                        }
+                    }
+                    safeFail(throwable)
+                }
+                is SocketTimeoutException, is InterruptedIOException -> {
+                    Resource.Failure(
+                        true,
+                        null,
+                        null,
+                        "Connection Timeout\nPlease try again later."
+                    )
+                }
+                is HttpException -> {
+                    Resource.Failure(
+                        false,
+                        throwable.statusCode,
+                        null,
+                        throwable.message ?: "HttpException"
+                    )
+                }
+                is UnknownHostException -> {
+                    Resource.Failure(true, null, null, "Cannot connect to server, try again later.")
+                }
+                is ErrorLoadingException -> {
+                    Resource.Failure(
+                        true,
+                        null,
+                        null,
+                        throwable.message ?: "Error loading, try again later."
+                    )
+                }
+                is NotImplementedError -> {
+                    Resource.Failure(false, null, null, "This operation is not implemented.")
+                }
+                is SSLHandshakeException -> {
+                    Resource.Failure(
+                        true,
+                        null,
+                        null,
+                        (throwable.message ?: "SSLHandshakeException") + "\nTry a VPN or DNS."
+                    )
+                }
+                else -> safeFail(throwable)
+            }
         }
     }
 }

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

@@ -17,8 +17,6 @@ import java.net.URI
 class CloudflareKiller : Interceptor {
     companion object {
         const val TAG = "CloudflareKiller"
-        private val ERROR_CODES = listOf(403, 503)
-        private val CLOUDFLARE_SERVERS = listOf("cloudflare-nginx", "cloudflare")
         fun parseCookieMap(cookie: String): Map<String, String> {
             return cookie.split(";").associate {
                 val split = it.split("=")
@@ -50,23 +48,15 @@ class CloudflareKiller : Interceptor {
 
     override fun intercept(chain: Interceptor.Chain): Response = runBlocking {
         val request = chain.request()
+        val cookies = savedCookies[request.url.host]
 
-        when (val cookies = savedCookies[request.url.host]) {
-            null -> {
-                val response = chain.proceed(request)
-                if(!(response.header("Server") in CLOUDFLARE_SERVERS && response.code in ERROR_CODES)) {
-                    return@runBlocking response
-                } else {
-                    response.close()
-                    bypassCloudflare(request)?.let {
-                        Log.d(TAG, "Succeeded bypassing cloudflare: ${request.url}")
-                        return@runBlocking it
-                    }
-                }
-            }
-            else -> {
-                return@runBlocking proceed(request, cookies)
+        if (cookies == null) {
+            bypassCloudflare(request)?.let {
+                Log.d(TAG, "Succeeded bypassing cloudflare: ${request.url}")
+                return@runBlocking it
             }
+        } else {
+            return@runBlocking proceed(request, cookies)
         }
 
         debugWarning({ true }) { "Failed cloudflare at: ${request.url}" }

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

@@ -2,8 +2,6 @@ package com.lagradost.cloudstream3.network
 
 import android.annotation.SuppressLint
 import android.net.http.SslError
-import android.os.Handler
-import android.os.Looper
 import android.webkit.*
 import com.lagradost.cloudstream3.AcraApplication
 import com.lagradost.cloudstream3.AcraApplication.Companion.context
@@ -29,39 +27,16 @@ import java.net.URI
  * @param additionalUrls this will make resolveUsingWebView also return all other requests matching the list of Regex.
  * @param userAgent if null then will use the default user agent
  * @param useOkhttp will try to use the okhttp client as much as possible, but this might cause some requests to fail. Disable for cloudflare.
- * @param script pass custom js to execute
- * @param scriptCallback will be called with the result from custom js
- * @param timeout close webview after timeout
  * */
 class WebViewResolver(
     val interceptUrl: Regex,
     val additionalUrls: List<Regex> = emptyList(),
     val userAgent: String? = USER_AGENT,
-    val useOkhttp: Boolean = true,
-    val script: String? = null,
-    val scriptCallback: ((String) -> Unit)? = null,
-    val timeout: Long = DEFAULT_TIMEOUT
+    val useOkhttp: Boolean = true
 ) :
     Interceptor {
 
-    constructor(
-        interceptUrl: Regex,
-        additionalUrls: List<Regex> = emptyList(),
-        userAgent: String? = USER_AGENT,
-        useOkhttp: Boolean = true,
-        script: String? = null,
-        scriptCallback: ((String) -> Unit)? = null,
-    ) : this(interceptUrl, additionalUrls, userAgent, useOkhttp, script, scriptCallback, DEFAULT_TIMEOUT)
-
-    constructor(
-        interceptUrl: Regex,
-        additionalUrls: List<Regex> = emptyList(),
-        userAgent: String? = USER_AGENT,
-        useOkhttp: Boolean = true
-    ) : this(interceptUrl, additionalUrls, userAgent, useOkhttp, null, null, DEFAULT_TIMEOUT)
-
     companion object {
-        private const val DEFAULT_TIMEOUT = 60_000L
         var webViewUserAgent: String? = null
 
         @JvmName("getWebViewUserAgent1")
@@ -161,14 +136,6 @@ class WebViewResolver(
                         val webViewUrl = request.url.toString()
                         println("Loading WebView URL: $webViewUrl")
 
-                        if (script != null) {
-                            val handler = Handler(Looper.getMainLooper())
-                            handler.post {
-                                view.evaluateJavascript("$script")
-                                { scriptCallback?.invoke(it) }
-                            }
-                        }
-
                         if (interceptUrl.containsMatchIn(webViewUrl)) {
                             fixedRequest = request.toRequest()?.also {
                                 requestCallBack(it)
@@ -274,7 +241,7 @@ class WebViewResolver(
 
         var loop = 0
         // Timeouts after this amount, 60s
-        val totalTime = timeout
+        val totalTime = 60000L
 
         val delayTime = 100L
 

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

@@ -36,9 +36,7 @@ abstract class Plugin {
         Log.i(PLUGIN_TAG, "Adding ${element.name} (${element.mainUrl}) MainAPI")
         element.sourcePlugin = this.__filename
         // Race condition causing which would case duplicates if not for distinctBy
-        synchronized(APIHolder.allProviders) {
-            APIHolder.allProviders.add(element)
-        }
+        APIHolder.allProviders.add(element)
         APIHolder.addPluginMapping(element)
     }
 
@@ -53,14 +51,10 @@ abstract class Plugin {
     }
 
     class Manifest {
-        @JsonProperty("name")
-        var name: String? = null
-        @JsonProperty("pluginClassName")
-        var pluginClassName: String? = null
-        @JsonProperty("version")
-        var version: Int? = null
-        @JsonProperty("requiresResources")
-        var requiresResources: Boolean = false
+        @JsonProperty("name") var name: String? = null
+        @JsonProperty("pluginClassName") var pluginClassName: String? = null
+        @JsonProperty("version") var version: Int? = null
+        @JsonProperty("requiresResources") var requiresResources: Boolean = false
     }
 
     /**

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

@@ -137,20 +137,6 @@ object PluginManager {
         }
     }
 
-    /**
-     * Deletes all generated oat files which will force Android to recompile the dex extensions.
-     * This might fix unrecoverable SIGSEGV exceptions when old oat files are loaded in a new app update.
-     */
-    fun deleteAllOatFiles(context: Context) {
-        File("${context.filesDir}/${ONLINE_PLUGINS_FOLDER}").listFiles()?.forEach { repo ->
-            repo.listFiles { file -> file.name == "oat" && file.isDirectory }?.forEach { file ->
-                val success = file.deleteRecursively()
-                Log.i(TAG, "Deleted oat directory: ${file.absolutePath} Success=$success")
-            }
-        }
-    }
-
-
     fun getPluginsOnline(): Array<PluginData> {
         return getKey(PLUGINS_KEY) ?: emptyArray()
     }
@@ -177,11 +163,7 @@ object PluginManager {
     private val classLoaders: MutableMap<PathClassLoader, Plugin> =
         HashMap<PathClassLoader, Plugin>()
 
-    var loadedLocalPlugins = false
-        private set
-
-    var loadedOnlinePlugins = false
-        private set
+    private var loadedLocalPlugins = false
     private val gson = Gson()
 
     private suspend fun maybeLoadPlugin(context: Context, file: File) {
@@ -295,7 +277,6 @@ object PluginManager {
         }
 
         // ioSafe {
-        loadedOnlinePlugins = true
         afterPluginsLoadedEvent.invoke(false)
         // }
 
@@ -308,7 +289,7 @@ object PluginManager {
      * 2. Fetch all not downloaded plugins
      * 3. Download them and reload plugins
      **/
-    fun downloadNotExistingPluginsAndLoad(activity: Activity, mode: AutoDownloadMode) {
+    fun downloadNotExistingPluginsAndLoad(activity: Activity) {
         val newDownloadPlugins = mutableListOf<String>()
         val urls = (getKey<Array<RepositoryData>>(REPOSITORIES_KEY)
             ?: emptyArray()) + PREBUILT_REPOSITORIES
@@ -322,8 +303,6 @@ object PluginManager {
         // Iterate online repos and returns not downloaded plugins
         val notDownloadedPlugins = onlinePlugins.mapNotNull { onlineData ->
             val sitePlugin = onlineData.second
-            val tvtypes = sitePlugin.tvTypes ?: listOf()
-
             //Don't include empty urls
             if (sitePlugin.url.isBlank()) {
                 return@mapNotNull null
@@ -338,29 +317,22 @@ object PluginManager {
                 return@mapNotNull null
             }
 
-            //Omit non-NSFW if mode is set to NSFW only
-            if (mode == AutoDownloadMode.NsfwOnly) {
-                if (tvtypes.contains(TvType.NSFW.name) == false) {
-                    return@mapNotNull null
-                }
-            }
-            //Omit NSFW, if disabled
-            if (!settingsForProvider.enableAdult) {
-                if (tvtypes.contains(TvType.NSFW.name)) {
-                    return@mapNotNull null
-                }
-            }
-
             //Omit lang not selected on language setting
-            if (mode == AutoDownloadMode.FilterByLang) {
-                val lang = sitePlugin.language ?: return@mapNotNull null
-                //If set to 'universal', don't skip any language
-                if (!providerLang.contains(AllLanguagesName) && !providerLang.contains(lang)) {
-                    return@mapNotNull null
-                }
-                //Log.i(TAG, "sitePlugin lang => $lang")
+            val lang = sitePlugin.language ?: return@mapNotNull null
+            //If set to 'universal', don't skip any language
+            if (!providerLang.contains(AllLanguagesName) && !providerLang.contains(lang)) {
+                return@mapNotNull null
             }
+            //Log.i(TAG, "sitePlugin lang => $lang")
 
+            //Omit NSFW, if disabled
+            sitePlugin.tvTypes?.let { tvtypes ->
+                if (!settingsForProvider.enableAdult) {
+                    if (tvtypes.contains(TvType.NSFW.name)) {
+                        return@mapNotNull null
+                    }
+                }
+            }
             val savedData = PluginData(
                 url = sitePlugin.url,
                 internalName = sitePlugin.internalName,
@@ -477,14 +449,6 @@ object PluginManager {
         Log.i(TAG, "Loading plugin: $data")
 
         return try {
-            // in case of android 14 then
-            try {
-                File(filePath).setReadOnly()
-            } catch (t: Throwable) {
-                Log.e(TAG, "Failed to set dex as readonly")
-                logError(t)
-            }
-
             val loader = PathClassLoader(filePath, context.classLoader)
             var manifest: Plugin.Manifest
             loader.getResourceAsStream("manifest.json").use { stream ->
@@ -567,14 +531,10 @@ object PluginManager {
         }
 
         // remove all registered apis
-        synchronized(APIHolder.apis) {
-            APIHolder.apis.filter { api -> api.sourcePlugin == plugin.__filename }.forEach {
-                removePluginMapping(it)
-            }
-        }
-        synchronized(APIHolder.allProviders) {
-            APIHolder.allProviders.removeIf { provider: MainAPI -> provider.sourcePlugin == plugin.__filename }
+        APIHolder.apis.filter { api -> api.sourcePlugin == plugin.__filename }.forEach {
+            removePluginMapping(it)
         }
+        APIHolder.allProviders.removeIf { provider: MainAPI -> provider.sourcePlugin == plugin.__filename }
         extractorApis.removeIf { provider: ExtractorApi -> provider.sourcePlugin == plugin.__filename }
 
         classLoaders.values.removeIf { v -> v == plugin }
@@ -732,4 +692,4 @@ object PluginManager {
             return null
         }
     }
-}
+}

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

@@ -8,14 +8,22 @@ import com.lagradost.cloudstream3.AcraApplication.Companion.setKey
 import com.lagradost.cloudstream3.R
 import java.security.MessageDigest
 import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
 import com.lagradost.cloudstream3.utils.Coroutines.main
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 
 object VotingApi { // please do not cheat the votes lol
     private const val LOGKEY = "VotingApi"
 
-    private const val apiDomain = "https://counterapi.com/api"
+    enum class VoteType(val value: Int) {
+        UPVOTE(1),
+        DOWNVOTE(-1),
+        NONE(0)
+    }
+
+    private val apiDomain = "https://api.countapi.xyz"
 
     private fun transformUrl(url: String): String = // dont touch or all votes get reset
         MessageDigest
@@ -27,12 +35,12 @@ object VotingApi { // please do not cheat the votes lol
         return getVotes(url)
     }
 
-    fun SitePlugin.hasVoted(): Boolean {
-        return hasVoted(url)
+    suspend fun SitePlugin.vote(requestType: VoteType): Int {
+        return vote(url, requestType)
     }
 
-    suspend fun SitePlugin.vote(): Int {
-        return vote(url)
+    fun SitePlugin.getVoteType(): VoteType {
+        return getVoteType(url)
     }
 
     fun SitePlugin.canVote(): Boolean {
@@ -42,31 +50,28 @@ object VotingApi { // please do not cheat the votes lol
     // Plugin url to Int
     private val votesCache = mutableMapOf<String, Int>()
 
-    private fun getRepository(pluginUrl: String) = pluginUrl
-        .split("/")
-        .drop(2)
-        .take(3)
-        .joinToString("-")
-
-    private suspend fun readVote(pluginUrl: String): Int {
-        var url = "${apiDomain}/cs-${getRepository(pluginUrl)}/vote/${transformUrl(pluginUrl)}?readOnly=true"
+    suspend fun getVotes(pluginUrl: String): Int {
+        val url = "${apiDomain}/get/cs3-votes/${transformUrl(pluginUrl)}"
         Log.d(LOGKEY, "Requesting: $url")
-        return app.get(url).parsedSafe<Result>()?.value ?: 0
-    }
-
-    private suspend fun writeVote(pluginUrl: String): Boolean {
-        var url = "${apiDomain}/cs-${getRepository(pluginUrl)}/vote/${transformUrl(pluginUrl)}"
-        Log.d(LOGKEY, "Requesting: $url")
-        return app.get(url).parsedSafe<Result>()?.value != null
-    }
-
-    suspend fun getVotes(pluginUrl: String): Int =
-            votesCache[pluginUrl] ?: readVote(pluginUrl).also {
-                votesCache[pluginUrl] = it
+        return votesCache[pluginUrl] ?: app.get(url).parsedSafe<Result>()?.value?.also {
+            votesCache[pluginUrl] = it
+        } ?: (0.also {
+            ioSafe {
+                createBucket(pluginUrl)
             }
+        })
+    }
 
-    fun hasVoted(pluginUrl: String) =
-        getKey("cs3-votes/${transformUrl(pluginUrl)}") ?: false
+    fun getVoteType(pluginUrl: String): VoteType {
+        return getKey("cs3-votes/${transformUrl(pluginUrl)}") ?: VoteType.NONE
+    }
+
+    private suspend fun createBucket(pluginUrl: String) {
+        val url =
+            "${apiDomain}/create?namespace=cs3-votes&key=${transformUrl(pluginUrl)}&value=0&update_lowerbound=-2&update_upperbound=2&enable_reset=0"
+        Log.d(LOGKEY, "Requesting: $url")
+        app.get(url)
+    }
 
     fun canVote(pluginUrl: String): Boolean {
         if (!PluginManager.urlPlugins.contains(pluginUrl)) return false
@@ -74,7 +79,7 @@ object VotingApi { // please do not cheat the votes lol
     }
 
     private val voteLock = Mutex()
-    suspend fun vote(pluginUrl: String): Int {
+    suspend fun vote(pluginUrl: String, requestType: VoteType): Int {
         // Prevent multiple requests at the same time.
         voteLock.withLock {
             if (!canVote(pluginUrl)) {
@@ -85,21 +90,33 @@ object VotingApi { // please do not cheat the votes lol
                 return getVotes(pluginUrl)
             }
 
-            if (hasVoted(pluginUrl)) {
-                main {
-                    Toast.makeText(context, R.string.already_voted, Toast.LENGTH_SHORT)
-                        .show()
-                }
-                return getVotes(pluginUrl)
+            val savedType: VoteType =
+                getKey("cs3-votes/${transformUrl(pluginUrl)}") ?: VoteType.NONE
+
+            val newType = if (requestType == savedType) VoteType.NONE else requestType
+            val changeValue = if (requestType == savedType) {
+                -requestType.value
+            } else if (savedType == VoteType.NONE) {
+                requestType.value
+            } else if (savedType != requestType) {
+                -savedType.value + requestType.value
+            } else 0
+
+            // Pre-emptively set vote key
+            setKey("cs3-votes/${transformUrl(pluginUrl)}", newType)
+
+            val url =
+                "${apiDomain}/update/cs3-votes/${transformUrl(pluginUrl)}?amount=${changeValue}"
+            Log.d(LOGKEY, "Requesting: $url")
+            val res = app.get(url).parsedSafe<Result>()?.value
+
+            if (res == null) {
+                // "Refund" key if the response is invalid
+                setKey("cs3-votes/${transformUrl(pluginUrl)}", savedType)
+            } else {
+                votesCache[pluginUrl] = res
             }
-
-
-            if (writeVote(pluginUrl)) {
-                setKey("cs3-votes/${transformUrl(pluginUrl)}", true)
-                votesCache[pluginUrl] = votesCache[pluginUrl]?.plus(1) ?: 1
-            }
-
-            return getVotes(pluginUrl)
+            return res ?: 0
         }
     }
 

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

@@ -1,96 +0,0 @@
-package com.lagradost.cloudstream3.services
-
-import android.content.Context
-import androidx.core.app.NotificationCompat
-import androidx.work.Constraints
-import androidx.work.CoroutineWorker
-import androidx.work.ExistingPeriodicWorkPolicy
-import androidx.work.ForegroundInfo
-import androidx.work.PeriodicWorkRequest
-import androidx.work.WorkManager
-import androidx.work.WorkerParameters
-import com.lagradost.cloudstream3.R
-import com.lagradost.cloudstream3.utils.AppUtils.createNotificationChannel
-import com.lagradost.cloudstream3.utils.BackupUtils
-import com.lagradost.cloudstream3.utils.UIHelper.colorFromAttribute
-import java.util.concurrent.TimeUnit
-
-const val BACKUP_CHANNEL_ID = "cloudstream3.backups"
-const val BACKUP_WORK_NAME = "work_backup"
-const val BACKUP_CHANNEL_NAME = "Backups"
-const val BACKUP_CHANNEL_DESCRIPTION = "Notifications for background backups"
-const val BACKUP_NOTIFICATION_ID = 938712898 // Random unique
-
-class BackupWorkManager(val context: Context, workerParams: WorkerParameters) :
-    CoroutineWorker(context, workerParams) {
-    companion object {
-        fun enqueuePeriodicWork(context: Context?, intervalHours: Long) {
-            if (context == null) return
-
-            if (intervalHours == 0L) {
-                WorkManager.getInstance(context).cancelUniqueWork(BACKUP_WORK_NAME)
-                return
-            }
-
-            val constraints = Constraints.Builder()
-                .setRequiresStorageNotLow(true)
-                .build()
-
-            val periodicSyncDataWork =
-                PeriodicWorkRequest.Builder(
-                    BackupWorkManager::class.java,
-                    intervalHours,
-                    TimeUnit.HOURS
-                )
-                    .addTag(BACKUP_WORK_NAME)
-                    .setConstraints(constraints)
-                    .build()
-
-            WorkManager.getInstance(context).enqueueUniquePeriodicWork(
-                BACKUP_WORK_NAME,
-                ExistingPeriodicWorkPolicy.UPDATE,
-                periodicSyncDataWork
-            )
-
-            // Uncomment below for testing
-
-//            val oneTimeBackupWork =
-//                OneTimeWorkRequest.Builder(BackupWorkManager::class.java)
-//                    .addTag(BACKUP_WORK_NAME)
-//                    .setConstraints(constraints)
-//                    .build()
-//
-//            WorkManager.getInstance(context).enqueue(oneTimeBackupWork)
-        }
-    }
-
-    private val backupNotificationBuilder =
-        NotificationCompat.Builder(context, BACKUP_CHANNEL_ID)
-            .setColorized(true)
-            .setOnlyAlertOnce(true)
-            .setSilent(true)
-            .setAutoCancel(true)
-            .setContentTitle(context.getString(R.string.pref_category_backup))
-            .setPriority(NotificationCompat.PRIORITY_DEFAULT)
-            .setColor(context.colorFromAttribute(R.attr.colorPrimary))
-            .setSmallIcon(R.drawable.ic_cloudstream_monochrome_big)
-
-    override suspend fun doWork(): Result {
-        context.createNotificationChannel(
-            BACKUP_CHANNEL_ID,
-            BACKUP_CHANNEL_NAME,
-            BACKUP_CHANNEL_DESCRIPTION
-        )
-
-        setForeground(
-            ForegroundInfo(
-                BACKUP_NOTIFICATION_ID,
-                backupNotificationBuilder.build()
-            )
-        )
-
-        BackupUtils.backup(context)
-
-        return Result.success()
-    }
-}

app/src/main/java/com/lagradost/cloudstream3/subtitles/AbstractSubProvider.kt

@@ -1,23 +1,11 @@
 package com.lagradost.cloudstream3.subtitles
 
 import androidx.annotation.WorkerThread
-import androidx.core.net.toUri
-import com.lagradost.cloudstream3.MainActivity.Companion.deleteFileOnExit
-import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.subtitles.AbstractSubtitleEntities.SubtitleEntity
 import com.lagradost.cloudstream3.subtitles.AbstractSubtitleEntities.SubtitleSearch
 import com.lagradost.cloudstream3.syncproviders.AuthAPI
-import com.lagradost.cloudstream3.ui.player.SubtitleOrigin
-import okio.BufferedSource
-import okio.buffer
-import okio.sink
-import okio.source
-import java.io.File
-import java.util.zip.ZipInputStream
 
 interface AbstractSubProvider {
-    val idPrefix: String
-
     @WorkerThread
     suspend fun search(query: SubtitleSearch): List<SubtitleEntity>? {
         throw NotImplementedError()
@@ -27,98 +15,6 @@ interface AbstractSubProvider {
     suspend fun load(data: SubtitleEntity): String? {
         throw NotImplementedError()
     }
-
-    @WorkerThread
-    suspend fun SubtitleResource.getResources(data: SubtitleEntity) {
-        this.addUrl(load(data))
-    }
-
-    @WorkerThread
-    suspend fun getResource(data: SubtitleEntity): SubtitleResource {
-        return SubtitleResource().apply {
-            this.getResources(data)
-        }
-    }
-}
-
-/**
- * A builder for subtitle files.
- * @see addUrl
- * @see addFile
- */
-class SubtitleResource {
-    fun downloadFile(source: BufferedSource): File {
-        val file = File.createTempFile("temp-subtitle", ".tmp").apply {
-            deleteFileOnExit(this)
-        }
-        val sink = file.sink().buffer()
-        sink.writeAll(source)
-        sink.close()
-        source.close()
-
-        return file
-    }
-
-    fun unzip(file: File): List<Pair<String, File>> {
-        val entries = mutableListOf<Pair<String, File>>()
-
-        ZipInputStream(file.inputStream()).use { zipInputStream ->
-            var zipEntry = zipInputStream.nextEntry
-
-            while (zipEntry != null) {
-                val tempFile = File.createTempFile("unzipped-subtitle", ".tmp").apply {
-                    deleteFileOnExit(this)
-                }
-                entries.add(zipEntry.name to tempFile)
-
-                tempFile.sink().buffer().use { buffer ->
-                    buffer.writeAll(zipInputStream.source())
-                }
-
-                zipEntry = zipInputStream.nextEntry
-            }
-        }
-        return entries
-    }
-
-    data class SingleSubtitleResource(
-        val name: String?,
-        val url: String,
-        val origin: SubtitleOrigin
-    )
-
-    private var resources: MutableList<SingleSubtitleResource> = mutableListOf()
-
-    fun getSubtitles(): List<SingleSubtitleResource> {
-        return resources.toList()
-    }
-
-    fun addUrl(url: String?, name: String? = null) {
-        if (url == null) return
-        this.resources.add(
-            SingleSubtitleResource(name, url, SubtitleOrigin.URL)
-        )
-    }
-
-    fun addFile(file: File, name: String? = null) {
-        this.resources.add(
-            SingleSubtitleResource(name, file.toUri().toString(), SubtitleOrigin.DOWNLOADED_FILE)
-        )
-        deleteFileOnExit(file)
-    }
-
-    suspend fun addZipUrl(
-        url: String,
-        nameGenerator: (String, File) -> String? = { _, _ -> null }
-    ) {
-        val source = app.get(url).okhttpResponse.body.source()
-        val zip = downloadFile(source)
-        val realFiles = unzip(zip)
-        zip.deleteRecursively()
-        realFiles.forEach { (name, subtitleFile) ->
-            addFile(subtitleFile, nameGenerator(name, subtitleFile))
-        }
-    }
 }
 
 interface AbstractSubApi : AbstractSubProvider, AuthAPI

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

@@ -3,7 +3,6 @@ package com.lagradost.cloudstream3.syncproviders
 import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
 import com.lagradost.cloudstream3.AcraApplication.Companion.removeKeys
 import com.lagradost.cloudstream3.AcraApplication.Companion.setKey
-import com.lagradost.cloudstream3.syncproviders.providers.SubScene
 import com.lagradost.cloudstream3.syncproviders.providers.*
 import java.util.concurrent.TimeUnit
 
@@ -12,28 +11,26 @@ abstract class AccountManager(private val defIndex: Int) : AuthAPI {
         val malApi = MALApi(0)
         val aniListApi = AniListApi(0)
         val openSubtitlesApi = OpenSubtitlesApi(0)
-        val simklApi = SimklApi(0)
         val indexSubtitlesApi = IndexSubtitleApi()
         val addic7ed = Addic7ed()
-        val subScene = SubScene()
         val localListApi = LocalList()
 
         // used to login via app intent
         val OAuth2Apis
             get() = listOf<OAuth2API>(
-                malApi, aniListApi, simklApi
+                malApi, aniListApi
             )
 
         // this needs init with context and can be accessed in settings
         val accountManagers
             get() = listOf(
-                malApi, aniListApi, openSubtitlesApi, simklApi //nginxApi
+                malApi, aniListApi, openSubtitlesApi, //nginxApi
             )
 
         // used for active syncing
         val SyncApis
             get() = listOf(
-                SyncRepo(malApi), SyncRepo(aniListApi), SyncRepo(localListApi), SyncRepo(simklApi)
+                SyncRepo(malApi), SyncRepo(aniListApi), SyncRepo(localListApi)
             )
 
         val inAppAuths
@@ -43,8 +40,7 @@ abstract class AccountManager(private val defIndex: Int) : AuthAPI {
             get() = listOf(
                 openSubtitlesApi,
                 indexSubtitlesApi, // they got anti scraping measures in place :(
-                addic7ed,
-                subScene
+                addic7ed
             )
 
         const val appString = "cloudstreamapp"

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

@@ -1,8 +1,6 @@
 package com.lagradost.cloudstream3.syncproviders
 
 import com.lagradost.cloudstream3.*
-import com.lagradost.cloudstream3.ui.SyncWatchType
-import com.lagradost.cloudstream3.ui.WatchType
 import com.lagradost.cloudstream3.ui.library.ListSorting
 import com.lagradost.cloudstream3.ui.result.UiText
 import me.xdrop.fuzzywuzzy.FuzzySearch
@@ -12,8 +10,7 @@ enum class SyncIdName {
     MyAnimeList,
     Trakt,
     Imdb,
-    Simkl,
-    LocalList,
+    LocalList
 }
 
 interface SyncAPI : OAuth2API {
@@ -38,9 +35,9 @@ interface SyncAPI : OAuth2API {
     4 -> PlanToWatch
     5 -> ReWatching
      */
-    suspend fun score(id: String, status: AbstractSyncStatus): Boolean
+    suspend fun score(id: String, status: SyncStatus): Boolean
 
-    suspend fun getStatus(id: String): AbstractSyncStatus?
+    suspend fun getStatus(id: String): SyncStatus?
 
     suspend fun getResult(id: String): SyncResult?
 
@@ -62,25 +59,14 @@ interface SyncAPI : OAuth2API {
         override var id: Int? = null,
     ) : SearchResponse
 
-    abstract class AbstractSyncStatus {
-        abstract var status: SyncWatchType
-
-        /** 1-10 */
-        abstract var score: Int?
-        abstract var watchedEpisodes: Int?
-        abstract var isFavorite: Boolean?
-        abstract var maxEpisodes: Int?
-    }
-
-
     data class SyncStatus(
-        override var status: SyncWatchType,
+        val status: Int,
         /** 1-10 */
-        override var score: Int?,
-        override var watchedEpisodes: Int?,
-        override var isFavorite: Boolean? = null,
-        override var maxEpisodes: Int? = null,
-    ) : AbstractSyncStatus()
+        val score: Int?,
+        val watchedEpisodes: Int?,
+        var isFavorite: Boolean? = null,
+        var maxEpisodes: Int? = null,
+    )
 
     data class SyncResult(
         /**Used to verify*/
@@ -169,8 +155,5 @@ interface SyncAPI : OAuth2API {
         override var posterHeaders: Map<String, String>?,
         override var quality: SearchQuality?,
         override var id: Int? = null,
-        val plot : String? = null,
-        val rating: Int? = null,
-        val tags: List<String>? = null,
     ) : SearchResponse
 }

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

@@ -18,11 +18,11 @@ class SyncRepo(private val repo: SyncAPI) {
             repo.requireLibraryRefresh = value
         }
 
-    suspend fun score(id: String, status: SyncAPI.AbstractSyncStatus): Resource<Boolean> {
+    suspend fun score(id: String, status: SyncAPI.SyncStatus): Resource<Boolean> {
         return safeApiCall { repo.score(id, status) }
     }
 
-    suspend fun getStatus(id: String): Resource<SyncAPI.AbstractSyncStatus> {
+    suspend fun getStatus(id: String): Resource<SyncAPI.SyncStatus> {
         return safeApiCall { repo.getStatus(id) ?: throw ErrorLoadingException("No data") }
     }
 

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

@@ -13,7 +13,6 @@ import com.lagradost.cloudstream3.syncproviders.AccountManager
 import com.lagradost.cloudstream3.syncproviders.AuthAPI
 import com.lagradost.cloudstream3.syncproviders.SyncAPI
 import com.lagradost.cloudstream3.syncproviders.SyncIdName
-import com.lagradost.cloudstream3.ui.SyncWatchType
 import com.lagradost.cloudstream3.ui.library.ListSorting
 import com.lagradost.cloudstream3.ui.result.txt
 import com.lagradost.cloudstream3.utils.AppUtils.parseJson
@@ -159,23 +158,23 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI {
         )
     }
 
-    override suspend fun getStatus(id: String): SyncAPI.AbstractSyncStatus? {
+    override suspend fun getStatus(id: String): SyncAPI.SyncStatus? {
         val internalId = id.toIntOrNull() ?: return null
         val data = getDataAboutId(internalId) ?: return null
 
         return SyncAPI.SyncStatus(
             score = data.score,
             watchedEpisodes = data.progress,
-            status = SyncWatchType.fromInternalId(data.type?.value ?: return null),
+            status = data.type?.value ?: return null,
             isFavorite = data.isFavourite,
             maxEpisodes = data.episodes,
         )
     }
 
-    override suspend fun score(id: String, status: SyncAPI.AbstractSyncStatus): Boolean {
+    override suspend fun score(id: String, status: SyncAPI.SyncStatus): Boolean {
         return postDataAboutId(
             id.toIntOrNull() ?: return false,
-            fromIntToAnimeStatus(status.status.internalId),
+            fromIntToAnimeStatus(status.status),
             status.score,
             status.watchedEpisodes
         ).also {
@@ -596,7 +595,7 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI {
         //@JsonProperty("source") val source: String,
         @JsonProperty("episodes") val episodes: Int,
         @JsonProperty("title") val title: Title,
-        @JsonProperty("description") val description: String?,
+        //@JsonProperty("description") val description: String,
         @JsonProperty("coverImage") val coverImage: CoverImage,
         @JsonProperty("synonyms") val synonyms: List<String>,
         @JsonProperty("nextAiringEpisode") val nextAiringEpisode: SeasonNextAiringEpisode?,
@@ -630,8 +629,7 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI {
                 ?: this.media.coverImage.medium,
                 null,
                 null,
-                null,
-                plot = this.media.description
+                null
             )
         }
     }

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

@@ -23,47 +23,6 @@ class IndexSubtitleApi : AbstractSubApi {
     companion object {
         const val host = "https://indexsubtitle.com"
         const val TAG = "INDEXSUBS"
-
-        fun getOrdinal(num: Int?): String? {
-            return when (num) {
-                1 -> "First"
-                2 -> "Second"
-                3 -> "Third"
-                4 -> "Fourth"
-                5 -> "Fifth"
-                6 -> "Sixth"
-                7 -> "Seventh"
-                8 -> "Eighth"
-                9 -> "Ninth"
-                10 -> "Tenth"
-                11 -> "Eleventh"
-                12 -> "Twelfth"
-                13 -> "Thirteenth"
-                14 -> "Fourteenth"
-                15 -> "Fifteenth"
-                16 -> "Sixteenth"
-                17 -> "Seventeenth"
-                18 -> "Eighteenth"
-                19 -> "Nineteenth"
-                20 -> "Twentieth"
-                21 -> "Twenty-First"
-                22 -> "Twenty-Second"
-                23 -> "Twenty-Third"
-                24 -> "Twenty-Fourth"
-                25 -> "Twenty-Fifth"
-                26 -> "Twenty-Sixth"
-                27 -> "Twenty-Seventh"
-                28 -> "Twenty-Eighth"
-                29 -> "Twenty-Ninth"
-                30 -> "Thirtieth"
-                31 -> "Thirty-First"
-                32 -> "Thirty-Second"
-                33 -> "Thirty-Third"
-                34 -> "Thirty-Fourth"
-                35 -> "Thirty-Fifth"
-                else -> null
-            }
-        }
     }
 
     private fun fixUrl(url: String): String {
@@ -85,6 +44,47 @@ class IndexSubtitleApi : AbstractSubApi {
         }
     }
 
+    private fun getOrdinal(num: Int?): String? {
+        return when (num) {
+            1 -> "First"
+            2 -> "Second"
+            3 -> "Third"
+            4 -> "Fourth"
+            5 -> "Fifth"
+            6 -> "Sixth"
+            7 -> "Seventh"
+            8 -> "Eighth"
+            9 -> "Ninth"
+            10 -> "Tenth"
+            11 -> "Eleventh"
+            12 -> "Twelfth"
+            13 -> "Thirteenth"
+            14 -> "Fourteenth"
+            15 -> "Fifteenth"
+            16 -> "Sixteenth"
+            17 -> "Seventeenth"
+            18 -> "Eighteenth"
+            19 -> "Nineteenth"
+            20 -> "Twentieth"
+            21 -> "Twenty-First"
+            22 -> "Twenty-Second"
+            23 -> "Twenty-Third"
+            24 -> "Twenty-Fourth"
+            25 -> "Twenty-Fifth"
+            26 -> "Twenty-Sixth"
+            27 -> "Twenty-Seventh"
+            28 -> "Twenty-Eighth"
+            29 -> "Twenty-Ninth"
+            30 -> "Thirtieth"
+            31 -> "Thirty-First"
+            32 -> "Thirty-Second"
+            33 -> "Thirty-Third"
+            34 -> "Thirty-Fourth"
+            35 -> "Thirty-Fifth"
+            else -> null
+        }
+    }
+
     private fun isRightEps(text: String, seasonNum: Int?, epNum: Int?): Boolean {
         val FILTER_EPS_REGEX =
             Regex("(?i)((Chapter\\s?0?${epNum})|((Season)?\\s?0?${seasonNum}?\\s?(Episode)\\s?0?${epNum}[^0-9]))|(?i)((S?0?${seasonNum}?E0?${epNum}[^0-9])|(0?${seasonNum}[a-z]0?${epNum}[^0-9]))")

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

@@ -8,9 +8,7 @@ import com.lagradost.cloudstream3.syncproviders.SyncIdName
 import com.lagradost.cloudstream3.ui.WatchType
 import com.lagradost.cloudstream3.ui.library.ListSorting
 import com.lagradost.cloudstream3.ui.result.txt
-import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTrueTvSettings
 import com.lagradost.cloudstream3.utils.Coroutines.ioWork
-import com.lagradost.cloudstream3.utils.DataStoreHelper.getAllFavorites
 import com.lagradost.cloudstream3.utils.DataStoreHelper.getAllSubscriptions
 import com.lagradost.cloudstream3.utils.DataStoreHelper.getAllWatchStateIds
 import com.lagradost.cloudstream3.utils.DataStoreHelper.getBookmarkedData
@@ -47,11 +45,11 @@ class LocalList : SyncAPI {
 
     override val mainUrl = ""
     override val syncIdName = SyncIdName.LocalList
-    override suspend fun score(id: String, status: SyncAPI.AbstractSyncStatus): Boolean {
+    override suspend fun score(id: String, status: SyncAPI.SyncStatus): Boolean {
         return true
     }
 
-    override suspend fun getStatus(id: String): SyncAPI.AbstractSyncStatus? {
+    override suspend fun getStatus(id: String): SyncAPI.SyncStatus? {
         return null
     }
 
@@ -71,52 +69,29 @@ class LocalList : SyncAPI {
         }?.distinctBy { it.first } ?: return null
 
         val list = ioWork {
-            val isTrueTv = isTrueTvSettings()
-
-            val baseMap = WatchType.values().filter { it != WatchType.NONE }.associate {
-                // None is not something to display
-                it.stringRes to emptyList<SyncAPI.LibraryItem>()
-            } + mapOf(
-                R.string.favorites_list_name to emptyList()
-            ) + if (!isTrueTv) {
-                mapOf(
-                    R.string.subscription_list_name to emptyList()
-                )
-            } else {
-                emptyMap()
-            }
-
-            val watchStatusMap = watchStatusIds.groupBy { it.second.stringRes }.mapValues { group ->
+            watchStatusIds.groupBy {
+                it.second.stringRes
+            }.mapValues { group ->
                 group.value.mapNotNull {
                     getBookmarkedData(it.first)?.toLibraryItem(it.first.toString())
                 }
-            }
-
-            val favoritesMap = mapOf(R.string.favorites_list_name to getAllFavorites().mapNotNull {
+            } + mapOf(R.string.subscription_list_name to getAllSubscriptions().mapNotNull {
                 it.toLibraryItem()
             })
-
-            // Don't show subscriptions on TV
-            val result = if (isTrueTv) {
-                baseMap + watchStatusMap + favoritesMap
-            } else {
-                val subscriptionsMap = mapOf(R.string.subscription_list_name to getAllSubscriptions().mapNotNull {
-                    it.toLibraryItem()
-                })
-
-                baseMap + watchStatusMap + subscriptionsMap + favoritesMap
-            }
-
-            result
         }
 
+        val baseMap = WatchType.values().filter { it != WatchType.NONE }.associate {
+            // None is not something to display
+            it.stringRes to emptyList<SyncAPI.LibraryItem>()
+        } + mapOf(R.string.subscription_list_name to emptyList())
+
         return SyncAPI.LibraryMetadata(
-            list.map { SyncAPI.LibraryList(txt(it.key), it.value) },
+            (baseMap + list).map { SyncAPI.LibraryList(txt(it.key), it.value) },
             setOf(
                 ListSorting.AlphabeticalA,
                 ListSorting.AlphabeticalZ,
-                ListSorting.UpdatedNew,
-                ListSorting.UpdatedOld,
+//                ListSorting.UpdatedNew,
+//                ListSorting.UpdatedOld,
 //                ListSorting.RatingHigh,
 //                ListSorting.RatingLow,
             )

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

@@ -16,7 +16,6 @@ import com.lagradost.cloudstream3.syncproviders.AccountManager
 import com.lagradost.cloudstream3.syncproviders.AuthAPI
 import com.lagradost.cloudstream3.syncproviders.SyncAPI
 import com.lagradost.cloudstream3.syncproviders.SyncIdName
-import com.lagradost.cloudstream3.ui.SyncWatchType
 import com.lagradost.cloudstream3.ui.library.ListSorting
 import com.lagradost.cloudstream3.ui.result.txt
 import com.lagradost.cloudstream3.utils.AppUtils.parseJson
@@ -92,10 +91,10 @@ class MALApi(index: Int) : AccountManager(index), SyncAPI {
         return Regex("""/anime/((.*)/|(.*))""").find(url)!!.groupValues.first()
     }
 
-    override suspend fun score(id: String, status: SyncAPI.AbstractSyncStatus): Boolean {
+    override suspend fun score(id: String, status: SyncAPI.SyncStatus): Boolean {
         return setScoreRequest(
             id.toIntOrNull() ?: return false,
-            fromIntToAnimeStatus(status.status.internalId),
+            fromIntToAnimeStatus(status.status),
             status.score,
             status.watchedEpisodes
         ).also {
@@ -246,7 +245,7 @@ class MALApi(index: Int) : AccountManager(index), SyncAPI {
             getDataAboutMalId(internalId)?.my_list_status //?: throw ErrorLoadingException("No my_list_status")
         return SyncAPI.SyncStatus(
             score = data?.score,
-            status = SyncWatchType.fromInternalId(malStatusAsString.indexOf(data?.status)) ,
+            status = malStatusAsString.indexOf(data?.status),
             isFavorite = null,
             watchedEpisodes = data?.num_episodes_watched,
         )
@@ -443,7 +442,6 @@ class MALApi(index: Int) : AccountManager(index), SyncAPI {
                 this.node.main_picture?.large ?: this.node.main_picture?.medium,
                 null,
                 null,
-                plot = this.node.synopsis,
             )
         }
     }

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

@@ -2,13 +2,12 @@ package com.lagradost.cloudstream3.syncproviders.providers
 
 import android.util.Log
 import com.fasterxml.jackson.annotation.JsonProperty
+import com.google.common.collect.BiMap
+import com.google.common.collect.HashBiMap
+import com.lagradost.cloudstream3.*
 import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
 import com.lagradost.cloudstream3.AcraApplication.Companion.removeKey
 import com.lagradost.cloudstream3.AcraApplication.Companion.setKey
-import com.lagradost.cloudstream3.ErrorLoadingException
-import com.lagradost.cloudstream3.R
-import com.lagradost.cloudstream3.TvType
-import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.subtitles.AbstractSubApi
 import com.lagradost.cloudstream3.subtitles.AbstractSubtitleEntities
@@ -16,8 +15,8 @@ import com.lagradost.cloudstream3.syncproviders.AuthAPI
 import com.lagradost.cloudstream3.syncproviders.InAppAuthAPI
 import com.lagradost.cloudstream3.syncproviders.InAppAuthAPIManager
 import com.lagradost.cloudstream3.utils.AppUtils
-import okhttp3.Interceptor
-import okhttp3.Response
+import java.net.URLEncoder
+import java.nio.charset.StandardCharsets
 
 class OpenSubtitlesApi(index: Int) : InAppAuthAPIManager(index), AbstractSubApi {
     override val idPrefix = "opensubtitles"
@@ -37,23 +36,6 @@ class OpenSubtitlesApi(index: Int) : InAppAuthAPIManager(index), AbstractSubApi
         var currentSession: SubtitleOAuthEntity? = null
     }
 
-    private val headerInterceptor = OpenSubtitleInterceptor()
-
-    /** Automatically adds required api headers */
-    private class OpenSubtitleInterceptor : Interceptor {
-        /** Required user agent! */
-        private val userAgent = "Cloudstream3 v0.1"
-        override fun intercept(chain: Interceptor.Chain): Response {
-            return chain.proceed(
-                chain.request().newBuilder()
-                    .removeHeader("user-agent")
-                    .addHeader("user-agent", userAgent)
-                    .addHeader("Api-Key", apiKey)
-                    .build()
-            )
-        }
-    }
-
     private fun canDoRequest(): Boolean {
         return unixTimeMs > currentCoolDown
     }
@@ -116,13 +98,13 @@ class OpenSubtitlesApi(index: Int) : InAppAuthAPIManager(index), AbstractSubApi
         val response = app.post(
             url = "$host/login",
             headers = mapOf(
-                "Content-Type" to "application/json",
+                "Api-Key" to apiKey,
+                "Content-Type" to "application/json"
             ),
             data = mapOf(
                 "username" to username,
                 "password" to password
-            ),
-            interceptor = headerInterceptor
+            )
         )
         //Log.i(TAG, "Responsecode = ${response.code}")
         //Log.i(TAG, "Result => ${response.text}")
@@ -167,13 +149,11 @@ class OpenSubtitlesApi(index: Int) : InAppAuthAPIManager(index), AbstractSubApi
 //        "pt" to "pt-PT",
 //        "pt" to "pt-BR"
     )
-
-    private fun fixLanguage(language: String?): String? {
+    private fun fixLanguage(language: String?) : String? {
         return languageExceptions[language] ?: language
     }
-
     // O(n) but good enough, BiMap did not want to work properly
-    private fun fixLanguageReverse(language: String?): String? {
+    private fun fixLanguageReverse(language: String?) : String? {
         return languageExceptions.entries.firstOrNull { it.value == language }?.key ?: language
     }
 
@@ -203,9 +183,9 @@ class OpenSubtitlesApi(index: Int) : InAppAuthAPIManager(index), AbstractSubApi
         val req = app.get(
             url = searchQueryUrl,
             headers = mapOf(
+                Pair("Api-Key", apiKey),
                 Pair("Content-Type", "application/json")
-            ),
-            interceptor = headerInterceptor
+            )
         )
         Log.i(TAG, "Search Req => ${req.text}")
         if (!req.isSuccessful) {
@@ -227,7 +207,7 @@ class OpenSubtitlesApi(index: Int) : InAppAuthAPIManager(index), AbstractSubApi
                 //Use any valid name/title in hierarchy
                 val name = filename ?: featureDetails?.movieName ?: featureDetails?.title
                 ?: featureDetails?.parentTitle ?: attr.release ?: query.query
-                val lang = fixLanguageReverse(attr.language) ?: ""
+                val lang = fixLanguageReverse(attr.language)?: ""
                 val resEpNum = featureDetails?.episodeNumber ?: query.epNumber
                 val resSeasonNum = featureDetails?.seasonNumber ?: query.seasonNumber
                 val year = featureDetails?.year ?: query.year
@@ -271,13 +251,13 @@ class OpenSubtitlesApi(index: Int) : InAppAuthAPIManager(index), AbstractSubApi
                     "Authorization",
                     "Bearer ${currentSession?.access_token ?: throw ErrorLoadingException("No access token active in current session")}"
                 ),
+                Pair("Api-Key", apiKey),
                 Pair("Content-Type", "application/json"),
                 Pair("Accept", "*/*")
             ),
             data = mapOf(
                 Pair("file_id", data.data)
-            ),
-            interceptor = headerInterceptor
+            )
         )
         Log.i(TAG, "Request result  => (${req.code}) ${req.text}")
         //Log.i(TAG, "Request headers => ${req.headers}")

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

@@ -1,118 +0,0 @@
-package com.lagradost.cloudstream3.syncproviders.providers
-
-import com.lagradost.cloudstream3.app
-import com.lagradost.cloudstream3.mvvm.debugPrint
-import com.lagradost.cloudstream3.subtitles.AbstractSubProvider
-import com.lagradost.cloudstream3.subtitles.AbstractSubtitleEntities
-import com.lagradost.cloudstream3.subtitles.SubtitleResource
-import com.lagradost.cloudstream3.syncproviders.providers.IndexSubtitleApi.Companion.getOrdinal
-import com.lagradost.cloudstream3.utils.SubtitleHelper
-
-class SubScene : AbstractSubProvider {
-    val mainUrl = "https://subscene.com"
-    val name = "Subscene"
-    override val idPrefix = "subscene"
-
-    override suspend fun search(query: AbstractSubtitleEntities.SubtitleSearch): List<AbstractSubtitleEntities.SubtitleEntity>? {
-        val seasonName =
-            query.seasonNumber?.let { number ->
-                // Need to translate "7" to "Seventh Season"
-                getOrdinal(number)?.let { words -> " - $words Season" }
-            } ?: ""
-
-        val fullQuery = query.query + seasonName
-
-        val doc = app.post(
-            "$mainUrl/subtitles/searchbytitle",
-            data = mapOf("query" to fullQuery, "l" to "")
-        ).document
-
-        return doc.select("div.title a").map { element ->
-            val href = "$mainUrl${element.attr("href")}"
-            val title = element.text()
-
-            AbstractSubtitleEntities.SubtitleEntity(
-                idPrefix = idPrefix,
-                name = title,
-                source = name,
-                data = href,
-                lang = query.lang ?: "en",
-                epNumber = query.epNumber
-            )
-        }.distinctBy { it.data }
-    }
-
-    override suspend fun SubtitleResource.getResources(data: AbstractSubtitleEntities.SubtitleEntity) {
-        val resultDoc = app.get(data.data).document
-        val queryLanguage = SubtitleHelper.fromTwoLettersToLanguage(data.lang) ?: "English"
-
-        val results = resultDoc.select("table tbody tr").mapNotNull { element ->
-            val anchor = element.select("a")
-            val href = anchor.attr("href") ?: return@mapNotNull null
-            val fixedHref = "$mainUrl${href}"
-            val spans = anchor.select("span")
-            val language = spans.firstOrNull()?.text()
-            val title = spans.getOrNull(1)?.text()
-            val isPositive = anchor.select("span.positive-icon").isNotEmpty()
-
-            TableElement(title, language, fixedHref, isPositive)
-        }.sortedBy {
-            it.getScore(queryLanguage, data.epNumber)
-        }
-
-        debugPrint { "$name found subtitles: ${results.takeLast(3)}" }
-        // Last = highest score
-        val selectedResult = results.lastOrNull() ?: return
-
-        val subtitleDocument = app.get(selectedResult.href).document
-        val subtitleDownloadUrl =
-            "$mainUrl${subtitleDocument.select("div.download a").attr("href")}"
-
-        this.addZipUrl(subtitleDownloadUrl) { name, _ ->
-            name
-        }
-    }
-
-    /**
-     * Class to manage the various different subtitle results and rank them.
-     */
-    data class TableElement(
-        val title: String?,
-        val language: String?,
-        val href: String,
-        val isPositive: Boolean
-    ) {
-        private fun matchesLanguage(other: String): Boolean {
-            return language != null && (language.contains(other, ignoreCase = true) ||
-                    other.contains(language, ignoreCase = true))
-        }
-
-        /**
-         * Scores in this order:
-         * Preferred Language > Episode number > Positive rating > English Language
-         */
-        fun getScore(queryLanguage: String, episodeNum: Int?): Int {
-            var score = 0
-            if (this.matchesLanguage(queryLanguage)) {
-                score += 8
-            }
-            // Matches Episode 7 using "E07" with any number of leading zeroes
-            if (episodeNum != null && title != null && title.contains(
-                    Regex(
-                        """E0*${episodeNum}""",
-                        RegexOption.IGNORE_CASE
-                    )
-                )
-            ) {
-                score += 4
-            }
-            if (isPositive) {
-                score += 2
-            }
-            if (this.matchesLanguage("English")) {
-                score += 1
-            }
-            return score
-        }
-    }
-}

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

@@ -1,24 +1,16 @@
 package com.lagradost.cloudstream3.ui
 
+import com.lagradost.cloudstream3.*
 import com.lagradost.cloudstream3.APIHolder.unixTime
 import com.lagradost.cloudstream3.APIHolder.unixTimeMS
-import com.lagradost.cloudstream3.DubStatus
-import com.lagradost.cloudstream3.ErrorLoadingException
-import com.lagradost.cloudstream3.HomePageResponse
-import com.lagradost.cloudstream3.LoadResponse
-import com.lagradost.cloudstream3.MainAPI
 import com.lagradost.cloudstream3.MainActivity.Companion.afterPluginsLoadedEvent
-import com.lagradost.cloudstream3.MainPageRequest
-import com.lagradost.cloudstream3.SearchResponse
-import com.lagradost.cloudstream3.SubtitleFile
-import com.lagradost.cloudstream3.TvType
-import com.lagradost.cloudstream3.fixUrl
 import com.lagradost.cloudstream3.mvvm.Resource
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.mvvm.safeApiCall
 import com.lagradost.cloudstream3.utils.Coroutines.threadSafeListOf
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.GlobalScope.coroutineContext
 import kotlinx.coroutines.async
 import kotlinx.coroutines.delay
@@ -182,7 +174,7 @@ class APIRepository(val api: MainAPI) {
         data: String,
         isCasting: Boolean,
         subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit,
+        callback: (ExtractorLink) -> Unit
     ): Boolean {
         if (isInvalidData(data)) return false // this makes providers cleaner
         return try {

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

@@ -3,7 +3,6 @@ package com.lagradost.cloudstream3.ui
 import android.content.Context
 import android.util.AttributeSet
 import android.view.View
-import androidx.core.view.children
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import kotlin.math.abs
@@ -25,7 +24,7 @@ class GrdLayoutManager(val context: Context, _spanCount: Int) :
         }
     }
 
-    /*override fun onRequestChildFocus(
+    override fun onRequestChildFocus(
         parent: RecyclerView,
         state: RecyclerView.State,
         child: View,
@@ -33,17 +32,13 @@ class GrdLayoutManager(val context: Context, _spanCount: Int) :
     ): Boolean {
         // android.widget.FrameLayout$LayoutParams cannot be cast to androidx.recyclerview.widget.RecyclerView$LayoutParams
         return try {
-            if(focused != null) {
-              //  val pos = maxOf(0, getPosition(focused) - 2) // IDK WHY
-                val pos = getPosition(focused)
-                if(pos >= 0) parent.scrollToPosition(pos)
-            }
-
+            val pos = maxOf(0, getPosition(focused!!) - 2)
+            parent.scrollToPosition(pos)
             super.onRequestChildFocus(parent, state, child, focused)
         } catch (e: Exception) {
             false
         }
-    }*/
+    }
 
     // Allows moving right and left with focus https://gist.github.com/vganin/8930b41f55820ec49e4d
     override fun onInterceptFocusSearch(focused: View, direction: Int): View? {
@@ -70,47 +65,32 @@ class GrdLayoutManager(val context: Context, _spanCount: Int) :
         val spanCount = this.spanCount
         val orientation = this.orientation
 
-        // fixes arabic by inverting left and right layout focus
-        val correctDirection = if (this.isLayoutRTL) {
-            when (direction) {
-                View.FOCUS_RIGHT -> View.FOCUS_LEFT
-                View.FOCUS_LEFT -> View.FOCUS_RIGHT
-                else -> direction
-            }
-        } else direction
-
         if (orientation == VERTICAL) {
-            when (correctDirection) {
+            when (direction) {
                 View.FOCUS_DOWN -> {
                     return spanCount
                 }
-
                 View.FOCUS_UP -> {
                     return -spanCount
                 }
-
                 View.FOCUS_RIGHT -> {
                     return 1
                 }
-
                 View.FOCUS_LEFT -> {
                     return -1
                 }
             }
         } else if (orientation == HORIZONTAL) {
-            when (correctDirection) {
+            when (direction) {
                 View.FOCUS_DOWN -> {
                     return 1
                 }
-
                 View.FOCUS_UP -> {
                     return -1
                 }
-
                 View.FOCUS_RIGHT -> {
                     return spanCount
                 }
-
                 View.FOCUS_LEFT -> {
                     return -spanCount
                 }
@@ -162,32 +142,4 @@ class AutofitRecyclerView @JvmOverloads constructor(context: Context, attrs: Att
 
         layoutManager = manager
     }
-}
-
-/**
- * Recyclerview wherein the max item width or height is set by the biggest view to prevent inconsistent view sizes.
- */
-class MaxRecyclerView(ctx: Context, attrs: AttributeSet) : RecyclerView(ctx, attrs) {
-    private var biggestObserved: Int = 0
-    private val orientation = LayoutManager.getProperties(context, attrs, 0, 0).orientation
-    private val isHorizontal = orientation == HORIZONTAL
-    private fun View.updateMaxSize() {
-        if (isHorizontal) {
-            this.minimumHeight = biggestObserved
-        } else {
-            this.minimumWidth = biggestObserved
-        }
-    }
-
-    override fun onChildAttachedToWindow(child: View) {
-        child.measure(MeasureSpec.UNSPECIFIED, MeasureSpec.UNSPECIFIED)
-        val observed = if (isHorizontal) child.measuredHeight else child.measuredWidth
-        if (observed > biggestObserved) {
-            biggestObserved = observed
-            children.forEach { it.updateMaxSize() }
-        } else {
-            child.updateMaxSize()
-        }
-        super.onChildAttachedToWindow(child)
-    }
 }

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

@@ -8,7 +8,7 @@ import android.widget.*
 import androidx.appcompat.app.AlertDialog
 import com.fasterxml.jackson.databind.DeserializationFeature
 import com.fasterxml.jackson.databind.json.JsonMapper
-import com.fasterxml.jackson.module.kotlin.kotlinModule
+import com.fasterxml.jackson.module.kotlin.KotlinModule
 import com.google.android.gms.cast.MediaQueueItem
 import com.google.android.gms.cast.MediaSeekOptions
 import com.google.android.gms.cast.MediaStatus.REPEAT_MODE_REPEAT_OFF
@@ -25,7 +25,6 @@ import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.mvvm.safeApiCall
 import com.lagradost.cloudstream3.sortSubs
 import com.lagradost.cloudstream3.sortUrls
-import com.lagradost.cloudstream3.ui.player.LoadType
 import com.lagradost.cloudstream3.ui.player.RepoLinkGenerator
 import com.lagradost.cloudstream3.ui.player.SubtitleData
 import com.lagradost.cloudstream3.ui.result.ResultEpisode
@@ -98,7 +97,7 @@ data class MetadataHolder(
 
 class SelectSourceController(val view: ImageView, val activity: ControllerActivity) :
     UIController() {
-    private val mapper: JsonMapper = JsonMapper.builder().addModule(kotlinModule())
+    private val mapper: JsonMapper = JsonMapper.builder().addModule(KotlinModule())
         .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false).build()
 
     init {
@@ -295,8 +294,7 @@ class SelectSourceController(val view: ImageView, val activity: ControllerActivi
                         val generator = RepoLinkGenerator(listOf(epData))
 
                         val isSuccessful = safeApiCall {
-                            generator.generateLinks(
-                                clearCache = false, type = LoadType.Chromecast,
+                            generator.generateLinks(clearCache = false, isCasting = true,
                                 callback = {
                                     it.first?.let { link ->
                                         currentLinks.add(link)

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

@@ -16,16 +16,14 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.AppCompatImageView
 import androidx.core.view.isVisible
 import com.lagradost.cloudstream3.R
-import com.lagradost.cloudstream3.databinding.ActivityEasterEggMonkeBinding
+import kotlinx.android.synthetic.main.activity_easter_egg_monke.*
+import java.util.*
 
 class EasterEggMonke : AppCompatActivity() {
 
-    lateinit var binding : ActivityEasterEggMonkeBinding
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-
-        binding = ActivityEasterEggMonkeBinding.inflate(layoutInflater)
-        setContentView(binding.root)
+        setContentView(R.layout.activity_easter_egg_monke)
 
         val handler = Handler(mainLooper)
         lateinit var runnable: Runnable
@@ -34,14 +32,15 @@ class EasterEggMonke : AppCompatActivity() {
             handler.postDelayed(runnable, 300)
         }
         handler.postDelayed(runnable, 1000)
+
     }
 
     private fun shower() {
 
-        val containerW = binding.frame.width
-        val containerH = binding.frame.height
-        var starW: Float = binding.monke.width.toFloat()
-        var starH: Float = binding.monke.height.toFloat()
+        val containerW = frame.width
+        val containerH = frame.height
+        var starW: Float = monke.width.toFloat()
+        var starH: Float = monke.height.toFloat()
 
         val newStar = AppCompatImageView(this)
         val idx = (monkeys.size * Math.random()).toInt()
@@ -49,7 +48,7 @@ class EasterEggMonke : AppCompatActivity() {
         newStar.isVisible = true
         newStar.layoutParams = FrameLayout.LayoutParams(FrameLayout.LayoutParams.WRAP_CONTENT,
             FrameLayout.LayoutParams.WRAP_CONTENT)
-        binding.frame.addView(newStar)
+        frame.addView(newStar)
 
         newStar.scaleX = Math.random().toFloat() * 1.5f +  newStar.scaleX
         newStar.scaleY = newStar.scaleX
@@ -71,7 +70,7 @@ class EasterEggMonke : AppCompatActivity() {
 
         set.addListener(object : AnimatorListenerAdapter() {
             override fun onAnimationEnd(animation: Animator) {
-                binding.frame.removeView(newStar)
+                frame.removeView(newStar)
             }
         })
 

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

@@ -15,27 +15,4 @@ enum class WatchType(val internalId: Int, @StringRes val stringRes: Int, @Drawab
     companion object {
         fun fromInternalId(id: Int?) = values().find { value -> value.internalId == id } ?: NONE
     }
-}
-
-enum class SyncWatchType(val internalId: Int, @StringRes val stringRes: Int, @DrawableRes val iconRes: Int) {
-    /*
-          -1 -> None
-          0 -> Watching
-          1 -> Completed
-          2 -> OnHold
-          3 -> Dropped
-          4 -> PlanToWatch
-          5 -> ReWatching
-          */
-    NONE(-1, R.string.type_none, R.drawable.ic_baseline_add_24),
-    WATCHING(0, R.string.type_watching, R.drawable.ic_baseline_bookmark_24),
-    COMPLETED(1, R.string.type_completed, R.drawable.ic_baseline_bookmark_24),
-    ONHOLD(2, R.string.type_on_hold, R.drawable.ic_baseline_bookmark_24),
-    DROPPED(3, R.string.type_dropped, R.drawable.ic_baseline_bookmark_24),
-    PLANTOWATCH(4, R.string.type_plan_to_watch, R.drawable.ic_baseline_bookmark_24),
-    REWATCHING(5, R.string.type_re_watching, R.drawable.ic_baseline_bookmark_24);
-
-    companion object {
-        fun fromInternalId(id: Int?) = values().find { value -> value.internalId == id } ?: NONE
-    }
-}
+}

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

@@ -12,23 +12,20 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
 import androidx.navigation.fragment.findNavController
 import com.lagradost.cloudstream3.MainActivity
+import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.USER_AGENT
-import com.lagradost.cloudstream3.databinding.FragmentWebviewBinding
 import com.lagradost.cloudstream3.network.WebViewResolver
 import com.lagradost.cloudstream3.utils.AppUtils.loadRepository
-
+import kotlinx.android.synthetic.main.fragment_webview.*
 
 class WebviewFragment : Fragment() {
-
-    var binding: FragmentWebviewBinding? = null
-
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         val url = arguments?.getString(WEBVIEW_URL) ?: "".also {
             findNavController().popBackStack()
         }
 
-        binding?.webView?.webViewClient = object : WebViewClient() {
+        web_view.webViewClient = object : WebViewClient() {
             override fun shouldOverrideUrlLoading(
                 view: WebView?,
                 request: WebResourceRequest?
@@ -43,28 +40,24 @@ class WebviewFragment : Fragment() {
                 return super.shouldOverrideUrlLoading(view, request)
             }
         }
-        binding?.webView?.apply {
-            WebViewResolver.webViewUserAgent = settings.userAgentString
 
-            addJavascriptInterface(RepoApi(activity), "RepoApi")
-            settings.javaScriptEnabled = true
-            settings.userAgentString = USER_AGENT
-            settings.domStorageEnabled = true
+        WebViewResolver.webViewUserAgent = web_view.settings.userAgentString
+
+        web_view.addJavascriptInterface(RepoApi(activity), "RepoApi")
+        web_view.settings.javaScriptEnabled = true
+        web_view.settings.userAgentString = USER_AGENT
+        web_view.settings.domStorageEnabled = true
 //        WebView.setWebContentsDebuggingEnabled(true)
 
-            loadUrl(url)
-        }
-
+        web_view.loadUrl(url)
     }
 
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View {
-        val localBinding = FragmentWebviewBinding.inflate(inflater, container, false)
-        binding = localBinding
+    ): View? {
         // Inflate the layout for this fragment
-        return localBinding.root//inflater.inflate(R.layout.fragment_webview, container, false)
+        return inflater.inflate(R.layout.fragment_webview, container, false)
     }
 
     companion object {
@@ -77,7 +70,7 @@ class WebviewFragment : Fragment() {
 
     private class RepoApi(val activity: FragmentActivity?) {
         @JavascriptInterface
-        fun installRepo(repoUrl: String) {
+         fun installRepo(repoUrl: String) {
             activity?.loadRepository(repoUrl)
         }
     }

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

@@ -1,198 +0,0 @@
-package com.lagradost.cloudstream3.ui.account
-
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import androidx.core.content.ContextCompat
-import androidx.core.view.isVisible
-import androidx.recyclerview.widget.RecyclerView
-import androidx.viewbinding.ViewBinding
-import com.lagradost.cloudstream3.R
-import com.lagradost.cloudstream3.databinding.AccountListItemAddBinding
-import com.lagradost.cloudstream3.databinding.AccountListItemBinding
-import com.lagradost.cloudstream3.databinding.AccountListItemEditBinding
-import com.lagradost.cloudstream3.ui.account.AccountHelper.showAccountEditDialog
-import com.lagradost.cloudstream3.ui.result.setImage
-import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTvSettings
-import com.lagradost.cloudstream3.utils.DataStoreHelper
-import com.lagradost.cloudstream3.utils.UIHelper.setImage
-
-class AccountAdapter(
-    private val accounts: List<DataStoreHelper.Account>,
-    private val accountSelectCallback: (DataStoreHelper.Account) -> Unit,
-    private val accountCreateCallback: (DataStoreHelper.Account) -> Unit,
-    private val accountEditCallback: (DataStoreHelper.Account) -> Unit,
-    private val accountDeleteCallback: (DataStoreHelper.Account) -> Unit
-) : RecyclerView.Adapter<AccountAdapter.AccountViewHolder>() {
-
-    companion object {
-        const val VIEW_TYPE_SELECT_ACCOUNT = 0
-        const val VIEW_TYPE_ADD_ACCOUNT = 1
-        const val VIEW_TYPE_EDIT_ACCOUNT = 2
-    }
-
-    inner class AccountViewHolder(private val binding: ViewBinding) :
-        RecyclerView.ViewHolder(binding.root) {
-
-        fun bind(account: DataStoreHelper.Account?) {
-            when (binding) {
-                is AccountListItemBinding -> binding.apply {
-                    if (account == null) return@apply
-
-                    val isTv = isTvSettings() || !root.isInTouchMode
-
-                    val isLastUsedAccount = account.keyIndex == DataStoreHelper.selectedKeyIndex
-
-                    accountName.text = account.name
-                    accountImage.setImage(account.image)
-                    lockIcon.isVisible = account.lockPin != null
-                    outline.isVisible = !isTv && isLastUsedAccount
-
-                    if (isTv) {
-                        // For emulator but this is fine on TV also
-                        root.isFocusableInTouchMode = true
-                        if (isLastUsedAccount) {
-                            root.requestFocus()
-                        }
-
-                        root.foreground = ContextCompat.getDrawable(
-                            root.context,
-                            R.drawable.outline_drawable
-                        )
-                    } else {
-                        root.setOnLongClickListener {
-                            showAccountEditDialog(
-                                context = root.context,
-                                account = account,
-                                isNewAccount = false,
-                                accountEditCallback = { account -> accountEditCallback.invoke(account) },
-                                accountDeleteCallback = { account -> accountDeleteCallback.invoke(account) }
-                            )
-
-                            true
-                        }
-                    }
-
-                    root.setOnClickListener {
-                        accountSelectCallback.invoke(account)
-                    }
-                }
-
-                is AccountListItemEditBinding -> binding.apply {
-                    if (account == null) return@apply
-
-                    val isTv = isTvSettings() || !root.isInTouchMode
-
-                    val isLastUsedAccount = account.keyIndex == DataStoreHelper.selectedKeyIndex
-
-                    accountName.text = account.name
-                    accountImage.setImage(
-                        account.image,
-                        fadeIn = false,
-                        radius = 10
-                    )
-                    lockIcon.isVisible = account.lockPin != null
-                    outline.isVisible = !isTv && isLastUsedAccount
-
-                    if (isTv) {
-                        // For emulator but this is fine on TV also
-                        root.isFocusableInTouchMode = true
-                        if (isLastUsedAccount) {
-                            root.requestFocus()
-                        }
-
-                        root.foreground = ContextCompat.getDrawable(
-                            root.context,
-                            R.drawable.outline_drawable
-                        )
-                    }
-
-                    root.setOnClickListener {
-                        showAccountEditDialog(
-                            context = root.context,
-                            account = account,
-                            isNewAccount = false,
-                            accountEditCallback = { account -> accountEditCallback.invoke(account) },
-                            accountDeleteCallback = { account -> accountDeleteCallback.invoke(account) }
-                        )
-                    }
-                }
-
-                is AccountListItemAddBinding -> binding.apply {
-                    root.setOnClickListener {
-                        val remainingImages =
-                            DataStoreHelper.profileImages.toSet() - accounts.filter { it.customImage == null }
-                                .mapNotNull { DataStoreHelper.profileImages.getOrNull(it.defaultImageIndex) }.toSet()
-
-                        val image =
-                            DataStoreHelper.profileImages.indexOf(remainingImages.randomOrNull() ?: DataStoreHelper.profileImages.random())
-                        val keyIndex = (accounts.maxOfOrNull { it.keyIndex } ?: 0) + 1
-
-                        val accountName = root.context.getString(R.string.account)
-
-                        showAccountEditDialog(
-                            root.context,
-                            DataStoreHelper.Account(
-                                keyIndex = keyIndex,
-                                name = "$accountName $keyIndex",
-                                customImage = null,
-                                defaultImageIndex = image
-                            ),
-                            isNewAccount = true,
-                            accountEditCallback = { account -> accountCreateCallback.invoke(account) },
-                            accountDeleteCallback = {}
-                        )
-                    }
-                }
-            }
-        }
-    }
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): AccountViewHolder =
-        AccountViewHolder(
-            binding = when (viewType) {
-                VIEW_TYPE_SELECT_ACCOUNT -> {
-                    AccountListItemBinding.inflate(
-                        LayoutInflater.from(parent.context),
-                        parent,
-                        false
-                    )
-                }
-                VIEW_TYPE_ADD_ACCOUNT -> {
-                    AccountListItemAddBinding.inflate(
-                        LayoutInflater.from(parent.context),
-                        parent,
-                        false
-                    )
-                }
-                VIEW_TYPE_EDIT_ACCOUNT -> {
-                    AccountListItemEditBinding.inflate(
-                        LayoutInflater.from(parent.context),
-                        parent,
-                        false
-                    )
-                }
-                else -> throw IllegalArgumentException("Invalid view type")
-            }
-        )
-
-    override fun onBindViewHolder(holder: AccountViewHolder, position: Int) {
-        holder.bind(accounts.getOrNull(position))
-    }
-
-    var viewType = 0
-
-    override fun getItemViewType(position: Int): Int {
-        if (viewType != 0 && position != accounts.count()) {
-            return viewType
-        }
-
-        return when (position) {
-            accounts.count() -> VIEW_TYPE_ADD_ACCOUNT
-            else -> VIEW_TYPE_SELECT_ACCOUNT
-        }
-    }
-
-    override fun getItemCount(): Int {
-        return accounts.count() + 1
-    }
-}

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

@@ -1,356 +0,0 @@
-package com.lagradost.cloudstream3.ui.account
-
-import android.app.Activity
-import android.content.Context
-import android.content.DialogInterface
-import android.content.Intent
-import android.text.Editable
-import android.view.LayoutInflater
-import android.view.inputmethod.EditorInfo
-import android.widget.TextView
-import androidx.annotation.StringRes
-import androidx.appcompat.app.AlertDialog
-import androidx.core.view.isGone
-import androidx.core.view.isVisible
-import androidx.core.widget.doOnTextChanged
-import androidx.lifecycle.ViewModelProvider
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import com.google.android.material.bottomsheet.BottomSheetDialog
-import com.lagradost.cloudstream3.AcraApplication.Companion.getActivity
-import com.lagradost.cloudstream3.MainActivity
-import com.lagradost.cloudstream3.R
-import com.lagradost.cloudstream3.databinding.AccountEditDialogBinding
-import com.lagradost.cloudstream3.databinding.AccountSelectLinearBinding
-import com.lagradost.cloudstream3.databinding.LockPinDialogBinding
-import com.lagradost.cloudstream3.mvvm.logError
-import com.lagradost.cloudstream3.mvvm.observe
-import com.lagradost.cloudstream3.ui.result.setImage
-import com.lagradost.cloudstream3.ui.result.setLinearListLayout
-import com.lagradost.cloudstream3.utils.AppUtils.setDefaultFocus
-import com.lagradost.cloudstream3.utils.DataStoreHelper
-import com.lagradost.cloudstream3.utils.DataStoreHelper.getDefaultAccount
-import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
-import com.lagradost.cloudstream3.utils.UIHelper.showInputMethod
-
-object AccountHelper {
-    fun showAccountEditDialog(
-        context: Context,
-        account: DataStoreHelper.Account,
-        isNewAccount: Boolean,
-        accountEditCallback: (DataStoreHelper.Account) -> Unit,
-        accountDeleteCallback: (DataStoreHelper.Account) -> Unit
-    ) {
-        val binding = AccountEditDialogBinding.inflate(LayoutInflater.from(context), null, false)
-        val builder = AlertDialog.Builder(context, R.style.AlertDialogCustom)
-            .setView(binding.root)
-
-        var currentEditAccount = account
-        val dialog = builder.show()
-
-        if (!isNewAccount) binding.title.setText(R.string.edit_account)
-
-        // Set up the dialog content
-        binding.accountName.text = Editable.Factory.getInstance()?.newEditable(account.name)
-        binding.accountName.doOnTextChanged { text, _, _, _ ->
-            currentEditAccount = currentEditAccount.copy(name = text?.toString() ?: "")
-        }
-
-        binding.deleteBtt.isGone = isNewAccount
-        binding.deleteBtt.setOnClickListener {
-            val dialogClickListener = DialogInterface.OnClickListener { _, which ->
-                when (which) {
-                    DialogInterface.BUTTON_POSITIVE -> {
-                        accountDeleteCallback.invoke(account)
-                        dialog?.dismissSafe()
-                    }
-
-                    DialogInterface.BUTTON_NEGATIVE -> {
-                        dialog?.dismissSafe()
-                    }
-                }
-            }
-
-            try {
-                AlertDialog.Builder(context).setTitle(R.string.delete).setMessage(
-                    context.getString(R.string.delete_message).format(
-                        currentEditAccount.name
-                    )
-                )
-                    .setPositiveButton(R.string.delete, dialogClickListener)
-                    .setNegativeButton(R.string.cancel, dialogClickListener)
-                    .show().setDefaultFocus()
-            } catch (t: Throwable) {
-                logError(t)
-            }
-        }
-
-        binding.cancelBtt.setOnClickListener {
-            dialog?.dismissSafe()
-        }
-
-        // Handle the profile picture and its interactions
-        binding.accountImage.setImage(account.image)
-        binding.accountImage.setOnClickListener {
-            // Roll the image forwards once
-            currentEditAccount =
-                currentEditAccount.copy(defaultImageIndex = (currentEditAccount.defaultImageIndex + 1) % DataStoreHelper.profileImages.size)
-            binding.accountImage.setImage(currentEditAccount.image)
-        }
-
-        // Handle applying changes
-        binding.applyBtt.setOnClickListener {
-            if (currentEditAccount.lockPin != null) {
-                // Ask for the current PIN
-                showPinInputDialog(context, currentEditAccount.lockPin, false) { pin ->
-                    if (pin == null) return@showPinInputDialog
-                    // PIN is correct, proceed to update the account
-                    accountEditCallback.invoke(currentEditAccount)
-                    dialog.dismissSafe()
-                }
-            } else {
-                // No lock PIN set, proceed to update the account
-                accountEditCallback.invoke(currentEditAccount)
-                dialog.dismissSafe()
-            }
-        }
-
-        // Handle setting or changing the PIN
-        if (currentEditAccount.keyIndex == getDefaultAccount(context).keyIndex) {
-            binding.lockProfileCheckbox.isVisible = false
-            if (currentEditAccount.lockPin != null) {
-                currentEditAccount = currentEditAccount.copy(lockPin = null)
-            }
-        }
-
-        var canSetPin = true
-
-        binding.lockProfileCheckbox.isChecked = currentEditAccount.lockPin != null
-
-        binding.lockProfileCheckbox.setOnCheckedChangeListener { _, isChecked ->
-            if (isChecked) {
-                if (canSetPin) {
-                    showPinInputDialog(context, null, true) { pin ->
-                        if (pin == null) {
-                            binding.lockProfileCheckbox.isChecked = false
-                            return@showPinInputDialog
-                        }
-
-                        currentEditAccount = currentEditAccount.copy(lockPin = pin)
-                    }
-                }
-            } else {
-                if (currentEditAccount.lockPin != null) {
-                    // Ask for the current PIN
-                    showPinInputDialog(context, currentEditAccount.lockPin, true) { pin ->
-                        if (pin == null || pin != currentEditAccount.lockPin) {
-                            canSetPin = false
-                            binding.lockProfileCheckbox.isChecked = true
-                        } else {
-                            currentEditAccount = currentEditAccount.copy(lockPin = null)
-                        }
-                    }
-                }
-            }
-        }
-
-        canSetPin = true
-    }
-
-    fun showPinInputDialog(
-        context: Context,
-        currentPin: String?,
-        editAccount: Boolean,
-        forStartup: Boolean = false,
-        errorText: String? = null,
-        callback: (String?) -> Unit
-    ) {
-        fun TextView.visibleWithText(@StringRes textRes: Int) {
-            isVisible = true
-            setText(textRes)
-        }
-
-        fun TextView.visibleWithText(text: String?) {
-            isVisible = true
-            setText(text)
-        }
-
-        val binding = LockPinDialogBinding.inflate(LayoutInflater.from(context))
-
-        val isPinSet = currentPin != null
-        val isNewPin = editAccount && !isPinSet
-        val isEditPin = editAccount && isPinSet
-
-        val titleRes = if (isEditPin) R.string.enter_current_pin else R.string.enter_pin
-
-        var isPinValid = false
-
-        val builder = AlertDialog.Builder(context, R.style.AlertDialogCustom)
-            .setView(binding.root)
-            .setTitle(titleRes)
-            .setNegativeButton(R.string.cancel) { _, _ ->
-                callback.invoke(null)
-            }
-            .setOnCancelListener {
-                callback.invoke(null)
-            }
-            .setOnDismissListener {
-                if (!isPinValid) {
-                    callback.invoke(null)
-                }
-            }
-
-        if (forStartup) {
-            val currentAccount = DataStoreHelper.accounts.firstOrNull {
-                it.keyIndex == DataStoreHelper.selectedKeyIndex
-            }
-
-            builder.setTitle(context.getString(R.string.enter_pin_with_name, currentAccount?.name))
-            builder.setOnDismissListener {
-                if (!isPinValid) {
-                    context.getActivity()?.finish()
-                }
-            }
-            // So that if they don't know the PIN for the current account,
-            // they don't get completely locked out
-            builder.setNeutralButton(R.string.use_default_account) { _, _ ->
-                val activity = context.getActivity()
-                if (activity is AccountSelectActivity) {
-                    isPinValid = true
-                    activity.viewModel.handleAccountSelect(getDefaultAccount(context), activity)
-                }
-            }
-        }
-
-        if (isNewPin) {
-            if (errorText != null) binding.pinEditTextError.visibleWithText(errorText)
-            builder.setPositiveButton(R.string.setup_done) { _, _ ->
-                if (!isPinValid) {
-                    // If the done button is pressed and there is an error,
-                    // ask again, and mention the error that caused this.
-                    showPinInputDialog(
-                        context = binding.root.context,
-                        currentPin = null,
-                        editAccount = true,
-                        errorText = binding.pinEditTextError.text.toString(),
-                        callback = callback
-                    )
-                } else {
-                    val enteredPin = binding.pinEditText.text.toString()
-                    callback.invoke(enteredPin)
-                }
-            }
-        }
-
-        val dialog = builder.create()
-
-        binding.pinEditText.doOnTextChanged { text, _, _, _ ->
-            val enteredPin = text.toString()
-            val isEnteredPinValid = enteredPin.length == 4
-
-            if (isEnteredPinValid) {
-                if (isPinSet) {
-                    if (enteredPin != currentPin) {
-                        binding.pinEditTextError.visibleWithText(R.string.pin_error_incorrect)
-                        binding.pinEditText.text = null
-                        isPinValid = false
-                    } else {
-                        binding.pinEditTextError.isVisible = false
-                        isPinValid = true
-
-                        callback.invoke(enteredPin)
-                        dialog.dismissSafe()
-                    }
-                } else {
-                    binding.pinEditTextError.isVisible = false
-                    isPinValid = true
-                }
-            } else if (isNewPin) {
-                binding.pinEditTextError.visibleWithText(R.string.pin_error_length)
-                isPinValid = false
-            }
-        }
-
-        // Detect IME_ACTION_DONE
-        binding.pinEditText.setOnEditorActionListener { _, actionId, _ ->
-            if (actionId == EditorInfo.IME_ACTION_DONE && isPinValid) {
-                val enteredPin = binding.pinEditText.text.toString()
-                callback.invoke(enteredPin)
-                dialog.dismissSafe()
-            }
-            true
-        }
-
-        // We don't want to accidentally have the dialog dismiss when clicking outside of it.
-        // That is what the cancel button is for.
-        dialog.setCanceledOnTouchOutside(false)
-
-        dialog.show()
-
-        // Auto focus on PIN input and show keyboard
-        binding.pinEditText.requestFocus()
-        binding.pinEditText.postDelayed({
-            showInputMethod(binding.pinEditText)
-        }, 200)
-    }
-
-    fun Activity?.showAccountSelectLinear() {
-        val activity = this as? MainActivity ?: return
-        val viewModel = ViewModelProvider(activity)[AccountViewModel::class.java]
-
-        val binding: AccountSelectLinearBinding = AccountSelectLinearBinding.inflate(
-            LayoutInflater.from(activity)
-        )
-
-        val builder = BottomSheetDialog(activity)
-        builder.setContentView(binding.root)
-        builder.show()
-
-        binding.manageAccountsButton.setOnClickListener {
-            val accountSelectIntent = Intent(activity, AccountSelectActivity::class.java)
-            accountSelectIntent.putExtra("isEditingFromMainActivity", true)
-            activity.startActivity(accountSelectIntent)
-            builder.dismissSafe()
-        }
-
-        val recyclerView: RecyclerView = binding.accountRecyclerView
-
-        val itemSize = recyclerView.resources.getDimensionPixelSize(
-            R.dimen.account_select_linear_item_size
-        )
-
-        recyclerView.addItemDecoration(AccountSelectLinearItemDecoration(itemSize))
-
-        recyclerView.setLinearListLayout(isHorizontal = true)
-
-        val currentAccount = DataStoreHelper.accounts.firstOrNull {
-            it.keyIndex == DataStoreHelper.selectedKeyIndex
-        } ?: getDefaultAccount(activity)
-
-        // We want to make sure the accounts are up-to-date
-        viewModel.handleAccountSelect(
-            currentAccount,
-            activity,
-            reloadForActivity = true
-        )
-
-        activity.observe(viewModel.accounts) { liveAccounts ->
-            recyclerView.adapter = AccountAdapter(
-                liveAccounts,
-                accountSelectCallback = { account ->
-                    viewModel.handleAccountSelect(account, activity)
-                    builder.dismissSafe()
-                },
-                accountCreateCallback = { viewModel.handleAccountUpdate(it, activity) },
-                accountEditCallback = { viewModel.handleAccountUpdate(it, activity) },
-                accountDeleteCallback = { viewModel.handleAccountDelete(it, activity) }
-            )
-
-            activity.observe(viewModel.selectedKeyIndex) { selectedKeyIndex ->
-                // Scroll to current account (which is focused by default)
-                val layoutManager = recyclerView.layoutManager as LinearLayoutManager
-                layoutManager.scrollToPositionWithOffset(selectedKeyIndex, 0)
-            }
-        }
-    }
-}

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

@@ -1,168 +0,0 @@
-package com.lagradost.cloudstream3.ui.account
-
-import android.annotation.SuppressLint
-import android.content.Intent
-import android.os.Bundle
-import androidx.appcompat.app.AppCompatActivity
-import androidx.lifecycle.ViewModelProvider
-import androidx.preference.PreferenceManager
-import androidx.recyclerview.widget.GridLayoutManager
-import com.lagradost.cloudstream3.CommonActivity
-import com.lagradost.cloudstream3.CommonActivity.loadThemes
-import com.lagradost.cloudstream3.CommonActivity.showToast
-import com.lagradost.cloudstream3.MainActivity
-import com.lagradost.cloudstream3.R
-import com.lagradost.cloudstream3.databinding.ActivityAccountSelectBinding
-import com.lagradost.cloudstream3.mvvm.observe
-import com.lagradost.cloudstream3.ui.AutofitRecyclerView
-import com.lagradost.cloudstream3.ui.account.AccountAdapter.Companion.VIEW_TYPE_EDIT_ACCOUNT
-import com.lagradost.cloudstream3.ui.account.AccountAdapter.Companion.VIEW_TYPE_SELECT_ACCOUNT
-import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTvSettings
-import com.lagradost.cloudstream3.utils.DataStoreHelper.accounts
-import com.lagradost.cloudstream3.utils.DataStoreHelper.selectedKeyIndex
-import com.lagradost.cloudstream3.utils.DataStoreHelper.setAccount
-import com.lagradost.cloudstream3.utils.UIHelper.colorFromAttribute
-
-class AccountSelectActivity : AppCompatActivity() {
-
-    lateinit var viewModel: AccountViewModel
-
-    @SuppressLint("NotifyDataSetChanged")
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        loadThemes(this)
-
-        window.navigationBarColor = colorFromAttribute(R.attr.primaryBlackBackground)
-
-        // Are we editing and coming from MainActivity?
-        val isEditingFromMainActivity = intent.getBooleanExtra(
-            "isEditingFromMainActivity",
-            false
-        )
-
-        val settingsManager = PreferenceManager.getDefaultSharedPreferences(this)
-        val skipStartup = settingsManager.getBoolean(
-            getString(R.string.skip_startup_account_select_key),
-            false
-        ) || accounts.count() <= 1
-
-        viewModel = ViewModelProvider(this)[AccountViewModel::class.java]
-
-        // Don't show account selection if there is only
-        // one account that exists
-        if (!isEditingFromMainActivity && skipStartup) {
-            val currentAccount = accounts.firstOrNull { it.keyIndex == selectedKeyIndex }
-            if (currentAccount?.lockPin != null) {
-                CommonActivity.init(this)
-                viewModel.handleAccountSelect(currentAccount, this, true)
-                observe(viewModel.isAllowedLogin) { isAllowedLogin ->
-                    if (isAllowedLogin) {
-                        // We are allowed to continue to MainActivity
-                        navigateToMainActivity()
-                    }
-                }
-            } else {
-                if (accounts.count() > 1) {
-                    showToast(this, getString(
-                        R.string.logged_account,
-                        currentAccount?.name
-                    ))
-                }
-
-                navigateToMainActivity()
-            }
-
-            return
-        }
-
-        CommonActivity.init(this)
-
-        val binding = ActivityAccountSelectBinding.inflate(layoutInflater)
-        setContentView(binding.root)
-
-        val recyclerView: AutofitRecyclerView = binding.accountRecyclerView
-
-        observe(viewModel.accounts) { liveAccounts ->
-            val adapter = AccountAdapter(
-                liveAccounts,
-                // Handle the selected account
-                accountSelectCallback = {
-                    viewModel.handleAccountSelect(it, this)
-                    observe(viewModel.isAllowedLogin) { isAllowedLogin ->
-                        if (isAllowedLogin) {
-                            // We are allowed to continue to MainActivity
-                            navigateToMainActivity()
-                        }
-                    }
-                },
-                accountCreateCallback = { viewModel.handleAccountUpdate(it, this) },
-                accountEditCallback = {
-                    viewModel.handleAccountUpdate(it, this)
-
-                    // We came from MainActivity, return there
-                    // and switch to the edited account
-                    if (isEditingFromMainActivity) {
-                        setAccount(it)
-                        navigateToMainActivity()
-                    }
-                },
-                accountDeleteCallback = { viewModel.handleAccountDelete(it,this) }
-            )
-
-            recyclerView.adapter = adapter
-
-            if (isTvSettings()) {
-                binding.editAccountButton.setBackgroundResource(
-                    R.drawable.player_button_tv_attr_no_bg
-                )
-            }
-
-            observe(viewModel.selectedKeyIndex) { selectedKeyIndex ->
-                // Scroll to current account (which is focused by default)
-                val layoutManager = recyclerView.layoutManager as GridLayoutManager
-                layoutManager.scrollToPositionWithOffset(selectedKeyIndex, 0)
-            }
-
-            observe(viewModel.isEditing) { isEditing ->
-                if (isEditing) {
-                    binding.editAccountButton.setImageResource(R.drawable.ic_baseline_close_24)
-                    binding.title.setText(R.string.manage_accounts)
-                    adapter.viewType = VIEW_TYPE_EDIT_ACCOUNT
-                } else {
-                    binding.editAccountButton.setImageResource(R.drawable.ic_baseline_edit_24)
-                    binding.title.setText(R.string.select_an_account)
-                    adapter.viewType = VIEW_TYPE_SELECT_ACCOUNT
-                }
-
-                adapter.notifyDataSetChanged()
-            }
-
-            if (isEditingFromMainActivity) {
-                viewModel.setIsEditing(true)
-            }
-
-            binding.editAccountButton.setOnClickListener {
-                // We came from MainActivity, return there
-                // and resume its state
-                if (isEditingFromMainActivity) {
-                    navigateToMainActivity()
-                    return@setOnClickListener
-                }
-
-                viewModel.toggleIsEditing()
-            }
-
-            if (isTvSettings()) {
-                recyclerView.spanCount = if (liveAccounts.count() + 1 <= 6) {
-                    liveAccounts.count() + 1
-                } else 6
-            }
-        }
-    }
-
-    private fun navigateToMainActivity() {
-        val mainIntent = Intent(this, MainActivity::class.java)
-        startActivity(mainIntent)
-        finish() // Finish the account selection activity
-    }
-}

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

@@ -1,14 +0,0 @@
-package com.lagradost.cloudstream3.ui.account
-
-import android.graphics.Rect
-import android.view.View
-import androidx.recyclerview.widget.RecyclerView
-
-class AccountSelectLinearItemDecoration(private val size: Int) : RecyclerView.ItemDecoration() {
-    override fun getItemOffsets(outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State) {
-        val layoutParams = view.layoutParams as RecyclerView.LayoutParams
-        layoutParams.width = size
-        layoutParams.height = size
-        view.layoutParams = layoutParams
-    }
-}