Fix oversight when cookies are already stored in cloudflare (#49)

.github/ISSUE_TEMPLATE/application-bug.yml

@@ -80,13 +80,13 @@ body:
       label: Acknowledgements
       description: Your issue will be closed if you haven't done these steps.
       options:
-        - label: I am sure my issue is related to the app and **NOT some extension**.
-          required: true
         - label: I have searched the existing issues and this is a new ticket, **NOT** a duplicate or related to another open issue.
           required: true
         - label: I have written a short but informative title.
           required: true
         - label: I have updated the app to pre-release version **[Latest](https://github.com/recloudstream/cloudstream/releases)**.
           required: true
+        - label: If related to a provider, I have checked the site and it works, but not the app. 
+          required: true
         - label: I will fill out all of the requested information in this form.
           required: true

.github/ISSUE_TEMPLATE/config.yml

@@ -1,8 +1,8 @@
 blank_issues_enabled: false
 contact_links:
-  - name: Request a new provider or report bug with an existing provider
+  - name: Report provider bug
     url: https://github.com/recloudstream
-    about: EXTREMELY IMPORTANT - Please do not report any provider bugs here or request new providers. This repository does not contain any providers. Please find the appropriate repository and report your issue there or join the discord.
+    about: Please do not report any provider bugs here. This repository does not contain any providers. Please find the appropriate repository and report your issue there or join the discord.
   - name: Discord
     url: https://discord.gg/5Hus6fM
     about: Join our discord for faster support on smaller issues.

.github/ISSUE_TEMPLATE/feature-request.yml

@@ -27,7 +27,9 @@ body:
       label: Acknowledgements
       description: Your issue will be closed if you haven't done these steps.
       options:
-        - label: My suggestion is **NOT** about adding a new provider
-          required: true
         - label: I have searched the existing issues and this is a new ticket, **NOT** a duplicate or related to another open issue.
-          required: true
+          required: true
+        - label: I have written a short but informative title.
+          required: true
+        - label: I will fill out all of the requested information in this form.
+          required: true

.github/locales.py

@@ -1,69 +0,0 @@
-import re
-import glob
-import requests
-import os
-import lxml.etree as ET  # builtin library doesn't preserve comments
-
-
-SETTINGS_PATH = "app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt"
-START_MARKER = "/* begin language list */"
-END_MARKER = "/* end language list */"
-XML_NAME = "app/src/main/res/values-"
-ISO_MAP_URL = "https://raw.githubusercontent.com/haliaeetus/iso-639/master/data/iso_639-1.min.json"
-INDENT = " "*4
-
-iso_map = requests.get(ISO_MAP_URL, timeout=300).json()
-
-# Load settings file
-src = open(SETTINGS_PATH, "r", encoding='utf-8').read()
-before_src, rest = src.split(START_MARKER)
-rest, after_src = rest.split(END_MARKER)
-
-# Load already added langs
-languages = {}
-for lang in re.finditer(r'Triple\("(.*)", "(.*)", "(.*)"\)', rest):
-    flag, name, iso = lang.groups()
-    languages[iso] = (flag, name)
-
-# Add not yet added langs
-for folder in glob.glob(f"{XML_NAME}*"):
-    iso = folder[len(XML_NAME):]
-    if iso not in languages.keys():
-        entry = iso_map.get(iso.lower(),{'nativeName':iso})
-        languages[iso] = ("", entry['nativeName'].split(',')[0])
-
-# Create triples
-triples = []
-for iso in sorted(languages.keys()):
-    flag, name = languages[iso]
-    triples.append(f'{INDENT}Triple("{flag}", "{name}", "{iso}"),')
-
-# Update settings file
-open(SETTINGS_PATH, "w+",encoding='utf-8').write(
-    before_src +
-    START_MARKER +
-    "\n" +
-    "\n".join(triples) +
-    "\n" +
-    END_MARKER +
-    after_src
-)
-
-# Go through each values.xml file and fix escaped \@string
-for file in glob.glob(f"{XML_NAME}*/strings.xml"):
-    try:
-        tree = ET.parse(file)
-        for child in tree.getroot():
-            if not child.text:
-                continue
-            if child.text.startswith("\\@string/"):
-                print(f"[{file}] fixing {child.attrib['name']}")
-                child.text = child.text.replace("\\@string/", "@string/")
-        with open(file, 'wb') as fp:
-            fp.write(b'<?xml version="1.0" encoding="utf-8"?>\n')
-            tree.write(fp, encoding="utf-8", method="xml", pretty_print=True, xml_declaration=False)
-            # Remove trailing new line to be consistent with weblate
-            fp.seek(-1, os.SEEK_END)
-            fp.truncate()
-    except ET.ParseError as ex:
-        print(f"[{file}] {ex}")

.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

@@ -20,7 +20,7 @@ jobs:
     steps:
       - name: Generate access token
         id: generate_token
-        uses: tibdex/github-app-token@v2
+        uses: tibdex/github-app-token@v1
         with:
           app_id: ${{ secrets.GH_APP_ID }}
           private_key: ${{ secrets.GH_APP_KEY }}
@@ -39,17 +39,17 @@ jobs:
       
       - name: Clean old builds
         run: |
+          shopt -s extglob
           cd $GITHUB_WORKSPACE/dokka/
-          rm -rf "./-cloudstream"
+          rm -rf !(.git)
 
-      - name: Setup JDK 17
-        uses: actions/setup-java@v4
+      - name: Setup JDK 11
+        uses: actions/setup-java@v1
         with:
-          java-version: 17
-          distribution: 'adopt'
+          java-version: 11
 
       - name: Setup Android SDK
-        uses: android-actions/setup-android@v3
+        uses: android-actions/setup-android@v2
 
       - name: Generate Dokka
         run: |

.github/workflows/issue-action.yml

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

.github/workflows/prerelease.yml

@@ -18,16 +18,16 @@ jobs:
     steps:
     - name: Generate access token
       id: generate_token
-      uses: tibdex/github-app-token@v2
+      uses: tibdex/github-app-token@v1
       with:
         app_id: ${{ secrets.GH_APP_ID }}
         private_key: ${{ secrets.GH_APP_KEY }}
         repository: "recloudstream/secrets"
-    - uses: actions/checkout@v4
-    - 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
@@ -40,25 +40,24 @@ jobs:
         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
+        echo "::set-output name=key_pwd::$KEY_PWD"
     - name: Run Gradle
       run: |
-        ./gradlew assemblePrerelease build androidSourcesJar
-        ./gradlew makeJar # for classes.jar, has to be done after assemblePrerelease
+        ./gradlew assemblePrerelease
+        ./gradlew androidSourcesJar
+        ./gradlew makeJar
       env:
         SIGNING_KEY_ALIAS: "key0"
         SIGNING_KEY_PASSWORD: ${{ steps.fetch_keystore.outputs.key_pwd }}
         SIGNING_STORE_PASSWORD: ${{ steps.fetch_keystore.outputs.key_pwd }}
-        SIMKL_CLIENT_ID: ${{ secrets.SIMKL_CLIENT_ID }}
-        SIMKL_CLIENT_SECRET: ${{ secrets.SIMKL_CLIENT_SECRET }}
     - name: Create pre-release
       uses: "marvinpinto/action-automatic-releases@latest"
       with:
         repo_token: "${{ secrets.GITHUB_TOKEN }}"
         automatic_release_tag: "pre-release"
-        prerelease: true
+        prerelease: false
         title: "Pre-release Build"
         files: |
-          app/build/outputs/apk/prerelease/release/*.apk
+          app/build/outputs/apk/prerelease/*.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
+      run: ./gradlew assembleDebug
     - 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"
+        path: "app/build/outputs/apk/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/compiler.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="17" />
+    <bytecodeTargetLevel target="11" />
   </component>
-</project>
+</project>

.idea/gradle.xml

@@ -4,16 +4,17 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
+        <option name="delegatedBuild" value="true" />
+        <option name="testRunner" value="GRADLE" />
+        <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
+        <option name="gradleJvm" value="11" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/app" />
-            <option value="$PROJECT_DIR$/library" />
           </set>
         </option>
-        <option name="resolveExternalAnnotations" value="false" />
       </GradleProjectSettings>
     </option>
   </component>

.idea/jarRepositories.xml

@@ -31,10 +31,5 @@
       <option name="name" value="maven2" />
       <option name="url" value="https://jitpack.io" />
     </remote-repository>
-    <remote-repository>
-      <option name="id" value="MavenRepo" />
-      <option name="name" value="MavenRepo" />
-      <option name="url" value="https://repo.maven.apache.org/maven2/" />
-    </remote-repository>
   </component>
 </project>

README.md

@@ -1,19 +1,44 @@
 # CloudStream
 
 **⚠️ Warning: By default this app doesn't provide any video sources, you have to install extensions in order to add functionality to the app.**
+You can find the list of community-maintained extension repositories [here
+](https://recloudstream.github.io/repos/)
 
 
-[![Discord](https://invidget.switchblade.xyz/5Hus6fM)](https://discord.gg/5Hus6fM)
+[![Discord](https://img.shields.io/discord/737724143126052974?style=for-the-badge)](https://discord.gg/5Hus6fM)
 
-### Features:
+***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/">
-  <img src="https://hosted.weblate.org/widgets/cloudstream/-/app/multi-auto.svg" alt="Translation status" />
-</a>
+***Screenshots:***
+
+<img src="./.github/home.jpg" height="400"/><img src="./.github/search.jpg" height="400"/><img src="./.github/downloads.jpg" height="400"/><img src="./.github/results.jpg" height="400"/>
+<img src="./.github/player.jpg" height="200"/>
+
+***The list of supported languages:***
+* 🇱🇧 Arabic
+* 🇨🇿 Czech
+* 🇳🇱 Dutch
+* 🇬🇧 English
+* 🇫🇷 French
+* 🇩🇪 German
+* 🇬🇷 Greek
+* 🇮🇳 Hindi
+* 🇮🇩 Indonesian
+* 🇮🇹 Italian
+* 🇲🇰 Macedonian
+* 🇮🇳 Malayalam
+* 🇳🇴 Norsk
+* 🇵🇱 Polish
+* 🇧🇷 Portuguese (Brazil)
+* 🇷🇴 Romanian
+* 🇪🇸 Spanish
+* 🇸🇪 Swedish
+* 🇵🇭 Tagalog
+* 🇹🇷 Turkish
+* 🇻🇳 Vietnamese
+

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

@@ -0,0 +1,215 @@
+plugins {
+    id 'com.android.application'
+    id 'kotlin-android'
+    id 'kotlin-kapt'
+    id 'kotlin-android-extensions'
+    id 'org.jetbrains.dokka'
+}
+
+def tmpFilePath = System.getProperty("user.home") + "/work/_temp/keystore/"
+def allFilesFromDir = new File(tmpFilePath).listFiles()
+def prereleaseStoreFile = null
+if (allFilesFromDir != null) {
+    prereleaseStoreFile = allFilesFromDir.first()
+}
+
+android {
+    testOptions {
+        unitTests.returnDefaultValues = true
+    }
+    signingConfigs {
+        prerelease {
+            if (prereleaseStoreFile != null) {
+                storeFile = file(prereleaseStoreFile)
+                storePassword System.getenv("SIGNING_STORE_PASSWORD")
+                keyAlias System.getenv("SIGNING_KEY_ALIAS")
+                keyPassword System.getenv("SIGNING_KEY_PASSWORD")
+            }
+        }
+    }
+    compileSdkVersion 31
+    buildToolsVersion "30.0.3"
+
+    defaultConfig {
+        applicationId "com.lagradost.cloudstream3"
+        minSdkVersion 21
+        targetSdkVersion 30
+
+        versionCode 50
+        versionName "3.1.3"
+
+        resValue "string", "app_version",
+                "${defaultConfig.versionName}${versionNameSuffix ?: ""}"
+
+        resValue "string", "commit_hash",
+                ("git rev-parse --short HEAD".execute().text.trim() ?: "")
+        
+        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));")
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+
+        kapt {
+            includeCompileClasspath = true
+        }
+    }
+
+    buildTypes {
+        // release {
+        //     debuggable false
+        //     minifyEnabled false
+        //     shrinkResources false
+        //     proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        //     resValue "bool", "is_prerelease", "false"
+        // }
+        prerelease {
+            applicationIdSuffix ".prerelease"
+            buildConfigField("boolean", "BETA", "true")
+            signingConfig signingConfigs.prerelease
+            versionNameSuffix '-PRE'
+            debuggable false
+            minifyEnabled false
+            shrinkResources false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            resValue "bool", "is_prerelease", "true"
+        }
+        debug {
+            debuggable true
+            applicationIdSuffix ".debug"
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            resValue "bool", "is_prerelease", "true"
+        }
+    }
+    compileOptions {
+        coreLibraryDesugaringEnabled true
+
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = '1.8'
+        freeCompilerArgs = ['-Xjvm-default=compatibility']
+    }
+    lintOptions {
+        checkReleaseBuilds false
+        abortOnError false
+    }
+}
+
+repositories {
+    maven { url 'https://jitpack.io' }
+}
+
+dependencies {
+    implementation 'com.google.android.mediahome:video:1.0.0'
+    implementation 'androidx.test.ext:junit-ktx:1.1.3'
+    testImplementation 'org.json:json:20180813'
+
+    implementation 'androidx.core:core-ktx:1.8.0'
+    implementation 'androidx.appcompat:appcompat:1.4.2'
+
+    // 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'
+
+    // implementation "androidx.leanback:leanback-paging:1.1.0-alpha09"
+
+    // Exoplayer
+    implementation 'com.google.android.exoplayer:exoplayer:2.16.1'
+    implementation 'com.google.android.exoplayer:extension-cast:2.16.1'
+    implementation "com.google.android.exoplayer:extension-mediasession:2.16.1"
+    implementation 'com.google.android.exoplayer:extension-okhttp:2.16.1'
+
+    //implementation "com.google.android.exoplayer:extension-leanback:2.14.0"
+
+    // Bug reports
+    implementation "ch.acra:acra-core:5.8.4"
+    implementation "ch.acra:acra-toast:5.8.4"
+
+    compileOnly "com.google.auto.service:auto-service-annotations:1.0"
+    //either for java sources:
+    annotationProcessor "com.google.auto.service:auto-service:1.0"
+    //or for kotlin sources (requires kapt gradle plugin):
+    kapt "com.google.auto.service:auto-service:1.0"
+
+    // subtitle color picker
+    implementation 'com.jaredrummler:colorpicker:1.1.0'
+
+    //run JS
+    implementation 'org.mozilla:rhino:1.7.14'
+
+    // TorrentStream
+    //implementation 'com.github.TorrentStream:TorrentStream-Android:2.7.0'
+
+    // Downloading
+    implementation "androidx.work:work-runtime:2.7.1"
+    implementation "androidx.work:work-runtime-ktx:2.7.1"
+
+    // Networking
+//    implementation "com.squareup.okhttp3:okhttp:4.9.2"
+//    implementation "com.squareup.okhttp3:okhttp-dnsoverhttps:4.9.1"
+    implementation 'com.github.Blatzar:NiceHttp:0.3.2'
+
+    // 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'
+
+    implementation "androidx.tvprovider:tvprovider:1.0.0"
+
+    // used for subtitle decoding https://github.com/albfernandez/juniversalchardet
+    implementation 'com.github.albfernandez:juniversalchardet:2.4.0'
+
+    // slow af yt
+    //implementation 'com.github.HaarigerHarald:android-youtubeExtractor:master-SNAPSHOT'
+
+    // newpipe yt
+    implementation 'com.github.recloudstream:NewPipeExtractor:master-SNAPSHOT'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
+
+    // Library/extensions searching with Levenshtein distance
+    implementation 'me.xdrop:fuzzywuzzy:1.4.0'
+}
+
+task androidSourcesJar(type: Jar) {
+    getArchiveClassifier().set('sources')
+    from android.sourceSets.main.java.srcDirs//full sources
+}
+
+task makeJar(type: Copy) {
+    // after modifying here, you can export. Jar
+    from('build/intermediates/compile_app_classes_jar/debug')
+    into('build') // output location
+    include('classes.jar') // the classes file of the imported rack package
+    dependsOn build
+}

app/build.gradle.kts

@@ -1,304 +0,0 @@
-import com.android.build.gradle.internal.cxx.configure.gradleLocalProperties
-import org.jetbrains.dokka.gradle.DokkaTask
-import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.util.archivesName
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-import java.io.ByteArrayOutputStream
-import java.net.URL
-
-plugins {
-    id("com.android.application")
-    id("com.google.devtools.ksp")
-    id("kotlin-android")
-    id("org.jetbrains.dokka")
-}
-
-val tmpFilePath = System.getProperty("user.home") + "/work/_temp/keystore/"
-val prereleaseStoreFile: File? = File(tmpFilePath).listFiles()?.first()
-
-fun String.execute() = ByteArrayOutputStream().use { baot ->
-    if (project.exec {
-            workingDir = projectDir
-            commandLine = this@execute.split(Regex("\\s"))
-            standardOutput = baot
-        }.exitValue == 0)
-        String(baot.toByteArray()).trim()
-    else null
-}
-
-android {
-    testOptions {
-        unitTests.isReturnDefaultValues = true
-    }
-
-    viewBinding {
-        enable = true
-    }
-
-    /* disable this for now
-    externalNativeBuild {
-        cmake {
-            path("CMakeLists.txt")
-        }
-    }*/
-
-    signingConfigs {
-        if (prereleaseStoreFile != null) {
-            create("prerelease") {
-                storeFile = file(prereleaseStoreFile)
-                storePassword = System.getenv("SIGNING_STORE_PASSWORD")
-                keyAlias = System.getenv("SIGNING_KEY_ALIAS")
-                keyPassword = System.getenv("SIGNING_KEY_PASSWORD")
-            }
-        }
-    }
-
-    compileSdk = 34
-    buildToolsVersion = "34.0.0"
-
-    defaultConfig {
-        applicationId = "com.lagradost.cloudstream3"
-        minSdk = 21
-        targetSdk = 33 /* Android 14 is Fu*ked
-        ^ https://developer.android.com/about/versions/14/behavior-changes-14#safer-dynamic-code-loading*/
-        versionCode = 64
-        versionName = "4.4.0"
-
-        resValue("string", "app_version", "${defaultConfig.versionName}${versionNameSuffix ?: ""}")
-        resValue("string", "commit_hash", "git rev-parse --short HEAD".execute() ?: "")
-        resValue("bool", "is_prerelease", "false")
-
-        // Reads local.properties
-        val localProperties = gradleLocalProperties(rootDir)
-
-        buildConfigField(
-            "long",
-            "BUILD_DATE",
-            "${System.currentTimeMillis()}"
-        )
-        buildConfigField(
-            "String",
-            "SIMKL_CLIENT_ID",
-            "\"" + (System.getenv("SIMKL_CLIENT_ID") ?: localProperties["simkl.id"]) + "\""
-        )
-        buildConfigField(
-            "String",
-            "SIMKL_CLIENT_SECRET",
-            "\"" + (System.getenv("SIMKL_CLIENT_SECRET") ?: localProperties["simkl.secret"]) + "\""
-        )
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-
-        ksp {
-            arg("room.schemaLocation", "$projectDir/schemas")
-            arg("exportSchema", "true")
-        }
-    }
-
-    buildTypes {
-        release {
-            isDebuggable = false
-            isMinifyEnabled = false
-            isShrinkResources = false
-            proguardFiles(
-                getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro"
-            )
-        }
-        debug {
-            isDebuggable = true
-            applicationIdSuffix = ".debug"
-            proguardFiles(
-                getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro"
-            )
-        }
-    }
-
-    flavorDimensions.add("state")
-    productFlavors {
-        create("stable") {
-            dimension = "state"
-            resValue("bool", "is_prerelease", "false")
-        }
-        create("prerelease") {
-            dimension = "state"
-            resValue("bool", "is_prerelease", "true")
-            buildConfigField("boolean", "BETA", "true")
-            applicationIdSuffix = ".prerelease"
-            if (signingConfigs.names.contains("prerelease")) {
-                signingConfig = signingConfigs.getByName("prerelease")
-            } else {
-                logger.warn("No prerelease signing config!")
-            }
-            versionNameSuffix = "-PRE"
-            versionCode = (System.currentTimeMillis() / 60000).toInt()
-        }
-    }
-
-    compileOptions {
-        isCoreLibraryDesugaringEnabled = true
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-    }
-
-    lint {
-        abortOnError = false
-        checkReleaseBuilds = false
-    }
-
-    buildFeatures {
-        buildConfig = true
-    }
-
-    namespace = "com.lagradost.cloudstream3"
-}
-
-repositories {
-    maven("https://jitpack.io")
-}
-
-dependencies {
-    // Testing
-    testImplementation("junit:junit:4.13.2")
-    testImplementation("org.json:json:20240303")
-    androidTestImplementation("androidx.test:core")
-    implementation("androidx.test.ext:junit-ktx:1.2.1")
-    androidTestImplementation("androidx.test.ext:junit:1.2.1")
-    androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1")
-
-    // Android Core & Lifecycle
-    implementation("androidx.core:core-ktx:1.13.1")
-    implementation("androidx.appcompat:appcompat:1.7.0")
-    implementation("androidx.navigation:navigation-ui-ktx:2.7.7")
-    implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.8.3")
-    implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.3")
-    implementation("androidx.navigation:navigation-fragment-ktx:2.7.7")
-
-    // Design & UI
-    implementation("jp.wasabeef:glide-transformations:4.3.0")
-    implementation("androidx.preference:preference-ktx:1.2.1")
-    implementation("com.google.android.material:material:1.12.0")
-    implementation("androidx.constraintlayout:constraintlayout:2.1.4")
-    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")
-
-    // For KSP -> Official Annotation Processors are Not Yet Supported for KSP
-    ksp("dev.zacsweers.autoservice:auto-service-ksp:1.2.0")
-    implementation("com.google.guava:guava:33.2.1-android")
-    implementation("dev.zacsweers.autoservice:auto-service-ksp:1.2.0")
-
-    // Media 3 (ExoPlayer)
-    implementation("androidx.media3:media3-ui:1.1.1")
-    implementation("androidx.media3:media3-cast:1.1.1")
-    implementation("androidx.media3:media3-common:1.1.1")
-    implementation("androidx.media3:media3-session:1.1.1")
-    implementation("androidx.media3:media3-exoplayer:1.1.1")
-    implementation("com.google.android.mediahome:video:1.0.0")
-    implementation("androidx.media3:media3-exoplayer-hls:1.1.1")
-    implementation("androidx.media3:media3-exoplayer-dash:1.1.1")
-    implementation("androidx.media3:media3-datasource-okhttp:1.1.1")
-
-    // PlayBack
-    implementation("com.jaredrummler:colorpicker:1.1.0") // Subtitle Color Picker
-    implementation("com.github.recloudstream:media-ffmpeg:1.1.0") // Custom FF-MPEG Lib for Audio Codecs
-    implementation("com.github.teamnewpipe:NewPipeExtractor:176da72") /* For Trailers
-    ^ Update to Latest Commits if Trailers Misbehave, github.com/TeamNewPipe/NewPipeExtractor/commits/dev */
-    implementation("com.github.albfernandez:juniversalchardet:2.5.0") // Subtitle Decoding
-
-    // Crash Reports (AcraApplication.kt)
-    implementation("ch.acra:acra-core:5.11.3")
-    implementation("ch.acra:acra-toast:5.11.3")
-
-    // UI Stuff
-    implementation("com.facebook.shimmer:shimmer:0.5.0") // Shimmering Effect (Loading Skeleton)
-    implementation("androidx.palette:palette-ktx:1.0.0") // Palette For Images -> Colors
-    implementation("androidx.tvprovider:tvprovider:1.0.0")
-    implementation("com.github.discord:OverlappingPanels:0.1.5") // Gestures
-    implementation("androidx.biometric:biometric:1.2.0-alpha05") // Fingerprint Authentication
-    implementation("com.github.rubensousa:previewseekbar-media3:1.1.1.0") // SeekBar Preview
-    implementation("io.github.g0dkar:qrcode-kotlin:4.2.0") // QR code for PIN Auth on TV
-
-    // Extensions & Other Libs
-    implementation("org.mozilla:rhino:1.7.15") // run JavaScript
-    implementation("me.xdrop:fuzzywuzzy:1.4.0") // Library/Ext Searching with Levenshtein Distance
-    implementation("com.github.LagradOst:SafeFile:0.0.6") // To Prevent the URI File Fu*kery
-    implementation("org.conscrypt:conscrypt-android:2.5.2") // To Fix SSL Fu*kery on Android 9
-    implementation("com.uwetrottmann.tmdb2:tmdb-java:2.11.0") // TMDB API v3 Wrapper Made with RetroFit
-    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs_nio:2.0.4") //nio flavor needed for NewPipeExtractor
-    implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.13.1") /* JSON Parser
-    ^ Don't Bump Jackson above 2.13.1 , Crashes on Android TV's and FireSticks that have Min API
-    Level 25 or Less. */
-
-    // Downloading & Networking
-    implementation("androidx.work:work-runtime:2.9.0")
-    implementation("androidx.work:work-runtime-ktx:2.9.0")
-    implementation("com.github.Blatzar:NiceHttp:0.4.11") // HTTP Lib
-
-    implementation(project(":library") {
-        // There does not seem to be a good way of getting the android flavor.
-        val isDebug = gradle.startParameter.taskRequests.any { task ->
-            task.args.any { arg ->
-                arg.contains("debug", true)
-            }
-        }
-
-        this.extra.set("isDebug", isDebug)
-    })
-}
-
-tasks.register<Jar>("androidSourcesJar") {
-    archiveClassifier.set("sources")
-    from(android.sourceSets.getByName("main").java.srcDirs) // Full Sources
-}
-
-tasks.register<Copy>("copyJar") {
-    from(
-        "build/intermediates/compile_app_classes_jar/prereleaseDebug",
-        "../library/build/libs"
-    )
-    into("build/app-classes")
-    include("classes.jar", "library-jvm*.jar")
-    // Remove the version
-    rename("library-jvm.*.jar", "library-jvm.jar")
-}
-
-// Merge the app classes and the library classes into classes.jar
-tasks.register<Jar>("makeJar") {
-    // Duplicates cause hard to catch errors, better to fail at compile time.
-    duplicatesStrategy = DuplicatesStrategy.FAIL
-    dependsOn(tasks.getByName("copyJar"))
-    from(
-        zipTree("build/app-classes/classes.jar"),
-        zipTree("build/app-classes/library-jvm.jar")
-    )
-    destinationDirectory.set(layout.buildDirectory)
-    archivesName = "classes"
-}
-
-tasks.withType<KotlinCompile> {
-    kotlinOptions {
-        jvmTarget = "1.8"
-        freeCompilerArgs = listOf("-Xjvm-default=all-compatibility")
-    }
-}
-
-tasks.withType<DokkaTask>().configureEach {
-    moduleName.set("Cloudstream")
-    dokkaSourceSets {
-        named("main") {
-            sourceLink {
-                // Unix based directory relative path to the root of the project (where you execute gradle respectively).
-                localDirectory.set(file("src/main/java"))
-
-                // 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/proguard-rules.pro

@@ -1,6 +1,6 @@
 # Add project specific ProGuard rules here.
 # You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.kts.
+# proguardFiles setting in build.gradle.
 #
 # For more details, see
 #   http://developer.android.com/guide/developing/tools/proguard.html

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

@@ -1,57 +1,155 @@
 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.mvvm.logError
+import com.lagradost.cloudstream3.utils.Qualities
 import com.lagradost.cloudstream3.utils.SubtitleHelper
-import com.lagradost.cloudstream3.utils.TestingUtils
 import kotlinx.coroutines.runBlocking
 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> {
-        println("Providers: ${APIHolder.allProviders.size}")
-        return APIHolder.allProviders.toTypedArray() //.filter { !it.usesWebView }
+    //@Test
+    //fun useAppContext() {
+    //    // Context of the app under test.
+    //    val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+    //    assertEquals("com.lagradost.cloudstream3", appContext.packageName)
+    //}
+
+    private fun getAllProviders(): List<MainAPI> {
+        return APIHolder.allProviders //.filter { !it.usesWebView }
+    }
+
+    private suspend fun loadLinks(api: MainAPI, url: String?): Boolean {
+        Assert.assertNotNull("Api ${api.name} has invalid url on episode", url)
+        if (url == null) return true
+        var linksLoaded = 0
+        try {
+            val success = api.loadLinks(url, false, {}) { link ->
+                Assert.assertTrue(
+                    "Api ${api.name} returns link with invalid Quality",
+                    Qualities.values().map { it.value }.contains(link.quality)
+                )
+                Assert.assertTrue(
+                    "Api ${api.name} returns link with invalid url ${link.url}",
+                    link.url.length > 4
+                )
+                linksLoaded++
+            }
+            if (success) {
+                return linksLoaded > 0
+            }
+            Assert.assertTrue("Api ${api.name} has returns false on .loadLinks", success)
+        } catch (e: Exception) {
+            if (e.cause is NotImplementedError) {
+                Assert.fail("Provider has not implemented .loadLinks")
+            }
+            logError(e)
+        }
+        return true
+    }
+
+    private suspend fun testSingleProviderApi(api: MainAPI): Boolean {
+        val searchQueries = listOf("over", "iron", "guy")
+        var correctResponses = 0
+        var searchResult: List<SearchResponse>? = null
+        for (query in searchQueries) {
+            val response = try {
+                api.search(query)
+            } catch (e: Exception) {
+                if (e.cause is NotImplementedError) {
+                    Assert.fail("Provider has not implemented .search")
+                }
+                logError(e)
+                null
+            }
+            if (!response.isNullOrEmpty()) {
+                correctResponses++
+                if (searchResult == null) {
+                    searchResult = response
+                }
+            }
+        }
+
+        if (correctResponses == 0 || searchResult == null) {
+            System.err.println("Api ${api.name} did not return any valid search responses")
+            return false
+        }
+
+        try {
+            var validResults = false
+            for (result in searchResult) {
+                Assert.assertEquals(
+                    "Invalid apiName on response on ${api.name}",
+                    result.apiName,
+                    api.name
+                )
+                val load = api.load(result.url) ?: continue
+                Assert.assertEquals(
+                    "Invalid apiName on load on ${api.name}",
+                    load.apiName,
+                    result.apiName
+                )
+                Assert.assertTrue(
+                    "Api ${api.name} on load does not contain any of the supportedTypes",
+                    api.supportedTypes.contains(load.type)
+                )
+                when (load) {
+                    is AnimeLoadResponse -> {
+                        val gotNoEpisodes =
+                            load.episodes.keys.isEmpty() || load.episodes.keys.any { load.episodes[it].isNullOrEmpty() }
+
+                        if (gotNoEpisodes) {
+                            println("Api ${api.name} got no episodes on ${load.url}")
+                            continue
+                        }
+
+                        val url = (load.episodes[load.episodes.keys.first()])?.first()?.data
+                        validResults = loadLinks(api, url)
+                        if (!validResults) continue
+                    }
+                    is MovieLoadResponse -> {
+                        val gotNoEpisodes = load.dataUrl.isBlank()
+                        if (gotNoEpisodes) {
+                            println("Api ${api.name} got no movie on ${load.url}")
+                            continue
+                        }
+
+                        validResults = loadLinks(api, load.dataUrl)
+                        if (!validResults) continue
+                    }
+                    is TvSeriesLoadResponse -> {
+                        val gotNoEpisodes = load.episodes.isEmpty()
+                        if (gotNoEpisodes) {
+                            println("Api ${api.name} got no episodes on ${load.url}")
+                            continue
+                        }
+
+                        validResults = loadLinks(api, load.episodes.first().data)
+                        if (!validResults) continue
+                    }
+                }
+                break
+            }
+            if(!validResults) {
+                System.err.println("Api ${api.name} did not load on any")
+            }
+
+            return validResults
+        } catch (e: Exception) {
+            if (e.cause is NotImplementedError) {
+                Assert.fail("Provider has not implemented .load")
+            }
+            logError(e)
+            return false
+        }
     }
 
     @Test
@@ -60,78 +158,7 @@ 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() {
         val isoNames = SubtitleHelper.languages.map { it.ISO_639_1 }
         Assert.assertFalse("ISO does not contain any languages", isoNames.isNullOrEmpty())
@@ -153,20 +180,66 @@ class ExampleInstrumentedTest {
     @Test
     fun providerCorrectHomepage() {
         runBlocking {
-            getAllProviders().toList().amap { api ->
-                TestingUtils.testHomepage(api, TestingUtils.Logger())
+            getAllProviders().apmap { api ->
+                if (api.hasMainPage) {
+                    try {
+                        val homepage = api.getMainPage()
+                        when {
+                            homepage == null -> {
+                                System.err.println("Homepage provider ${api.name} did not correctly load homepage!")
+                            }
+                            homepage.items.isEmpty() -> {
+                                System.err.println("Homepage provider ${api.name} does not contain any items!")
+                            }
+                            homepage.items.any { it.list.isEmpty() } -> {
+                                System.err.println ("Homepage provider ${api.name} does not have any items on result!")
+                            }
+                        }
+                    } catch (e: Exception) {
+                        if (e.cause is NotImplementedError) {
+                            Assert.fail("Provider marked as hasMainPage, while in reality is has not been implemented")
+                        }
+                        logError(e)
+                    }
+                }
             }
         }
         println("Done providerCorrectHomepage")
     }
 
+//    @Test
+//    fun testSingleProvider() {
+//        testSingleProviderApi(ThenosProvider())
+//    }
+
     @Test
-    fun testAllProvidersCorrect() {
+    fun providerCorrect() {
         runBlocking {
-            TestingUtils.getDeferredProviderTests(
-                this,
-                getAllProviders(),
-            ) { _, _ -> }
+            val invalidProvider = ArrayList<Pair<MainAPI, Exception?>>()
+            val providers = getAllProviders()
+            providers.apmap { api ->
+                try {
+                    println("Trying $api")
+                    if (testSingleProviderApi(api)) {
+                        println("Success $api")
+                    } else {
+                        System.err.println("Error $api")
+                        invalidProvider.add(Pair(api, null))
+                    }
+                } catch (e: Exception) {
+                    logError(e)
+                    invalidProvider.add(Pair(api, e))
+                }
+            }
+            if(invalidProvider.isEmpty()) {
+                println("No Invalid providers! :D")
+            } else {
+                println("Invalid providers are: ")
+                for (provider in invalidProvider) {
+                    println("${provider.first}")
+                }
+            }
         }
+        println("Done providerCorrect")
     }
 }

app/src/main/AndroidManifest.xml

@@ -1,27 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
+    xmlns:tools="http://schemas.android.com/tools"
+    package="com.lagradost.cloudstream3">
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <!-- I dont remember, probs has to do with downloads -->
     <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 -->
-    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" /> <!-- Used for app notifications on Android 13+ -->
-    <uses-permission android:name="com.android.providers.tv.permission.WRITE_EPG_DATA" /> <!-- Used for Android TV watch next -->
-    <uses-permission android:name="android.permission.UPDATE_PACKAGES_WITHOUT_USER_ACTION" /> <!-- Used for updates without prompt -->
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" /> <!-- Used for update service -->
-    <uses-permission android:name="android.permission.USE_BIOMETRIC" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
-
-    <!-- Required for getting arbitrary Aniyomi packages  -->
-    <uses-permission
-        android:name="android.permission.QUERY_ALL_PACKAGES"
-        tools:ignore="QueryAllPackagesPermission" />
-
+    <!-- <uses-permission android:name="com.android.providers.tv.permission.WRITE_EPG_DATA" /> not used atm, but code exist that requires it that are not run -->
+    <!-- <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"
@@ -30,30 +21,20 @@
         android:name="android.software.leanback"
         android:required="false" />
 
-    <queries>
-        <package android:name="org.videolan.vlc" />
-        <package android:name="com.instantbits.cast.webvideo" />
-        <package android:name="is.xyz.mpv" />
-    </queries>
-
-    <!-- Without the large heap Exoplayer buffering gets reset due to OOM. -->
     <!--TODO https://stackoverflow.com/questions/41799732/chromecast-button-not-visible-in-android-->
     <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"
         android:roundIcon="@mipmap/ic_launcher_round"
         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 +50,7 @@
             android:exported="true"
             android:resizeableActivity="true"
             android:screenOrientation="userLandscape"
-            android:supportsPictureInPicture="true"
-            android:taskAffinity="com.lagradost.cloudstream3.downloadedplayer"
-            android:launchMode="singleTask">
+            android:supportsPictureInPicture="true">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
@@ -97,20 +76,16 @@
         -->
         <activity
             android:name=".MainActivity"
-            android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout|keyboard|keyboardHidden|navigation|uiMode"
+            android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout|keyboard|keyboardHidden|navigation"
             android:exported="true"
             android:launchMode="singleTask"
             android:resizeableActivity="true"
             android:supportsPictureInPicture="true">
+            <intent-filter android:exported="true">
+                <action android:name="android.intent.action.MAIN" />
 
-            <!-- cloudstreamplayer://encodedUrl?name=Dune -->
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data android:scheme="cloudstreamplayer" />
+                <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" />
@@ -128,30 +103,6 @@
 
                 <data android:scheme="cloudstreamrepo" />
             </intent-filter>
-
-            <!-- Allow searching with intents: cloudstreamsearch://Your%20Name -->
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data android:scheme="cloudstreamsearch" />
-            </intent-filter>
-
-            <!--
-            Allow opening from continue watching with intents: cloudstreamsearch://1234
-            Used on Android TV Watch Next
-             -->
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data android:scheme="cloudstreamcontinuewatching" />
-            </intent-filter>
-
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
@@ -165,21 +116,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 +123,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" />
@@ -203,11 +138,6 @@
             android:name=".ui.ControllerActivity"
             android:exported="false" />
 
-        <service
-            android:foregroundServiceType="dataSync"
-            android:name=".utils.PackageInstallerService"
-            android:exported="false" />
-
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="${applicationId}.provider"

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

@@ -4,18 +4,12 @@ import android.app.Activity
 import android.app.Application
 import android.content.Context
 import android.content.ContextWrapper
-import android.content.Intent
 import android.widget.Toast
 import androidx.fragment.app.Fragment
-import androidx.fragment.app.FragmentActivity
-import com.lagradost.api.setContext
+import com.google.auto.service.AutoService
 import com.lagradost.cloudstream3.mvvm.normalSafeApiCall
 import com.lagradost.cloudstream3.mvvm.suspendSafeApiCall
-import com.lagradost.cloudstream3.plugins.PluginManager
-import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR
-import com.lagradost.cloudstream3.ui.settings.Globals.TV
-import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
-import com.lagradost.cloudstream3.utils.AppContextUtils.openBrowser
+import com.lagradost.cloudstream3.utils.AppUtils.openBrowser
 import com.lagradost.cloudstream3.utils.Coroutines.runOnMainThread
 import com.lagradost.cloudstream3.utils.DataStore.getKey
 import com.lagradost.cloudstream3.utils.DataStore.getKeys
@@ -23,7 +17,6 @@ import com.lagradost.cloudstream3.utils.DataStore.removeKey
 import com.lagradost.cloudstream3.utils.DataStore.removeKeys
 import com.lagradost.cloudstream3.utils.DataStore.setKey
 import kotlinx.coroutines.runBlocking
-import org.acra.ACRA
 import org.acra.ReportField
 import org.acra.config.CoreConfiguration
 import org.acra.data.CrashReportData
@@ -31,29 +24,24 @@ import org.acra.data.StringFormat
 import org.acra.ktx.initAcra
 import org.acra.sender.ReportSender
 import org.acra.sender.ReportSenderFactory
-import java.io.File
-import java.io.FileNotFoundException
-import java.io.PrintStream
 import java.lang.ref.WeakReference
-import java.util.Locale
 import kotlin.concurrent.thread
-import kotlin.system.exitProcess
 
 class CustomReportSender : ReportSender {
     // Sends all your crashes to google forms
     override fun send(context: Context, errorContent: CrashReportData) {
         println("Sending report")
         val url =
-            "https://docs.google.com/forms/d/e/1FAIpQLSfO4r353BJ79TTY_-t5KWSIJT2xfqcQWY81xjAA1-1N0U2eSg/formResponse"
+            "https://docs.google.com/forms/u/0/d/e/1FAIpQLSeFmyBChi6HF3IkhTVWPiDXJtxt8W0Hf4Agljm_0-0_QuEYFg/formResponse"
         val data = mapOf(
-            "entry.1993829403" to errorContent.toJSON()
+            "entry.134906550" 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")
                 }
             }
         }
@@ -66,6 +54,7 @@ class CustomReportSender : ReportSender {
     }
 }
 
+@AutoService(ReportSenderFactory::class)
 class CustomSenderFactory : ReportSenderFactory {
     override fun create(context: Context, config: CoreConfiguration): ReportSender {
         return CustomReportSender()
@@ -76,40 +65,7 @@ class CustomSenderFactory : ReportSenderFactory {
     }
 }
 
-class ExceptionHandler(val errorFile: File, val onError: (() -> Unit)) :
-    Thread.UncaughtExceptionHandler {
-    override fun uncaughtException(thread: Thread, error: Throwable) {
-        ACRA.errorReporter.handleException(error)
-        try {
-            PrintStream(errorFile).use { ps ->
-                ps.println("Currently loading extension: ${PluginManager.currentlyLoading ?: "none"}")
-                ps.println("Fatal exception on thread ${thread.name} (${thread.id})")
-                error.printStackTrace(ps)
-            }
-        } catch (ignored: FileNotFoundException) {
-        }
-        try {
-            onError.invoke()
-        } catch (ignored: Exception) {
-        }
-        exitProcess(1)
-    }
-
-}
-
 class AcraApplication : Application() {
-
-    override fun onCreate() {
-        super.onCreate()
-        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?) {
         super.attachBaseContext(base)
         context = base
@@ -119,10 +75,10 @@ class AcraApplication : Application() {
             buildConfigClass = BuildConfig::class.java
             reportFormat = StringFormat.JSON
 
-            reportContent = listOf(
+            reportContent = arrayOf(
                 ReportField.BUILD_CONFIG, ReportField.USER_CRASH_DATE,
                 ReportField.ANDROID_VERSION, ReportField.PHONE_MODEL,
-                ReportField.STACK_TRACE,
+                ReportField.STACK_TRACE
             )
 
             // removed this due to bug when starting the app, moved it to when it actually crashes
@@ -135,8 +91,6 @@ class AcraApplication : Application() {
     }
 
     companion object {
-        var exceptionHandler: ExceptionHandler? = null
-
         /** Use to get activity from Context */
         tailrec fun Context.getActivity(): Activity? = this as? Activity
             ?: (this as? ContextWrapper)?.baseContext?.getActivity()
@@ -146,17 +100,8 @@ class AcraApplication : Application() {
             get() = _context?.get()
             private set(value) {
                 _context = WeakReference(value)
-                setContext(WeakReference(value))
             }
 
-        fun <T : Any> getKeyClass(path: String, valueType: Class<T>): T? {
-            return context?.getKey(path, valueType)
-        }
-
-        fun <T : Any> setKeyClass(path: String, value: T) {
-            context?.setKey(path, value)
-        }
-
         fun removeKeys(folder: String): Int? {
             return context?.removeKeys(folder)
         }
@@ -203,14 +148,5 @@ class AcraApplication : Application() {
         fun openBrowser(url: String, fallbackWebview: Boolean = false, fragment: Fragment? = null) {
             context?.openBrowser(url, fallbackWebview, fragment)
         }
-
-        /** Will fallback to webview if in TV layout */
-        fun openBrowser(url: String, activity: FragmentActivity?) {
-            openBrowser(
-                url,
-                isLayout(TV or EMULATOR),
-                activity?.supportFragmentManager?.fragments?.lastOrNull()
-            )
-        }
     }
-}
+}

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

@@ -1,95 +1,40 @@
 package com.lagradost.cloudstream3
 
-import android.Manifest
 import android.app.Activity
 import android.app.PictureInPictureParams
 import android.content.Context
 import android.content.pm.PackageManager
-import android.content.res.Configuration
 import android.content.res.Resources
 import android.os.Build
-import android.util.DisplayMetrics
+import android.os.Looper
 import android.util.Log
-import android.view.Gravity
-import android.view.KeyEvent
-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
-import androidx.activity.result.contract.ActivityResultContracts
 import androidx.annotation.MainThread
 import androidx.annotation.StringRes
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.SearchView
-import androidx.core.content.ContextCompat
-import androidx.core.view.children
 import androidx.preference.PreferenceManager
 import com.google.android.gms.cast.framework.CastSession
-import com.google.android.material.chip.ChipGroup
-import com.google.android.material.navigationrail.NavigationRailView
-import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
-import com.lagradost.cloudstream3.AcraApplication.Companion.removeKey
-import com.lagradost.cloudstream3.MainActivity.Companion.resumeApps
-import com.lagradost.cloudstream3.databinding.ToastBinding
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.ui.player.PlayerEventType
-import com.lagradost.cloudstream3.ui.result.ResultFragment
 import com.lagradost.cloudstream3.ui.result.UiText
-import com.lagradost.cloudstream3.ui.settings.Globals.updateTv
-import com.lagradost.cloudstream3.utils.AppContextUtils.isRtl
-import com.lagradost.cloudstream3.utils.DataStoreHelper
 import com.lagradost.cloudstream3.utils.Event
 import com.lagradost.cloudstream3.utils.UIHelper
 import com.lagradost.cloudstream3.utils.UIHelper.hasPIPPermission
 import com.lagradost.cloudstream3.utils.UIHelper.shouldShowPIPMode
 import com.lagradost.cloudstream3.utils.UIHelper.toPx
+import kotlinx.coroutines.currentCoroutineContext
 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
     var isInPIPMode: Boolean = false
@@ -100,32 +45,9 @@ object CommonActivity {
     var playerEventListener: ((PlayerEventType) -> Unit)? = null
     var keyEventListener: ((Pair<KeyEvent?, Boolean>) -> Boolean)? = null
 
-    private var currentToast: Toast? = null
 
-    fun showToast(@StringRes message: Int, duration: Int? = null) {
-        val act = activity ?: return
-        act.runOnUiThread {
-            showToast(act, act.getString(message), duration)
-        }
-    }
+    var currentToast: Toast? = null
 
-    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 {
@@ -133,9 +55,7 @@ object CommonActivity {
         }
     }
 
-    /** duration is Toast.LENGTH_SHORT if null*/
-    @MainThread
-    fun showToast(act: Activity?, @StringRes message: Int, duration: Int? = null) {
+    fun showToast(act: Activity?, @StringRes message: Int, duration: Int) {
         if (act == null) return
         showToast(act, act.getString(message), duration)
     }
@@ -143,7 +63,6 @@ object CommonActivity {
     const val TAG = "COMPACT"
 
     /** duration is Toast.LENGTH_SHORT if null*/
-    @MainThread
     fun showToast(act: Activity?, message: String?, duration: Int? = null) {
         if (act == null || message == null) {
             Log.w(TAG, "invalid showToast act = $act message = $message")
@@ -156,36 +75,33 @@ object CommonActivity {
         } catch (e: Exception) {
             logError(e)
         }
-
         try {
-            val binding = ToastBinding.inflate(act.layoutInflater)
-            binding.text.text = message.trim()
+            val inflater =
+                act.getSystemService(AppCompatActivity.LAYOUT_INFLATER_SERVICE) as LayoutInflater
+
+            val layout: View = inflater.inflate(
+                R.layout.toast,
+                act.findViewById<View>(R.id.toast_layout_root) as ViewGroup?
+            )
+
+            val text = layout.findViewById(R.id.text) as TextView
+            text.text = message.trim()
 
-            // custom toasts are deprecated and won't appear when cs3 sets minSDK to api30 (A11)
             val toast = Toast(act)
-            toast.duration = duration ?: Toast.LENGTH_SHORT
             toast.setGravity(Gravity.CENTER_HORIZONTAL or Gravity.BOTTOM, 0, 5.toPx)
-            toast.view = binding.root //fixme Find an alternative using default Toasts since custom toasts are deprecated and won't appear with api30 set as minSDK version.
-            currentToast = toast
+            toast.duration = duration ?: Toast.LENGTH_SHORT
+            toast.view = layout
+            //https://github.com/PureWriter/ToastCompat
             toast.show()
-
+            currentToast = toast
         } catch (e: Exception) {
             logError(e)
         }
     }
 
-    /**
-     * Not all languages can be fetched from locale with a code.
-     * This map allows sidestepping the default Locale(languageCode)
-     * when setting the app language.
-     **/
-    val appLanguageExceptions = hashMapOf(
-        "zh-rTW" to Locale.TRADITIONAL_CHINESE
-    )
-
     fun setLocale(context: Context?, languageCode: String?) {
         if (context == null || languageCode == null) return
-        val locale = appLanguageExceptions[languageCode] ?: Locale(languageCode)
+        val locale = Locale(languageCode)
         val resources: Resources = context.resources
         val config = resources.configuration
         Locale.setDefault(locale)
@@ -202,54 +118,18 @@ object CommonActivity {
         setLocale(this, localeCode)
     }
 
-    fun init(act: Activity) {
-        setActivityInstance(act)
-
-        val componentActivity = activity as? ComponentActivity ?: return
-
+    fun init(act: Activity?) {
+        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
+
+        act.updateLocale()
 
-        componentActivity.updateLocale()
-        componentActivity.updateTv()
         NewPipe.init(DownloaderTestImpl.getInstance())
-
-        for (resumeApp in resumeApps) {
-            resumeApp.launcher =
-                componentActivity.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) {
-                        val pos = resumeApp.getPosition(data)
-                        val dur = resumeApp.getDuration(data)
-                        if (dur > 0L && pos > 0L)
-                            DataStoreHelper.setViewPos(getKey(resumeApp.lastId), pos, dur)
-                        removeKey(resumeApp.lastId)
-                        ResultFragment.updateUI()
-                    }
-                }
-        }
-
-        // Ask for notification permissions on Android 13
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU &&
-            ContextCompat.checkSelfPermission(
-                componentActivity,
-                Manifest.permission.POST_NOTIFICATIONS
-            ) != PackageManager.PERMISSION_GRANTED
-        ) {
-            val requestPermissionLauncher = componentActivity.registerForActivityResult(
-                ActivityResultContracts.RequestPermission()
-            ) { isGranted: Boolean ->
-                Log.d(TAG, "Notification permission: $isGranted")
-            }
-            requestPermissionLauncher.launch(
-                Manifest.permission.POST_NOTIFICATIONS
-            )
-        }
     }
 
     private fun Activity.enterPIPMode() {
@@ -277,57 +157,28 @@ object CommonActivity {
         }
     }
 
-    fun updateTheme(act: Activity) {
-        val settingsManager = PreferenceManager.getDefaultSharedPreferences(act)
-        if (settingsManager
-            .getString(act.getString(R.string.app_theme_key), "AmoledLight") == "System"
-            && Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            loadThemes(act)
-        }
-    }
-
-    private fun mapSystemTheme(act: Activity): Int {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            val currentNightMode =
-                act.resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK
-            return when (currentNightMode) {
-                Configuration.UI_MODE_NIGHT_NO -> R.style.LightMode // Night mode is not active, we're using the light theme
-                else -> R.style.AppTheme // Night mode is active, we're using dark theme
-            }
-        } else {
-            return R.style.AppTheme
-        }
-    }
-
     fun loadThemes(act: Activity?) {
         if (act == null) return
         val settingsManager = PreferenceManager.getDefaultSharedPreferences(act)
 
         val currentTheme =
             when (settingsManager.getString(act.getString(R.string.app_theme_key), "AmoledLight")) {
-                "System" -> mapSystemTheme(act)
                 "Black" -> R.style.AppTheme
                 "Light" -> R.style.LightMode
                 "Amoled" -> R.style.AmoledMode
                 "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
             }
 
         val currentOverlayTheme =
             when (settingsManager.getString(act.getString(R.string.primary_color_key), "Normal")) {
                 "Normal" -> R.style.OverlayPrimaryColorNormal
-                "DandelionYellow" -> R.style.OverlayPrimaryColorDandelionYellow
                 "CarnationPink" -> R.style.OverlayPrimaryColorCarnationPink
-                "Orange" -> R.style.OverlayPrimaryColorOrange
                 "DarkGreen" -> R.style.OverlayPrimaryColorDarkGreen
                 "Maroon" -> R.style.OverlayPrimaryColorMaroon
                 "NavyBlue" -> R.style.OverlayPrimaryColorNavyBlue
                 "Grey" -> R.style.OverlayPrimaryColorGrey
                 "White" -> R.style.OverlayPrimaryColorWhite
-                "CoolBlue" -> R.style.OverlayPrimaryColorCoolBlue
                 "Brown" -> R.style.OverlayPrimaryColorBrown
                 "Purple" -> R.style.OverlayPrimaryColorPurple
                 "Green" -> R.style.OverlayPrimaryColorGreen
@@ -336,13 +187,6 @@ object CommonActivity {
                 "Banana" -> R.style.OverlayPrimaryColorBanana
                 "Party" -> R.style.OverlayPrimaryColorParty
                 "Pink" -> R.style.OverlayPrimaryColorPink
-                "Lavender" -> R.style.OverlayPrimaryColorLavender
-                "Monet" -> if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S)
-                    R.style.OverlayPrimaryColorMonet else R.style.OverlayPrimaryColorNormal
-
-                "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)
@@ -354,207 +198,120 @@ 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")
+        //showToast(
+        //    this,
+        //    "Got Keycode $keyCode | ${KeyEvent.keyCodeToString(keyCode)} \n ${event?.action}",
+        //    Toast.LENGTH_LONG
+        //)
+
+        // Tested keycodes on remote:
+        // KeyEvent.KEYCODE_MEDIA_FAST_FORWARD
+        // KeyEvent.KEYCODE_MEDIA_REWIND
+        // KeyEvent.KEYCODE_MENU
+        // KeyEvent.KEYCODE_MEDIA_NEXT
+        // KeyEvent.KEYCODE_MEDIA_PREVIOUS
+        // KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE
 
         // 149 keycode_numpad 5
         when (keyCode) {
             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 -> {
+            KeyEvent.KEYCODE_L, KeyEvent.KEYCODE_NUMPAD_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 -> {
+            KeyEvent.KEYCODE_S, KeyEvent.KEYCODE_NUMPAD_9 -> {
                 PlayerEventType.ShowMirrors
             }
             // OpenSubtitles shortcut
-            KeyEvent.KEYCODE_O, KeyEvent.KEYCODE_NUMPAD_8, KeyEvent.KEYCODE_8 -> {
+            KeyEvent.KEYCODE_O, KeyEvent.KEYCODE_NUMPAD_8 -> {
                 PlayerEventType.SearchSubtitlesOnline
             }
-
-            KeyEvent.KEYCODE_E, KeyEvent.KEYCODE_NUMPAD_3, KeyEvent.KEYCODE_3 -> {
+            KeyEvent.KEYCODE_E, KeyEvent.KEYCODE_NUMPAD_3 -> {
                 PlayerEventType.ShowSpeed
             }
-
-            KeyEvent.KEYCODE_R, KeyEvent.KEYCODE_NUMPAD_0, KeyEvent.KEYCODE_0 -> {
+            KeyEvent.KEYCODE_R, KeyEvent.KEYCODE_NUMPAD_0 -> {
                 PlayerEventType.Resize
             }
-
-            KeyEvent.KEYCODE_C, KeyEvent.KEYCODE_NUMPAD_4, KeyEvent.KEYCODE_4 -> {
+            KeyEvent.KEYCODE_C, KeyEvent.KEYCODE_NUMPAD_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)
@@ -567,67 +324,67 @@ 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
         }
         return null
     }
-}
+}

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

@@ -2,7 +2,6 @@ package com.lagradost.cloudstream3
 
 import okhttp3.OkHttpClient
 import okhttp3.RequestBody
-import okhttp3.RequestBody.Companion.toRequestBody
 import org.schabi.newpipe.extractor.downloader.Downloader
 import org.schabi.newpipe.extractor.downloader.Request
 import org.schabi.newpipe.extractor.downloader.Response
@@ -11,7 +10,7 @@ import java.util.concurrent.TimeUnit
 
 
 class DownloaderTestImpl private constructor(builder: OkHttpClient.Builder) : Downloader() {
-    private val client: OkHttpClient = builder.readTimeout(30, TimeUnit.SECONDS).build()
+    private val client: OkHttpClient
     override fun execute(request: Request): Response {
         val httpMethod: String = request.httpMethod()
         val url: String = request.url()
@@ -19,7 +18,7 @@ class DownloaderTestImpl private constructor(builder: OkHttpClient.Builder) : Do
         val dataToSend: ByteArray? = request.dataToSend()
         var requestBody: RequestBody? = null
         if (dataToSend != null) {
-            requestBody = dataToSend.toRequestBody(null, 0, dataToSend.size)
+            requestBody = RequestBody.create(null, dataToSend)
         }
         val requestBuilder: okhttp3.Request.Builder = okhttp3.Request.Builder()
             .method(httpMethod, requestBody).url(url)
@@ -51,7 +50,7 @@ class DownloaderTestImpl private constructor(builder: OkHttpClient.Builder) : Do
 
     companion object {
         private const val USER_AGENT =
-            "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/116.0.0.0 Safari/537.36"
+            "Mozilla/5.0 (Windows NT 10.0; rv:91.0) Gecko/20100101 Firefox/91.0"
         private var instance: DownloaderTestImpl? = null
 
         /**
@@ -74,4 +73,8 @@ class DownloaderTestImpl private constructor(builder: OkHttpClient.Builder) : Do
             return instance
         }
     }
+
+    init {
+        client = builder.readTimeout(30, TimeUnit.SECONDS).build()
+    }
 }

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

@@ -1,11 +0,0 @@
-package com.lagradost.cloudstream3
-
-import android.view.LayoutInflater
-import androidx.annotation.LayoutRes
-import androidx.recyclerview.widget.RecyclerView
-import com.lagradost.cloudstream3.ui.HeaderViewDecoration
-
-fun setHeaderDecoration(view: RecyclerView, @LayoutRes headerViewRes: Int) {
-    val headerView = LayoutInflater.from(view.context).inflate(headerViewRes, null)
-    view.addItemDecoration(HeaderViewDecoration(headerView))
-}

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

@@ -1,7 +1,8 @@
 package com.lagradost.cloudstream3
 
 import com.lagradost.cloudstream3.mvvm.logError
-import kotlinx.coroutines.*
+import kotlinx.coroutines.async
+import kotlinx.coroutines.runBlocking
 
 //https://stackoverflow.com/questions/34697828/parallel-operations-on-kotlin-collections
 /*
@@ -25,25 +26,10 @@ fun <T, R> Iterable<T>.pmap(
     return ArrayList<R>(destination)
 }*/
 
-
-@OptIn(DelicateCoroutinesApi::class)
-suspend fun <K, V, R> Map<out K, V>.amap(f: suspend (Map.Entry<K, V>) -> R): List<R> =
-    with(CoroutineScope(GlobalScope.coroutineContext)) {
-        map { async { f(it) } }.map { it.await() }
-    }
-
 fun <K, V, R> Map<out K, V>.apmap(f: suspend (Map.Entry<K, V>) -> R): List<R> = runBlocking {
     map { async { f(it) } }.map { it.await() }
 }
 
-
-@OptIn(DelicateCoroutinesApi::class)
-suspend fun <A, B> List<A>.amap(f: suspend (A) -> B): List<B> =
-    with(CoroutineScope(GlobalScope.coroutineContext)) {
-        map { async { f(it) } }.map { it.await() }
-    }
-
-
 fun <A, B> List<A>.apmap(f: suspend (A) -> B): List<B> = runBlocking {
     map { async { f(it) } }.map { it.await() }
 }
@@ -52,12 +38,6 @@ fun <A, B> List<A>.apmapIndexed(f: suspend (index: Int, A) -> B): List<B> = runB
     mapIndexed { index, a -> async { f(index, a) } }.map { it.await() }
 }
 
-@OptIn(DelicateCoroutinesApi::class)
-suspend fun <A, B> List<A>.amapIndexed(f: suspend (index: Int, A) -> B): List<B> =
-    with(CoroutineScope(GlobalScope.coroutineContext)) {
-        mapIndexed { index, a -> async { f(index, a) } }.map { it.await() }
-    }
-
 // run code in parallel
 /*fun <R> argpmap(
     vararg transforms: () -> R,

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

@@ -0,0 +1,40 @@
+package com.lagradost.cloudstream3.extractors
+
+import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.base64Decode
+import com.lagradost.cloudstream3.utils.*
+
+class Acefile : ExtractorApi() {
+    override val name = "Acefile"
+    override val mainUrl = "https://acefile.co"
+    override val requiresReferer = false
+
+    override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink> {
+        val sources = mutableListOf<ExtractorLink>()
+        app.get(url).document.select("script").map { script ->
+            if (script.data().contains("eval(function(p,a,c,k,e,d)")) {
+                val data = getAndUnpack(script.data())
+                val id = data.substringAfter("{\"id\":\"").substringBefore("\",")
+                val key = data.substringAfter("var nfck=\"").substringBefore("\";")
+                app.get("https://acefile.co/local/$id?key=$key").text.let {
+                    base64Decode(
+                        it.substringAfter("JSON.parse(atob(\"").substringBefore("\"))")
+                    ).let { res ->
+                        sources.add(
+                            ExtractorLink(
+                                name,
+                                name,
+                                res.substringAfter("\"file\":\"").substringBefore("\","),
+                                "$mainUrl/",
+                                Qualities.Unknown.value,
+                                headers = mapOf("range" to "bytes=0-")
+                            )
+                        )
+                    }
+                }
+            }
+        }
+        return sources
+    }
+
+}

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

@@ -7,9 +7,9 @@ import com.lagradost.cloudstream3.utils.M3u8Helper
 import com.lagradost.cloudstream3.utils.getQualityFromName
 import java.net.URI
 
-open class AsianLoad : ExtractorApi() {
+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/Blogger.kt

@@ -5,7 +5,7 @@ import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.utils.*
 import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
 
-open class Blogger : ExtractorApi() {
+class Blogger : ExtractorApi() {
     override val name = "Blogger"
     override val mainUrl = "https://www.blogger.com"
     override val requiresReferer = false

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

@@ -5,7 +5,7 @@ import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.M3u8Helper
 
-open class BullStream : ExtractorApi() {
+class BullStream : ExtractorApi() {
     override val name = "BullStream"
     override val mainUrl = "https://bullstream.xyz"
     override val requiresReferer = false
@@ -18,7 +18,7 @@ open class BullStream : ExtractorApi() {
             ?: return null
 
         val m3u8 = "$mainUrl/m3u8/${data[1]}/${data[2]}/master.txt?s=1&cache=${data[4]}"
-        //println("shiv : $m3u8")
+        println("shiv : $m3u8")
         return M3u8Helper.generateM3u8(
             name,
             m3u8,

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

@@ -7,26 +7,6 @@ import com.lagradost.cloudstream3.utils.Qualities
 import com.lagradost.cloudstream3.utils.getQualityFromName
 import kotlinx.coroutines.delay
 
-class D0000d : DoodLaExtractor() {
-    override var mainUrl = "https://d0000d.com"
-}
-
-class D000dCom : DoodLaExtractor() {
-    override var mainUrl = "https://d000d.com"
-}
-
-class DoodstreamCom : DoodLaExtractor() {
-    override var mainUrl = "https://doodstream.com"
-}
-
-class Dooood : DoodLaExtractor() {
-    override var mainUrl = "https://dooood.com"
-}
-
-class DoodWfExtractor : DoodLaExtractor() {
-    override var mainUrl = "https://dood.wf"
-}
-
 class DoodCxExtractor : DoodLaExtractor() {
     override var mainUrl = "https://dood.cx"
 }
@@ -54,9 +34,6 @@ class DoodWsExtractor : DoodLaExtractor() {
     override var mainUrl = "https://dood.ws"
 }
 
-class DoodYtExtractor : DoodLaExtractor() {
-    override var mainUrl = "https://dood.yt"
-}
 
 open class DoodLaExtractor : ExtractorApi() {
     override var name = "DoodStream"
@@ -68,14 +45,13 @@ open class DoodLaExtractor : ExtractorApi() {
     }
 
     override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink>? {
-        val newUrl= url.replace(mainUrl, "https://d0000d.com")
-        val response0 = app.get(newUrl).text // html of DoodStream page to look for /pass_md5/...
-        val md5 ="https://d0000d.com"+(Regex("/pass_md5/[^']*").find(response0)?.value ?: return null)  // get https://dood.ws/pass_md5/...
-        val trueUrl = app.get(md5, referer = newUrl).text + "zUEJeL3mUN?token=" + md5.substringAfterLast("/")   //direct link to extract  (zUEJeL3mUN is random)
+        val response0 = app.get(url).text // html of DoodStream page to look for /pass_md5/...
+        val md5 =mainUrl+(Regex("/pass_md5/[^']*").find(response0)?.value ?: return null)  // get https://dood.ws/pass_md5/...
+        val trueUrl = app.get(md5, referer = url).text + "zUEJeL3mUN?token=" + md5.substringAfterLast("/")   //direct link to extract  (zUEJeL3mUN is random)
         val quality = Regex("\\d{3,4}p").find(response0.substringAfter("<title>").substringBefore("</title>"))?.groupValues?.get(0)
         return listOf(
             ExtractorLink(
-                this.name,
+                trueUrl,
                 this.name,
                 trueUrl,
                 mainUrl,

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

@@ -16,7 +16,26 @@ open class Evoload : ExtractorApi() {
 
 
     override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink> {
-        val id = url.replace("https://evoload.io/e/", "")  // wanted media id
+        val lang = url.substring(0, 2)
+        val flag =
+            if (lang == "vo") {
+                " \uD83C\uDDEC\uD83C\uDDE7"
+            }
+            else if (lang == "vf"){
+                " \uD83C\uDDE8\uD83C\uDDF5"
+            } else {
+                ""
+            }
+        
+        val cleaned_url = if (lang == "ht") {  // if url doesn't contain a flag and the url starts with http://
+            url
+        } else {
+            url.substring(2, url.length)
+        }
+	//println(lang)
+        //println(cleaned_url)
+
+        val id = cleaned_url.replace("https://evoload.io/e/", "")  // wanted media id
         val csrv_token = app.get("https://csrv.evosrv.com/captcha?m412548=").text  // whatever that is
         val captchaPass = app.get("https://cd2.evosrv.com/html/jsx/e.jsx").text.take(300).split("captcha_pass = '")[1].split("\'")[0]  //extract the captcha pass from the js response (located in the 300 first chars)
         val payload = mapOf("code" to id, "csrv_token" to csrv_token, "pass" to captchaPass)
@@ -25,9 +44,9 @@ open class Evoload : ExtractorApi() {
         return listOf(
             ExtractorLink(
                 name,
-                name,
+                name + flag,
                 link,
-                url,
+                cleaned_url,
                 Qualities.Unknown.value,
             )
         )

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

@@ -0,0 +1,39 @@
+package com.lagradost.cloudstream3.extractors
+
+import com.lagradost.cloudstream3.apmap
+import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.utils.ExtractorApi
+import com.lagradost.cloudstream3.utils.ExtractorLink
+import com.lagradost.cloudstream3.utils.M3u8Helper.Companion.generateM3u8
+
+class Fastream: ExtractorApi() {
+    override var mainUrl = "https://fastream.to"
+    override var name = "Fastream"
+    override val requiresReferer = false
+
+
+    override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink>? {
+        val id = Regex("emb\\.html\\?(.*)\\=(enc|)").find(url)?.destructured?.component1() ?: return emptyList()
+        val sources = mutableListOf<ExtractorLink>()
+        val response = app.post("$mainUrl/dl",
+        data = mapOf(
+            Pair("op","embed"),
+            Pair("file_code",id),
+            Pair("auto","1")
+        )).document
+        response.select("script").apmap { script ->
+            if (script.data().contains("sources")) {
+                val m3u8regex = Regex("((https:|http:)\\/\\/.*\\.m3u8)")
+                val m3u8 = m3u8regex.find(script.data())?.value ?: return@apmap
+                generateM3u8(
+                    name,
+                    m3u8,
+                    mainUrl
+                ).forEach { link ->
+                    sources.add(link)
+                }
+            }
+        }
+        return sources
+    }
+}

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

@@ -0,0 +1,38 @@
+package com.lagradost.cloudstream3.extractors
+
+import com.fasterxml.jackson.annotation.JsonProperty
+import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.utils.*
+import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
+
+class Filesim : ExtractorApi() {
+    override val name = "Filesim"
+    override val mainUrl = "https://files.im"
+    override val requiresReferer = false
+
+    override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink> {
+        val sources = mutableListOf<ExtractorLink>()
+        with(app.get(url).document) {
+            this.select("script").map { script ->
+                if (script.data().contains("eval(function(p,a,c,k,e,d)")) {
+                    val data = getAndUnpack(script.data()).substringAfter("sources:[").substringBefore("]")
+                    tryParseJson<List<ResponseSource>>("[$data]")?.map {
+                        M3u8Helper.generateM3u8(
+                            name,
+                            it.file,
+                            "$mainUrl/",
+                        ).forEach { m3uData -> sources.add(m3uData) }
+                    }
+                }
+            }
+        }
+        return sources
+    }
+
+    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/GMPlayer.kt

@@ -3,9 +3,9 @@ package com.lagradost.cloudstream3.extractors
 import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
-import com.lagradost.cloudstream3.utils.Qualities
+import com.lagradost.cloudstream3.utils.M3u8Helper
 
-open class GMPlayer : ExtractorApi() {
+class GMPlayer : ExtractorApi() {
     override val name = "GM Player"
     override val mainUrl = "https://gmplayer.xyz"
     override val requiresReferer = true
@@ -25,16 +25,11 @@ open class GMPlayer : ExtractorApi() {
             data = mapOf("hash" to id, "r" to ref)
         ).parsed<GmResponse>().videoSource ?: return null
 
-        return listOf(
-            ExtractorLink(
-                this.name,
-                this.name,
-                m3u8,
-                ref,
-                Qualities.Unknown.value,
-                headers = mapOf("accept" to "*/*"),
-                isM3u8 = true
-            )
+        return M3u8Helper.generateM3u8(
+            name,
+            m3u8,
+            ref,
+            headers = mapOf("accept" to "*/*")
         )
     }
 

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

@@ -0,0 +1,36 @@
+package com.lagradost.cloudstream3.extractors
+import com.fasterxml.jackson.annotation.JsonProperty
+import com.lagradost.cloudstream3.utils.ExtractorLink
+import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.utils.*
+
+open class GuardareStream : ExtractorApi() {
+    override var name = "Guardare"
+    override var mainUrl = "https://guardare.stream"
+    override val requiresReferer = false
+
+    data class GuardareJsonData (
+        @JsonProperty("data") val data : List<GuardareData>,
+    )
+
+    data class GuardareData (
+        @JsonProperty("file") val file : String,
+        @JsonProperty("label") val label : String,
+        @JsonProperty("type") val type : String
+    )
+
+    override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink>? {
+        val response = app.post(url.replace("/v/","/api/source/"), data = mapOf("d" to mainUrl)).text
+        val jsonvideodata = AppUtils.parseJson<GuardareJsonData>(response)
+        return jsonvideodata.data.map {
+            ExtractorLink(
+                it.file+".${it.type}",
+                this.name,
+                it.file+".${it.type}",
+                mainUrl,
+                it.label.filter{ it.isDigit() }.toInt(),
+                false
+            )
+        }
+    }
+}

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

@@ -0,0 +1,46 @@
+package com.lagradost.cloudstream3.extractors
+
+import com.fasterxml.jackson.annotation.JsonProperty
+import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.utils.ExtractorApi
+import com.lagradost.cloudstream3.utils.ExtractorLink
+import com.lagradost.cloudstream3.utils.getQualityFromName
+
+class Linkbox : ExtractorApi() {
+    override val name = "Linkbox"
+    override val mainUrl = "https://www.linkbox.to"
+    override val requiresReferer = true
+
+    override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink> {
+        val id = url.substringAfter("id=")
+        val sources = mutableListOf<ExtractorLink>()
+
+        app.get("$mainUrl/api/open/get_url?itemId=$id", referer=url).parsedSafe<Responses>()?.data?.rList?.map { link ->
+            sources.add(
+                ExtractorLink(
+                    name,
+                    name,
+                    link.url,
+                    url,
+                    getQualityFromName(link.resolution)
+                )
+            )
+        }
+
+        return sources
+    }
+
+    data class RList(
+        @JsonProperty("url") val url: String,
+        @JsonProperty("resolution") val resolution: String?,
+    )
+
+    data class Data(
+        @JsonProperty("rList") val rList: List<RList>?,
+    )
+
+    data class Responses(
+        @JsonProperty("data") val data: Data?,
+    )
+
+}

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

@@ -0,0 +1,7 @@
+package com.lagradost.cloudstream3.extractors
+
+open class Mcloud : WcoStream() {
+    override var name = "Mcloud"
+    override var mainUrl = "https://mcloud.to"
+    override val requiresReferer = true
+}

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

@@ -0,0 +1,34 @@
+package com.lagradost.cloudstream3.extractors
+
+import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.utils.ExtractorApi
+import com.lagradost.cloudstream3.utils.ExtractorLink
+import com.lagradost.cloudstream3.utils.Qualities
+import com.lagradost.cloudstream3.utils.getAndUnpack
+
+class Mp4Upload : ExtractorApi() {
+    override var name = "Mp4Upload"
+    override var mainUrl = "https://www.mp4upload.com"
+    private val srcRegex = Regex("""player\.src\("(.*?)"""")
+    override val requiresReferer = true
+
+    override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink>? {
+        with(app.get(url)) {
+            getAndUnpack(this.text).let { unpackedText ->
+                val quality = unpackedText.lowercase().substringAfter(" height=").substringBefore(" ").toIntOrNull()
+                srcRegex.find(unpackedText)?.groupValues?.get(1)?.let { link ->
+                    return listOf(
+                        ExtractorLink(
+                            name,
+                            name,
+                            link,
+                            url,
+                            quality ?: Qualities.Unknown.value,
+                        )
+                    )
+                }
+            }
+        }
+        return null
+    }
+}

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

@@ -7,9 +7,9 @@ import com.lagradost.cloudstream3.utils.Qualities
 import com.lagradost.cloudstream3.utils.getQualityFromName
 import java.net.URI
 
-open class MultiQuality : ExtractorApi() {
+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/OkRuExtractor.kt

@@ -0,0 +1,67 @@
+package com.lagradost.cloudstream3.extractors
+
+import com.fasterxml.jackson.annotation.JsonProperty
+import com.lagradost.cloudstream3.utils.*
+import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.utils.AppUtils.parseJson
+
+data class DataOptionsJson (
+    @JsonProperty("flashvars") var flashvars : Flashvars? = Flashvars(),
+)
+data class Flashvars (
+    @JsonProperty("metadata") var metadata : String? = null,
+    @JsonProperty("hlsManifestUrl") var hlsManifestUrl : String? = null, //m3u8
+)
+
+data class MetadataOkru (
+    @JsonProperty("videos") var videos: ArrayList<Videos> = arrayListOf(),
+)
+
+data class Videos (
+    @JsonProperty("name") var name : String,
+    @JsonProperty("url") var url : String,
+    @JsonProperty("seekSchema") var seekSchema : Int? = null,
+    @JsonProperty("disallowed") var disallowed : Boolean? = null
+)
+
+class OkRuHttps: OkRu(){
+    override var mainUrl = "https://ok.ru"
+}
+
+open class OkRu : ExtractorApi() {
+    override var name = "Okru"
+    override var mainUrl = "http://ok.ru"
+    override val requiresReferer = false
+
+    override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink>? {
+        val doc = app.get(url).document
+        val sources = ArrayList<ExtractorLink>()
+        val datajson = doc.select("div[data-options]").attr("data-options")
+        if (datajson.isNotBlank()) {
+            val main = parseJson<DataOptionsJson>(datajson)
+            val metadatajson = parseJson<MetadataOkru>(main.flashvars?.metadata!!)
+            val servers = metadatajson.videos
+            servers.forEach {
+                val quality = it.name.uppercase()
+                    .replace("MOBILE","144p")
+                    .replace("LOWEST","240p")
+                    .replace("LOW","360p")
+                    .replace("SD","480p")
+                    .replace("HD","720p")
+                    .replace("FULL","1080p")
+                    .replace("QUAD","1440p")
+                    .replace("ULTRA","4k")
+                val extractedurl = it.url.replace("\\\\u0026", "&")
+                sources.add(ExtractorLink(
+                    name,
+                    name = this.name,
+                    extractedurl,
+                    url,
+                    getQualityFromName(quality),
+                    isM3u8 = false
+                ))
+            }
+        }
+        return sources
+    }
+}

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

@@ -1,11 +1,10 @@
 package com.lagradost.cloudstream3.extractors
 
 import com.lagradost.cloudstream3.SubtitleFile
-import com.lagradost.cloudstream3.amap
+import com.lagradost.cloudstream3.apmap
 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
@@ -15,7 +14,7 @@ import org.jsoup.Jsoup
  * overrideMainUrl is necessary for for other vidstream clones like vidembed.cc
  * If they diverge it'd be better to make them separate.
  * */
-open class Pelisplus(val mainUrl: String) {
+class Pelisplus(val mainUrl: String) {
     val name: String = "Vidstream"
 
     private fun getExtractorUrl(id: String): String {
@@ -36,7 +35,7 @@ open class Pelisplus(val mainUrl: String) {
         callback: (ExtractorLink) -> Unit
     ): Boolean {
         try {
-            normalApis.amap { api ->
+            normalApis.apmap { api ->
                 val url = api.getExtractorUrl(id)
                 api.getSafeUrl(url, subtitleCallback = subtitleCallback, callback = callback)
             }
@@ -52,8 +51,8 @@ open class Pelisplus(val mainUrl: String) {
                 val qualityRegex = Regex("(\\d+)P")
 
                 //a[download]
-                pageDoc.select(".dowload > a")?.amap { element ->
-                    val href = element.attr("href") ?: return@amap
+                pageDoc.select(".dowload > a")?.apmap { element ->
+                    val href = element.attr("href") ?: return@apmap
                     val qual = if (element.text()
                             .contains("HDP")
                     ) "1080" else qualityRegex.find(element.text())?.destructured?.component1()
@@ -67,7 +66,7 @@ open class Pelisplus(val mainUrl: String) {
                                 href,
                                 page.url,
                                 getQualityFromName(qual),
-                                type = INFER_TYPE
+                                element.attr("href").contains(".m3u8")
                             )
                         )
                     }
@@ -85,7 +84,7 @@ open class Pelisplus(val mainUrl: String) {
                     //val name = element.text()
 
                     // Matches vidstream links with extractors
-                    extractorApis.filter { !it.requiresReferer || !isCasting }.amap { api ->
+                    extractorApis.filter { !it.requiresReferer || !isCasting }.apmap { api ->
                         if (link.startsWith(api.mainUrl)) {
                             api.getSafeUrl(link, extractorUrl, subtitleCallback, callback)
                         }

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

@@ -8,7 +8,7 @@ import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.getQualityFromName
 
 
-open class Solidfiles : ExtractorApi() {
+class Solidfiles : ExtractorApi() {
     override val name = "Solidfiles"
     override val mainUrl = "https://www.solidfiles.com"
     override val requiresReferer = false

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

@@ -7,12 +7,10 @@ import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.M3u8Helper
 
-open class Minoplres : ExtractorApi() {
-
-    override val name = "Minoplres" // formerly SpeedoStream
+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 +22,7 @@ open class Minoplres : ExtractorApi() {
                     M3u8Helper.generateM3u8(
                         name,
                         it.file,
-                        "$hostUrl/",
+                        "$mainUrl/",
                     ).forEach { m3uData -> sources.add(m3uData) }
                 }
             }
@@ -35,4 +33,6 @@ open class Minoplres : ExtractorApi() {
     private data class File(
         @JsonProperty("file") val file: String,
     )
-}
+
+
+}

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

@@ -0,0 +1,126 @@
+package com.lagradost.cloudstream3.extractors
+
+import com.fasterxml.jackson.annotation.JsonProperty
+import com.lagradost.cloudstream3.app
+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
+
+class Ssbstream : StreamSB() {
+    override var mainUrl = "https://ssbstream.net"
+}
+
+class SBfull : StreamSB() {
+    override var mainUrl = "https://sbfull.com"
+}
+
+class StreamSB1 : StreamSB() {
+    override var mainUrl = "https://sbplay1.com"
+}
+
+class StreamSB2 : StreamSB() {
+    override var mainUrl = "https://sbplay2.com"
+}
+
+class StreamSB3 : StreamSB() {
+    override var mainUrl = "https://sbplay3.com"
+}
+
+class StreamSB4 : StreamSB() {
+    override var mainUrl = "https://cloudemb.com"
+}
+
+class StreamSB5 : StreamSB() {
+    override var mainUrl = "https://sbplay.org"
+}
+
+class StreamSB6 : StreamSB() {
+    override var mainUrl = "https://embedsb.com"
+}
+
+class StreamSB7 : StreamSB() {
+    override var mainUrl = "https://pelistop.co"
+}
+
+class StreamSB8 : StreamSB() {
+    override var mainUrl = "https://streamsb.net"
+}
+
+class StreamSB9 : StreamSB() {
+    override var mainUrl = "https://sbplay.one"
+}
+
+class StreamSB10 : StreamSB() {
+    override var mainUrl = "https://sbplay2.xyz"
+}
+
+// This is a modified version of https://github.com/jmir1/aniyomi-extensions/blob/master/src/en/genoanime/src/eu/kanade/tachiyomi/animeextension/en/genoanime/extractors/StreamSBExtractor.kt
+// The following code is under the Apache License 2.0 https://github.com/jmir1/aniyomi-extensions/blob/master/LICENSE
+open class StreamSB : ExtractorApi() {
+    override var name = "StreamSB"
+    override var mainUrl = "https://watchsb.com"
+    override val requiresReferer = false
+
+    private val hexArray = "0123456789ABCDEF".toCharArray()
+
+    private fun bytesToHex(bytes: ByteArray): String {
+        val hexChars = CharArray(bytes.size * 2)
+        for (j in bytes.indices) {
+            val v = bytes[j].toInt() and 0xFF
+
+            hexChars[j * 2] = hexArray[v ushr 4]
+            hexChars[j * 2 + 1] = hexArray[v and 0x0F]
+        }
+        return String(hexChars)
+    }
+
+    data class Subs (
+        @JsonProperty("file") val file: String,
+        @JsonProperty("label") val label: String,
+    )
+
+    data class StreamData (
+        @JsonProperty("file") val file: String,
+        @JsonProperty("cdn_img") val cdnImg: String,
+        @JsonProperty("hash") val hash: String,
+        @JsonProperty("subs") val subs: List<Subs>?,
+        @JsonProperty("length") val length: String,
+        @JsonProperty("id") val id: String,
+        @JsonProperty("title") val title: String,
+        @JsonProperty("backup") val backup: String,
+    )
+
+    data class Main (
+        @JsonProperty("stream_data") val streamData: StreamData,
+        @JsonProperty("status_code") val statusCode: Int,
+    )
+
+    override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink>? {
+        val regexID = Regex("(embed-[a-zA-Z0-9]{0,8}[a-zA-Z0-9_-]+|\\/e\\/[a-zA-Z0-9]{0,8}[a-zA-Z0-9_-]+)")
+        val id = regexID.findAll(url).map {
+            it.value.replace(Regex("(embed-|\\/e\\/)"),"")
+        }.first()
+        val bytes = id.toByteArray()
+        val bytesToHex = bytesToHex(bytes)
+        val master = "$mainUrl/sources43/6d6144797752744a454267617c7c${bytesToHex.lowercase()}7c7c4e61755a56456f34385243727c7c73747265616d7362/6b4a33767968506e4e71374f7c7c343837323439333133333462353935333633373836643638376337633462333634663539343137373761333635313533333835333763376333393636363133393635366136323733343435323332376137633763373337343732363536313664373336327c7c504d754478413835306633797c7c73747265616d7362"
+        val headers = mapOf(
+            "watchsb" to "streamsb",
+            )
+        val urltext = app.get(master,
+            headers = headers,
+            allowRedirects = false
+        ).text
+        val mapped = urltext.let { parseJson<Main>(it) }
+        val testurl = app.get(mapped.streamData.file, headers = headers).text
+        // val urlmain = mapped.streamData.file.substringBefore("/hls/")
+        if (urltext.contains("m3u8") && testurl.contains("EXTM3U"))
+            return M3u8Helper.generateM3u8(
+                name,
+                mapped.streamData.file,
+                url,
+                headers = headers
+            )
+        return null
+    }
+}

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

@@ -5,19 +5,7 @@ import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.Qualities
 
-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"
-}
-
-open class StreamTape : ExtractorApi() {
+class StreamTape : ExtractorApi() {
     override var name = "StreamTape"
     override var mainUrl = "https://streamtape.com"
     override val requiresReferer = false
@@ -28,8 +16,7 @@ open class StreamTape : ExtractorApi() {
     override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink>? {
         with(app.get(url)) {
             linkRegex.find(this.text)?.let {
-                val extractedUrl =
-                    "https:${it.groups[1]!!.value + it.groups[2]!!.value.substring(3)}"
+                val extractedUrl = "https:${it.groups[1]!!.value + it.groups[2]!!.value.substring(3,)}"
                 return listOf(
                     ExtractorLink(
                         name,

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

@@ -7,7 +7,7 @@ import com.lagradost.cloudstream3.utils.JsUnpacker
 import com.lagradost.cloudstream3.utils.Qualities
 import java.net.URI
 
-open class Streamhub : ExtractorApi() {
+class Streamhub : ExtractorApi() {
     override var mainUrl = "https://streamhub.to"
     override var name = "Streamhub"
     override val requiresReferer = false

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

@@ -11,22 +11,19 @@ data class Files(
     @JsonProperty("label") val label: String? = null,
 )
 
-open class Supervideo : ExtractorApi() {
+    open class Supervideo : ExtractorApi() {
     override var name = "Supervideo"
-    override var mainUrl = "https://supervideo.cc"
+    override var mainUrl = "https://supervideo.tv"
     override val requiresReferer = false
     override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink>? {
         val extractedLinksList: MutableList<ExtractorLink> = mutableListOf()
         val response = app.get(url).text
         val jstounpack = Regex("eval((.|\\n)*?)</script>").find(response)?.groups?.get(1)?.value
         val unpacjed = JsUnpacker(jstounpack).unpack()
-        val extractedUrl =
-            unpacjed?.let { Regex("""sources:((.|\n)*?)image""").find(it) }?.groups?.get(1)?.value.toString()
-                .replace("file", """"file"""").replace("label", """"label"""")
-                .substringBeforeLast(",")
+        val extractedUrl = unpacjed?.let { Regex("""sources:((.|\n)*?)image""").find(it) }?.groups?.get(1)?.value.toString().replace("file",""""file"""").replace("label",""""label"""").substringBeforeLast(",")
         val parsedlinks = parseJson<List<Files>>(extractedUrl)
         parsedlinks.forEach { data ->
-            if (data.label.isNullOrBlank()) { // mp4 links (with labels) are slow. Use only m3u8 link.
+            if (data.label.isNullOrBlank()){ // mp4 links (with labels) are slow. Use only m3u8 link.
                 M3u8Helper.generateM3u8(
                     name,
                     data.id,
@@ -37,6 +34,8 @@ open class Supervideo : ExtractorApi() {
                 }
             }
         }
+
+
         return extractedLinksList
     }
 }

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

@@ -30,7 +30,7 @@ open class Tantifilm : ExtractorApi() {
         val jsonvideodata = parseJson<TantifilmJsonData>(response)
         return jsonvideodata.data.map {
             ExtractorLink(
-                this.name,
+                it.file+".${it.type}",
                 this.name,
                 it.file+".${it.type}",
                 mainUrl,

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

@@ -0,0 +1,41 @@
+package com.lagradost.cloudstream3.extractors
+
+import com.fasterxml.jackson.annotation.JsonProperty
+import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.utils.AppUtils.parseJson
+import com.lagradost.cloudstream3.utils.ExtractorApi
+import com.lagradost.cloudstream3.utils.ExtractorLink
+import com.lagradost.cloudstream3.utils.Qualities
+
+class Cinestart: Tomatomatela() {
+    override var name = "Cinestart"
+    override var mainUrl = "https://cinestart.net"
+    override val details = "vr.php?v="
+}
+
+open class Tomatomatela : ExtractorApi() {
+    override var name = "Tomatomatela"
+    override var mainUrl = "https://tomatomatela.com"
+    override val requiresReferer = false
+    private data class Tomato (
+        @JsonProperty("status") val status: Int,
+        @JsonProperty("file") val file: String
+    )
+    open val details = "details.php?v="
+    override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink>? {
+        val link = url.replace("$mainUrl/embed.html#","$mainUrl/$details")
+        val server = app.get(link, allowRedirects = false).text
+        val json = parseJson<Tomato>(server)
+        if (json.status == 200) return listOf(
+            ExtractorLink(
+                name,
+                name,
+                json.file,
+                "",
+                Qualities.Unknown.value,
+                isM3u8 = false
+            )
+        )
+        return null
+    }
+}

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

@@ -1,23 +1,19 @@
 package com.lagradost.cloudstream3.extractors
 
-import com.lagradost.cloudstream3.SubtitleFile
 import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
-import com.lagradost.cloudstream3.utils.M3u8Helper
+import com.lagradost.cloudstream3.utils.Qualities
 
-open class UpstreamExtractor : ExtractorApi() {
-    override val name: String = "Upstream"
+class UpstreamExtractor: ExtractorApi() {
+    override val name: String = "Upstream.to"
     override val mainUrl: String = "https://upstream.to"
     override val requiresReferer = true
 
-    override suspend fun getUrl(
-        url: String,
-        referer: String?,
-        subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit
-    ) {
+    override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink> {
+        // WIP: m3u8 link fetched but sometimes not playing
         //Log.i(this.name, "Result => (no extractor) ${url}")
+        val sources: MutableList<ExtractorLink> = mutableListOf()
         val doc = app.get(url, referer = referer).text
         if (doc.isNotBlank()) {
             var reg = Regex("(?<=master)(.*)(?=hls)")
@@ -34,9 +30,7 @@ open class UpstreamExtractor : ExtractorApi() {
                             domName = "${part}.${domName}"
                         }
                         domName.trimEnd('.')
-                    } else {
-                        ""
-                    }
+                    } else { "" }
                 }
                 false -> ""
             }
@@ -48,13 +42,18 @@ open class UpstreamExtractor : ExtractorApi() {
 
             result?.forEach {
                 val linkUrl = "https://${domain}/hls/${it}/master.m3u8"
-                M3u8Helper.generateM3u8(
-                    this.name,
-                    linkUrl,
-                    "$mainUrl/",
-                    headers = mapOf("Origin" to mainUrl)
-                ).forEach(callback)
+                sources.add(
+                    ExtractorLink(
+                    name = "Upstream m3u8",
+                    source = this.name,
+                    url = linkUrl,
+                    quality = Qualities.Unknown.value,
+                    referer = referer ?: linkUrl,
+                    isM3u8 = true
+                    )
+                )
             }
         }
+        return sources
     }
 }

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

@@ -7,10 +7,6 @@ class Uqload1 : Uqload() {
     override var mainUrl = "https://uqload.com"
 }
 
-class Uqload2 : Uqload() {
-    override var mainUrl = "https://uqload.co"
-}
-
 open class Uqload : ExtractorApi() {
     override val name: String = "Uqload"
     override val mainUrl: String = "https://www.uqload.com"
@@ -19,14 +15,30 @@ open class Uqload : ExtractorApi() {
 
 
     override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink>? {
-        with(app.get(url)) {  // raised error ERROR_CODE_PARSING_CONTAINER_UNSUPPORTED (3003) is due to the response: "error_nofile"
+        val lang = url.substring(0, 2)
+        val flag =
+            if (lang == "vo") {
+                " \uD83C\uDDEC\uD83C\uDDE7"
+            }
+            else if (lang == "vf"){
+                " \uD83C\uDDE8\uD83C\uDDF5"
+            } else {
+                ""
+            }
+        
+        val cleaned_url = if (lang == "ht") {  // if url doesn't contain a flag and the url starts with http://
+            url
+        } else {
+            url.substring(2, url.length)
+        }
+        with(app.get(cleaned_url)) {  // raised error ERROR_CODE_PARSING_CONTAINER_UNSUPPORTED (3003) is due to the response: "error_nofile"
             srcRegex.find(this.text)?.groupValues?.get(1)?.replace("\"", "")?.let { link ->
                 return listOf(
                     ExtractorLink(
                         name,
-                        name,
+                        name + flag,
                         link,
-                        url,
+                        cleaned_url,
                         Qualities.Unknown.value,
                     )
                 )

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

@@ -0,0 +1,68 @@
+package com.lagradost.cloudstream3.extractors
+
+import com.lagradost.cloudstream3.SubtitleFile
+import com.lagradost.cloudstream3.apmap
+import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.utils.ExtractorApi
+import com.lagradost.cloudstream3.utils.ExtractorLink
+import com.lagradost.cloudstream3.utils.M3u8Helper
+import com.lagradost.cloudstream3.utils.loadExtractor
+
+class VidSrcExtractor2 : VidSrcExtractor() {
+    override val mainUrl = "https://vidsrc.me/embed"
+    override suspend fun getUrl(
+        url: String,
+        referer: String?,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
+        val newUrl = url.lowercase().replace(mainUrl, super.mainUrl)
+        super.getUrl(newUrl, referer, subtitleCallback, callback)
+    }
+}
+
+open class VidSrcExtractor : ExtractorApi() {
+    override val name = "VidSrc"
+    private val absoluteUrl = "https://v2.vidsrc.me"
+    override val mainUrl = "$absoluteUrl/embed"
+    override val requiresReferer = false
+
+    override suspend fun getUrl(
+        url: String,
+        referer: String?,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
+        val iframedoc = app.get(url).document
+
+        val serverslist =
+            iframedoc.select("div#sources.button_content div#content div#list div").map {
+                val datahash = it.attr("data-hash")
+                if (datahash.isNotBlank()) {
+                    val links = try {
+                        app.get("$absoluteUrl/src/$datahash", referer = "https://source.vidsrc.me/").url
+                    } catch (e: Exception) {
+                        ""
+                    }
+                    links
+                } else ""
+            }
+
+        serverslist.apmap { server ->
+            val linkfixed = server.replace("https://vidsrc.xyz/", "https://embedsito.com/")
+            if (linkfixed.contains("/pro")) {
+                val srcresponse = app.get(server, referer = absoluteUrl).text
+                val m3u8Regex = Regex("((https:|http:)//.*\\.m3u8)")
+                val srcm3u8 = m3u8Regex.find(srcresponse)?.value ?: return@apmap
+                M3u8Helper.generateM3u8(
+                    name,
+                    srcm3u8,
+                    absoluteUrl
+                ).forEach(callback)
+            } else {
+                loadExtractor(linkfixed, url, subtitleCallback, callback)
+            }
+        }
+    }
+
+}

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

@@ -11,7 +11,7 @@ class VideovardSX : WcoStream() {
     override var mainUrl = "https://videovard.sx"
 }
 
-open class VideoVard : ExtractorApi() {
+class VideoVard : ExtractorApi() {
     override var name = "Videovard" // Cause works for animekisa and wco
     override var mainUrl = "https://videovard.to"
     override val requiresReferer = false

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

@@ -1,11 +1,10 @@
 package com.lagradost.cloudstream3.extractors
 
 import com.lagradost.cloudstream3.SubtitleFile
-import com.lagradost.cloudstream3.amap
+import com.lagradost.cloudstream3.apmap
 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
@@ -38,7 +37,7 @@ class Vidstream(val mainUrl: String) {
         val extractorUrl = getExtractorUrl(id)
         argamap(
             {
-                normalApis.amap { api ->
+                normalApis.apmap { api ->
                     val url = api.getExtractorUrl(id)
                     api.getSafeUrl(
                         url,
@@ -56,8 +55,8 @@ class Vidstream(val mainUrl: String) {
                 val qualityRegex = Regex("(\\d+)P")
 
                 //a[download]
-                pageDoc.select(".dowload > a")?.amap { element ->
-                    val href = element.attr("href") ?: return@amap
+                pageDoc.select(".dowload > a")?.apmap { element ->
+                    val href = element.attr("href") ?: return@apmap
                     val qual = if (element.text()
                             .contains("HDP")
                     ) "1080" else qualityRegex.find(element.text())?.destructured?.component1()
@@ -71,7 +70,7 @@ class Vidstream(val mainUrl: String) {
                                 href,
                                 page.url,
                                 getQualityFromName(qual),
-                                type = INFER_TYPE
+                                element.attr("href").contains(".m3u8")
                             )
                         )
                     }
@@ -88,7 +87,7 @@ class Vidstream(val mainUrl: String) {
                         //val name = element.text()
 
                         // Matches vidstream links with extractors
-                        extractorApis.filter { !it.requiresReferer || !isCasting }.amap { api ->
+                        extractorApis.filter { !it.requiresReferer || !isCasting }.apmap { api ->
                             if (link.startsWith(api.mainUrl)) {
                                 api.getSafeUrl(link, extractorUrl, subtitleCallback, callback)
                             }

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

@@ -0,0 +1,51 @@
+package com.lagradost.cloudstream3.extractors
+
+import com.fasterxml.jackson.annotation.JsonProperty
+import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.utils.AppUtils.parseJson
+import com.lagradost.cloudstream3.utils.ExtractorApi
+import com.lagradost.cloudstream3.utils.ExtractorLink
+import com.lagradost.cloudstream3.utils.getQualityFromName
+
+open class VoeExtractor : ExtractorApi() {
+    override val name: String = "Voe"
+    override val mainUrl: String = "https://voe.sx"
+    override val requiresReferer = false
+
+    private data class ResponseLinks(
+        @JsonProperty("hls") val url: String?,
+        @JsonProperty("video_height") val label: Int?
+        //val type: String // Mp4
+    )
+
+    override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink> {
+        val extractedLinksList: MutableList<ExtractorLink> = mutableListOf()
+        val doc = app.get(url).text
+        if (doc.isNotBlank()) {
+            val start = "const sources ="
+            var src = doc.substring(doc.indexOf(start))
+            src = src.substring(start.length, src.indexOf(";"))
+                .replace("0,", "0")
+                .trim()
+            //Log.i(this.name, "Result => (src) ${src}")
+            parseJson<ResponseLinks?>(src)?.let { voelink ->
+                //Log.i(this.name, "Result => (voelink) ${voelink}")
+                val linkUrl = voelink.url
+                val linkLabel = voelink.label?.toString() ?: ""
+                if (!linkUrl.isNullOrEmpty()) {
+                    extractedLinksList.add(
+                        ExtractorLink(
+                            name = this.name,
+                            source = this.name,
+                            url = linkUrl,
+                            quality = getQualityFromName(linkLabel),
+                            referer = url,
+                            isM3u8 = true
+                        )
+                    )
+                }
+            }
+        }
+        return extractedLinksList
+    }
+}

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() {
@@ -54,12 +53,6 @@ class VizcloudSite : WcoStream() {
     override var mainUrl = "https://vizcloud.site"
 }
 
-class Mcloud : WcoStream() {
-    override var name = "Mcloud"
-    override var mainUrl = "https://mcloud.to"
-    override val requiresReferer = true
-}
-
 open class WcoStream : ExtractorApi() {
     override var name = "VidStream" // Cause works for animekisa and wco
     override var mainUrl = "https://vidstream.pro"
@@ -127,7 +120,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/XStreamCdn.kt

@@ -1,42 +1,12 @@
 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.utils.AppUtils.tryParseJson
+import com.lagradost.cloudstream3.utils.AppUtils
 import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.getQualityFromName
 
-class StreamM4u : XStreamCdn() {
-    override val name: String = "StreamM4u"
-    override val mainUrl: String = "https://streamm4u.club"
-}
-
-class Fembed9hd : XStreamCdn() {
-    override var mainUrl = "https://fembed9hd.com"
-    override var name = "Fembed9hd"
-}
-
-class Cdnplayer: XStreamCdn() {
-    override val name: String = "Cdnplayer"
-    override val mainUrl: String = "https://cdnplayer.online"
-}
-
-class Kotakajair: XStreamCdn() {
-    override val name: String = "Kotakajair"
-    override val mainUrl: String = "https://kotakajair.xyz"
-}
-
-class FEnet: XStreamCdn() {
-    override val name: String = "FEnet"
-    override val mainUrl: String = "https://fembed.net"
-}
-
-class Rasacintaku: XStreamCdn() {
-    override val mainUrl: String = "https://rasa-cintaku-semakin-berantai.xyz"
-}
-
 class LayarKaca: XStreamCdn() {
     override val name: String = "LayarKaca-xxi"
     override val mainUrl: String = "https://layarkacaxxi.icu"
@@ -80,67 +50,44 @@ open class XStreamCdn : ExtractorApi() {
         //val type: String // Mp4
     )
 
-    private data class Player(
-        @JsonProperty("poster_file") val poster_file: String? = null,
-    )
-
     private data class ResponseJson(
         @JsonProperty("success") val success: Boolean,
-        @JsonProperty("player") val player: Player? = null,
-        @JsonProperty("data") val data: List<ResponseData>?,
-        @JsonProperty("captions") val captions: List<Captions?>?,
-    )
-
-    private data class Captions(
-        @JsonProperty("id") val id: String,
-        @JsonProperty("hash") val hash: String,
-        @JsonProperty("language") val language: String,
-        @JsonProperty("extension") val extension: String
+        @JsonProperty("data") val data: List<ResponseData>?
     )
 
     override fun getExtractorUrl(id: String): String {
         return "$domainUrl/api/source/$id"
     }
 
-    override suspend fun getUrl(
-        url: String,
-        referer: String?,
-        subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit
-    ) {
+    override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink> {
         val headers = mapOf(
             "Referer" to url,
             "User-Agent" to "Mozilla/5.0 (Windows NT 10.0; rv:78.0) Gecko/20100101 Firefox/78.0",
         )
         val id = url.trimEnd('/').split("/").last()
         val newUrl = "https://${domainUrl}/api/source/${id}"
-        app.post(newUrl, headers = headers).let { res ->
-            val sources = tryParseJson<ResponseJson?>(res.text)
-            sources?.let {
+        val extractedLinksList: MutableList<ExtractorLink> = mutableListOf()
+        with(app.post(newUrl, headers = headers)) {
+            if (this.code != 200) return listOf()
+            val text = this.text
+            if (text.isEmpty()) return listOf()
+            if (text == """{"success":false,"data":"Video not found or has been removed"}""") return listOf()
+            AppUtils.parseJson<ResponseJson?>(text)?.let {
                 if (it.success && it.data != null) {
-                    it.data.map { source ->
-                        callback.invoke(
+                    it.data.forEach { data ->
+                        extractedLinksList.add(
                             ExtractorLink(
                                 name,
                                 name = name,
-                                source.file,
+                                data.file,
                                 url,
-                                getQualityFromName(source.label),
+                                getQualityFromName(data.label),
                             )
                         )
                     }
                 }
             }
-
-            val userData = sources?.player?.poster_file?.split("/")?.get(2)
-            sources?.captions?.map {
-                subtitleCallback.invoke(
-                    SubtitleFile(
-                        it?.language.toString(),
-                        "$mainUrl/asset/userdata/$userData/caption/${it?.hash}/${it?.id}.${it?.extension}"
-                    )
-                )
-            }
         }
+        return extractedLinksList
     }
 }

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

@@ -7,7 +7,7 @@ import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.getQualityFromName
 
-open class YourUpload: ExtractorApi() {
+class YourUpload: ExtractorApi() {
     override val name = "Yourupload"
     override val mainUrl = "https://www.yourupload.com"
     override val requiresReferer = false

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

@@ -1,6 +1,6 @@
 package com.lagradost.cloudstream3.extractors
 
-import com.lagradost.cloudstream3.amap
+import com.lagradost.cloudstream3.apmap
 import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
@@ -36,7 +36,7 @@ open class ZplayerV2 : ExtractorApi() {
                 val m3u8regex = Regex("((https:|http:)\\/\\/.*\\.m3u8)")
                 m3u8regex.findAll(testdata).map {
                     it.value
-                }.toList().amap { urlm3u8 ->
+                }.toList().apmap { urlm3u8 ->
                     if (urlm3u8.contains("m3u8")) {
                         val testurl = app.get(urlm3u8, headers = mapOf("Referer" to url)).text
                         if (testurl.contains("EXTM3U")) {

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

@@ -1,8 +1,8 @@
 package com.lagradost.cloudstream3.extractors.helper
 
-import com.lagradost.api.Log
+import android.util.Log
 import com.lagradost.cloudstream3.SubtitleFile
-import com.lagradost.cloudstream3.amap
+import com.lagradost.cloudstream3.apmap
 import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.loadExtractor
@@ -18,7 +18,7 @@ class AsianEmbedHelper {
             val doc = app.get(url).document
             val links = doc.select("div#list-server-more > ul > li.linkserver")
             if (!links.isNullOrEmpty()) {
-                links.amap {
+                links.apmap {
                     val datavid = it.attr("data-video") ?: ""
                     //Log.i("AsianEmbed", "Result => (datavid) ${datavid}")
                     if (datavid.isNotBlank()) {

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

@@ -1,6 +1,8 @@
 package com.lagradost.cloudstream3.extractors.helper
 
 import com.fasterxml.jackson.annotation.JsonProperty
+import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
+import com.lagradost.cloudstream3.AcraApplication.Companion.setKey
 import com.lagradost.cloudstream3.app
 
 class WcoHelper {
@@ -28,7 +30,9 @@ class WcoHelper {
         private suspend fun getKeys() {
             keys = keys
                 ?: app.get("https://raw.githubusercontent.com/reduplicated/Cloudstream/master/docs/keys.json")
-                    .parsedSafe<ExternalKeys>()
+                    .parsedSafe<ExternalKeys>()?.also { setKey(BACKUP_KEY_DATA, it) } ?: getKey(
+                    BACKUP_KEY_DATA
+                )
         }
 
         suspend fun getWcoKey(): ExternalKeys? {
@@ -39,7 +43,9 @@ class WcoHelper {
         private suspend fun getNewKeys() {
             newKeys = newKeys
                 ?: app.get("https://raw.githubusercontent.com/chekaslowakiya/BruhFlow/main/keys.json")
-                    .parsedSafe<NewExternalKeys>()
+                    .parsedSafe<NewExternalKeys>()?.also { setKey(BACKUP_KEY_DATA, it) } ?: getKey(
+                    BACKUP_KEY_DATA
+                )
         }
 
         suspend fun getNewWcoKey(): NewExternalKeys? {

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

@@ -0,0 +1,30 @@
+package com.lagradost.cloudstream3.metaproviders
+
+import com.lagradost.cloudstream3.ErrorLoadingException
+import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.SyncApis
+import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.aniListApi
+import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.malApi
+import com.lagradost.cloudstream3.utils.SyncUtil
+
+object SyncRedirector {
+    val syncApis = SyncApis
+
+    suspend fun redirect(url: String, preferredUrl: String): String {
+        for (api in syncApis) {
+            if (url.contains(api.mainUrl)) {
+                val otherApi = when (api.name) {
+                    aniListApi.name -> "anilist"
+                    malApi.name -> "myanimelist"
+                    else -> return url
+                }
+
+                return SyncUtil.getUrlsFromId(api.getIdFromUrl(url), otherApi).firstOrNull { realUrl ->
+                    realUrl.contains(preferredUrl)
+                } ?: run {
+                    throw ErrorLoadingException("Page does not exist on $preferredUrl")
+                }
+            }
+        }
+        return url
+    }
+}

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,
@@ -40,7 +39,7 @@ class CrossTmdbProvider : TmdbProvider() {
     ): Boolean {
         tryParseJson<CrossMetaData>(data)?.let { metaData ->
             if (!metaData.isSuccess) return false
-            metaData.movies?.amap { (apiName, data) ->
+            metaData.movies?.apmap { (apiName, data) ->
                 getApiFromNameNull(apiName)?.let {
                     try {
                         it.loadLinks(data, isCasting, subtitleCallback, callback)
@@ -61,15 +60,14 @@ 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 -> {
-                    val data = validApis.amap { api ->
+                    val data = validApis.apmap { api ->
                         try {
                             if (api.supportedTypes.contains(TvType.Movie)) { //|| api.supportedTypes.contains(TvType.AnimeMovie)
-                                return@amap api.search(this.name)?.first {
+                                return@apmap api.search(this.name)?.first {
                                     if (filterName(it.name).equals(
                                             matchName,
                                             ignoreCase = true
@@ -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).apmap { 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
+            }
+        }
+    }
+}