Translated using Weblate (Albanian) (#3102)

Currently translated at 100.0% (4 of 4 strings)

Translated using Weblate (Albanian)

Currently translated at 100.0% (735 of 735 strings)

Translated using Weblate (Ukrainian)

Currently translated at 100.0% (735 of 735 strings)

Translated using Weblate (Tamil)

Currently translated at 100.0% (735 of 735 strings)

Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 100.0% (735 of 735 strings)

Translated using Weblate (Turkish)

Currently translated at 100.0% (735 of 735 strings)

Translated using Weblate (Italian)

Currently translated at 100.0% (735 of 735 strings)

Update translation files

Updated by "Remove blank strings" hook in Weblate.

Translated using Weblate (Spanish)

Currently translated at 99.7% (733 of 735 strings)

Translated using Weblate (Vietnamese)

Currently translated at 99.8% (734 of 735 strings)

Translated using Weblate (Swedish)

Currently translated at 99.8% (734 of 735 strings)

Translated using Weblate (Polish)

Currently translated at 100.0% (735 of 735 strings)

Translated using Weblate (Arabic)

Currently translated at 99.7% (733 of 735 strings)

Translated using Weblate (English)

Currently translated at 99.8% (734 of 735 strings)

Translated using Weblate (Ukrainian)

Currently translated at 100.0% (735 of 735 strings)

Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 100.0% (735 of 735 strings)

Translated using Weblate (Turkish)

Currently translated at 100.0% (735 of 735 strings)

Translated using Weblate (Polish)

Currently translated at 100.0% (735 of 735 strings)

Translated using Weblate (Czech)

Currently translated at 100.0% (735 of 735 strings)

Translated using Weblate (Italian)

Currently translated at 100.0% (733 of 733 strings)

Translated using Weblate (Czech)

Currently translated at 100.0% (733 of 733 strings)













Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/ar/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/cs/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/en/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/es/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/it/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/pl/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/sq/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/sv/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/ta/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/tr/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/uk/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/vi/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/zh_Hans/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/fastlane/sq/
Translation: Cloudstream/App
Translation: Cloudstream/Fastlane

Co-authored-by: 007 <juri.malaj@gmail.com>
Co-authored-by: Aziz Hadidi <azizhadidi@proton.me>
Co-authored-by: Dan <jonweblin2205@protonmail.com>
Co-authored-by: Fjuro <fjuro@users.noreply.hosted.weblate.org>
Co-authored-by: Hosted Weblate user 54392 <hamburger2048@users.noreply.hosted.weblate.org>
Co-authored-by: Man <thebroker2308@gmail.com>
Co-authored-by: Massimo Pissarello <mapi68@gmail.com>
Co-authored-by: Matthaiks <kitynska@gmail.com>
Co-authored-by: Oğuz Ersen <oguz@ersen.moe>
Co-authored-by: win7guru <winsevn@users.noreply.hosted.weblate.org>
Co-authored-by: தமிழ்நேரம் <tamilneram247@gmail.com>

.github/locales.py

@@ -1,14 +1,13 @@
 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-"
+XML_NAME = "app/src/main/res/values-b+"
 ISO_MAP_URL = "https://raw.githubusercontent.com/haliaeetus/iso-639/master/data/iso_639-1.min.json"
 INDENT = " "*4
 
@@ -21,29 +20,29 @@ rest, after_src = rest.split(END_MARKER)
 
 # Load already added langs
 languages = {}
-for lang in re.finditer(r'Triple\("(.*)", "(.*)", "(.*)"\)', rest):
+for lang in re.finditer(r'Pair\("(.*)", "(.*)"\)', rest):
-    flag, name, iso = lang.groups()
+    name, iso = lang.groups()
-    languages[iso] = (flag, name)
+    languages[iso] = name
 
 # Add not yet added langs
 for folder in glob.glob(f"{XML_NAME}*"):
-    iso = folder[len(XML_NAME):]
+    iso = folder[len(XML_NAME):].replace("+", "-")
     if iso not in languages.keys():
-        entry = iso_map.get(iso.lower(),{'nativeName':iso})
+        entry = iso_map.get(iso.lower(), {'nativeName':iso}) # fallback to iso code if not found
-        languages[iso] = ("", entry['nativeName'].split(',')[0])
+        languages[iso] = entry['nativeName'].split(',')[0] # first name if there are multiple
 
-# Create triples
+# Create pairs
-triples = []
+pairs = []
-for iso in sorted(languages.keys()):
+for iso in sorted(languages, key=lambda iso: languages[iso].lower()): # sort by language name
-    flag, name = languages[iso]
+    name = languages[iso]
-    triples.append(f'{INDENT}Triple("{flag}", "{name}", "{iso}"),')
+    pairs.append(f'{INDENT}Pair("{name}", "{iso}"),')
 
 # Update settings file
 open(SETTINGS_PATH, "w+",encoding='utf-8').write(
     before_src +
     START_MARKER +
     "\n" +
-    "\n".join(triples) +
+    "\n".join(pairs) +
     "\n" +
     END_MARKER +
     after_src
@@ -62,8 +61,5 @@ for file in glob.glob(f"{XML_NAME}*/strings.xml"):
         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

@@ -9,6 +9,9 @@ on:
       - '**/wcokey.txt'
   workflow_dispatch:
 
+permissions:
+  contents: read
+
 concurrency:
   group: "Archive-build"
   cancel-in-progress: true
@@ -24,6 +27,7 @@ jobs:
         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
@@ -31,14 +35,18 @@ jobs:
         app_id: ${{ secrets.GH_APP_ID }}
         private_key: ${{ secrets.GH_APP_KEY }}
         repository: "recloudstream/cloudstream-archive"
-    - uses: actions/checkout@v4
+
+    - uses: actions/checkout@v6
+
     - name: Set up JDK 17
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@v5
       with:
-        java-version: '17'
+        distribution: temurin
-        distribution: 'adopt'
+        java-version: 17
+
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
+
     - name: Fetch keystore
       id: fetch_keystore
       run: |
@@ -49,24 +57,33 @@ jobs:
         KEY_PWD="$(cat keystore_password.txt)"
         echo "::add-mask::${KEY_PWD}"
         echo "key_pwd=$KEY_PWD" >> $GITHUB_OUTPUT
+
+    - name: Setup Gradle
+      uses: gradle/actions/setup-gradle@v5
+      with:
+        cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
+
     - name: Run Gradle
-      run: |
+      run: ./gradlew assemblePrereleaseRelease
-        ./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
+        TRAKT_CLIENT_ID: ${{ secrets.TRAKT_CLIENT_ID }}
+        MDL_API_KEY: ${{ secrets.MDL_API_KEY }}
+        MAL_KEY: ${{ secrets.MAL_KEY }}
+        ANILIST_KEY: ${{ secrets.ANILIST_KEY }}
+
+    - uses: actions/checkout@v6
       with:
         repository: "recloudstream/cloudstream-archive"
         token: ${{ steps.generate_archive_token.outputs.token }}
         path: "archive"
 
     - name: Move build
-      run: |
+      run: cp app/build/outputs/apk/prerelease/release/*.apk "archive/$(git rev-parse --short HEAD).apk"
-        cp app/build/outputs/apk/prerelease/release/*.apk "archive/$(git rev-parse --short HEAD).apk"
 
     - name: Push archive
       run: |

.github/workflows/generate_dokka.yml

@@ -1,19 +1,18 @@
 name: Dokka
 
-# https://docs.github.com/en/actions/learn-github-actions/workflow-syntax-for-github-actions#concurrency
-concurrency: 
-  group: "dokka"
-  cancel-in-progress: true
-
 on:
   push:
-    branches:
+    branches: [ master ]
-      # choose your default branch
-      - master
-      - main
     paths-ignore:
       - '*.md'
 
+permissions:
+  contents: read
+
+concurrency:
+  group: "dokka"
+  cancel-in-progress: true
+
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -25,13 +24,14 @@ jobs:
           app_id: ${{ secrets.GH_APP_ID }}
           private_key: ${{ secrets.GH_APP_KEY }}
           repository: "recloudstream/dokka"
+
       - name: Checkout
-        uses: actions/checkout@master
+        uses: actions/checkout@v6
         with:
           path: "src"
 
       - name: Checkout dokka
-        uses: actions/checkout@master
+        uses: actions/checkout@v6
         with:
           repository: "recloudstream/dokka"
           path: "dokka"
@@ -44,13 +44,15 @@ jobs:
           rm -rf "./library"
 
       - name: Set up JDK 17
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
+          distribution: temurin
           java-version: 17
-          distribution: 'adopt'
 
-      - name: Setup Android SDK
+      - name: Setup Gradle
-        uses: android-actions/setup-android@v3
+        uses: gradle/actions/setup-gradle@v5
+        with:
+          cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
 
       - name: Generate Dokka
         run: |
@@ -59,8 +61,7 @@ jobs:
           ./gradlew docs:dokkaGeneratePublicationHtml
 
       - name: Copy Dokka
-        run: |
+        run: cp -r $GITHUB_WORKSPACE/src/docs/build/dokka/html/* $GITHUB_WORKSPACE/dokka/
-          cp -r $GITHUB_WORKSPACE/src/docs/build/dokka/html/* $GITHUB_WORKSPACE/dokka/
 
       - name: Push builds
         run: |

.github/workflows/instrumented-tests.yml

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

.github/workflows/issue_action.yml

@@ -1,88 +0,0 @@
-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'
-          
-          

.github/workflows/prerelease.yml

@@ -12,6 +12,9 @@ concurrency:
   group: "pre-release"
   cancel-in-progress: true
 
+permissions:
+  contents: write
+
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -23,14 +26,18 @@ jobs:
         app_id: ${{ secrets.GH_APP_ID }}
         private_key: ${{ secrets.GH_APP_KEY }}
         repository: "recloudstream/secrets"
-    - uses: actions/checkout@v4
+
+    - uses: actions/checkout@v6
+
     - name: Set up JDK 17
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@v5
       with:
-        java-version: '17'
+        distribution: temurin
-        distribution: 'adopt'
+        java-version: 17
+
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
+
     - name: Fetch keystore
       id: fetch_keystore
       run: |
@@ -41,18 +48,27 @@ jobs:
         KEY_PWD="$(cat keystore_password.txt)"
         echo "::add-mask::${KEY_PWD}"
         echo "key_pwd=$KEY_PWD" >> $GITHUB_OUTPUT
+
+    - name: Setup Gradle
+      uses: gradle/actions/setup-gradle@v5
+      with:
+        cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
+
     - name: Run Gradle
-      run: |
+      run: ./gradlew assemblePrereleaseRelease androidSourcesJar makeJar
-        ./gradlew assemblePrerelease build androidSourcesJar
-        ./gradlew makeJar # for classes.jar, has to be done after assemblePrerelease
       env:
         SIGNING_KEY_ALIAS: "key0"
         SIGNING_KEY_PASSWORD: ${{ steps.fetch_keystore.outputs.key_pwd }}
         SIGNING_STORE_PASSWORD: ${{ steps.fetch_keystore.outputs.key_pwd }}
         SIMKL_CLIENT_ID: ${{ secrets.SIMKL_CLIENT_ID }}
         SIMKL_CLIENT_SECRET: ${{ secrets.SIMKL_CLIENT_SECRET }}
+        TRAKT_CLIENT_ID: ${{ secrets.TRAKT_CLIENT_ID }}
+        MDL_API_KEY: ${{ secrets.MDL_API_KEY }}
+        MAL_KEY: ${{ secrets.MAL_KEY }}
+        ANILIST_KEY: ${{ secrets.ANILIST_KEY }}
+
     - name: Create pre-release
-      uses: "marvinpinto/action-automatic-releases@latest"
+      uses: marvinpinto/action-automatic-releases@latest
       with:
         repo_token: "${{ secrets.GITHUB_TOKEN }}"
         automatic_release_tag: "pre-release"

.github/workflows/pull_request.yml

@@ -2,22 +2,40 @@ name: Artifact Build
 
 on: [pull_request]
 
+permissions:
+  contents: read
+
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
+
     - name: Set up JDK 17
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@v5
       with:
-        java-version: '17'
+        distribution: temurin
-        distribution: 'adopt'
+        java-version: 17
+
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
+
+    - name: Setup Gradle
+      uses: gradle/actions/setup-gradle@v5
+      with:
+        cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
+        cache-read-only: false
+
+    - name: Ensure binary compatibility
+      # This is to ensure that your code is backwards compatible.
+      # If this fails you need to add a @Prerelease annotation to new code.
+      run: ./gradlew library:checkKotlinAbi
+
     - name: Run Gradle
-      run: ./gradlew assemblePrereleaseDebug
+      run: ./gradlew assemblePrereleaseDebug lint check
+
     - name: Upload Artifact
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v7
       with:
         name: pull-request-build
         path: "app/build/outputs/apk/prerelease/debug/*.apk"

.github/workflows/update_locales.yml

@@ -1,17 +1,19 @@
 name: Fix locale issues
 
 on:
-  workflow_dispatch:
   push:
+    branches: [ master ]
     paths:
       - '**.xml'
-    branches:
+  workflow_dispatch:
-      - master
 
 concurrency:
   group: "locale"
   cancel-in-progress: true
 
+permissions:
+  contents: read
+
 jobs:
   create:
     runs-on: ubuntu-latest
@@ -23,15 +25,17 @@ jobs:
         app_id: ${{ secrets.GH_APP_ID }}
         private_key: ${{ secrets.GH_APP_KEY }}
         repository: "recloudstream/cloudstream"
-    - uses: actions/checkout@v4
+
+    - uses: actions/checkout@v6
       with:
         token: ${{ steps.generate_token.outputs.token }}
+
     - name: Install dependencies
-      run: |
+      run: pip3 install lxml requests
-        pip3 install lxml
+
     - name: Edit files
-      run: |
+      run: python3 .github/locales.py
-        python3 .github/locales.py
+
     - name: Commit to the repo
       run: |
         git config --local user.email "111277985+recloudstream[bot]@users.noreply.github.com"

.gitignore

@@ -1,5 +1,3 @@
-*.iml
-.gradle
 /local.properties
 /.idea/caches
 /.idea/misc.xml
@@ -11,6 +9,220 @@
 .DS_Store
 /build
 /captures
-.externalNativeBuild
 .cxx
+.kotlin/*
+
+# Created by https://www.toptal.com/developers/gitignore/api/kotlin,java,android,androidstudio,visualstudiocode
+# Edit at https://www.toptal.com/developers/gitignore?templates=kotlin,java,android,androidstudio,visualstudiocode
+
+### Android ###
+# Gradle files
+.gradle/
+build/
+
+# Local configuration file (sdk path, etc)
 local.properties
+
+# Log/OS Files
+*.log
+
+# Android Studio generated files and folders
+captures/
+.externalNativeBuild/
+.cxx/
+*.apk
+output.json
+
+# IntelliJ
+*.iml
+.idea/
+misc.xml
+deploymentTargetDropDown.xml
+render.experimental.xml
+
+# Keystore files
+*.jks
+*.keystore
+
+# Google Services (e.g. APIs or Firebase)
+google-services.json
+
+# Android Profiling
+*.hprof
+
+### Android Patch ###
+gen-external-apklibs
+
+# Replacement of .externalNativeBuild directories introduced
+# with Android Studio 3.5.
+
+### Java ###
+# Compiled class file
+*.class
+
+# Log file
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+replay_pid*
+
+### Kotlin ###
+# Compiled class file
+
+# Log file
+
+# BlueJ files
+
+# Mobile Tools for Java (J2ME)
+
+# Package Files #
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+
+### VisualStudioCode ###
+.vscode/*
+
+# Local History for Visual Studio Code
+.history/
+
+# Built Visual Studio Code Extensions
+*.vsix
+
+### VisualStudioCode Patch ###
+# Ignore all local history of files
+.history
+.ionide
+
+### AndroidStudio ###
+# Covers files to be ignored for android development using Android Studio.
+
+# Built application files
+*.ap_
+*.aab
+
+# Files for the ART/Dalvik VM
+*.dex
+
+# Java class files
+
+# Generated files
+bin/
+gen/
+out/
+
+# Gradle files
+.gradle
+
+# Signing files
+.signing/
+
+# Local configuration file (sdk path, etc)
+
+# Proguard folder generated by Eclipse
+proguard/
+
+# Log Files
+
+# Android Studio
+/*/build/
+/*/local.properties
+/*/out
+/*/*/build
+/*/*/production
+.navigation/
+*.ipr
+*~
+*.swp
+
+# Keystore files
+
+# Google Services (e.g. APIs or Firebase)
+# google-services.json
+
+# Android Patch
+
+# External native build folder generated in Android Studio 2.2 and later
+.externalNativeBuild
+
+# NDK
+obj/
+
+# IntelliJ IDEA
+*.iws
+/out/
+
+# User-specific configurations
+.idea/caches/
+.idea/libraries/
+.idea/shelf/
+.idea/workspace.xml
+.idea/tasks.xml
+.idea/.name
+.idea/compiler.xml
+.idea/copyright/profiles_settings.xml
+.idea/encodings.xml
+.idea/misc.xml
+.idea/modules.xml
+.idea/scopes/scope_settings.xml
+.idea/dictionaries
+.idea/vcs.xml
+.idea/jsLibraryMappings.xml
+.idea/datasources.xml
+.idea/dataSources.ids
+.idea/sqlDataSources.xml
+.idea/dynamic.xml
+.idea/uiDesigner.xml
+.idea/assetWizardSettings.xml
+.idea/gradle.xml
+.idea/jarRepositories.xml
+.idea/navEditor.xml
+
+# Legacy Eclipse project files
+.classpath
+.project
+.cproject
+.settings/
+
+# Mobile Tools for Java (J2ME)
+
+# Package Files #
+
+# virtual machine crash logs (Reference: http://www.java.com/en/download/help/error_hotspot.xml)
+
+## Plugin-specific files:
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Mongo Explorer plugin
+.idea/mongoSettings.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+### AndroidStudio Patch ###
+
+!/gradle/wrapper/gradle-wrapper.jar
+
+# End of https://www.toptal.com/developers/gitignore/api/kotlin,java,android,androidstudio,visualstudiocode

.idea/.name

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

.idea/codeStyles/Project.xml

@@ -1,123 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <JetCodeStyleSettings>
-      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
-    </JetCodeStyleSettings>
-    <codeStyleSettings language="XML">
-      <option name="FORCE_REARRANGE_MODE" value="1" />
-      <indentOptions>
-        <option name="CONTINUATION_INDENT_SIZE" value="4" />
-      </indentOptions>
-      <arrangement>
-        <rules>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>xmlns:android</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>xmlns:.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*:id</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*:name</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>name</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>style</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>ANDROID_ATTRIBUTE_ORDER</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>.*</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-        </rules>
-      </arrangement>
-    </codeStyleSettings>
-    <codeStyleSettings language="kotlin">
-      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
-    </codeStyleSettings>
-  </code_scheme>
-</component>

.idea/codeStyles/codeStyleConfig.xml

@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
-  </state>
-</component>

.idea/compiler.xml

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

.idea/discord.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="DiscordProjectSettings">
-    <option name="show" value="PROJECT_FILES" />
-    <option name="description" value="" />
-  </component>
-</project>

.idea/gradle.xml

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="GradleMigrationSettings" migrationVersion="1" />
-  <component name="GradleSettings">
-    <option name="linkedExternalProjectsSettings">
-      <GradleProjectSettings>
-        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
-        <option name="modules">
-          <set>
-            <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/app" />
-            <option value="$PROJECT_DIR$/docs" />
-            <option value="$PROJECT_DIR$/library" />
-          </set>
-        </option>
-        <option name="resolveExternalAnnotations" value="false" />
-      </GradleProjectSettings>
-    </option>
-  </component>
-</project>

.idea/jarRepositories.xml

@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RemoteRepositoriesConfiguration">
-    <remote-repository>
-      <option name="id" value="central" />
-      <option name="name" value="Maven Central repository" />
-      <option name="url" value="https://repo1.maven.org/maven2" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="jboss.community" />
-      <option name="name" value="JBoss Community repository" />
-      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="BintrayJCenter" />
-      <option name="name" value="BintrayJCenter" />
-      <option name="url" value="https://jcenter.bintray.com/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="Google" />
-      <option name="name" value="Google" />
-      <option name="url" value="https://dl.google.com/dl/android/maven2/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="maven" />
-      <option name="name" value="maven" />
-      <option name="url" value="https://github.com/psiegman/mvn-repo/raw/master/releases" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="maven2" />
-      <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>

.idea/studiobot.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="StudioBotProjectSettings">
-    <option name="shareContext" value="OptedOut" />
-  </component>
-</project>

.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-  </component>
-</project>

.vscode/settings.json

@@ -1,6 +0,0 @@
-{
-    "githubPullRequests.ignoredPullRequestBranches": [
-        "master"
-    ],
-    "java.configuration.updateBuildConfiguration": "interactive"
-}

AI-POLICY.md

@@ -0,0 +1,11 @@
+# AI Policy
+
+AI is a great tool. However, we want you to follow these rules regarding usage of AI in order to ensure the quality of both code and discussions.
+
+1. Always state any AI usage in pull requests and issues. 
+
+2. Always test code before making a pull request. We do not want to test your AI generated code. 
+
+3. Listen to humans over computers. Contributors to CloudStream know this codebase better than an AI. 
+
+4. You should be able to explain and fix any code you submit. We do in-depth reviews and will reject low effort contributions.

COMPOSE.md

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

README.md

@@ -13,7 +13,7 @@
   + [Bugs Reports:](#bug_report)
   + [Enhancement:](#enhancment)
 + [Extension Development:](#extensions)
-+ [Languauge Support:](#languages)
++ [Language Support:](#languages)
 + [Further Sources](#contact_and_sources)
 
 

app/build.gradle.kts

@@ -1,53 +1,96 @@
 import com.android.build.gradle.internal.cxx.configure.gradleLocalProperties
 import org.jetbrains.dokka.gradle.engine.parameters.KotlinPlatform
 import org.jetbrains.dokka.gradle.engine.parameters.VisibilityModifier
+import org.jetbrains.kotlin.gradle.dsl.JvmDefaultMode
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
 
 plugins {
-    id("com.android.application")
+    alias(libs.plugins.android.application)
-    id("kotlin-android")
+    alias(libs.plugins.dokka)
-    id("org.jetbrains.dokka")
+    alias(libs.plugins.kotlin.serialization)
 }
 
 val javaTarget = JvmTarget.fromTarget(libs.versions.jvmTarget.get())
-val tmpFilePath = System.getProperty("user.home") + "/work/_temp/keystore/"
-val prereleaseStoreFile: File? = File(tmpFilePath).listFiles()?.first()
 
-fun getGitCommitHash(): String {
+abstract class GenerateGitHashTask : DefaultTask() {
-    return try {
-        val headFile = file("${project.rootDir}/.git/HEAD")
 
+    @get:InputFile
+    @get:PathSensitive(PathSensitivity.RELATIVE)
+    abstract val headFile: RegularFileProperty
+
+    @get:InputDirectory
+    @get:PathSensitive(PathSensitivity.RELATIVE)
+    abstract val headsDir: DirectoryProperty
+
+    @get:OutputDirectory
+    abstract val outputDir: DirectoryProperty
+
+    @TaskAction
+    fun generate() {
+        val head = headFile.get().asFile
+
+        val hash = try {
+            if (head.exists()) {
                 // Read the commit hash from .git/HEAD
-        if (headFile.exists()) {
+                val headContent = head.readText().trim()
-            val headContent = headFile.readText().trim()
                 if (headContent.startsWith("ref:")) {
                     val refPath = headContent.substring(5) // e.g., refs/heads/main
-                val commitFile = file("${project.rootDir}/.git/$refPath")
+                    val commitFile = File(head.parentFile, refPath)
                     if (commitFile.exists()) commitFile.readText().trim() else ""
                 } else headContent // If it's a detached HEAD (commit hash directly)
-        } else {
+            } else "" // If .git/HEAD doesn't exist
-            "" // If .git/HEAD doesn't exist
-        }.take(7) // Return the short commit hash
         } catch (_: Throwable) {
-        "" // Just return an empty string if any exception occurs
+            "" // Just set to an empty string if any exception occurs
+        }.take(7) // Get the short commit hash
+
+        val outFile = outputDir.file("git-hash.txt").get().asFile
+        outFile.parentFile.mkdirs()
+        outFile.writeText(hash)
     }
 }
 
+val generateGitHash = tasks.register<GenerateGitHashTask>("generateGitHash") {
+    val gitDir = layout.projectDirectory.dir("../.git")
+
+    headFile.set(gitDir.file("HEAD"))
+    headsDir.set(gitDir.dir("refs/heads"))
+
+    outputDir.set(layout.buildDirectory.dir("generated/git"))
+}
+
 android {
     @Suppress("UnstableApiUsage")
     testOptions {
         unitTests.isReturnDefaultValues = true
     }
 
-    viewBinding {
+    // Looks like google likes to add metadata only they can read https://gitlab.com/IzzyOnDroid/repo/-/work_items/491
-        enable = true
+    dependenciesInfo {
+        // Disables dependency metadata when building APKs.
+        includeInApk = false
+        // Disables dependency metadata when building Android App Bundles.
+        includeInBundle = false
+    }
+
+    androidComponents {
+        onVariants { variant ->
+            variant.sources.assets?.addGeneratedSourceDirectory(
+                generateGitHash,
+                GenerateGitHashTask::outputDir
+            )
+        }
     }
 
     signingConfigs {
-        if (prereleaseStoreFile != null) {
+        // We just use SIGNING_KEY_ALIAS here since it won't change
+        // so won't kill the configuration cache.
+        if (System.getenv("SIGNING_KEY_ALIAS") != null) {
             create("prerelease") {
-                storeFile = file(prereleaseStoreFile)
+                val tmpFilePath = System.getProperty("user.home") + "/work/_temp/keystore/"
+                val prereleaseStoreFile: File? = File(tmpFilePath).listFiles()?.first()
+
+                storeFile = prereleaseStoreFile?.let { file(it) }
                 storePassword = System.getenv("SIGNING_STORE_PASSWORD")
                 keyAlias = System.getenv("SIGNING_KEY_ALIAS")
                 keyPassword = System.getenv("SIGNING_KEY_PASSWORD")
@@ -61,12 +104,10 @@ android {
         applicationId = "com.lagradost.cloudstream3"
         minSdk = libs.versions.minSdk.get().toInt()
         targetSdk = libs.versions.targetSdk.get().toInt()
-        versionCode = 65
+        versionCode = libs.versions.versionCode.get().toInt()
-        versionName = "4.5.1"
+        versionName = libs.versions.versionName.get()
 
-        resValue("string", "app_version", "${defaultConfig.versionName}${versionNameSuffix ?: ""}")
+        manifestPlaceholders["target_sdk_version"] = libs.versions.targetSdk.get()
-        resValue("string", "commit_hash", getGitCommitHash())
-        resValue("bool", "is_prerelease", "false")
 
         // Reads local.properties
         val localProperties = gradleLocalProperties(rootDir, project.providers)
@@ -86,6 +127,16 @@ android {
             "SIMKL_CLIENT_SECRET",
             "\"" + (System.getenv("SIMKL_CLIENT_SECRET") ?: localProperties["simkl.secret"]) + "\""
         )
+        buildConfigField(
+            "String",
+            "MAL_KEY",
+            "\"" + (System.getenv("MAL_KEY") ?: localProperties["mal.key"]) + "\""
+        )
+        buildConfigField(
+            "String",
+            "ANILIST_KEY",
+            "\"" + (System.getenv("ANILIST_KEY") ?: localProperties["anilist.key"]) + "\""
+        )
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
 
@@ -113,12 +164,9 @@ android {
     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")
@@ -136,13 +184,29 @@ android {
         targetCompatibility = JavaVersion.toVersion(javaTarget.target)
     }
 
+    java {
+        // Use Java 17 toolchain even if a higher JDK runs the build.
+        // We still use Java 8 for now which higher JDKs have deprecated.
+        toolchain {
+            languageVersion.set(JavaLanguageVersion.of(libs.versions.jdkToolchain.get()))
+        }
+    }
+
     lint {
-        abortOnError = false
         checkReleaseBuilds = false
     }
 
     buildFeatures {
         buildConfig = true
+        viewBinding = true
+    }
+
+    packaging {
+        jniLibs {
+            // Enables legacy JNI packaging to reduce APK size (similar to builds before minSdk 23).
+            // Note: This may increase app startup time slightly.
+            useLegacyPackaging = true
+        }
     }
 
     namespace = "com.lagradost.cloudstream3"
@@ -153,44 +217,46 @@ dependencies {
     testImplementation(libs.junit)
     testImplementation(libs.json)
     androidTestImplementation(libs.core)
-    implementation(libs.junit.ktx)
-    androidTestImplementation(libs.ext.junit)
     androidTestImplementation(libs.espresso.core)
+    androidTestImplementation(libs.ext.junit)
+    androidTestImplementation(libs.instancio.core)
+    androidTestImplementation(libs.junit.ktx)
+    androidTestImplementation(libs.kotlin.test)
 
     // Android Core & Lifecycle
     implementation(libs.core.ktx)
+    implementation(libs.activity.ktx)
+    implementation(libs.annotation)
     implementation(libs.appcompat)
-    implementation(libs.navigation.ui.ktx)
+    implementation(libs.fragment.ktx)
-    implementation(libs.lifecycle.livedata.ktx)
+    implementation(libs.bundles.lifecycle)
-    implementation(libs.lifecycle.viewmodel.ktx)
+    implementation(libs.bundles.navigation)
-    implementation(libs.navigation.fragment.ktx)
+    implementation(libs.kotlinx.collections.immutable)
+    implementation(libs.kotlinx.serialization.json) // JSON Parser
 
     // Design & UI
     implementation(libs.preference.ktx)
     implementation(libs.material)
     implementation(libs.constraintlayout)
-    implementation(libs.swiperefreshlayout)
 
     // Coil Image Loading
-    implementation(libs.coil)
+    implementation(libs.bundles.coil)
-    implementation(libs.coil.network.okhttp)
 
     // Media 3 (ExoPlayer)
     implementation(libs.bundles.media3)
     implementation(libs.video)
 
+    // FFmpeg Decoding
+    implementation(libs.bundles.nextlib)
+
+    // Anime-db for filler
+    implementation(libs.anime.db)
+
     // PlayBack
     implementation(libs.colorpicker) // Subtitle Color Picker
     implementation(libs.newpipeextractor) // For Trailers
     implementation(libs.juniversalchardet) // Subtitle Decoding
 
-    // FFmpeg Decoding
-    implementation(libs.bundles.nextlibMedia3)
-
-    // Crash Reports (AcraApplication.kt)
-    implementation(libs.acra.core)
-    implementation(libs.acra.toast)
-
     // UI Stuff
     implementation(libs.shimmer) // Shimmering Effect (Loading Skeleton)
     implementation(libs.palette.ktx) // Palette for Images -> Colors
@@ -201,50 +267,37 @@ dependencies {
     implementation(libs.qrcode.kotlin) // QR Code for PIN Auth on TV
 
     // Extensions & Other Libs
+    implementation(libs.jsoup) // HTML Parser
+    implementation(libs.ksoup) // HTML Parser
     implementation(libs.rhino) // Run JavaScript
-    implementation(libs.quickjs)
-    implementation(libs.fuzzywuzzy) // Library/Ext Searching with Levenshtein Distance
     implementation(libs.safefile) // To Prevent the URI File Fu*kery
     coreLibraryDesugaring(libs.desugar.jdk.libs.nio) // NIO Flavor Needed for NewPipeExtractor
-    implementation(libs.conscrypt.android) {
+    implementation(libs.conscrypt.android) // To Fix SSL Fu*kery on Android 9
-        version {
+    implementation(libs.jackson.module.kotlin) // JSON Parser
-            strictly("2.5.2")
+    implementation(libs.zipline)
-        }
+
-        because("2.5.3 crashes everything for everyone.")
+    // Temp/deprecated; will be removed once extensions have time to migrate from using it
-    } // To Fix SSL Fu*kery on Android 9
+    implementation("com.google.code.gson:gson:2.11.0")
-    implementation(libs.jackson.module.kotlin) {
+    // Deprecated; will be removed once extensions have time to migrate from using it
-        version {
+    implementation("me.xdrop:fuzzywuzzy:1.4.0")
-            strictly("2.13.1")
-        }
-        because("Don't Bump Jackson above 2.13.1, Crashes on Android TV's and FireSticks that have Min API Level 25 or Less.")
-    } // JSON Parser
 
     // Torrent Support
-    // implementation(libs.torrentserver)
+    implementation(libs.torrentserver)
 
     // Downloading & Networking
-    implementation(libs.work.runtime)
     implementation(libs.work.runtime.ktx)
     implementation(libs.nicehttp) // HTTP Lib
 
-    implementation(project(":library") {
+    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
+    from(android.sourceSets.getByName("main").java.directories) // Full Sources
 }
 
 tasks.register<Copy>("copyJar") {
+    dependsOn("build", ":library:jvmJar")
     from(
         "build/intermediates/compile_app_classes_jar/prereleaseDebug/bundlePrereleaseDebugClassesToCompileJar",
         "../library/build/libs"
@@ -271,15 +324,21 @@ tasks.register<Jar>("makeJar") {
 tasks.withType<KotlinJvmCompile> {
     compilerOptions {
         jvmTarget.set(javaTarget)
-        freeCompilerArgs.add("-Xjvm-default=all-compatibility")
+        jvmDefault.set(JvmDefaultMode.ENABLE)
+        optIn.addAll(
+            "com.lagradost.cloudstream3.InternalAPI",
+            "com.lagradost.cloudstream3.Prerelease",
+        )
     }
 }
 
 dokka {
     moduleName = "App"
     dokkaSourceSets {
-        main {
+        configureEach {
+            suppress = name != "prereleaseDebug"
             analysisPlatform = KotlinPlatform.JVM
+            displayName = "JVM"
             documentedVisibilities(
                 VisibilityModifier.Public,
                 VisibilityModifier.Protected

app/lint.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lint>
+    <!-- ByteOrderMark has errors in values-b+ja/strings.xml, but it's handled by weblate so we don't really care. -->
+    <issue id="ByteOrderMark" severity="ignore" />
+
+    <!-- We don't care about MissingTranslation since it's handled by weblate. -->
+    <issue id="MissingTranslation" severity="ignore" />
+
+    <!-- We only care about the source language here. -->
+    <issue id="StringFormatInvalid">
+        <ignore path="**/res/values-*/**" />
+    </issue>
+</lint>

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

@@ -7,6 +7,7 @@ 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.BottomResultviewPreviewBinding
 import com.lagradost.cloudstream3.databinding.FragmentHomeBinding
 import com.lagradost.cloudstream3.databinding.FragmentHomeTvBinding
 import com.lagradost.cloudstream3.databinding.FragmentLibraryBinding
@@ -54,12 +55,6 @@ class ExampleInstrumentedTest {
         return APIHolder.allProviders.toTypedArray() //.filter { !it.usesWebView }
     }
 
-    @Test
-    fun providersExist() {
-        Assert.assertTrue(getAllProviders().isNotEmpty())
-        println("Done providersExist")
-    }
-
     @Throws
     private inline fun <reified T : ViewBinding> testAllLayouts(
         activity: Activity,
@@ -88,6 +83,8 @@ class ExampleInstrumentedTest {
                // testAllLayouts<ActivityMainBinding>(activity,R.layout.activity_main, R.layout.activity_main_tv)
                 //testAllLayouts<ActivityMainBinding>(activity, R.layout.activity_main_tv)
 
+                testAllLayouts<BottomResultviewPreviewBinding>(activity, R.layout.bottom_resultview_preview,R.layout.bottom_resultview_preview_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)
 
@@ -133,14 +130,14 @@ class ExampleInstrumentedTest {
     @Test
     @Throws(AssertionError::class)
     fun providerCorrectData() {
-        val isoNames = SubtitleHelper.languages.map { it.ISO_639_1 }
+        val langTagsIETF = SubtitleHelper.languages.map { it.IETF_tag }
-        Assert.assertFalse("ISO does not contain any languages", isoNames.isNullOrEmpty())
+        Assert.assertFalse("IETFTagNames does not contain any languages", langTagsIETF.isNullOrEmpty())
         for (api in getAllProviders()) {
             Assert.assertTrue("Api does not contain a mainUrl", api.mainUrl != "NONE")
             Assert.assertTrue("Api does not contain a name", api.name != "NONE")
             Assert.assertTrue(
                 "Api ${api.name} does not contain a valid language code",
-                isoNames.contains(api.lang)
+                langTagsIETF.contains(api.lang)
             )
             Assert.assertTrue(
                 "Api ${api.name} does not contain any supported types",

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

@@ -0,0 +1,154 @@
+package com.lagradost.cloudstream3
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
+import com.lagradost.cloudstream3.SkipSerializationTest
+import com.lagradost.cloudstream3.utils.AppUtils.toJson
+import dalvik.system.DexFile
+import kotlinx.serialization.ExperimentalSerializationApi
+import kotlinx.serialization.InternalSerializationApi
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.serializer
+import kotlinx.serialization.serializerOrNull
+import org.instancio.Instancio
+import org.junit.Test
+import org.junit.runner.RunWith
+import kotlin.reflect.KClass
+import kotlin.reflect.jvm.jvmName
+import kotlin.test.assertEquals
+import kotlin.test.assertNotNull
+
+@RunWith(AndroidJUnit4::class)
+class SerializationClassTester {
+    // Same as app, or using app reference
+    val jacksonMapper = mapper
+    val kotlinxMapper = json
+
+    @Test
+    fun isIdenticalSerialization() {
+        val serializableClasses = findSerializableClasses("com.lagradost")
+        println("Number of serializable classes: ${serializableClasses.size}")
+
+        val failures = mutableListOf<String>()
+
+        serializableClasses.forEach { kClass ->
+            runCatching {
+                val instance = Instancio.of(kClass.java).withMaxDepth(10).create()
+
+                val jacksonJson = jacksonMapper.writeValueAsString(instance)
+                val kotlinxJson = serializeWithKotlinx(kClass, instance)
+
+                assertEquals(
+                    jacksonJson,
+                    kotlinxJson,
+                    """
+                    Serialization mismatch for:
+                    ${kClass.qualifiedName}
+
+                    Jackson:
+                    $jacksonJson
+
+                    Kotlinx:
+                    $kotlinxJson
+                    
+                    """.trimIndent()
+                )
+                println("Identical serialization for: ${kClass.jvmName}")
+            }.onFailure { e ->
+                failures.add("FAILED ${kClass.qualifiedName}: ${e.message}")
+            }
+        }
+
+        if (failures.isNotEmpty()) {
+            throw AssertionError("${failures.size} class(es) failed:\n${failures.joinToString("\n")}")
+        }
+    }
+
+    @OptIn(InternalSerializationApi::class, ExperimentalSerializationApi::class)
+    @Test
+    fun isIdenticalDeserialization() {
+        val serializableClasses = findSerializableClasses("com.lagradost")
+        println("Number of serializable classes: ${serializableClasses.size}")
+
+        val failures = mutableListOf<String>()
+
+        serializableClasses.forEach { kClass ->
+            runCatching {
+                val instance = Instancio.of(kClass.java).withMaxDepth(10).create()
+                // Convert to JSON to get example JSON object
+                // We prefer jackson here because the app may have many jackson JSON strings in local storage
+                val originalJson = jacksonMapper.writeValueAsString(instance)
+
+                // Create an object from the JSON using kotlinx
+                val serializer =
+                    kClass.serializerOrNull() ?: kotlinxMapper.serializersModule.getContextual(kClass)
+                assertNotNull(serializer, "The class: ${kClass.jvmName} must be serializable!")
+                val kotlinxDecoded = kotlinxMapper.decodeFromString(serializer, originalJson)
+
+                // Create an object from the JSON using jackson
+                val mapperDecoded = jacksonMapper.readValue(originalJson, kClass.java)
+
+                // Deep inspect both object using the mapper toJson function.
+                // This deep equality check can be performed using other methods, but this just works.
+                val jacksonJson = mapperDecoded.toJson()
+                val kotlinxJson = kotlinxDecoded.toJson()
+
+                assertEquals(
+                    jacksonJson,
+                    kotlinxJson,
+                    """
+                    Serialization mismatch for:
+                    ${kClass.qualifiedName}
+
+                    Jackson:
+                    $jacksonJson
+
+                    Kotlinx:
+                    $kotlinxJson
+                    
+                    """.trimIndent()
+                )
+                println("Identical deserialization for: ${kClass.jvmName}")
+            }.onFailure { e ->
+                failures.add("FAILED ${kClass.qualifiedName}: ${e.message}")
+            }
+        }
+
+        if (failures.isNotEmpty()) {
+            throw AssertionError("${failures.size} class(es) failed:\n${failures.joinToString("\n")}")
+        }
+    }
+
+    // DEX files are the best solution to read all our classes dynamically.
+    // classgraph could be used instead, but it only gives results on the JVM, not Android.
+    @Suppress("DEPRECATION")
+    private fun findSerializableClasses(packageName: String): List<KClass<*>> {
+        val context = InstrumentationRegistry
+            .getInstrumentation()
+            .targetContext
+
+        val dexFile = DexFile(context.packageCodePath)
+        return dexFile.entries()
+            .toList()
+            .filter { it.startsWith(packageName) }
+            .mapNotNull {
+                runCatching { Class.forName(it).kotlin }.getOrNull()
+            }.filter { kClass ->
+                // Not possible to use .hasAnnotation() on newer Android versions.
+                kClass.java.annotations.any { it is Serializable }
+                    && kClass.java.annotations.none { it is SkipSerializationTest }
+                    && !kClass.isAbstract
+            }
+    }
+
+    @OptIn(InternalSerializationApi::class)
+    @Suppress("UNCHECKED_CAST")
+    private fun serializeWithKotlinx(
+        kClass: KClass<*>,
+        value: Any
+    ): String {
+        val serializer = kClass.serializer() as KSerializer<Any>
+        return kotlinxMapper.encodeToString(serializer, value)
+    }
+}

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

@@ -0,0 +1,41 @@
+package com.lagradost.cloudstream3.utils.serializers
+
+import android.net.Uri
+import com.lagradost.cloudstream3.utils.AppUtils.parseJson
+import com.lagradost.cloudstream3.utils.AppUtils.toJson
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertTrue
+import org.junit.Test
+
+@Serializable
+data class UriData(
+    @Serializable(with = UriSerializer::class)
+    @SerialName("uri") val uri: Uri = Uri.EMPTY,
+)
+
+class UriSerializerTest {
+
+    @Test
+    fun uriSerializerSerializesUriToString() {
+        val data = UriData(uri = Uri.parse("https://example.com/path?query=1"))
+        val result = data.toJson()
+        assertTrue(result.contains("https://example.com/path?query=1"))
+    }
+
+    @Test
+    fun uriSerializerDeserializesStringToUri() {
+        val input = """{"uri":"https://example.com/path?query=1"}"""
+        val result = parseJson<UriData>(input)
+        assertEquals(Uri.parse("https://example.com/path?query=1"), result.uri)
+    }
+
+    @Test
+    fun uriSerializerRoundtripsCorrectly() {
+        val data = UriData(uri = Uri.parse("https://example.com/path?query=1"))
+        val encoded = data.toJson()
+        val decoded = parseJson<UriData>(encoded)
+        assertEquals(data.uri, decoded.uri)
+    }
+}

app/src/main/AndroidManifest.xml

@@ -16,12 +16,53 @@
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
     <uses-permission android:name="android.permission.USE_BIOMETRIC" />
     <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" /> <!-- We can use this directly as CS3 is not on Play Store -->
-
+    <uses-permission android:name="com.android.providers.tv.permission.READ_EPG_DATA" />  <!-- We can use to read the tv channel list -->
     <!-- Required for OpenInAppAction and getting arbitrary Aniyomi packages  -->
     <uses-permission
         android:name="android.permission.QUERY_ALL_PACKAGES"
         tools:ignore="QueryAllPackagesPermission" />
 
+    <queries>
+        <!-- 
+            QUERY_ALL_PACKAGES does not work on some devices running Android 11+ (like Google TV 14), 
+            so we must explicitly specify the packages and intent patterns we query to ensure visibility.
+        -->
+        <!-- For external video players -->
+        <intent>
+            <action android:name="android.intent.action.VIEW" />
+            <data android:mimeType="video/*" />
+        </intent>
+        <intent>
+            <action android:name="android.intent.action.VIEW" />
+            <data android:mimeType="application/x-mpegURL" />
+        </intent>
+        <intent>
+            <action android:name="android.intent.action.VIEW" />
+            <data android:mimeType="application/vnd.apple.mpegurl" />
+        </intent>
+        <intent>
+            <action android:name="android.intent.action.VIEW" />
+            <data android:scheme="magnet" />
+        </intent>
+
+        <!-- Common players supported in actions/temp -->
+        <package android:name="org.videolan.vlc" />
+        <package android:name="org.videolan.vlc.debug" />
+        <package android:name="is.xyz.mpv" />
+        <package android:name="is.xyz.mpv.ytdl" />
+        <package android:name="app.marlboroadvance.mpvex" />
+        <package android:name="live.mehiz.mpvkt" />
+        <package android:name="live.mehiz.mpvkt.preview" />
+        <package android:name="com.brouken.player" />
+        <package android:name="dev.anilbeesetti.nextplayer" />
+        <package android:name="com.instantbits.cast.webvideo" />
+        <package android:name="com.gianlu.aria2android" />
+        
+        <!-- Torrent clients -->
+        <package android:name="org.proninyaroslav.libretorrent" />
+        <package android:name="com.biglybt.android.client" />
+    </queries>
+
     <!-- Fixes android tv fuckery -->
     <uses-feature
         android:name="android.hardware.touchscreen"
@@ -33,9 +74,8 @@
     <!-- 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:name=".CloudStreamApp"
         android:allowBackup="true"
-        android:enableOnBackInvokedCallback="true"
         android:appCategory="video"
         android:banner="@mipmap/ic_banner"
         android:fullBackupContent="@xml/backup_descriptor"
@@ -43,11 +83,12 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:largeHeap="true"
+        android:pageSizeCompat="enabled"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
         android:usesCleartextTraffic="true"
-        tools:targetApi="35">
+        tools:targetApi="${target_sdk_version}">
 
         <meta-data
             android:name="com.google.android.gms.cast.framework.OPTIONS_PROVIDER_CLASS_NAME"
@@ -108,14 +149,31 @@
         android:launchMode="singleTask"
         is a bit experimental, it makes loading repositories from browser still stay on the same page
         no idea about side effects
+
+        Not exported to prevent bypassing the AccountSelectActivity
         -->
         <activity
             android:name=".MainActivity"
             android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout|keyboard|keyboardHidden|navigation|uiMode"
-            android:exported="true"
+            android:exported="false"
             android:launchMode="singleTask"
             android:resizeableActivity="true"
-            android:supportsPictureInPicture="true">
+            android:supportsPictureInPicture="true" />
+
+        <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>
 
             <!-- cloudstreamplayer://encodedUrl?name=Dune -->
             <intent-filter>
@@ -142,7 +200,14 @@
 
                 <data android:scheme="cloudstreamrepo" />
             </intent-filter>
+            <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="csshare" />
+            </intent-filter>
             <!-- Allow searching with intents: cloudstreamsearch://Your%20Name -->
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
@@ -166,7 +231,7 @@
                 <data android:scheme="cloudstreamcontinuewatching" />
             </intent-filter>
 
-            <intent-filter>
+            <intent-filter android:autoVerify="false">
                 <action android:name="android.intent.action.VIEW" />
 
                 <category android:name="android.intent.category.DEFAULT" />
@@ -179,25 +244,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" />
-
         <receiver
             android:name=".receivers.VideoDownloadRestartReceiver"
             android:enabled="false"
@@ -213,6 +259,12 @@
             android:foregroundServiceType="dataSync"
             android:exported="false" />
 
+        <service
+            android:name=".services.DownloadQueueService"
+            android:enabled="true"
+            android:foregroundServiceType="dataSync"
+            android:exported="false" />
+
         <!-- Necessary for WorkManager services: https://stackoverflow.com/a/77186316 -->
         <service
             android:name="androidx.work.impl.foreground.SystemForegroundService"

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

@@ -1,233 +1,78 @@
 package com.lagradost.cloudstream3
 
-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 coil3.PlatformContext
-import coil3.SingletonImageLoader
-import com.lagradost.api.setContext
-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.Coroutines.runOnMainThread
-import com.lagradost.cloudstream3.utils.DataStore.getKey
-import com.lagradost.cloudstream3.utils.DataStore.getKeys
-import com.lagradost.cloudstream3.utils.DataStore.removeKey
-import com.lagradost.cloudstream3.utils.DataStore.removeKeys
-import com.lagradost.cloudstream3.utils.DataStore.setKey
-import com.lagradost.cloudstream3.utils.ImageLoader
-import kotlinx.coroutines.runBlocking
-import org.acra.ACRA
-import org.acra.ReportField
-import org.acra.config.CoreConfiguration
-import org.acra.data.CrashReportData
-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/$id/formResponse"
-        val data = mapOf(
-            "entry.$entry" to errorContent.toJSON()
-        )
-
-        thread { // to not run it on main thread
-            runBlocking {
-                suspendSafeApiCall {
-                    app.post(url, data = data)
-                    //println("Report response: $post")
-                }
-            }
-        }
-
-        runOnMainThread { // to run it on main looper
-            normalSafeApiCall {
-                Toast.makeText(context, R.string.acra_report_toast, Toast.LENGTH_SHORT).show()
-            }
-        }*/
-    }
-}
-
-class CustomSenderFactory : ReportSenderFactory {
-    override fun create(context: Context, config: CoreConfiguration): ReportSender {
-        return CustomReportSender()
-    }
-
-    override fun enabled(config: CoreConfiguration): Boolean {
-        return true
-    }
-}
-
-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(), SingletonImageLoader.Factory {
-
-    override fun onCreate() {
-        super.onCreate()
-        // if we want to initialise coil at earliest
-        // (maybe when loading an image or gif using in splash screen activity)
-        //ImageLoader.buildImageLoader(applicationContext)
-
-        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
-
-        initAcra {
-            //core configuration:
-            buildConfigClass = BuildConfig::class.java
-            reportFormat = StringFormat.JSON
-
-            reportContent = listOf(
-                ReportField.BUILD_CONFIG, ReportField.USER_CRASH_DATE,
-                ReportField.ANDROID_VERSION, ReportField.PHONE_MODEL,
-                ReportField.STACK_TRACE,
-            )
-
-            // removed this due to bug when starting the app, moved it to when it actually crashes
-            //each plugin you chose above can be configured in a block like this:
-            /*toast {
-                text = getString(R.string.acra_report_toast)
-                //opening this block automatically enables the plugin.
-            }*/
-        }
-    }
-
-    override fun newImageLoader(context: PlatformContext): coil3.ImageLoader {
-        // Coil Module will be initialized & setSafe globally when first loadImage() is invoked
-        return ImageLoader.buildImageLoader(applicationContext)
-    }
-
-    companion object {
-        var exceptionHandler: ExceptionHandler? = null
-
-        /** Use to get activity from Context */
-        tailrec fun Context.getActivity(): Activity? {
-            return when (this) {
-                is Activity -> this
-                is ContextWrapper -> baseContext.getActivity()
-                else -> null
-            }
-        }
-
-        private var _context: WeakReference<Context>? = null
-        var context
-            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)
-        }
-
-        fun <T> setKey(path: String, value: T) {
-            context?.setKey(path, value)
-        }
-
-        fun <T> setKey(folder: String, path: String, value: T) {
-            context?.setKey(folder, path, value)
-        }
-
-        inline fun <reified T : Any> getKey(path: String, defVal: T?): T? {
-            return context?.getKey(path, defVal)
-        }
-
-        inline fun <reified T : Any> getKey(path: String): T? {
-            return context?.getKey(path)
-        }
-
-        inline fun <reified T : Any> getKey(folder: String, path: String): T? {
-            return context?.getKey(folder, path)
-        }
-
-        inline fun <reified T : Any> getKey(folder: String, path: String, defVal: T?): T? {
-            return context?.getKey(folder, path, defVal)
-        }
-
-        fun getKeys(folder: String): List<String>? {
-            return context?.getKeys(folder)
-        }
-
-        fun removeKey(folder: String, path: String) {
-            context?.removeKey(folder, path)
-        }
-
-        fun removeKey(path: String) {
-            context?.removeKey(path)
-        }
-
 /**
-         * If fallbackWebview is true and a fragment is supplied then it will open a webview with the url if the browser fails.
+ * Deprecated alias for CloudStreamApp for backwards compatibility with plugins.
-         * */
+ * Use CloudStreamApp instead.
-        fun openBrowser(url: String, fallbackWebview: Boolean = false, fragment: Fragment? = null) {
+ */
-            context?.openBrowser(url, fallbackWebview, fragment)
+@Deprecated(
-        }
+    message = "AcraApplication is deprecated, use CloudStreamApp instead",
-
+    replaceWith = ReplaceWith("com.lagradost.cloudstream3.CloudStreamApp"),
-        /** Will fallback to webview if in TV layout */
+    level = DeprecationLevel.ERROR
-        fun openBrowser(url: String, activity: FragmentActivity?) {
-            openBrowser(
-                url,
-                isLayout(TV or EMULATOR),
-                activity?.supportFragmentManager?.fragments?.lastOrNull()
 )
-        }
+class AcraApplication {
+	companion object {
+
+		@Deprecated(
+		    message = "AcraApplication is deprecated, use CloudStreamApp instead",
+		    replaceWith = ReplaceWith("com.lagradost.cloudstream3.CloudStreamApp.context"),
+		    level = DeprecationLevel.ERROR
+		)
+		val context get() = CloudStreamApp.context
+
+		@Deprecated(
+		    message = "AcraApplication is deprecated, use CloudStreamApp instead",
+		    replaceWith = ReplaceWith("com.lagradost.cloudstream3.CloudStreamApp.removeKeys(folder)"),
+		    level = DeprecationLevel.ERROR
+		)
+		fun removeKeys(folder: String): Int? =
+		    CloudStreamApp.removeKeys(folder)
+
+		@Deprecated(
+		    message = "AcraApplication is deprecated, use CloudStreamApp instead",
+		    replaceWith = ReplaceWith("com.lagradost.cloudstream3.CloudStreamApp.setKey(path, value)"),
+		    level = DeprecationLevel.ERROR
+		)
+		fun <T> setKey(path: String, value: T) =
+			CloudStreamApp.setKey(path, value)
+
+		@Deprecated(
+		    message = "AcraApplication is deprecated, use CloudStreamApp instead",
+		    replaceWith = ReplaceWith("com.lagradost.cloudstream3.CloudStreamApp.setKey(folder, path, value)"),
+		    level = DeprecationLevel.ERROR
+		)
+		fun <T> setKey(folder: String, path: String, value: T) =
+			CloudStreamApp.setKey(folder, path, value)
+
+		@Deprecated(
+		    message = "AcraApplication is deprecated, use CloudStreamApp instead",
+		    replaceWith = ReplaceWith("com.lagradost.cloudstream3.CloudStreamApp.getKey(path, defVal)"),
+		    level = DeprecationLevel.ERROR
+		)
+		inline fun <reified T : Any> getKey(path: String, defVal: T?): T? =
+			CloudStreamApp.getKey(path, defVal)
+
+		@Deprecated(
+		    message = "AcraApplication is deprecated, use CloudStreamApp instead",
+		    replaceWith = ReplaceWith("com.lagradost.cloudstream3.CloudStreamApp.getKey(path)"),
+		    level = DeprecationLevel.ERROR
+		)
+		inline fun <reified T : Any> getKey(path: String): T? =
+			CloudStreamApp.getKey(path)
+
+		@Deprecated(
+		    message = "AcraApplication is deprecated, use CloudStreamApp instead",
+		    replaceWith = ReplaceWith("com.lagradost.cloudstream3.CloudStreamApp.getKey(folder, path)"),
+		    level = DeprecationLevel.ERROR
+		)
+		inline fun <reified T : Any> getKey(folder: String, path: String): T? =
+		    CloudStreamApp.getKey(folder, path)
+
+		@Deprecated(
+		    message = "AcraApplication is deprecated, use CloudStreamApp instead",
+		    replaceWith = ReplaceWith("com.lagradost.cloudstream3.CloudStreamApp.getKey(folder, path, defVal)"),
+		    level = DeprecationLevel.ERROR
+		)
+		inline fun <reified T : Any> getKey(folder: String, path: String, defVal: T?): T? =
+			CloudStreamApp.getKey(folder, path, defVal)
 	}
 }

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

@@ -0,0 +1,181 @@
+package com.lagradost.cloudstream3
+
+import android.app.Activity
+import android.app.Application
+import android.content.Context
+import android.content.ContextWrapper
+import android.content.Intent
+import android.os.Build
+import android.widget.Toast
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentActivity
+import coil3.ImageLoader
+import coil3.PlatformContext
+import coil3.SingletonImageLoader
+import com.lagradost.api.setContext
+import com.lagradost.cloudstream3.BuildConfig
+import com.lagradost.cloudstream3.mvvm.safe
+import com.lagradost.cloudstream3.mvvm.safeAsync
+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.AppDebug
+import com.lagradost.cloudstream3.utils.Coroutines.runOnMainThread
+import com.lagradost.cloudstream3.utils.DataStore.getKey
+import com.lagradost.cloudstream3.utils.DataStore.getKeys
+import com.lagradost.cloudstream3.utils.DataStore.removeKey
+import com.lagradost.cloudstream3.utils.DataStore.removeKeys
+import com.lagradost.cloudstream3.utils.DataStore.setKey
+import com.lagradost.cloudstream3.utils.ImageLoader.buildImageLoader
+import kotlinx.coroutines.runBlocking
+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 ExceptionHandler(
+    val errorFile: File,
+    val onError: (() -> Unit)
+) : Thread.UncaughtExceptionHandler {
+
+    override fun uncaughtException(thread: Thread, error: Throwable) {
+        try {
+            val threadId = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.BAKLAVA) {
+                thread.threadId()
+            } else {
+                @Suppress("DEPRECATION")
+                thread.id
+            }
+
+            PrintStream(errorFile).use { ps ->
+                ps.println("Currently loading extension: ${PluginManager.currentlyLoading ?: "none"}")
+                ps.println("Fatal exception on thread ${thread.name} ($threadId)")
+                error.printStackTrace(ps)
+            }
+        } catch (_: FileNotFoundException) {
+        }
+        try {
+            onError()
+        } catch (_: Exception) {
+        }
+        exitProcess(1)
+    }
+}
+
+class CloudStreamApp : Application(), SingletonImageLoader.Factory {
+
+    override fun onCreate() {
+        super.onCreate()
+        // If we want to initialize Coil as early as possible, maybe when
+        // loading an image or GIF in a splash screen activity.
+        // buildImageLoader(applicationContext)
+
+        ExceptionHandler(filesDir.resolve("last_error")) {
+            val intent = context!!.packageManager.getLaunchIntentForPackage(context!!.packageName)
+            startActivity(Intent.makeRestartActivityTask(intent!!.component))
+        }.also {
+            exceptionHandler = it
+            Thread.setDefaultUncaughtExceptionHandler(it)
+        }
+
+        AppDebug.isDebug = BuildConfig.DEBUG
+    }
+
+    override fun attachBaseContext(base: Context?) {
+        super.attachBaseContext(base)
+        context = base
+    }
+
+    override fun newImageLoader(context: PlatformContext): ImageLoader {
+        // Coil module will be initialized globally when first loadImage() is invoked.
+        return buildImageLoader(applicationContext)
+    }
+
+    companion object {
+        var exceptionHandler: ExceptionHandler? = null
+
+        /** Use to get Activity from Context. */
+        tailrec fun Context.getActivity(): Activity? {
+            return when (this) {
+                is Activity -> this
+                is ContextWrapper -> baseContext.getActivity()
+                else -> null
+            }
+        }
+
+        private var _context: WeakReference<Context>? = null
+        var context
+            get() = _context?.get()
+            private set(value) {
+                _context = WeakReference(value)
+                setContext(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)
+        }
+
+        fun <T> setKey(path: String, value: T) {
+            context?.setKey(path, value)
+        }
+
+        fun <T> setKey(folder: String, path: String, value: T) {
+            context?.setKey(folder, path, value)
+        }
+
+        inline fun <reified T : Any> getKey(path: String, defVal: T?): T? {
+            return context?.getKey(path, defVal)
+        }
+
+        inline fun <reified T : Any> getKey(path: String): T? {
+            return context?.getKey(path)
+        }
+
+        inline fun <reified T : Any> getKey(folder: String, path: String): T? {
+            return context?.getKey(folder, path)
+        }
+
+        inline fun <reified T : Any> getKey(folder: String, path: String, defVal: T?): T? {
+            return context?.getKey(folder, path, defVal)
+        }
+
+        fun getKeys(folder: String): List<String>? {
+            return context?.getKeys(folder)
+        }
+
+        fun removeKey(folder: String, path: String) {
+            context?.removeKey(folder, path)
+        }
+
+        fun removeKey(path: String) {
+            context?.removeKey(path)
+        }
+
+        /** If fallbackWebView is true and a fragment is supplied then it will open a WebView with the URL if the browser fails. */
+        fun openBrowser(url: String, fallbackWebView: Boolean = false, fragment: Fragment? = null) {
+            context?.openBrowser(url, fallbackWebView, fragment)
+        }
+
+        /** Will fall back to WebView if in TV or emulator 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,13 +1,16 @@
 package com.lagradost.cloudstream3
 
-import android.Manifest
+import android.annotation.SuppressLint
 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.Manifest
 import android.os.Build
+import android.os.Handler
+import android.os.Looper
 import android.util.DisplayMetrics
 import android.util.Log
 import android.view.Gravity
@@ -24,32 +27,41 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.SearchView
 import androidx.core.content.ContextCompat
 import androidx.core.view.children
+import androidx.core.view.isNotEmpty
 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.CloudStreamApp.Companion.getKey
-import com.lagradost.cloudstream3.AcraApplication.Companion.removeKey
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.removeKey
 import com.lagradost.cloudstream3.actions.OpenInAppAction
 import com.lagradost.cloudstream3.actions.VideoClickActionHolder
 import com.lagradost.cloudstream3.databinding.ToastBinding
 import com.lagradost.cloudstream3.mvvm.logError
-import com.lagradost.cloudstream3.ui.player.PlayerEventType
+import com.lagradost.cloudstream3.syncproviders.AccountManager
+import com.lagradost.cloudstream3.ui.home.HomeChildItemAdapter
+import com.lagradost.cloudstream3.ui.home.ParentItemAdapter
+import com.lagradost.cloudstream3.ui.player.PlayerPipHelper.isPIPPossible
 import com.lagradost.cloudstream3.ui.player.Torrent
-import com.lagradost.cloudstream3.utils.UiText
+import com.lagradost.cloudstream3.ui.result.ActorAdaptor
+import com.lagradost.cloudstream3.ui.result.EpisodeAdapter
+import com.lagradost.cloudstream3.ui.result.ImageAdapter
+import com.lagradost.cloudstream3.ui.search.SearchAdapter
+import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
+import com.lagradost.cloudstream3.ui.settings.Globals.TV
 import com.lagradost.cloudstream3.ui.settings.Globals.updateTv
+import com.lagradost.cloudstream3.ui.settings.extensions.PluginAdapter
 import com.lagradost.cloudstream3.utils.AppContextUtils.isRtl
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
 import com.lagradost.cloudstream3.utils.Event
-import com.lagradost.cloudstream3.utils.UIHelper
+import com.lagradost.cloudstream3.utils.UIHelper.showInputMethod
-import com.lagradost.cloudstream3.utils.UIHelper.hasPIPPermission
-import com.lagradost.cloudstream3.utils.UIHelper.shouldShowPIPMode
 import com.lagradost.cloudstream3.utils.UIHelper.toPx
-import org.schabi.newpipe.extractor.NewPipe
+import com.lagradost.cloudstream3.utils.UiText
 import java.lang.ref.WeakReference
 import java.util.Locale
 import kotlin.math.max
 import kotlin.math.min
+import org.schabi.newpipe.extractor.NewPipe
 
 enum class FocusDirection {
     Start,
@@ -89,17 +101,24 @@ object CommonActivity {
         get() {
             return min(displayMetrics.widthPixels, displayMetrics.heightPixels)
         }
+    val screenWidthWithOrientation: Int
+        get() {
+            return displayMetrics.widthPixels
+        }
+    val screenHeightWithOrientation: Int
+        get() {
+            return displayMetrics.heightPixels
+        }
 
-
+    var isPipDesired: Boolean = false
-    var canEnterPipMode: Boolean = false
-    var canShowPipMode: Boolean = false
     var isInPIPMode: Boolean = false
 
     val onColorSelectedEvent = Event<Pair<Int, Int>>()
     val onDialogDismissedEvent = Event<Int>()
 
-    var playerEventListener: ((PlayerEventType) -> Unit)? = null
     var keyEventListener: ((Pair<KeyEvent?, Boolean>) -> Boolean)? = null
+    var appliedTheme: Int = 0
+    var appliedColor: Int = 0
 
     private var currentToast: Toast? = null
 
@@ -167,27 +186,40 @@ object CommonActivity {
             toast.duration = duration ?: Toast.LENGTH_SHORT
             toast.setGravity(Gravity.CENTER_HORIZONTAL or Gravity.BOTTOM, 0, 5.toPx)
             @Suppress("DEPRECATION")
-            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.
+            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.show()
 
+            val handler = Handler(Looper.getMainLooper())
+            val ref = WeakReference(toast)
+
+            /* Clean up activity leak */
+            handler.postDelayed({
+                if (ref.get() == currentToast) {
+                    currentToast = null
+                }
+            }, 10_000)
+
         } catch (e: Exception) {
             logError(e)
         }
     }
 
     /**
-     * Not all languages can be fetched from locale with a code.
+     * Set locale
-     * This map allows sidestepping the default Locale(languageCode)
+     * @param languageTag shall a IETF BCP 47 conformant tag.
-     * when setting the app language.
+     * Check [com.lagradost.cloudstream3.utils.SubtitleHelper].
-     **/
+     *
-    val appLanguageExceptions = hashMapOf(
+     * See locales on:
-        "zh-rTW" to Locale.TRADITIONAL_CHINESE
+     * https://github.com/unicode-org/cldr-json/blob/main/cldr-json/cldr-core/availableLocales.json
-    )
+     * https://www.iana.org/assignments/language-subtag-registry/language-subtag-registry
-
+     * https://android.googlesource.com/platform/frameworks/base/+/android-16.0.0_r2/core/res/res/values/locale_config.xml
-    fun setLocale(context: Context?, languageCode: String?) {
+     * https://iso639-3.sil.org/code_tables/639/data/all
-        if (context == null || languageCode == null) return
+     */
-        val locale = appLanguageExceptions[languageCode] ?: Locale(languageCode)
+    fun setLocale(context: Context?, languageTag: String?) {
+        if (context == null || languageTag == null) return
+        val locale = Locale.forLanguageTag(languageTag)
         val resources: Resources = context.resources
         val config = resources.configuration
         Locale.setDefault(locale)
@@ -195,8 +227,12 @@ object CommonActivity {
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
             context.createConfigurationContext(config)
+
         @Suppress("DEPRECATION")
-        resources.updateConfiguration(config, resources.displayMetrics) // FIXME this should be replaced
+        resources.updateConfiguration(
+            config,
+            resources.displayMetrics
+        ) // FIXME this should be replaced
     }
 
     fun Context.updateLocale() {
@@ -208,28 +244,24 @@ object CommonActivity {
     fun init(act: Activity) {
         setActivityInstance(act)
         ioSafe { Torrent.deleteAllFiles() }
-
         val componentActivity = activity as? ComponentActivity ?: 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
-
         componentActivity.updateLocale()
         componentActivity.updateTv()
+        AccountManager.initMainAPI()
         NewPipe.init(DownloaderTestImpl.getInstance())
 
-        MainActivity.activityResultLauncher = componentActivity.registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
+        MainActivity.activityResultLauncher =
+            componentActivity.registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
                 if (result.resultCode == AppCompatActivity.RESULT_OK) {
-                val actionUid = getKey<String>("last_click_action") ?: return@registerForActivityResult
+                    val actionUid =
+                        getKey<String>("last_click_action") ?: return@registerForActivityResult
                     Log.d(TAG, "Loading action $actionUid result handler")
-                val action = VideoClickActionHolder.getByUniqueId(actionUid) as? OpenInAppAction ?: return@registerForActivityResult
+                    val action = VideoClickActionHolder.getByUniqueId(actionUid) as? OpenInAppAction
+                        ?: return@registerForActivityResult
                     action.onResultSafe(act, result.data)
                     removeKey("last_click_action")
-                removeKey("last_opened_id")
+                    removeKey("last_opened")
                 }
             }
 
@@ -251,13 +283,15 @@ object CommonActivity {
         }
     }
 
+    /** Enters pip mode if it is both possible and desired to do so*/
     private fun Activity.enterPIPMode() {
-        if (!shouldShowPIPMode(canEnterPipMode) || !canShowPipMode) return
+        if (!isPipDesired || !this.isPIPPossible()) return
+
         try {
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
                 try {
                     enterPictureInPictureMode(PictureInPictureParams.Builder().build())
-                } catch (e: Exception) {
+                } catch (_: Exception) {
                     // Use fallback just in case
                     @Suppress("DEPRECATION")
                     enterPictureInPictureMode()
@@ -273,17 +307,18 @@ object CommonActivity {
         }
     }
 
-    fun onUserLeaveHint(act: Activity?) {
+    fun onUserLeaveHint(act: Activity) {
-        if (canEnterPipMode && canShowPipMode) {
+        // On Android 12 and later we use setAutoEnterEnabled() instead.
-            act?.enterPIPMode()
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) return
-        }
+        act.enterPIPMode()
     }
 
     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) {
+            && Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q
+        ) {
             loadThemes(act)
         }
     }
@@ -315,6 +350,10 @@ object CommonActivity {
                 "Monet" -> if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S)
                     R.style.MonetMode else R.style.AppTheme
 
+                "Dracula" -> R.style.DraculaMode
+                "Lavender" -> R.style.LavenderMode
+                "SilentBlue" -> R.style.SilentBlueMode
+
                 else -> R.style.AppTheme
             }
 
@@ -347,9 +386,13 @@ object CommonActivity {
 
                 else -> R.style.OverlayPrimaryColorNormal
             }
+
         act.theme.applyStyle(currentTheme, true)
         act.theme.applyStyle(currentOverlayTheme, true)
-
+        appliedTheme = currentTheme
+        appliedColor = currentOverlayTheme
+        act.updateTv()
+        if (isLayout(TV)) act.theme.applyStyle(R.style.AppThemeTvOverlay, true)
         act.theme.applyStyle(
             R.style.LoadedStyle,
             true
@@ -380,8 +423,7 @@ object CommonActivity {
 
     private fun View.hasContent(): Boolean {
         return isShown && when (this) {
-            //is RecyclerView -> this.childCount > 0
+            is ViewGroup -> this.isNotEmpty()
-            is ViewGroup -> this.childCount > 0
             else -> true
         }
     }
@@ -411,7 +453,7 @@ object CommonActivity {
         // 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
+            parent.descendantFocusability == ViewGroup.FOCUS_AFTER_DESCENDANTS && parent.isNotEmpty()
         } ?: false
         if (!next.isFocusable && shown && !hasChildrenThatWantsFocus) return null
 
@@ -489,84 +531,8 @@ object CommonActivity {
     }
 
 
-    fun onKeyDown(act: Activity?, keyCode: Int, event: KeyEvent?) {
+    fun onKeyDown(act: Activity?, keyCode: Int, event: KeyEvent?): Boolean? {
-
+        return null
-        // 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, KeyEvent.KEYCODE_NUMPAD_2, KeyEvent.KEYCODE_CHANNEL_UP -> {
-                PlayerEventType.NextEpisode
-            }
-
-            KeyEvent.KEYCODE_MEDIA_PREVIOUS, KeyEvent.KEYCODE_BUTTON_L1, KeyEvent.KEYCODE_B, KeyEvent.KEYCODE_NUMPAD_1, KeyEvent.KEYCODE_CHANNEL_DOWN -> {
-                PlayerEventType.PrevEpisode
-            }
-
-            KeyEvent.KEYCODE_MEDIA_PAUSE -> {
-                PlayerEventType.Pause
-            }
-
-            KeyEvent.KEYCODE_MEDIA_PLAY, KeyEvent.KEYCODE_BUTTON_START -> {
-                PlayerEventType.Play
-            }
-
-            KeyEvent.KEYCODE_L, KeyEvent.KEYCODE_NUMPAD_7, KeyEvent.KEYCODE_7 -> {
-                PlayerEventType.Lock
-            }
-
-            KeyEvent.KEYCODE_H, KeyEvent.KEYCODE_MENU -> {
-                PlayerEventType.ToggleHide
-            }
-
-            KeyEvent.KEYCODE_M, KeyEvent.KEYCODE_VOLUME_MUTE -> {
-                PlayerEventType.ToggleMute
-            }
-
-            KeyEvent.KEYCODE_S, KeyEvent.KEYCODE_NUMPAD_9, KeyEvent.KEYCODE_9 -> {
-                PlayerEventType.ShowMirrors
-            }
-            // OpenSubtitles shortcut
-            KeyEvent.KEYCODE_O, KeyEvent.KEYCODE_NUMPAD_8, KeyEvent.KEYCODE_8 -> {
-                PlayerEventType.SearchSubtitlesOnline
-            }
-
-            KeyEvent.KEYCODE_E, KeyEvent.KEYCODE_NUMPAD_3, KeyEvent.KEYCODE_3 -> {
-                PlayerEventType.ShowSpeed
-            }
-
-            KeyEvent.KEYCODE_R, KeyEvent.KEYCODE_NUMPAD_0, KeyEvent.KEYCODE_0 -> {
-                PlayerEventType.Resize
-            }
-
-            KeyEvent.KEYCODE_C, KeyEvent.KEYCODE_NUMPAD_4, KeyEvent.KEYCODE_4 -> {
-                PlayerEventType.SkipOp
-            }
-
-            KeyEvent.KEYCODE_V, KeyEvent.KEYCODE_NUMPAD_5, KeyEvent.KEYCODE_5 -> {
-                PlayerEventType.SkipCurrentChapter
-            }
-
-            KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE, KeyEvent.KEYCODE_P, KeyEvent.KEYCODE_SPACE, KeyEvent.KEYCODE_NUMPAD_ENTER, KeyEvent.KEYCODE_ENTER -> { // space is not captured due to navigation
-                PlayerEventType.PlayPauseToggle
-            }
-
-            else -> null
-        }?.let { playerEvent ->
-            playerEventListener?.invoke(playerEvent)
-        }
-
-        //when (keyCode) {
-        //    KeyEvent.KEYCODE_DPAD_CENTER -> {
-        //        println("DPAD PRESSED")
-        //    }
-        //}
     }
 
     /** overrides focus and custom key events */
@@ -603,6 +569,7 @@ object CommonActivity {
 
                 else -> null
             }
+
             // println("NEXT FOCUS : $nextView")
             if (nextView != null) {
                 nextView.requestFocus()
@@ -610,10 +577,15 @@ object CommonActivity {
                 return true
             }
 
-            if (keyCode == KeyEvent.KEYCODE_DPAD_CENTER &&
+            // TODO: Figure out why removing the check for SearchAutoComplete seems
+            // to break focus on TV as it shouldn't need to be used.
+            // Also handle KEYCODE_ENTER here because some remotes (e.g. LG Magic Remote)
+            // send KEYCODE_ENTER instead of KEYCODE_DPAD_CENTER when clicking the OK button.
+            @SuppressLint("RestrictedApi")
+            if ((keyCode == KeyEvent.KEYCODE_DPAD_CENTER || keyCode == KeyEvent.KEYCODE_ENTER) &&
                 (act.currentFocus is SearchView || act.currentFocus is SearchView.SearchAutoComplete)
             ) {
-                UIHelper.showInputMethod(act.currentFocus?.findFocus())
+                showInputMethod(act.currentFocus?.findFocus())
             }
 
             //println("Keycode: $keyCode")
@@ -622,7 +594,6 @@ object CommonActivity {
             //    "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

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/actions/AlwaysAskAction.kt

@@ -0,0 +1,26 @@
+package com.lagradost.cloudstream3.actions
+
+import android.content.Context
+import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.ui.result.LinkLoadingResult
+import com.lagradost.cloudstream3.ui.result.ResultEpisode
+import com.lagradost.cloudstream3.utils.txt
+
+class AlwaysAskAction : VideoClickAction() {
+    override val name = txt(R.string.player_settings_always_ask)
+    override val isPlayer = true
+
+    // Only show in settings, not on a video
+    override fun shouldShow(context: Context?, video: ResultEpisode?): Boolean = video == null
+    
+    override suspend fun runAction(
+        context: Context?,
+        video: ResultEpisode,
+        result: LinkLoadingResult,
+        index: Int?
+    ) {
+        // This is handled specially in ResultViewModel2.kt by detecting the AlwaysAskAction
+        // and showing the player selection dialog instead of executing the action directly
+        throw NotImplementedError("AlwaysAskAction is handled specially by the calling code")
+    }
+}

app/src/main/java/com/lagradost/cloudstream3/actions/OpenInAppAction.kt

@@ -6,8 +6,8 @@ import android.content.Context
 import android.content.Intent
 import androidx.core.content.FileProvider
 import androidx.core.net.toUri
-import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.getKey
-import com.lagradost.cloudstream3.AcraApplication.Companion.setKey
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.setKey
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.ui.result.LinkLoadingResult
@@ -21,7 +21,8 @@ import java.io.File
 
 fun updateDurationAndPosition(position: Long, duration: Long) {
     if (position <= 0 || duration <= 0) return
-    DataStoreHelper.setViewPos(getKey("last_opened_id"), position, duration)
+    val episode = getKey<ResultEpisode>("last_opened") ?: return
+    DataStoreHelper.setViewPosAndResume(episode.id, position, duration, episode, null)
     ResultFragment.updateUI()
 }
 
@@ -98,7 +99,7 @@ abstract class OpenInAppAction(
             intent.component = ComponentName(packageName, intentClass)
         }
         putExtra(context, intent, video, result, index)
-        setKey("last_opened_id", video.id)
+        setKey("last_opened", video)
         launchResult(intent)
     }
 

app/src/main/java/com/lagradost/cloudstream3/actions/VideoClickAction.kt

@@ -12,44 +12,63 @@ import com.lagradost.cloudstream3.CommonActivity
 import com.lagradost.cloudstream3.ErrorLoadingException
 import com.lagradost.cloudstream3.MainActivity
 import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.actions.temp.BiglyBTPackage
 import com.lagradost.cloudstream3.actions.temp.CopyClipboardAction
+import com.lagradost.cloudstream3.actions.temp.JustPlayerPackage
+import com.lagradost.cloudstream3.actions.temp.LibreTorrentPackage
+import com.lagradost.cloudstream3.actions.temp.MpvExPackage
 import com.lagradost.cloudstream3.actions.temp.MpvKtPackage
 import com.lagradost.cloudstream3.actions.temp.MpvKtPreviewPackage
 import com.lagradost.cloudstream3.actions.temp.MpvPackage
+import com.lagradost.cloudstream3.actions.temp.MpvRxPackage
 import com.lagradost.cloudstream3.actions.temp.MpvYTDLPackage
+import com.lagradost.cloudstream3.actions.temp.NextPlayerPackage
+import com.lagradost.cloudstream3.actions.temp.OnlyPlayer
 import com.lagradost.cloudstream3.actions.temp.PlayInBrowserAction
+import com.lagradost.cloudstream3.actions.temp.PlayMirrorAction
 import com.lagradost.cloudstream3.actions.temp.ViewM3U8Action
+import com.lagradost.cloudstream3.actions.temp.VlcNightlyPackage
 import com.lagradost.cloudstream3.actions.temp.VlcPackage
 import com.lagradost.cloudstream3.actions.temp.WebVideoCastPackage
 import com.lagradost.cloudstream3.actions.temp.fcast.FcastAction
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.ui.result.LinkLoadingResult
 import com.lagradost.cloudstream3.ui.result.ResultEpisode
-import com.lagradost.cloudstream3.utils.UiText
+import com.lagradost.cloudstream3.utils.Coroutines.atomicListOf
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
-import com.lagradost.cloudstream3.utils.Coroutines.threadSafeListOf
 import com.lagradost.cloudstream3.utils.ExtractorLinkType
+import com.lagradost.cloudstream3.utils.UiText
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import java.util.concurrent.Callable
 import java.util.concurrent.FutureTask
-import kotlin.reflect.jvm.jvmName
 
 object VideoClickActionHolder {
-    val allVideoClickActions = threadSafeListOf(
+    val allVideoClickActions = atomicListOf(
         // Default
         PlayInBrowserAction(),
         CopyClipboardAction(),
         ViewM3U8Action(),
+        PlayMirrorAction(),
         // main support external apps
         VlcPackage(),
         MpvPackage(),
+        MpvExPackage(),
+        NextPlayerPackage(),
+        JustPlayerPackage(),
         FcastAction(),
+        LibreTorrentPackage(),
+        BiglyBTPackage(),
         // forks/backup apps
+        VlcNightlyPackage(),
         WebVideoCastPackage(),
         MpvYTDLPackage(),
         MpvKtPackage(),
         MpvKtPreviewPackage(),
+        OnlyPlayer(),
+        MpvRxPackage(),
+        // Always Ask option
+        AlwaysAskAction(),
         // added by plugins
         // ...
     )
@@ -141,7 +160,7 @@ abstract class VideoClickAction {
         }
     }
 
-    fun uniqueId() = "$sourcePlugin:${this::class.jvmName}"
+    fun uniqueId() = "$sourcePlugin:${this::class.qualifiedName}"
 
     @Throws
     abstract fun shouldShow(context: Context?, video: ResultEpisode?): Boolean

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

@@ -0,0 +1,30 @@
+package com.lagradost.cloudstream3.actions.temp
+
+import android.app.Activity
+import android.content.Context
+import android.content.Intent
+import com.lagradost.cloudstream3.actions.OpenInAppAction
+import com.lagradost.cloudstream3.ui.result.LinkLoadingResult
+import com.lagradost.cloudstream3.ui.result.ResultEpisode
+import com.lagradost.cloudstream3.utils.txt
+
+/** https://github.com/devgianlu/Aria2Android */
+@Suppress("unused")
+class Aria2Package : OpenInAppAction(
+    appName = txt("Aria2"),
+    packageName = "com.gianlu.aria2android",
+    intentClass = "com.gianlu.aria2android.MainActivity"
+) {
+    override val oneSource: Boolean = true
+    override suspend fun putExtra(
+        context: Context,
+        intent: Intent,
+        video: ResultEpisode,
+        result: LinkLoadingResult,
+        index: Int?
+    ) {
+        throw NotImplementedError("Aria2Android is missing getIntent, and onNewIntent, meaning it cant handle intents")
+    }
+
+    override fun onResult(activity: Activity, intent: Intent?) = Unit
+}

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

@@ -0,0 +1,36 @@
+package com.lagradost.cloudstream3.actions.temp
+
+import android.app.Activity
+import android.content.Context
+import android.content.Intent
+import androidx.core.net.toUri
+import com.lagradost.cloudstream3.actions.OpenInAppAction
+import com.lagradost.cloudstream3.ui.result.LinkLoadingResult
+import com.lagradost.cloudstream3.ui.result.ResultEpisode
+import com.lagradost.cloudstream3.utils.ExtractorLinkType
+import com.lagradost.cloudstream3.utils.txt
+
+/** https://github.com/BiglySoftware/BiglyBT-Android */
+class BiglyBTPackage : OpenInAppAction(
+    appName = txt("BiglyBT"),
+    packageName = "com.biglybt.android.client",
+    intentClass = "com.biglybt.android.client.activity.IntentHandler"
+) {
+    // Only torrents are supported by the app
+    override val sourceTypes: Set<ExtractorLinkType> =
+        setOf(ExtractorLinkType.MAGNET, ExtractorLinkType.TORRENT)
+
+    override val oneSource: Boolean = true
+
+    override suspend fun putExtra(
+        context: Context,
+        intent: Intent,
+        video: ResultEpisode,
+        result: LinkLoadingResult,
+        index: Int?
+    ) {
+        intent.data = result.links[index!!].url.toUri()
+    }
+
+    override fun onResult(activity: Activity, intent: Intent?) = Unit
+}

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

@@ -0,0 +1,160 @@
+package com.lagradost.cloudstream3.actions.temp
+
+import android.app.Activity
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import com.fasterxml.jackson.annotation.JsonProperty
+import com.lagradost.cloudstream3.actions.OpenInAppAction
+import com.lagradost.cloudstream3.BuildConfig
+import com.lagradost.cloudstream3.SkipSerializationTest
+import com.lagradost.cloudstream3.ui.player.ExtractorUri
+import com.lagradost.cloudstream3.ui.player.SubtitleData
+import com.lagradost.cloudstream3.ui.player.SubtitleOrigin
+import com.lagradost.cloudstream3.ui.result.LinkLoadingResult
+import com.lagradost.cloudstream3.ui.result.ResultEpisode
+import com.lagradost.cloudstream3.utils.AppUtils.toJson
+import com.lagradost.cloudstream3.utils.DataStoreHelper.getViewPos
+import com.lagradost.cloudstream3.utils.DrmExtractorLink
+import com.lagradost.cloudstream3.utils.ExtractorLink
+import com.lagradost.cloudstream3.utils.ExtractorLinkPlayList
+import com.lagradost.cloudstream3.utils.ExtractorLinkType
+import com.lagradost.cloudstream3.utils.newExtractorLink
+import com.lagradost.cloudstream3.utils.Qualities
+import com.lagradost.cloudstream3.utils.SubtitleHelper.fromCodeToLangTagIETF
+import com.lagradost.cloudstream3.utils.SubtitleHelper.fromLanguageToTagIETF
+import com.lagradost.cloudstream3.utils.serializers.UriSerializer
+import com.lagradost.cloudstream3.utils.txt
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+/**
+ * If you want to support CloudStream 3 as an external player, then this shows how to play any video link
+ * For basic interactions, just `intent.data = uri` works
+ *
+ * However for more advanced use, CloudStream 3 also supports playlists of MinimalVideoLink and MinimalSubtitleLink with a `String[]` of JSON
+ * These are passed as LINKS_EXTRA and SUBTITLE_EXTRA respectively
+ */
+@Suppress("Unused")
+class CloudStreamPackage : OpenInAppAction(
+    appName = txt("CloudStream"),
+    packageName = BuildConfig.APPLICATION_ID, //"com.lagradost.cloudstream3" or "com.lagradost.cloudstream3.prerelease"
+    intentClass = "com.lagradost.cloudstream3.ui.player.DownloadedPlayerActivity"
+) {
+    override val oneSource: Boolean = false
+
+    companion object {
+        const val SUBTITLE_EXTRA: String = "subs" // Json of an array of MinimalVideoLink
+        const val LINKS_EXTRA: String = "links" // Json of an array of MinimalSubtitleLink
+        const val TITLE_EXTRA: String = "title" // Unused (String)
+        const val ID_EXTRA: String =
+            "id" // Identification number for the video(s), used to store start time (Int)
+        const val POSITION_EXTRA: String = "pos" // Start time in MS (Long)
+        const val DURATION_EXTRA: String = "dur" // Duration time in MS (Long)
+    }
+
+    @Serializable
+    @SkipSerializationTest //.Uri has issues with Jackson
+    data class MinimalVideoLink(
+        @JsonProperty("uri") @SerialName("uri")
+        @Serializable(with = UriSerializer::class)
+        val uri: Uri?,
+        @JsonProperty("url") @SerialName("url") val url: String?,
+        @JsonProperty("mimeType") @SerialName("mimeType") val mimeType: String = "video/mp4",
+        @JsonProperty("name") @SerialName("name") val name: String?,
+        @JsonProperty("headers") @SerialName("headers") var headers: Map<String, String> = mapOf(),
+        @JsonProperty("quality") @SerialName("quality") val quality: Int?,
+    ) {
+        companion object {
+            fun fromExtractor(link: ExtractorLink): MinimalVideoLink = MinimalVideoLink(
+                uri = null,
+                url = link.url,
+                name = link.name,
+                mimeType = link.type.getMimeType(),
+                headers = if (link.referer.isBlank()) emptyMap() else mapOf("referer" to link.referer) + link.headers,
+                quality = link.quality
+            )
+        }
+
+        suspend fun toExtractorLink(): Pair<ExtractorLink?, ExtractorUri?> =
+            url?.let { url ->
+                newExtractorLink(
+                    source = "NONE",
+                    name = name ?: "Unknown",
+                    url = url,
+                    type = ExtractorLinkType.entries.firstOrNull { ty -> ty.getMimeType() == mimeType }
+                        ?: ExtractorLinkType.VIDEO) {
+
+                    this@newExtractorLink.headers =
+                        this@MinimalVideoLink.headers
+
+                    this@newExtractorLink.quality =
+                        this@MinimalVideoLink.quality ?: Qualities.Unknown.value
+                }
+            } to uri?.let { uri ->
+                ExtractorUri(
+                    uri = uri,
+                    name = name ?: "Unknown",
+                )
+            }
+    }
+
+    @Serializable
+    data class MinimalSubtitleLink(
+        @JsonProperty("url") @SerialName("url") val url: String,
+        @JsonProperty("mimeType") @SerialName("mimeType") val mimeType: String = "text/vtt",
+        @JsonProperty("name") @SerialName("name") val name: String?,
+        @JsonProperty("headers") @SerialName("headers") var headers: Map<String, String> = mapOf(),
+    ) {
+        companion object {
+            fun fromSubtitle(sub: SubtitleData): MinimalSubtitleLink = MinimalSubtitleLink(
+                url = sub.url,
+                mimeType = sub.mimeType,
+                name = sub.originalName,
+                headers = sub.headers,
+            )
+        }
+
+        fun toSubtitleData(): SubtitleData = SubtitleData(
+            url = url,
+            nameSuffix = "",
+            mimeType = mimeType,
+            originalName = name ?: "Unknown",
+            headers = headers,
+            origin = SubtitleOrigin.URL,
+            languageCode = fromCodeToLangTagIETF(name) ?:
+                           fromLanguageToTagIETF(name, true) ?:
+                           name,
+        )
+    }
+
+    override suspend fun putExtra(
+        context: Context,
+        intent: Intent,
+        video: ResultEpisode,
+        result: LinkLoadingResult,
+        index: Int?
+    ) {
+        intent.apply {
+            val position = getViewPos(video.id)?.position
+            if (position != null)
+                putExtra(POSITION_EXTRA, position)
+
+            putExtra(ID_EXTRA, video.id)
+            putExtra(TITLE_EXTRA, video.name)
+            putExtra(
+                SUBTITLE_EXTRA,
+                result.subs.map { MinimalSubtitleLink.fromSubtitle(it).toJson() }.toTypedArray()
+            )
+            putExtra(
+                LINKS_EXTRA,
+                result.links.filter { it !is ExtractorLinkPlayList && it !is DrmExtractorLink }
+                    .map { MinimalVideoLink.fromExtractor(it).toJson() }.toTypedArray()
+            )
+        }
+    }
+
+    override fun onResult(activity: Activity, intent: Intent?) {
+        // No results yet
+    }
+}

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

@@ -0,0 +1,37 @@
+package com.lagradost.cloudstream3.actions.temp
+
+import android.app.Activity
+import android.content.Context
+import android.content.Intent
+import androidx.core.net.toUri
+import com.lagradost.cloudstream3.actions.OpenInAppAction
+import com.lagradost.cloudstream3.ui.result.LinkLoadingResult
+import com.lagradost.cloudstream3.ui.result.ResultEpisode
+import com.lagradost.cloudstream3.utils.ExtractorLinkType
+import com.lagradost.cloudstream3.utils.txt
+
+/** https://github.com/moneytoo/Player/ */
+class JustPlayerPackage : OpenInAppAction(
+    appName = txt("JustPlayer"),
+    packageName = "com.brouken.player",
+    intentClass = "com.brouken.player.PlayerActivity"
+) {
+    override val sourceTypes: Set<ExtractorLinkType> =
+        setOf(ExtractorLinkType.VIDEO, ExtractorLinkType.M3U8, ExtractorLinkType.DASH)
+
+    override val oneSource: Boolean = true
+
+    override suspend fun putExtra(
+        context: Context,
+        intent: Intent,
+        video: ResultEpisode,
+        result: LinkLoadingResult,
+        index: Int?
+    ) {
+        // While JustPlayer has support for subs, it cant add both subs and links at the same time
+        // See https://github.com/moneytoo/Player/blob/49d80eb8de7a7bfc662393fdf114788fed1ebb2e/app/src/main/java/com/brouken/player/PlayerActivity.java#L794
+        intent.data = result.links[index!!].url.toUri()
+    }
+
+    override fun onResult(activity: Activity, intent: Intent?) = Unit
+}

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

@@ -0,0 +1,36 @@
+package com.lagradost.cloudstream3.actions.temp
+
+import android.app.Activity
+import android.content.Context
+import android.content.Intent
+import androidx.core.net.toUri
+import com.lagradost.cloudstream3.actions.OpenInAppAction
+import com.lagradost.cloudstream3.ui.result.LinkLoadingResult
+import com.lagradost.cloudstream3.ui.result.ResultEpisode
+import com.lagradost.cloudstream3.utils.ExtractorLinkType
+import com.lagradost.cloudstream3.utils.txt
+
+/** https://github.com/proninyaroslav/libretorrent */
+class LibreTorrentPackage : OpenInAppAction(
+    appName = txt("LibreTorrent"),
+    packageName = "org.proninyaroslav.libretorrent",
+    intentClass = "org.proninyaroslav.libretorrent.ui.addtorrent.AddTorrentActivity"
+) {
+    // Only torrents are supported by the app
+    override val sourceTypes: Set<ExtractorLinkType> =
+        setOf(ExtractorLinkType.MAGNET, ExtractorLinkType.TORRENT)
+
+    override val oneSource: Boolean = true
+
+    override suspend fun putExtra(
+        context: Context,
+        intent: Intent,
+        video: ResultEpisode,
+        result: LinkLoadingResult,
+        index: Int?
+    ) {
+        intent.data = result.links[index!!].url.toUri()
+    }
+
+    override fun onResult(activity: Activity, intent: Intent?) = Unit
+}

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

@@ -3,7 +3,6 @@ package com.lagradost.cloudstream3.actions.temp
 import android.app.Activity
 import android.content.Context
 import android.content.Intent
-import android.net.Uri
 import androidx.core.net.toUri
 import com.lagradost.cloudstream3.actions.OpenInAppAction
 import com.lagradost.cloudstream3.actions.updateDurationAndPosition
@@ -45,7 +44,7 @@ open class MpvKtPackage(
 
         intent.apply {
             putExtra("subs", result.subs.map { it.url.toUri() }.toTypedArray())
-            setDataAndType(Uri.parse(link.url), "video/*")
+            setDataAndType(link.url.toUri(), "video/*")
 
             // m3u8 plays, but changing sources feature is not available
             // makeTempM3U8Intent(activity, this, result)

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

@@ -3,7 +3,6 @@ package com.lagradost.cloudstream3.actions.temp
 import android.app.Activity
 import android.content.Context
 import android.content.Intent
-import android.net.Uri
 import androidx.core.net.toUri
 import com.lagradost.api.Log
 import com.lagradost.cloudstream3.actions.OpenInAppAction
@@ -18,6 +17,9 @@ import com.lagradost.cloudstream3.utils.ExtractorLinkType
 // https://github.com/mpv-android/mpv-android/blob/0eb3cdc6f1632636b9c30d52ec50e4b017661980/app/src/main/java/is/xyz/mpv/MPVActivity.kt#L904
 // https://mpv-android.github.io/mpv-android/intent.html
 
+//https://github.com/marlboro-advance/mpvEx
+class MpvExPackage: MpvPackage("mpvEx","app.marlboroadvance.mpvex","app.marlboroadvance.mpvex.ui.player.PlayerActivity")
+
 class MpvYTDLPackage : MpvPackage("MPV YTDL", "is.xyz.mpv.ytdl") {
     override val sourceTypes = setOf(
         ExtractorLinkType.VIDEO,
@@ -26,10 +28,10 @@ class MpvYTDLPackage : MpvPackage("MPV YTDL", "is.xyz.mpv.ytdl") {
     )
 }
 
-open class MpvPackage(appName: String = "MPV", packageName: String = "is.xyz.mpv"): OpenInAppAction(
+open class MpvPackage(appName: String = "MPV", packageName: String = "is.xyz.mpv",intentClass:String = "is.xyz.mpv.MPVActivity"): OpenInAppAction(
     txt(appName),
     packageName,
-    "is.xyz.mpv.MPVActivity"
+    intentClass
 ) {
     override val oneSource = true // mpv has poor playlist support on TV
     override suspend fun putExtra(
@@ -44,7 +46,7 @@ open class MpvPackage(appName: String = "MPV", packageName: String = "is.xyz.mpv
             putExtra("title", video.name)
 
             if (index != null) {
-                setDataAndType(Uri.parse(result.links.getOrNull(index)?.url ?: return), "video/*")
+                setDataAndType((result.links.getOrNull(index)?.url ?: return).toUri(), "video/*")
             } else {
                 makeTempM3U8Intent(context, this, result)
             }

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

@@ -0,0 +1,75 @@
+package com.lagradost.cloudstream3.actions.temp
+
+import android.app.Activity
+import android.content.Context
+import android.content.Intent
+import androidx.core.net.toUri
+import com.lagradost.api.Log
+import com.lagradost.cloudstream3.actions.OpenInAppAction
+import com.lagradost.cloudstream3.actions.updateDurationAndPosition
+import com.lagradost.cloudstream3.isEpisodeBased
+import com.lagradost.cloudstream3.ui.result.LinkLoadingResult
+import com.lagradost.cloudstream3.ui.result.ResultEpisode
+import com.lagradost.cloudstream3.utils.DataStoreHelper.getViewPos
+import com.lagradost.cloudstream3.utils.txt
+
+/** https://github.com/Riteshp2001/mpvRx
+ *
+ * https://github.com/Riteshp2001/mpvRx/blob/00e0c5e803ab53e5757426cbf2248448ba1f49bf/app/src/main/java/app/gyrolet/mpvrx/utils/media/MediaUtils.kt#L132
+ * https://github.com/Riteshp2001/mpvRx/blob/00e0c5e803ab53e5757426cbf2248448ba1f49bf/app/src/main/java/app/gyrolet/mpvrx/utils/media/MediaUtils.kt#L56
+ * */
+class MpvRxPackage : OpenInAppAction(
+    appName = txt("mpvRx"),
+    packageName = "app.gyrolet.mpvrx",
+    intentClass = "app.gyrolet.mpvrx.ui.player.PlayerActivity"
+) {
+    override val oneSource = true
+    override suspend fun putExtra(
+        context: Context,
+        intent: Intent,
+        video: ResultEpisode,
+        result: LinkLoadingResult,
+        index: Int?
+    ) {
+        intent.apply {
+            putExtra("title", video.name)
+            val link = result.links[index!!]
+            val headers = link.headers
+
+            setData(link.url.toUri())
+            if (headers.isNotEmpty()) {
+                // PlayerActivity expects a flat array: [key1, value1, key2, value2, ...]
+                val flat = headers.entries.flatMap { listOf(it.key, it.value) }.toTypedArray()
+                intent.putExtra("headers", flat)
+            }
+            /*val subs = result.subs // disabled due to https://github.com/Riteshp2001/mpvRx/issues/146
+            intent.putExtra("subs", subs.map { it.url.toUri() }.toTypedArray())
+            intent.putExtra(
+                "subs.titles",
+                subs.map { it.name }.toTypedArray(),
+            )
+            intent.putExtra(
+                "subs.langs",
+                subs.map { it.languageCode }.toTypedArray(),
+            )
+            val selected = subs.firstOrNull { it.matchesLanguageCode("en") }?.url?.toUri()
+            intent.putExtra("subs.enable", selected?.let { arrayOf(it) } ?: arrayOf<Uri>() )*/
+
+            if (video.tvType.isEpisodeBased()) {
+                video.season?.let { intent.putExtra("introdb_season", it) }
+                video.episode.let { intent.putExtra("introdb_episode", it) }
+            }
+
+            val position = getViewPos(video.id)?.position
+            if (position != null)
+                putExtra("position", position.toInt())
+        }
+    }
+
+    override fun onResult(activity: Activity, intent: Intent?) {
+        val position = intent?.getIntExtra("position", -1) ?: -1
+        val duration = intent?.getIntExtra("duration", -1) ?: -1
+        Log.d("MPV", "Position: $position, Duration: $duration")
+        updateDurationAndPosition(position.toLong(), duration.toLong())
+    }
+}

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

@@ -0,0 +1,35 @@
+package com.lagradost.cloudstream3.actions.temp
+
+import android.app.Activity
+import android.content.Context
+import android.content.Intent
+import androidx.core.net.toUri
+import com.lagradost.cloudstream3.actions.OpenInAppAction
+import com.lagradost.cloudstream3.ui.result.LinkLoadingResult
+import com.lagradost.cloudstream3.ui.result.ResultEpisode
+import com.lagradost.cloudstream3.utils.ExtractorLinkType
+import com.lagradost.cloudstream3.utils.txt
+
+/** https://github.com/anilbeesetti/nextplayer */
+class NextPlayerPackage : OpenInAppAction(
+    appName = txt("NextPlayer"),
+    packageName = "dev.anilbeesetti.nextplayer",
+    intentClass = "dev.anilbeesetti.nextplayer.feature.player.PlayerActivity"
+) {
+    override val sourceTypes: Set<ExtractorLinkType> =
+        setOf(ExtractorLinkType.VIDEO, ExtractorLinkType.M3U8, ExtractorLinkType.DASH)
+
+    override val oneSource: Boolean = true
+
+    override suspend fun putExtra(
+        context: Context,
+        intent: Intent,
+        video: ResultEpisode,
+        result: LinkLoadingResult,
+        index: Int?
+    ) {
+        intent.data = result.links[index!!].url.toUri()
+    }
+
+    override fun onResult(activity: Activity, intent: Intent?) = Unit
+}

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

@@ -0,0 +1,44 @@
+package com.lagradost.cloudstream3.actions.temp
+
+import android.app.Activity
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import androidx.core.net.toUri
+import com.lagradost.cloudstream3.actions.OpenInAppAction
+import com.lagradost.cloudstream3.ui.result.LinkLoadingResult
+import com.lagradost.cloudstream3.ui.result.ResultEpisode
+import com.lagradost.cloudstream3.utils.txt
+
+/** https://github.com/Kindness-Kismet/only_player/tree/main
+ * https://github.com/Kindness-Kismet/only_player/blob/main/feature/player/src/main/java/one/only/player/feature/player/PlayerActivity.kt */
+class OnlyPlayer : OpenInAppAction(
+    txt("Only Player"),
+    "one.only.player",
+    intentClass = "one.only.player.feature.player.PlayerActivity"
+) {
+    override val oneSource = true
+    override suspend fun putExtra(
+        context: Context,
+        intent: Intent,
+        video: ResultEpisode,
+        result: LinkLoadingResult,
+        index: Int?
+    ) {
+        /** https://github.com/Kindness-Kismet/only_player/blob/d3f55049a2913fa762d31b311146073cc2da46cb/app/src/main/java/one/only/player/navigation/CloudNavGraph.kt#L39 */
+        intent.apply {
+            val link = result.links[index!!]
+            setData(link.url.toUri())
+
+            putExtra("headers", Bundle().apply {
+                for ((key, value) in link.headers) {
+                    putExtra(key, value)
+                }
+            })
+        }
+    }
+
+    override fun onResult(activity: Activity, intent: Intent?) {
+        /* onResult does not get called */
+    }
+}

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

@@ -2,7 +2,7 @@ package com.lagradost.cloudstream3.actions.temp
 
 import android.content.Context
 import android.content.Intent
-import android.net.Uri
+import androidx.core.net.toUri
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.actions.VideoClickAction
 import com.lagradost.cloudstream3.ui.result.LinkLoadingResult
@@ -33,7 +33,7 @@ class PlayInBrowserAction: VideoClickAction() {
     ) {
         val link = result.links.getOrNull(index ?: 0) ?: return
         val i = Intent(Intent.ACTION_VIEW)
-        i.data = Uri.parse(link.url)
+        i.data = link.url.toUri()
         launch(i)
     }
 }

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

@@ -0,0 +1,65 @@
+package com.lagradost.cloudstream3.actions.temp
+
+import android.app.Activity
+import android.content.Context
+import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.actions.VideoClickAction
+import com.lagradost.cloudstream3.ui.player.ExtractorUri
+import com.lagradost.cloudstream3.ui.player.GeneratorPlayer
+import com.lagradost.cloudstream3.ui.player.LOADTYPE_INAPP
+import com.lagradost.cloudstream3.ui.player.SubtitleData
+import com.lagradost.cloudstream3.ui.player.VideoGenerator
+import com.lagradost.cloudstream3.ui.result.LinkLoadingResult
+import com.lagradost.cloudstream3.ui.result.ResultEpisode
+import com.lagradost.cloudstream3.utils.ExtractorLink
+import com.lagradost.cloudstream3.utils.ExtractorLinkType
+import com.lagradost.cloudstream3.utils.UIHelper.navigate
+import com.lagradost.cloudstream3.utils.txt
+
+class PlayMirrorAction : VideoClickAction() {
+    override val name = txt(R.string.episode_action_play_mirror)
+
+    override val oneSource = true
+
+    override val isPlayer = true
+
+    override val sourceTypes: Set<ExtractorLinkType> = LOADTYPE_INAPP
+
+    override fun shouldShow(context: Context?, video: ResultEpisode?) = true
+
+    override suspend fun runAction(
+        context: Context?,
+        video: ResultEpisode,
+        result: LinkLoadingResult,
+        index: Int?
+    ) {
+        //Implemented a generator to handle the single
+        val activity = context as? Activity ?: return
+        val link = index?.let { result.links[it] }
+        val generatorMirror = object : VideoGenerator<ResultEpisode>(listOf(video)) {
+            override val hasCache: Boolean = false
+            override val canSkipLoading: Boolean = false
+            override fun getId(index: Int): Int = video.id
+
+            override suspend fun generateLinks(
+                clearCache: Boolean,
+                sourceTypes: Set<ExtractorLinkType>,
+                callback: (Pair<ExtractorLink?, ExtractorUri?>) -> Unit,
+                subtitleCallback: (SubtitleData) -> Unit,
+                offset: Int,
+                isCasting: Boolean
+            ): Boolean {
+                index?.let { callback(link to null) }
+                result.subs.forEach { subtitle -> subtitleCallback(subtitle) }
+                return true
+            }
+        }
+
+        activity.navigate(
+            R.id.global_to_navigation_player,
+            GeneratorPlayer.newInstance(
+                generatorMirror, 0, result.syncData
+            )
+        )
+    }
+}

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

@@ -6,7 +6,7 @@ import android.content.Intent
 import android.os.Build
 import androidx.core.net.toUri
 import com.lagradost.api.Log
-import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.getKey
 import com.lagradost.cloudstream3.actions.OpenInAppAction
 import com.lagradost.cloudstream3.actions.makeTempM3U8Intent
 import com.lagradost.cloudstream3.actions.updateDurationAndPosition
@@ -19,7 +19,12 @@ import com.lagradost.cloudstream3.utils.DataStoreHelper.getViewPos
 // https://github.com/videolan/vlc-android/blob/3706c4be2da6800b3d26344fc04fab03ffa4b860/application/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.kt#L1898
 // https://wiki.videolan.org/Android_Player_Intents/
 
-class VlcPackage: OpenInAppAction(
+class VlcNightlyPackage : VlcPackage() {
+    override val packageName = "org.videolan.vlc.debug"
+    override val appName = txt("VLC Nightly")
+}
+
+open class VlcPackage: OpenInAppAction(
     appName = txt("VLC"),
     packageName = "org.videolan.vlc",
     intentClass = if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
@@ -55,7 +60,7 @@ class VlcPackage: OpenInAppAction(
         intent.putExtra("secure_uri", true)
         intent.putExtra("title", video.name)
 
-        val subsLang = getKey(SUBTITLE_AUTO_SELECT_KEY) ?: "en"
+        val subsLang = getKey<String>(SUBTITLE_AUTO_SELECT_KEY) ?: "en"
         result.subs.firstOrNull {
             subsLang == it.languageCode
         }?.let {

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

@@ -3,7 +3,6 @@ package com.lagradost.cloudstream3.actions.temp
 import android.app.Activity
 import android.content.Context
 import android.content.Intent
-import android.net.Uri
 import android.os.Bundle
 import androidx.core.net.toUri
 import com.lagradost.cloudstream3.USER_AGENT
@@ -38,7 +37,7 @@ class WebVideoCastPackage: OpenInAppAction(
         val link = result.links[index ?: 0]
 
         intent.apply {
-            setDataAndType(Uri.parse(link.url), "video/*")
+            setDataAndType(link.url.toUri(), "video/*")
 
             val title = video.name ?: video.headerName
 

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

@@ -1,7 +1,7 @@
 package com.lagradost.cloudstream3.actions.temp.fcast
 
 import android.content.Context
-import com.lagradost.cloudstream3.AcraApplication.Companion.getActivity
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.getActivity
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.USER_AGENT
 import com.lagradost.cloudstream3.actions.VideoClickAction

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

@@ -7,6 +7,7 @@ import android.net.nsd.NsdServiceInfo
 import android.os.Build
 import android.os.ext.SdkExtensions
 import android.util.Log
+import com.lagradost.cloudstream3.mvvm.safe
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
 
 class FcastManager {
@@ -72,18 +73,25 @@ class FcastManager {
         }
 
         override fun onServiceFound(serviceInfo: NsdServiceInfo?) {
-            if (serviceInfo == null) return
+            // Safe here as, java.lang.NoClassDefFoundError: Failed resolution of: Landroid/net/nsd/NsdManager$ServiceInfoCallback
+            safe {
+                if (serviceInfo == null) return@safe
 
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R && SdkExtensions.getExtensionVersion(
-                    Build.VERSION_CODES.TIRAMISU) >= 7) {
+                        Build.VERSION_CODES.TIRAMISU
-                nsdManager?.registerServiceInfoCallback(serviceInfo,
+                    ) >= 7
+                ) {
+                    nsdManager?.registerServiceInfoCallback(
+                        serviceInfo,
                         Runnable::run,
                         object : NsdManager.ServiceInfoCallback {
                             override fun onServiceInfoCallbackRegistrationFailed(errorCode: Int) {
                                 Log.e(tag, "Service registration failed: $errorCode")
                             }
+
                             override fun onServiceUpdated(serviceInfo: NsdServiceInfo) {
-                            Log.d(tag,
+                                Log.d(
+                                    tag,
                                     "Service updated: ${serviceInfo.serviceName}," +
                                             "Net: ${serviceInfo.hostAddresses.firstOrNull()?.hostAddress}"
                                 )
@@ -92,18 +100,24 @@ class FcastManager {
                                     _currentDevices.add(PublicDeviceInfo(serviceInfo))
                                 }
                             }
+
                             override fun onServiceLost() {
                                 Log.d(tag, "Service lost: ${serviceInfo.serviceName},")
                                 synchronized(_currentDevices) {
                                     _currentDevices.removeIf { it.rawName == serviceInfo.serviceName }
                                 }
                             }
+
                             override fun onServiceInfoCallbackUnregistered() {}
                         })
                 } else {
                     @Suppress("DEPRECATION")
                     nsdManager?.resolveService(serviceInfo, object : ResolveListener {
-                    override fun onResolveFailed(serviceInfo: NsdServiceInfo?, errorCode: Int) {}
+                        override fun onResolveFailed(
+                            serviceInfo: NsdServiceInfo?,
+                            errorCode: Int
+                        ) {
+                        }
 
                         override fun onServiceResolved(serviceInfo: NsdServiceInfo?) {
                             if (serviceInfo == null) return
@@ -120,6 +134,7 @@ class FcastManager {
                     })
                 }
             }
+        }
 
         override fun onServiceLost(serviceInfo: NsdServiceInfo?) {
             if (serviceInfo == null) return
@@ -168,7 +183,8 @@ class PublicDeviceInfo(serviceInfo: NsdServiceInfo) {
     val host: String? = if (
         Build.VERSION.SDK_INT >= Build.VERSION_CODES.R &&
         SdkExtensions.getExtensionVersion(
-            Build.VERSION_CODES.TIRAMISU) >= 7
+            Build.VERSION_CODES.TIRAMISU
+        ) >= 7
     ) {
         serviceInfo.hostAddresses.firstOrNull()?.hostAddress
     } else {

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

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

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

@@ -1,16 +1,68 @@
 package com.lagradost.cloudstream3.mvvm
 
+import android.view.View
+import androidx.activity.ComponentActivity
+import androidx.core.view.doOnAttach
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.LiveData
+import androidx.lifecycle.findViewTreeLifecycleOwner
+import androidx.viewbinding.ViewBinding
+import com.lagradost.cloudstream3.ui.BaseFragment
 
 /** NOTE: Only one observer at a time per value */
-fun <T> LifecycleOwner.observe(liveData: LiveData<T>, action: (t: T) -> Unit) {
+fun <T> ComponentActivity.observe(liveData: LiveData<T>, action: (T) -> Unit) {
-    liveData.removeObservers(this)
+    observeNullable(liveData) { t -> t?.run(action) }
-    liveData.observe(this) { it?.let { t -> action(t) } }
 }
 
 /** NOTE: Only one observer at a time per value */
-fun <T> LifecycleOwner.observeNullable(liveData: LiveData<T>, action: (t: T) -> Unit) {
+fun <T> ComponentActivity.observeNullable(liveData: LiveData<T>, action: (T?) -> Unit) {
     liveData.removeObservers(this)
-    liveData.observe(this) { action(it) }
+    liveData.observe(this, action)
+}
+
+/** NOTE: Only one observer at a time per value */
+fun <T, V : ViewBinding> BaseFragment<V>.observe(liveData: LiveData<T>, action: (T) -> Unit) {
+    observeNullable(liveData) { t -> t?.run(action) }
+}
+
+/**
+ * Attaches an observable to the root binding, instead of the fragment. This is more efficient as
+ * it will not call observe if the view is in the background.
+ *
+ * NOTE: Only one observer at a time per value
+ * */
+fun <T, V : ViewBinding> BaseFragment<V>.observeNullable(
+    liveData: LiveData<T>, action: (T?) -> Unit
+) {
+    val root = this.binding?.root
+    if (root == null) {
+        liveData.removeObservers(this)
+        liveData.observe(this, action)
+    } else {
+        root.doOnAttach { view ->
+            // On attach should make findViewTreeLifecycleOwner non-null, but use "this" just in case
+            val owner: LifecycleOwner = view.findViewTreeLifecycleOwner() ?: this@observeNullable
+            liveData.removeObservers(owner)
+            liveData.observe(owner, action)
+        }
+    }
+}
+
+/** NOTE: Only one observer at a time per value */
+fun <T> View.observe(liveData: LiveData<T>, action: (T) -> Unit) {
+    observeNullable(liveData) { t -> t?.run(action) }
+}
+
+/** NOTE: Only one observer at a time per value */
+fun <T> View.observeNullable(liveData: LiveData<T>, action: (T?) -> Unit) {
+    doOnAttach { view ->
+        // On attach should make findViewTreeLifecycleOwner non-null
+        val owner: LifecycleOwner? = view.findViewTreeLifecycleOwner()
+        if(owner == null) {
+            debugException { "Expected non-null findViewTreeLifecycleOwner" }
+            return@doOnAttach
+        }
+        liveData.removeObservers(owner)
+        liveData.observe(owner, action)
+    }
 }

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

@@ -5,7 +5,7 @@ import android.webkit.CookieManager
 import androidx.annotation.AnyThread
 import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.mvvm.debugWarning
-import com.lagradost.cloudstream3.mvvm.normalSafeApiCall
+import com.lagradost.cloudstream3.mvvm.safe
 import com.lagradost.nicehttp.Requests.Companion.await
 import com.lagradost.nicehttp.cookies
 import kotlinx.coroutines.runBlocking
@@ -32,7 +32,7 @@ class CloudflareKiller : Interceptor {
 
     init {
         // Needs to clear cookies between sessions to generate new cookies.
-        normalSafeApiCall {
+        safe {
             // This can throw an exception on unsupported devices :(
             CookieManager.getInstance().removeAllCookies(null)
         }
@@ -77,7 +77,7 @@ class CloudflareKiller : Interceptor {
     }
 
     private fun getWebViewCookie(url: String): String? {
-        return normalSafeApiCall {
+        return safe {
             CookieManager.getInstance()?.getCookie(url)
         }
     }

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

@@ -2,9 +2,10 @@ package com.lagradost.cloudstream3.network
 
 import android.content.Context
 import androidx.preference.PreferenceManager
+import com.lagradost.cloudstream3.Prerelease
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.USER_AGENT
-import com.lagradost.cloudstream3.mvvm.normalSafeApiCall
+import com.lagradost.cloudstream3.mvvm.safe
 import com.lagradost.nicehttp.Requests
 import com.lagradost.nicehttp.ignoreAllSSLErrors
 import okhttp3.Cache
@@ -15,19 +16,36 @@ import org.conscrypt.Conscrypt
 import java.io.File
 import java.security.Security
 
+// Backwards compatible constructor, mark as deprecated later
 fun Requests.initClient(context: Context) {
     this.baseClient = buildDefaultClient(context)
 }
 
+/** Only use ignoreSSL if you know what you are doing*/
+fun Requests.initClient(context: Context, ignoreSSL: Boolean = false) {
+    this.baseClient = buildDefaultClient(context, ignoreSSL)
+}
+
+
+// Backwards compatible constructor, mark as deprecated later
 fun buildDefaultClient(context: Context): OkHttpClient {
-    normalSafeApiCall { Security.insertProviderAt(Conscrypt.newProvider(), 1) }
+    return buildDefaultClient(context, false)
+}
+
+/** Only use ignoreSSL if you know what you are doing*/
+fun buildDefaultClient(context: Context, ignoreSSL: Boolean = false): OkHttpClient {
+    safe { Security.insertProviderAt(Conscrypt.newProvider(), 1) }
     
     val settingsManager = PreferenceManager.getDefaultSharedPreferences(context)
     val dns = settingsManager.getInt(context.getString(R.string.dns_pref), 0)
     val baseClient = OkHttpClient.Builder()
         .followRedirects(true)
         .followSslRedirects(true)
-        .ignoreAllSSLErrors()
+        .apply {
+            if (ignoreSSL) {
+                ignoreAllSSLErrors()
+            }
+        }
         .cache(
             // Note that you need to add a ResponseInterceptor to make this 100% active.
             // The server response dictates if and when stuff should be cached.
@@ -52,11 +70,6 @@ fun buildDefaultClient(context: Context): OkHttpClient {
     return baseClient
 }
 
-//val Request.cookies: Map<String, String>
-//    get() {
-//        return this.headers.getCookies("Cookie")
-//    }
-
 private val DEFAULT_HEADERS = mapOf("user-agent" to USER_AGENT)
 
 /**

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

@@ -7,7 +7,6 @@ import com.lagradost.cloudstream3.actions.VideoClickAction
 import com.lagradost.cloudstream3.actions.VideoClickActionHolder
 import kotlin.Throws
 
-
 abstract class Plugin : BasePlugin() {
     /**
      * Called when your Plugin is loaded
@@ -26,10 +25,8 @@ abstract class Plugin : BasePlugin() {
     fun registerVideoClickAction(element: VideoClickAction) {
         Log.i(PLUGIN_TAG, "Adding ${element.name} VideoClickAction")
         element.sourcePlugin = this.filename
-        synchronized(VideoClickActionHolder.allVideoClickActions) {
         VideoClickActionHolder.allVideoClickActions.add(element)
     }
-    }
 
     /**
      * This will contain your resources if you specified requiresResources in gradle

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

@@ -13,6 +13,7 @@ import android.os.Build
 import android.os.Environment
 import android.util.Log
 import android.widget.Toast
+import androidx.annotation.WorkerThread
 import androidx.core.app.ActivityCompat
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
@@ -20,30 +21,32 @@ import androidx.fragment.app.FragmentActivity
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.cloudstream3.APIHolder
 import com.lagradost.cloudstream3.APIHolder.removePluginMapping
-import com.lagradost.cloudstream3.AcraApplication.Companion.getActivity
-import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
-import com.lagradost.cloudstream3.AcraApplication.Companion.removeKey
-import com.lagradost.cloudstream3.AcraApplication.Companion.setKey
 import com.lagradost.cloudstream3.AllLanguagesName
 import com.lagradost.cloudstream3.AutoDownloadMode
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.getKey
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.removeKey
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.setKey
 import com.lagradost.cloudstream3.CommonActivity.showToast
+import com.lagradost.cloudstream3.InternalAPI
 import com.lagradost.cloudstream3.MainAPI
 import com.lagradost.cloudstream3.MainAPI.Companion.settingsForProvider
 import com.lagradost.cloudstream3.MainActivity.Companion.afterPluginsLoadedEvent
+import com.lagradost.cloudstream3.MainActivity.Companion.lastError
 import com.lagradost.cloudstream3.PROVIDER_STATUS_DOWN
 import com.lagradost.cloudstream3.PROVIDER_STATUS_OK
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.TvType
 import com.lagradost.cloudstream3.actions.VideoClickAction
 import com.lagradost.cloudstream3.actions.VideoClickActionHolder
-import com.lagradost.cloudstream3.apmap
+import com.lagradost.cloudstream3.amap
 import com.lagradost.cloudstream3.mvvm.debugPrint
 import com.lagradost.cloudstream3.mvvm.logError
-import com.lagradost.cloudstream3.mvvm.normalSafeApiCall
+import com.lagradost.cloudstream3.mvvm.safe
 import com.lagradost.cloudstream3.plugins.RepositoryManager.ONLINE_PLUGINS_FOLDER
 import com.lagradost.cloudstream3.plugins.RepositoryManager.PREBUILT_REPOSITORIES
 import com.lagradost.cloudstream3.plugins.RepositoryManager.downloadPluginToFile
 import com.lagradost.cloudstream3.plugins.RepositoryManager.getRepoPlugins
+import com.lagradost.cloudstream3.plugins.RepositoryManager.sha256
 import com.lagradost.cloudstream3.ui.settings.extensions.REPOSITORIES_KEY
 import com.lagradost.cloudstream3.ui.settings.extensions.RepositoryData
 import com.lagradost.cloudstream3.utils.AppContextUtils.getApiProviderLangSettings
@@ -52,12 +55,14 @@ import com.lagradost.cloudstream3.utils.Coroutines.main
 import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.UIHelper.colorFromAttribute
 import com.lagradost.cloudstream3.utils.UiText
-import com.lagradost.cloudstream3.utils.VideoDownloadManager.sanitizeFilename
+import com.lagradost.cloudstream3.utils.downloader.DownloadFileManagement.sanitizeFilename
 import com.lagradost.cloudstream3.utils.extractorApis
 import com.lagradost.cloudstream3.utils.txt
 import dalvik.system.PathClassLoader
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import java.io.File
 import java.io.InputStreamReader
 
@@ -70,13 +75,15 @@ const val EXTENSIONS_CHANNEL_NAME = "Extensions"
 const val EXTENSIONS_CHANNEL_DESCRIPT = "Extension notification channel"
 
 // Data class for internal storage
+@Serializable
 data class PluginData(
-    @JsonProperty("internalName") val internalName: String,
+    @JsonProperty("internalName") @SerialName("internalName") val internalName: String,
-    @JsonProperty("url") val url: String?,
+    @JsonProperty("url") @SerialName("url") val url: String?,
-    @JsonProperty("isOnline") val isOnline: Boolean,
+    @JsonProperty("isOnline") @SerialName("isOnline") val isOnline: Boolean,
-    @JsonProperty("filePath") val filePath: String,
+    @JsonProperty("filePath") @SerialName("filePath") val filePath: String,
-    @JsonProperty("version") val version: Int,
+    @JsonProperty("version") @SerialName("version") val version: Int,
 ) {
+    @WorkerThread
     fun toSitePlugin(): SitePlugin {
         return SitePlugin(
             this.filePath,
@@ -91,7 +98,9 @@ data class PluginData(
             null,
             null,
             null,
-            File(this.filePath).length()
+            File(this.filePath).length(),
+            // No file hash for local plugins. Local plugins have no use for the hash, and it's expensive to compute.
+            null
         )
     }
 }
@@ -145,7 +154,7 @@ object PluginManager {
                 !it.filePath.contains(repositoryPath)
             }
             val file = File(repositoryPath)
-            normalSafeApiCall {
+            safe {
                 if (file.exists()) file.deleteRecursively()
             }
             setKey(PLUGINS_KEY, plugins)
@@ -167,11 +176,11 @@ object PluginManager {
 
 
     fun getPluginsOnline(): Array<PluginData> {
-        return getKey(PLUGINS_KEY) ?: emptyArray()
+        return getKey<Array<PluginData>>(PLUGINS_KEY) ?: emptyArray()
     }
 
     fun getPluginsLocal(): Array<PluginData> {
-        return getKey(PLUGINS_KEY_LOCAL) ?: emptyArray()
+        return getKey<Array<PluginData>>(PLUGINS_KEY_LOCAL) ?: emptyArray()
     }
 
     private val CLOUD_STREAM_FOLDER =
@@ -215,17 +224,17 @@ object PluginManager {
     // Helper class for updateAllOnlinePluginsAndLoadThem
     data class OnlinePluginData(
         val savedData: PluginData,
-        val onlineData: Pair<String, SitePlugin>,
+        val onlineData: PluginWrapper,
     ) {
         val isOutdated =
-            onlineData.second.version > savedData.version || onlineData.second.version == PLUGIN_VERSION_ALWAYS_UPDATE
+            onlineData.plugin.version > savedData.version || onlineData.plugin.version == PLUGIN_VERSION_ALWAYS_UPDATE
-        val isDisabled = onlineData.second.status == PROVIDER_STATUS_DOWN
+        val isDisabled = onlineData.plugin.status == PROVIDER_STATUS_DOWN
 
         fun validOnlineData(context: Context): Boolean {
             return getPluginPath(
                 context,
                 savedData.internalName,
-                onlineData.first
+                onlineData.repositoryData.url
             ).absolutePath == savedData.filePath
         }
     }
@@ -255,29 +264,37 @@ object PluginManager {
      * 2. If disabled do nothing
      * 3. If outdated download and load the plugin
      * 4. Else load the plugin normally
-     **/
+     *
-    fun updateAllOnlinePluginsAndLoadThem(activity: Activity) {
+     * DO NOT USE THIS IN A PLUGIN! It may case an infinite recursive loop lagging or crashing everyone's devices.
+     * If you use it from a plugin, do not expect a stable jvmName, SO DO NOT USE IT!
+     */
+    @Suppress("FunctionName")
+    @InternalAPI
+    @Throws
+    suspend fun ___DO_NOT_CALL_FROM_A_PLUGIN_updateAllOnlinePluginsAndLoadThem(activity: Activity) {
+        assertNonRecursiveCallstack()
+
         // Load all plugins as fast as possible!
-        loadAllOnlinePlugins(activity)
+        ___DO_NOT_CALL_FROM_A_PLUGIN_loadAllOnlinePlugins(activity)
         afterPluginsLoadedEvent.invoke(false)
 
         val urls = (getKey<Array<RepositoryData>>(REPOSITORIES_KEY)
             ?: emptyArray()) + PREBUILT_REPOSITORIES
 
-        val onlinePlugins = urls.toList().apmap {
+        val onlinePlugins = urls.toList().amap {
-            getRepoPlugins(it.url)?.toList() ?: emptyList()
+            getRepoPlugins(it) ?: emptyList()
-        }.flatten().distinctBy { it.second.url }
+        }.flatten().distinctBy { it.plugin.url }
 
         // Iterates over all offline plugins, compares to remote repo and returns the plugins which are outdated
         val outdatedPlugins = getPluginsOnline().map { savedData ->
             onlinePlugins
-                .filter { onlineData -> savedData.internalName == onlineData.second.internalName }
+                .filter { onlineData -> savedData.internalName == onlineData.plugin.internalName }
                 .map { onlineData ->
                     OnlinePluginData(savedData, onlineData)
                 }.filter {
                     it.validOnlineData(activity)
                 }
-        }.flatten().distinctBy { it.onlineData.second.url }
+        }.flatten().distinctBy { it.onlineData.plugin.url }
 
         debugPrint {
             "Outdated plugins: ${outdatedPlugins.filter { it.isOutdated }}"
@@ -285,20 +302,21 @@ object PluginManager {
 
         val updatedPlugins = mutableListOf<String>()
 
-        outdatedPlugins.apmap { pluginData ->
+        outdatedPlugins.amap { pluginData ->
             if (pluginData.isDisabled) {
                 //updatedPlugins.add(activity.getString(R.string.single_plugin_disabled, pluginData.onlineData.second.name))
                 unloadPlugin(pluginData.savedData.filePath)
             } else if (pluginData.isOutdated) {
                 downloadPlugin(
                     activity,
-                    pluginData.onlineData.second.url,
+                    pluginData.onlineData.plugin.url,
+                    pluginData.onlineData.plugin.fileHash,
                     pluginData.savedData.internalName,
                     File(pluginData.savedData.filePath),
                     true
                 ).let { success ->
                     if (success)
-                        updatedPlugins.add(pluginData.onlineData.second.name)
+                        updatedPlugins.add(pluginData.onlineData.plugin.name)
                 }
             }
         }
@@ -324,21 +342,32 @@ object PluginManager {
      * 1. Gets all online data from online plugins repo
      * 2. Fetch all not downloaded plugins
      * 3. Download them and reload plugins
-     **/
+     *
-    fun downloadNotExistingPluginsAndLoad(activity: Activity, mode: AutoDownloadMode) {
+     * DO NOT USE THIS IN A PLUGIN! It may case an infinite recursive loop lagging or crashing everyone's devices.
+     * If you use it from a plugin, do not expect a stable jvmName, SO DO NOT USE IT!
+     */
+    @Suppress("FunctionName")
+    @InternalAPI
+    @Throws
+    suspend fun ___DO_NOT_CALL_FROM_A_PLUGIN_downloadNotExistingPluginsAndLoad(
+        activity: Activity,
+        mode: AutoDownloadMode
+    ) {
+        assertNonRecursiveCallstack()
+
         val newDownloadPlugins = mutableListOf<String>()
         val urls = (getKey<Array<RepositoryData>>(REPOSITORIES_KEY)
             ?: emptyArray()) + PREBUILT_REPOSITORIES
-        val onlinePlugins = urls.toList().apmap {
+        val onlinePlugins = urls.toList().amap {
-            getRepoPlugins(it.url)?.toList() ?: emptyList()
+            getRepoPlugins(it)?.toList() ?: emptyList()
-        }.flatten().distinctBy { it.second.url }
+        }.flatten().distinctBy { it.plugin.url }
 
         val providerLang = activity.getApiProviderLangSettings()
         //Log.i(TAG, "providerLang => ${providerLang.toJson()}")
 
         // Iterate online repos and returns not downloaded plugins
         val notDownloadedPlugins = onlinePlugins.mapNotNull { onlineData ->
-            val sitePlugin = onlineData.second
+            val sitePlugin = onlineData.plugin
             val tvtypes = sitePlugin.tvTypes ?: listOf()
 
             //Don't include empty urls
@@ -350,7 +379,7 @@ object PluginManager {
             }
 
             //Omit already existing plugins
-            if (getPluginPath(activity, sitePlugin.internalName, onlineData.first).exists()) {
+            if (getPluginPath(activity, sitePlugin.internalName, onlineData.repositoryData.url).exists()) {
                 Log.i(TAG, "Skip > ${sitePlugin.internalName}")
                 return@mapNotNull null
             }
@@ -389,16 +418,17 @@ object PluginManager {
         }
         //Log.i(TAG, "notDownloadedPlugins => ${notDownloadedPlugins.toJson()}")
 
-        notDownloadedPlugins.apmap { pluginData ->
+        notDownloadedPlugins.amap { pluginData ->
             downloadPlugin(
                 activity,
-                pluginData.onlineData.second.url,
+                pluginData.onlineData.plugin.url,
+                pluginData.onlineData.plugin.fileHash,
                 pluginData.savedData.internalName,
-                pluginData.onlineData.first,
+                pluginData.onlineData.repositoryData.url,
                 !pluginData.isDisabled
             ).let { success ->
                 if (success)
-                    newDownloadPlugins.add(pluginData.onlineData.second.name)
+                    newDownloadPlugins.add(pluginData.onlineData.plugin.name)
             }
         }
 
@@ -414,12 +444,27 @@ object PluginManager {
         Log.i(TAG, "Plugin download done!")
     }
 
+    @Throws
+    private fun assertNonRecursiveCallstack() {
+        if (Thread.currentThread().stackTrace.any { it.methodName == "loadPlugin" }) {
+            throw Error("You tried to call a function that will recursively call loadPlugin, this will cause crashes or memory leaks. Do not do this, there is better ways to implement the feature than reloading plugins. Are you sure you read the compile error or docs?")
+        }
+    }
+
     /**
      * Use updateAllOnlinePluginsAndLoadThem
-     * */
+     *
-    fun loadAllOnlinePlugins(context: Context) {
+     * DO NOT USE THIS IN A PLUGIN! It may case an infinite recursive loop lagging or crashing everyone's devices.
+     * If you use it from a plugin, do not expect a stable jvmName, SO DO NOT USE IT!
+     */
+    @Suppress("FunctionName")
+    @InternalAPI
+    @Throws
+    suspend fun ___DO_NOT_CALL_FROM_A_PLUGIN_loadAllOnlinePlugins(context: Context) {
+        assertNonRecursiveCallstack()
+
         // Load all plugins as fast as possible!
-        (getPluginsOnline()).toList().apmap { pluginData ->
+        (getPluginsOnline()).toList().amap { pluginData ->
             loadPlugin(
                 context,
                 File(pluginData.filePath),
@@ -430,27 +475,46 @@ object PluginManager {
 
     /**
      * Reloads all local plugins and forces a page update, used for hot reloading with deployWithAdb
-     **/
+     *
-    fun hotReloadAllLocalPlugins(activity: FragmentActivity?) {
+     * DO NOT USE THIS IN A PLUGIN! It may case an infinite recursive loop lagging or crashing everyone's devices.
+     * If you use it from a plugin, do not expect a stable jvmName, SO DO NOT USE IT!
+     */
+    @Suppress("FunctionName")
+    @InternalAPI
+    @Throws
+    suspend fun ___DO_NOT_CALL_FROM_A_PLUGIN_hotReloadAllLocalPlugins(activity: FragmentActivity?) {
+        assertNonRecursiveCallstack()
+
         Log.d(TAG, "Reloading all local plugins!")
         if (activity == null) return
         getPluginsLocal().forEach {
             unloadPlugin(it.filePath)
         }
-        loadAllLocalPlugins(activity, true)
+        ___DO_NOT_CALL_FROM_A_PLUGIN_loadAllLocalPlugins(activity, true)
     }
 
     /**
      * @param forceReload see afterPluginsLoadedEvent, basically a way to load all local plugins
      * and reload all pages even if they are previously valid
-     **/
+     *
-    fun loadAllLocalPlugins(context: Context, forceReload: Boolean) {
+     * DO NOT USE THIS IN A PLUGIN! It may case an infinite recursive loop lagging or crashing everyone's devices.
+     * If you use it from a plugin, do not expect a stable jvmName, SO DO NOT USE IT!
+     */
+    @Suppress("FunctionName")
+    @InternalAPI
+    @Throws
+    suspend fun ___DO_NOT_CALL_FROM_A_PLUGIN_loadAllLocalPlugins(context: Context, forceReload: Boolean) {
+        assertNonRecursiveCallstack()
+
         val dir = File(LOCAL_PLUGINS_PATH)
 
         if (!dir.exists()) {
             val res = dir.mkdirs()
             if (!res) {
                 Log.w(TAG, "Failed to create local directories")
+                // We have tried to load local plugins, but exit early.
+                // This needs to be true to prevent the downloader waiting for plugins.
+                loadedLocalPlugins = true
                 return
             }
         }
@@ -471,7 +535,7 @@ object PluginManager {
         // Make sure all local plugins are fully refreshed.
         removeKey(PLUGINS_KEY_LOCAL)
 
-        sortedPlugins?.sortedBy { it.name }?.apmap { file ->
+        sortedPlugins?.sortedBy { it.name }?.amap { file ->
             try {
                 val destinationFile = File(pluginDirectory, file.name)
 
@@ -479,7 +543,8 @@ object PluginManager {
                 // has been modified (check file length and modification time).
                 if (!destinationFile.exists() ||
                     destinationFile.length() != file.length() ||
-                    destinationFile.lastModified() != file.lastModified()) {
+                    destinationFile.lastModified() != file.lastModified()
+                ) {
 
                     // Copy the file to the app-specific plugin directory
                     file.copyTo(destinationFile, overwrite = true)
@@ -502,14 +567,19 @@ object PluginManager {
         afterPluginsLoadedEvent.invoke(forceReload)
     }
 
+    /** @return true if safe mode is enabled in any possible way. */
+    fun isSafeMode(): Boolean {
+        return checkSafeModeFile() || lastError != null
+    }
+
     /**
      * This can be used to override any extension loading to fix crashes!
      * @return true if safe mode file is present
      **/
     fun checkSafeModeFile(): Boolean {
-        return normalSafeApiCall {
+        return safe {
             val folder = File(CLOUD_STREAM_FOLDER)
-            if (!folder.exists()) return@normalSafeApiCall false
+            if (!folder.exists()) return@safe false
             val files = folder.listFiles { _, name ->
                 name.equals("safe", ignoreCase = true)
             }
@@ -546,7 +616,7 @@ object PluginManager {
                     return false
                 }
                 InputStreamReader(stream).use { reader ->
-                    manifest = parseJson(reader, BasePlugin.Manifest::class.java)
+                    manifest = parseJson<BasePlugin.Manifest>(reader.readText())
                 }
             }
 
@@ -587,9 +657,15 @@ object PluginManager {
                     context.resources.configuration
                 )
             }
+            synchronized(plugins) {
                 plugins[filePath] = pluginInstance
+            }
+            synchronized(classLoaders) {
                 classLoaders[loader] = pluginInstance
+            }
+            synchronized(urlPlugins) {
                 urlPlugins[data.url ?: filePath] = pluginInstance
+            }
             if (pluginInstance is Plugin) {
                 pluginInstance.load(context)
             } else {
@@ -601,7 +677,7 @@ object PluginManager {
         } catch (e: Throwable) {
             Log.e(TAG, "Failed to load $file: ${Log.getStackTraceString(e)}")
             showToast(
-                context.getActivity(),
+                // context.getActivity(), // we are not always on the main thread
                 context.getString(R.string.plugin_load_fail).format(fileName),
                 Toast.LENGTH_LONG
             )
@@ -625,26 +701,34 @@ object PluginManager {
         }
 
         // remove all registered apis
-        synchronized(APIHolder.apis) {
         APIHolder.apis.filter { api -> api.sourcePlugin == plugin.filename }.forEach {
             removePluginMapping(it)
         }
-        }
+
-        synchronized(APIHolder.allProviders) {
+        APIHolder.allProviders.withLock {
-            APIHolder.allProviders.removeIf { provider: MainAPI -> provider.sourcePlugin == plugin.filename }
+            APIHolder.allProviders.removeAll { provider -> provider.sourcePlugin == plugin.filename }
         }
 
-        extractorApis.removeIf { provider: ExtractorApi -> provider.sourcePlugin == plugin.filename }
+        extractorApis.withLock {
-
+            extractorApis.removeAll { provider -> provider.sourcePlugin == plugin.filename }
-        synchronized(VideoClickActionHolder.allVideoClickActions) {
-            VideoClickActionHolder.allVideoClickActions.removeIf { action: VideoClickAction -> action.sourcePlugin == plugin.filename }
         }
 
+        VideoClickActionHolder.allVideoClickActions.withLock {
+            VideoClickActionHolder.allVideoClickActions.removeAll { action -> action.sourcePlugin == plugin.filename }
+        }
+
+        synchronized(classLoaders) {
             classLoaders.values.removeIf { v -> v == plugin }
+        }
 
+        synchronized(plugins) {
             plugins.remove(absolutePath)
+        }
+
+        synchronized(urlPlugins) {
             urlPlugins.values.removeIf { v -> v == plugin }
         }
+    }
 
     /**
      * Spits out a unique and safe filename based on name.
@@ -673,25 +757,27 @@ object PluginManager {
     suspend fun downloadPlugin(
         activity: Activity,
         pluginUrl: String,
+        pluginHash: String?,
         internalName: String,
         repositoryUrl: String,
         loadPlugin: Boolean
     ): Boolean {
         val file = getPluginPath(activity, internalName, repositoryUrl)
-        return downloadPlugin(activity, pluginUrl, internalName, file, loadPlugin)
+        return downloadPlugin(activity, pluginUrl, pluginHash, internalName, file, loadPlugin)
     }
 
     suspend fun downloadPlugin(
         activity: Activity,
         pluginUrl: String,
+        pluginHash: String?,
         internalName: String,
         file: File,
-        loadPlugin: Boolean
+        loadPlugin: Boolean,
     ): Boolean {
         try {
             Log.d(TAG, "Downloading plugin: $pluginUrl to ${file.absolutePath}")
             // The plugin file needs to be salted with the repository url hash as to allow multiple repositories with the same internal plugin names
-            val newFile = downloadPluginToFile(pluginUrl, file) ?: return false
+            val newFile = downloadPluginToFile(activity, pluginUrl, file, pluginHash) ?: return false
 
             val data = PluginData(
                 internalName,
@@ -734,6 +820,84 @@ object PluginManager {
         }
     }
 
+    /**
+     * DO NOT USE THIS IN A PLUGIN! It may case an infinite recursive loop lagging or crashing everyone's devices.
+     * If you use it from a plugin, do not expect a stable jvmName, SO DO NOT USE IT!
+     */
+    @Suppress("FunctionName")
+    @InternalAPI
+    @Throws
+    suspend fun ___DO_NOT_CALL_FROM_A_PLUGIN_manuallyReloadAndUpdatePlugins(activity: Activity) {
+        assertNonRecursiveCallstack()
+
+        showToast(activity.getString(R.string.starting_plugin_update_manually), Toast.LENGTH_LONG)
+
+        ___DO_NOT_CALL_FROM_A_PLUGIN_loadAllOnlinePlugins(activity)
+        afterPluginsLoadedEvent.invoke(false)
+
+        val urls = (getKey<Array<RepositoryData>>(REPOSITORIES_KEY)
+            ?: emptyArray()) + PREBUILT_REPOSITORIES
+        val onlinePlugins = urls.toList().amap {
+            getRepoPlugins(it) ?: emptyList()
+        }.flatten().distinctBy { it.plugin.url }
+
+        val allPlugins = getPluginsOnline().flatMap { savedData ->
+            onlinePlugins
+                .filter { it.plugin.internalName == savedData.internalName }
+                .mapNotNull { onlineData ->
+                    OnlinePluginData(savedData, onlineData).takeIf { it.validOnlineData(activity) }
+                }
+        }.distinctBy { it.onlineData.plugin.url }
+
+        val updatedPlugins = mutableListOf<String>()
+
+        allPlugins.amap { pluginData ->
+            if (pluginData.isDisabled) {
+                Log.e(
+                    "PluginManager",
+                    "Unloading disabled plugin: ${pluginData.onlineData.plugin.name}"
+                )
+                unloadPlugin(pluginData.savedData.filePath)
+            } else {
+                val existingFile = File(pluginData.savedData.filePath)
+                if (existingFile.exists()) existingFile.delete()
+
+                if (downloadPlugin(
+                        activity,
+                        pluginData.onlineData.plugin.url,
+                        pluginData.onlineData.plugin.fileHash,
+                        pluginData.savedData.internalName,
+                        existingFile,
+                        true
+                    )
+                ) {
+                    updatedPlugins.add(pluginData.onlineData.plugin.name)
+                }
+            }
+        }.also {
+            main {
+                val message = if (updatedPlugins.isNotEmpty()) {
+                    activity.getString(R.string.plugins_updated_manually, updatedPlugins.size)
+                } else {
+                    activity.getString(R.string.no_plugins_updated_manually)
+                }
+                showToast(message, Toast.LENGTH_LONG)
+
+                val notificationText = UiText.StringResource(
+                    R.string.plugins_updated_manually,
+                    listOf(updatedPlugins.size)
+                )
+                createNotification(activity, notificationText, updatedPlugins)
+
+            }
+        }
+
+        loadedOnlinePlugins = true
+        afterPluginsLoadedEvent.invoke(false)
+
+        Log.i("PluginManager", "Plugin update done!")
+    }
+
     private fun Context.createNotificationChannel() {
         hasCreatedNotChanel = true
         // Create the NotificationChannel, but only on API 26+ because

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

@@ -1,37 +1,42 @@
 package com.lagradost.cloudstream3.plugins
 
 import android.content.Context
+import androidx.annotation.WorkerThread
 import com.fasterxml.jackson.annotation.JsonProperty
-import com.lagradost.cloudstream3.AcraApplication.Companion.context
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.context
-import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.getKey
-import com.lagradost.cloudstream3.AcraApplication.Companion.setKey
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.setKey
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.amap
 import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.mvvm.logError
-import com.lagradost.cloudstream3.mvvm.normalSafeApiCall
+import com.lagradost.cloudstream3.mvvm.safe
-import com.lagradost.cloudstream3.mvvm.suspendSafeApiCall
+import com.lagradost.cloudstream3.mvvm.safeAsync
 import com.lagradost.cloudstream3.plugins.PluginManager.getPluginSanitizedFileName
 import com.lagradost.cloudstream3.plugins.PluginManager.unloadPlugin
 import com.lagradost.cloudstream3.ui.settings.extensions.REPOSITORIES_KEY
 import com.lagradost.cloudstream3.ui.settings.extensions.RepositoryData
-import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
-import java.io.BufferedInputStream
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import java.io.File
-import java.io.InputStream
+import java.nio.file.AtomicMoveNotSupportedException
-import java.io.OutputStream
+import java.nio.file.Files
+import java.nio.file.StandardCopyOption
+import java.security.MessageDigest
+import java.util.concurrent.TimeUnit
 
 /**
  * Comes with the app, always available in the app, non removable.
- * */
+ */
-
+@Serializable
 data class Repository(
-    @JsonProperty("name") val name: String,
+    @JsonProperty("iconUrl") @SerialName("iconUrl") val iconUrl: String?,
-    @JsonProperty("description") val description: String?,
+    @JsonProperty("name") @SerialName("name") val name: String,
-    @JsonProperty("manifestVersion") val manifestVersion: Int,
+    @JsonProperty("description") @SerialName("description") val description: String?,
-    @JsonProperty("pluginLists") val pluginLists: List<String>
+    @JsonProperty("manifestVersion") @SerialName("manifestVersion") val manifestVersion: Int,
+    @JsonProperty("pluginLists") @SerialName("pluginLists") val pluginLists: List<String>,
 )
 
 /**
@@ -40,40 +45,81 @@ data class Repository(
  * 1: Ok
  * 2: Slow
  * 3: Beta only
- * */
+ */
+@Serializable
 data class SitePlugin(
     // Url to the .cs3 file
-    @JsonProperty("url") val url: String,
+    @JsonProperty("url") @SerialName("url") val url: String,
     // Status to remotely disable the provider
-    @JsonProperty("status") val status: Int,
+    @JsonProperty("status") @SerialName("status") val status: Int,
     // Integer over 0, any change of this will trigger an auto update
-    @JsonProperty("version") val version: Int,
+    @JsonProperty("version") @SerialName("version") val version: Int,
     // Unused currently, used to make the api backwards compatible?
     // Set to 1
-    @JsonProperty("apiVersion") val apiVersion: Int,
+    @JsonProperty("apiVersion") @SerialName("apiVersion") val apiVersion: Int,
     // Name to be shown in app
-    @JsonProperty("name") val name: String,
+    @JsonProperty("name") @SerialName("name") val name: String,
     // Name to be referenced internally. Separate to make name and url changes possible
-    @JsonProperty("internalName") val internalName: String,
+    @JsonProperty("internalName") @SerialName("internalName") val internalName: String,
-    @JsonProperty("authors") val authors: List<String>,
+    @JsonProperty("authors") @SerialName("authors") val authors: List<String>,
-    @JsonProperty("description") val description: String?,
+    @JsonProperty("description") @SerialName("description") val description: String?,
     // Might be used to go directly to the plugin repo in the future
-    @JsonProperty("repositoryUrl") val repositoryUrl: String?,
+    @JsonProperty("repositoryUrl") @SerialName("repositoryUrl") val repositoryUrl: String?,
     // These types are yet to be mapped and used, ignore for now
-    @JsonProperty("tvTypes") val tvTypes: List<String>?,
+    @JsonProperty("tvTypes") @SerialName("tvTypes") val tvTypes: List<String>?,
-    @JsonProperty("language") val language: String?,
+    // Most often a language tag like "en" or "zh-TW"
-    @JsonProperty("iconUrl") val iconUrl: String?,
+    @JsonProperty("language") @SerialName("language") val language: String?,
+    @JsonProperty("iconUrl") @SerialName("iconUrl") val iconUrl: String?,
     // Automatically generated by the gradle plugin
-    @JsonProperty("fileSize") val fileSize: Long?,
+    @JsonProperty("fileSize") @SerialName("fileSize") val fileSize: Long?,
+    @JsonProperty("fileHash") @SerialName("fileHash") val fileHash: String?,
 )
 
+@Serializable
+data class PluginWrapper(
+    @JsonProperty("repository") @SerialName("repository") val repository: Repository,
+    @JsonProperty("repositoryData") @SerialName("repositoryData") val repositoryData: RepositoryData,
+    @JsonProperty("plugin") @SerialName("plugin") val plugin: SitePlugin
+) {
+    companion object {
+        private val localRepository = Repository("", "", "", 1, emptyList())
+        private val localRepositoryData = RepositoryData("", "", "")
+        fun getLocalPluginWrapper(plugin: SitePlugin): PluginWrapper {
+            return PluginWrapper(
+                localRepository,
+                localRepositoryData,
+                plugin
+            )
+        }
+    }
+}
+
 
 object RepositoryManager {
     const val ONLINE_PLUGINS_FOLDER = "Extensions"
     val PREBUILT_REPOSITORIES: Array<RepositoryData> by lazy {
-        getKey("PREBUILT_REPOSITORIES") ?: emptyArray()
+        getKey<Array<RepositoryData>>("PREBUILT_REPOSITORIES") ?: emptyArray()
+    }
+    private val GH_REGEX =
+        Regex("^https://raw.githubusercontent.com/([A-Za-z0-9-]+)/([A-Za-z0-9_.-]+)/(.*)$")
+
+
+    /** Returns a SHA-256 string of the file content.
+     * Example: "sha256-b70462c264cb7f90fc2860a8e58d7544ce747ff347d1d11fa093623901853573" **/
+    @WorkerThread
+    fun sha256(file: File): String {
+        val digest = MessageDigest.getInstance("SHA-256")
+
+        file.inputStream().use { fis ->
+            val buffer = ByteArray(8192)
+            var read = fis.read(buffer)
+            while (read != -1) {
+                digest.update(buffer, 0, read)
+                read = fis.read(buffer)
+            }
+        }
+        return "sha256-" + digest.digest().joinToString("") { "%02x".format(it) }
     }
-    private val GH_REGEX = Regex("^https://raw.githubusercontent.com/([A-Za-z0-9-]+)/([A-Za-z0-9_.-]+)/(.*)$")
 
     /* Convert raw.githubusercontent.com urls to cdn.jsdelivr.net if enabled in settings */
     fun convertRawGitUrl(url: String): String {
@@ -94,32 +140,37 @@ object RepositoryManager {
                 else fixedUrl
             }
         } else if (fixedUrl.matches("^[a-zA-Z0-9!_-]+$".toRegex())) {
-            suspendSafeApiCall {
+            safeAsync {
-                app.get("https://cutt.ly/${fixedUrl}", allowRedirects = false).let { it2 ->
+                if (fixedUrl.startsWith("!")) {
-                    it2.headers["Location"]?.let { url ->
+                    val response = app.get("https://py.md/${fixedUrl.removePrefix("!")}", allowRedirects = false)
-                        if (url.startsWith("https://cutt.ly/404")) return@suspendSafeApiCall null
+                    val url = response.headers["Location"] ?: return@safeAsync null
-                        if (url.removeSuffix("/") == "https://cutt.ly") return@suspendSafeApiCall null
+                    if (url.startsWith("https://py.md/404")) return@safeAsync null
-                        return@suspendSafeApiCall url
+                    if (url.removeSuffix("/") == "https://py.md") return@safeAsync null
-                    }
+                    return@safeAsync url
+                } else {
+                    val response = app.get("https://cutt.ly/${fixedUrl}", allowRedirects = false)
+                    val url = response.headers["Location"] ?: return@safeAsync null
+                    if (url.startsWith("https://cutt.ly/404")) return@safeAsync null
+                    if (url.removeSuffix("/") == "https://cutt.ly") return@safeAsync null
+                    return@safeAsync url
                 }
             }
         } else null
     }
 
     suspend fun parseRepository(url: String): Repository? {
-        return suspendSafeApiCall {
+        return safeAsync {
             // Take manifestVersion and such into account later
-            app.get(convertRawGitUrl(url)).parsedSafe()
+            app.get(convertRawGitUrl(url), cacheTime = 5, cacheUnit = TimeUnit.MINUTES)
+                .parsedSafe<Repository>()
         }
     }
 
     private suspend fun parsePlugins(pluginUrls: String): List<SitePlugin> {
         // Take manifestVersion and such into account later
         return try {
-            val response = app.get(convertRawGitUrl(pluginUrls))
+            app.get(convertRawGitUrl(pluginUrls), cacheTime = 5, cacheUnit = TimeUnit.MINUTES)
-            // Normal parsed function not working?
+                .parsed<Array<SitePlugin>>().toList()
-            // return response.parsedSafe()
-            tryParseJson<Array<SitePlugin>>(response.text)?.toList() ?: emptyList()
         } catch (t: Throwable) {
             logError(t)
             emptyList()
@@ -128,37 +179,68 @@ object RepositoryManager {
 
     /**
      * Gets all plugins from repositories and pairs them with the repository url
-     * */
+     */
-    suspend fun getRepoPlugins(repositoryUrl: String): List<Pair<String, SitePlugin>>? {
+    suspend fun getRepoPlugins(repositoryData: RepositoryData): List<PluginWrapper>? {
-        val repo = parseRepository(repositoryUrl) ?: return null
+        val repo = parseRepository(repositoryData.url) ?: return null
-        return repo.pluginLists.amap { url ->
+        val list = repo.pluginLists.amap { url ->
             parsePlugins(url).map {
-                repositoryUrl to it
+                PluginWrapper(repo, repositoryData, it)
             }
         }.flatten()
+        return list
     }
 
     suspend fun downloadPluginToFile(
+        context: Context,
         pluginUrl: String,
-        file: File
+        file: File,
+        expectedFileHash: String?
     ): File? {
-        return suspendSafeApiCall {
+        return safeAsync {
-            file.mkdirs()
+            val parentDir = file.parentFile ?: return@safeAsync null
+            parentDir.mkdirs()
 
-            // Overwrite if exists
+            // Prevent corrupting the plugin file if the operation fails
-            if (file.exists()) {
+            val tempFile = File.createTempFile(file.name, ".tmp", context.cacheDir)
-                file.delete()
-            }
-            file.createNewFile()
 
             val body = app.get(convertRawGitUrl(pluginUrl)).okhttpResponse.body
-            write(body.byteStream(), file.outputStream())
+
+            body.byteStream().use { body ->
+                tempFile.outputStream().use { fileSteam ->
+                    body.copyTo(fileSteam)
+                }
+            }
+
+            if (expectedFileHash != null) {
+                val downloadHash = sha256(tempFile)
+                if (expectedFileHash != downloadHash) {
+                    tempFile.delete()
+                    throw IllegalStateException("Extension hash mismatch when validating '${file.name}'! Expected: '$expectedFileHash', got: '$downloadHash'.")
+                }
+            }
+
+            // We prefer the operation to be atomic
+            try {
+                Files.move(
+                    tempFile.toPath(),
+                    file.toPath(),
+                    StandardCopyOption.REPLACE_EXISTING,
+                    StandardCopyOption.ATOMIC_MOVE
+                )
+            } catch (_: AtomicMoveNotSupportedException) {
+                Files.move(
+                    tempFile.toPath(),
+                    file.toPath(),
+                    StandardCopyOption.REPLACE_EXISTING
+                )
+            }
+
             file
         }
     }
 
     fun getRepositories(): Array<RepositoryData> {
-        return getKey(REPOSITORIES_KEY) ?: emptyArray()
+        return getKey<Array<RepositoryData>>(REPOSITORIES_KEY) ?: emptyArray()
     }
 
     // Don't want to read before we write in another thread
@@ -173,7 +255,7 @@ object RepositoryManager {
 
     /**
      * Also deletes downloaded repository plugins
-     * */
+     */
     suspend fun removeRepository(context: Context, repository: RepositoryData) {
         val extensionsDir = File(context.filesDir, ONLINE_PLUGINS_FOLDER)
 
@@ -191,7 +273,7 @@ object RepositoryManager {
 
         // Unload all plugins, not using deletePlugin since we
         // delete all data and files in deleteRepositoryData
-        normalSafeApiCall {
+        safe {
             file.listFiles { plugin: File ->
                 unloadPlugin(plugin.absolutePath)
                 false
@@ -200,13 +282,4 @@ object RepositoryManager {
 
         PluginManager.deleteRepositoryData(file.absolutePath)
     }
-
-    private fun write(stream: InputStream, output: OutputStream) {
-        val input = BufferedInputStream(stream)
-        val dataBuffer = ByteArray(512)
-        var readBytes: Int
-        while (input.read(dataBuffer).also { readBytes = it } != -1) {
-            output.write(dataBuffer, 0, readBytes)
-        }
-    }
 }

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

@@ -2,62 +2,49 @@ package com.lagradost.cloudstream3.plugins
 
 import android.util.Log
 import android.widget.Toast
-import com.lagradost.cloudstream3.AcraApplication.Companion.context
+import com.fasterxml.jackson.annotation.JsonProperty
-import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.context
-import com.lagradost.cloudstream3.AcraApplication.Companion.setKey
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.getKey
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.setKey
 import com.lagradost.cloudstream3.R
 import java.security.MessageDigest
 import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.utils.Coroutines.main
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 
-object VotingApi { // please do not cheat the votes lol
+object VotingApi {
     private const val LOGKEY = "VotingApi"
+    private const val API_DOMAIN = "https://api.countify.xyz"
 
-    private const val API_DOMAIN = "https://counterapi.com/api"
+    private fun transformUrl(url: String): String =
-
-    private fun transformUrl(url: String): String = // dont touch or all votes get reset
         MessageDigest
             .getInstance("SHA-256")
             .digest("${url}#funny-salt".toByteArray())
             .fold("") { str, it -> str + "%02x".format(it) }
 
-    suspend fun SitePlugin.getVotes(): Int {
+    suspend fun SitePlugin.getVotes(): Int = getVotes(url)
-        return getVotes(url)
+    fun SitePlugin.hasVoted(): Boolean = hasVoted(url)
-    }
+    suspend fun SitePlugin.vote(): Int = vote(url)
+    fun SitePlugin.canVote(): Boolean = canVote(this.url)
 
-    fun SitePlugin.hasVoted(): Boolean {
-        return hasVoted(url)
-    }
-
-    suspend fun SitePlugin.vote(): Int {
-        return vote(url)
-    }
-
-    fun SitePlugin.canVote(): Boolean {
-        return canVote(this.url)
-    }
-
-    // Plugin url to Int
     private val votesCache = mutableMapOf<String, Int>()
 
-    private fun getRepository(pluginUrl: String) = pluginUrl
-        .split("/")
-        .drop(2)
-        .take(3)
-        .joinToString("-")
-
     private suspend fun readVote(pluginUrl: String): Int {
-        val url = "${API_DOMAIN}/cs-${getRepository(pluginUrl)}/vote/${transformUrl(pluginUrl)}?readOnly=true"
+        val id = transformUrl(pluginUrl)
-        Log.d(LOGKEY, "Requesting: $url")
+        val url = "$API_DOMAIN/get-total/$id"
-        return app.get(url).parsedSafe<Result>()?.value ?: 0
+        Log.d(LOGKEY, "Requesting GET: $url")
+        return app.get(url).parsedSafe<CountifyResult>()?.count ?: 0
     }
 
     private suspend fun writeVote(pluginUrl: String): Boolean {
-        val url = "${API_DOMAIN}/cs-${getRepository(pluginUrl)}/vote/${transformUrl(pluginUrl)}"
+        val id = transformUrl(pluginUrl)
-        Log.d(LOGKEY, "Requesting: $url")
+        val url = "$API_DOMAIN/increment/$id"
-        return app.get(url).parsedSafe<Result>()?.value != null
+        Log.d(LOGKEY, "Requesting POST: $url")
+        return app.post(url, emptyMap<String, String>())
+            .parsedSafe<CountifyResult>()?.count != null
     }
 
     suspend fun getVotes(pluginUrl: String): Int =
@@ -65,34 +52,38 @@ object VotingApi { // please do not cheat the votes lol
             votesCache[pluginUrl] = it
         }
 
-    fun hasVoted(pluginUrl: String) =
+    fun hasVoted(pluginUrl: String): Boolean =
-        getKey("cs3-votes/${transformUrl(pluginUrl)}") ?: false
+        getKey<Boolean>("cs3-votes/${transformUrl(pluginUrl)}") ?: false
 
-    fun canVote(pluginUrl: String): Boolean {
+    fun canVote(pluginUrl: String): Boolean =
-        return PluginManager.urlPlugins.contains(pluginUrl)
+        PluginManager.urlPlugins.contains(pluginUrl)
-    }
 
     private val voteLock = Mutex()
+
     suspend fun vote(pluginUrl: String): Int {
-        // Prevent multiple requests at the same time.
         voteLock.withLock {
             if (!canVote(pluginUrl)) {
                 main {
-                    Toast.makeText(context, R.string.extension_install_first, Toast.LENGTH_SHORT)
+                    Toast.makeText(
-                        .show()
+                        context,
+                        R.string.extension_install_first,
+                        Toast.LENGTH_SHORT
+                    ).show()
                 }
                 return getVotes(pluginUrl)
             }
 
             if (hasVoted(pluginUrl)) {
                 main {
-                    Toast.makeText(context, R.string.already_voted, Toast.LENGTH_SHORT)
+                    Toast.makeText(
-                        .show()
+                        context,
+                        R.string.already_voted,
+                        Toast.LENGTH_SHORT
+                    ).show()
                 }
                 return getVotes(pluginUrl)
             }
 
-
             if (writeVote(pluginUrl)) {
                 setKey("cs3-votes/${transformUrl(pluginUrl)}", true)
                 votesCache[pluginUrl] = votesCache[pluginUrl]?.plus(1) ?: 1
@@ -102,7 +93,9 @@ object VotingApi { // please do not cheat the votes lol
         }
     }
 
-    private data class Result(
+    @Serializable
-        val value: Int?
+    private data class CountifyResult(
+        @JsonProperty("id") @SerialName("id") val id: String? = null,
+        @JsonProperty("count") @SerialName("count") val count: Int? = null,
     )
 }

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

@@ -0,0 +1,279 @@
+package com.lagradost.cloudstream3.services
+
+import android.Manifest
+import android.app.Service
+import android.content.Context
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC
+import android.os.Build.VERSION.SDK_INT
+import android.os.IBinder
+import android.util.Log
+import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationManagerCompat
+import androidx.core.app.PendingIntentCompat
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.removeKey
+import com.lagradost.cloudstream3.MainActivity
+import com.lagradost.cloudstream3.MainActivity.Companion.lastError
+import com.lagradost.cloudstream3.MainActivity.Companion.setLastError
+import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.mvvm.debugAssert
+import com.lagradost.cloudstream3.mvvm.debugWarning
+import com.lagradost.cloudstream3.mvvm.logError
+import com.lagradost.cloudstream3.mvvm.safe
+import com.lagradost.cloudstream3.plugins.PluginManager
+import com.lagradost.cloudstream3.utils.AppContextUtils.createNotificationChannel
+import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
+import com.lagradost.cloudstream3.utils.UIHelper.colorFromAttribute
+import com.lagradost.cloudstream3.utils.downloader.DownloadQueueManager
+import com.lagradost.cloudstream3.utils.downloader.VideoDownloadManager
+import com.lagradost.cloudstream3.utils.downloader.VideoDownloadManager.KEY_RESUME_IN_QUEUE
+import com.lagradost.cloudstream3.utils.downloader.VideoDownloadManager.KEY_RESUME_PACKAGES
+import com.lagradost.cloudstream3.utils.downloader.VideoDownloadManager.downloadEvent
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.FlowPreview
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.debounce
+import kotlinx.coroutines.flow.takeWhile
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.flow.updateAndGet
+import kotlinx.coroutines.withTimeoutOrNull
+import kotlin.system.measureTimeMillis
+import kotlin.time.Duration.Companion.milliseconds
+import kotlin.time.Duration.Companion.seconds
+
+class DownloadQueueService : Service() {
+    companion object {
+        const val TAG = "DownloadQueueService"
+        const val DOWNLOAD_QUEUE_CHANNEL_ID = "cloudstream3.download.queue"
+        const val DOWNLOAD_QUEUE_CHANNEL_NAME = "Download queue service"
+        const val DOWNLOAD_QUEUE_CHANNEL_DESCRIPTION = "App download queue notification."
+        const val DOWNLOAD_QUEUE_NOTIFICATION_ID = 917194232 // Random unique
+        @Volatile
+        var isRunning = false
+
+        fun getIntent(
+            context: Context,
+        ): Intent {
+            return Intent(context, DownloadQueueService::class.java)
+        }
+
+        private val _downloadInstances: MutableStateFlow<List<VideoDownloadManager.EpisodeDownloadInstance>> =
+            MutableStateFlow(emptyList())
+
+        /** Flow of all active downloads, not queued. May temporarily contain completed or failed EpisodeDownloadInstances.
+         * Completed or failed instances are automatically removed by the download queue service.
+         *
+         */
+        val downloadInstances: StateFlow<List<VideoDownloadManager.EpisodeDownloadInstance>> =
+            _downloadInstances
+
+        private val totalDownloadFlow =
+            downloadInstances.combine(DownloadQueueManager.queue) { instances, queue ->
+                instances to queue
+            }
+                .combine(VideoDownloadManager.currentDownloads) { (instances, queue), currentDownloads ->
+                    Triple(instances, queue, currentDownloads)
+                }
+    }
+
+
+    private val baseNotification by lazy {
+        val intent = Intent(this, MainActivity::class.java)
+        val pendingIntent =
+            PendingIntentCompat.getActivity(this, 0, intent, 0, false)
+
+        val activeDownloads = resources.getQuantityString(R.plurals.downloads_active, 0).format(0)
+        val activeQueue = resources.getQuantityString(R.plurals.downloads_queued, 0).format(0)
+
+        NotificationCompat.Builder(this, DOWNLOAD_QUEUE_CHANNEL_ID)
+            .setOngoing(true) // Make it persistent
+            .setAutoCancel(false)
+            .setColorized(false)
+            .setOnlyAlertOnce(true)
+            .setSilent(true)
+            .setShowWhen(false)
+            // If low priority then the notification might not show :(
+            .setPriority(NotificationCompat.PRIORITY_DEFAULT)
+            .setColor(this.colorFromAttribute(R.attr.colorPrimary))
+            .setContentText(activeDownloads)
+            .setSubText(activeQueue)
+            .setContentIntent(pendingIntent)
+            .setSmallIcon(R.drawable.download_icon_load)
+    }
+
+
+    private fun updateNotification(context: Context, downloads: Int, queued: Int) {
+        if (context.checkSelfPermission(Manifest.permission.POST_NOTIFICATIONS)
+            != PackageManager.PERMISSION_GRANTED
+        ) return
+
+        val activeDownloads =
+            resources.getQuantityString(R.plurals.downloads_active, downloads).format(downloads)
+        val activeQueue =
+            resources.getQuantityString(R.plurals.downloads_queued, queued).format(queued)
+
+        val newNotification = baseNotification
+            .setContentText(activeDownloads)
+            .setSubText(activeQueue)
+            .build()
+
+        safe {
+            NotificationManagerCompat.from(context)
+                .notify(DOWNLOAD_QUEUE_NOTIFICATION_ID, newNotification)
+        }
+    }
+
+    // We always need to listen to events, even before the download is launched.
+    // Stopping link loading is an event which can trigger before downloading.
+    val downloadEventListener = { event: Pair<Int, VideoDownloadManager.DownloadActionType> ->
+        when (event.second) {
+            VideoDownloadManager.DownloadActionType.Stop -> {
+                removeKey(KEY_RESUME_PACKAGES, event.first.toString())
+                removeKey(KEY_RESUME_IN_QUEUE, event.first.toString())
+                DownloadQueueManager.cancelDownload(event.first)
+            }
+
+            else -> {}
+        }
+    }
+
+    @OptIn(ExperimentalCoroutinesApi::class, FlowPreview::class)
+    override fun onCreate() {
+        isRunning = true
+        val context: Context = this // To make code more readable
+
+        Log.d(TAG, "Download queue service started.")
+        this.createNotificationChannel(
+            DOWNLOAD_QUEUE_CHANNEL_ID,
+            DOWNLOAD_QUEUE_CHANNEL_NAME,
+            DOWNLOAD_QUEUE_CHANNEL_DESCRIPTION
+        )
+        if (SDK_INT >= 29) {
+            startForeground(
+                DOWNLOAD_QUEUE_NOTIFICATION_ID,
+                baseNotification.build(),
+                FOREGROUND_SERVICE_TYPE_DATA_SYNC
+            )
+        } else {
+            startForeground(DOWNLOAD_QUEUE_NOTIFICATION_ID, baseNotification.build())
+        }
+
+        downloadEvent += downloadEventListener
+
+        val queueJob = ioSafe {
+            // Ensure this is up to date to prevent race conditions with MainActivity launches
+            setLastError(context)
+            // Early return, to prevent waiting for plugins in safe mode
+            if (lastError != null) return@ioSafe
+
+            // Try to ensure all plugins are loaded before starting the downloader.
+            // To prevent infinite stalls we use a timeout of 15 seconds, it is judged as long enough
+            val timeout = 15.seconds
+            val timeTaken = withTimeoutOrNull(timeout) {
+                measureTimeMillis {
+                    while (!(PluginManager.loadedOnlinePlugins && PluginManager.loadedLocalPlugins)) {
+                        delay(100.milliseconds)
+                    }
+                }
+            }
+
+            debugWarning({ timeTaken == null || timeTaken > 3_000 }, {
+                "Abnormally long downloader startup time of: ${timeTaken ?: timeout.inWholeMilliseconds}ms"
+            })
+            debugAssert({ timeTaken == null }, { "Downloader startup should not time out" })
+
+            totalDownloadFlow
+                .debounce { (instances, queue) ->
+                    // Filter away incorrect transient queue states.
+                    // For example when we pop the queue and add a download instance there exists a transient state where
+                    // there is no queue and no download instances (leading to an early exit)
+                    if (instances.isEmpty() && queue.isEmpty()) {
+                        500.milliseconds
+                    } else {
+                        0.milliseconds
+                    }
+                }
+                .takeWhile { (instances, queue) ->
+                    // Stop if destroyed
+                    isRunning
+                            // Run as long as there is a queue to process
+                            && (instances.isNotEmpty() || queue.isNotEmpty())
+                            // Run as long as there are no app crashes
+                            && lastError == null
+                }
+                .collect { (_, queue, currentDownloads) ->
+                    // Remove completed or failed
+                    val newInstances = _downloadInstances.updateAndGet { currentInstances ->
+                        currentInstances.filterNot { it.isCompleted || it.isFailed || it.isCancelled }
+                    }
+
+                    val maxDownloads = VideoDownloadManager.maxConcurrentDownloads(context)
+                    val currentInstanceCount = newInstances.size
+
+                    val newDownloads = minOf(
+                        // Cannot exceed the max downloads
+                        maxOf(0, maxDownloads - currentInstanceCount),
+                        // Cannot start more downloads than the queue size
+                        queue.size
+                    )
+
+                    // Cant start multiple downloads at once. If this is rerun it may start too many downloads.
+                    if (newDownloads > 0) {
+                        _downloadInstances.update { instances ->
+                            val downloadInstance = DownloadQueueManager.popQueue(context)
+                            if (downloadInstance != null) {
+                                downloadInstance.startDownload()
+                                instances + downloadInstance
+                            } else {
+                                instances
+                            }
+                        }
+                    }
+
+                    // The downloads actually displayed to the user with a notification
+                    val currentVisualDownloads =
+                        currentDownloads.size + newInstances.count {
+                            currentDownloads.contains(it.downloadQueueWrapper.id)
+                                .not()
+                        }
+                    // Just the queue
+                    val currentVisualQueue = queue.size
+
+                    updateNotification(context, currentVisualDownloads, currentVisualQueue)
+                }
+        }
+
+        // Stop self regardless of job outcome
+        queueJob.invokeOnCompletion { throwable ->
+            if (throwable != null) {
+                logError(throwable)
+            }
+            safe {
+                stopSelf()
+            }
+        }
+    }
+
+    override fun onDestroy() {
+        Log.d(TAG, "Download queue service stopped.")
+        downloadEvent -= downloadEventListener
+        isRunning = false
+        super.onDestroy()
+    }
+
+    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+        return START_STICKY // We want the service restarted if its killed
+    }
+
+    override fun onBind(intent: Intent?): IBinder? = null
+
+    override fun onTimeout(reason: Int) {
+        stopSelf()
+        Log.e(TAG, "Service stopped due to timeout: $reason")
+    }
+
+}

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

@@ -22,7 +22,7 @@ import com.lagradost.cloudstream3.utils.DataStoreHelper
 import com.lagradost.cloudstream3.utils.DataStoreHelper.getAllSubscriptions
 import com.lagradost.cloudstream3.utils.DataStoreHelper.getDub
 import com.lagradost.cloudstream3.utils.UIHelper.colorFromAttribute
-import com.lagradost.cloudstream3.utils.VideoDownloadManager.getImageBitmapFromUrl
+import com.lagradost.cloudstream3.utils.downloader.DownloadUtils.getImageBitmapFromUrl
 import kotlinx.coroutines.withTimeoutOrNull
 import java.util.concurrent.TimeUnit
 
@@ -128,18 +128,18 @@ class SubscriptionWorkManager(val context: Context, workerParams: WorkerParamete
             updateProgress(max, progress, true)
 
             // We need all plugins loaded.
-            PluginManager.loadAllOnlinePlugins(context)
+            PluginManager.___DO_NOT_CALL_FROM_A_PLUGIN_loadAllOnlinePlugins(context)
-            PluginManager.loadAllLocalPlugins(context, false)
+            PluginManager.___DO_NOT_CALL_FROM_A_PLUGIN_loadAllLocalPlugins(context, false)
 
-            subscriptions.apmap { savedData ->
+            subscriptions.amap { savedData ->
                 try {
-                    val id = savedData.id ?: return@apmap null
+                    val id = savedData.id ?: return@amap null
-                    val api = getApiFromNameNull(savedData.apiName) ?: return@apmap null
+                    val api = getApiFromNameNull(savedData.apiName) ?: return@amap null
 
                     // Reasonable timeout to prevent having this worker run forever.
                     val response = withTimeoutOrNull(60_000) {
                         api.load(savedData.url) as? EpisodeResponse
-                    } ?: return@apmap null
+                    } ?: return@amap null
 
                     val dubPreference =
                         getDub(id) ?: if (

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

@@ -2,12 +2,13 @@ package com.lagradost.cloudstream3.services
 import android.app.Service
 import android.content.Intent
 import android.os.IBinder
-import com.lagradost.cloudstream3.utils.VideoDownloadManager
+import com.lagradost.cloudstream3.utils.downloader.VideoDownloadManager
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.launch
 
+/** Handle notification actions such as pause/resume downloads */
 class VideoDownloadService : Service() {
 
     private val downloadScope = CoroutineScope(Dispatchers.Default)
@@ -42,19 +43,3 @@ class VideoDownloadService : Service() {
         super.onDestroy()
     }
 }
-//    override fun onHandleIntent(intent: Intent?) {
-//        if (intent != null) {
-//            val id = intent.getIntExtra("id", -1)
-//            val type = intent.getStringExtra("type")
-//            if (id != -1 && type != null) {
-//                val state = when (type) {
-//                    "resume" -> VideoDownloadManager.DownloadActionType.Resume
-//                    "pause" -> VideoDownloadManager.DownloadActionType.Pause
-//                    "stop" -> VideoDownloadManager.DownloadActionType.Stop
-//                    else -> return
-//                }
-//                VideoDownloadManager.downloadEvent.invoke(Pair(id, state))
-//            }
-//        }
-//    }
-//}

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

@@ -1,18 +1,9 @@
 package com.lagradost.cloudstream3.subtitles
 
-import androidx.annotation.WorkerThread
 import androidx.core.net.toUri
-import com.lagradost.cloudstream3.APIHolder.unixTime
-import com.lagradost.cloudstream3.ErrorLoadingException
 import com.lagradost.cloudstream3.MainActivity.Companion.deleteFileOnExit
 import com.lagradost.cloudstream3.app
-import com.lagradost.cloudstream3.mvvm.Resource
-import com.lagradost.cloudstream3.mvvm.safeApiCall
-import com.lagradost.cloudstream3.subtitles.AbstractSubtitleEntities.SubtitleEntity
-import com.lagradost.cloudstream3.subtitles.AbstractSubtitleEntities.SubtitleSearch
-import com.lagradost.cloudstream3.syncproviders.AuthAPI
 import com.lagradost.cloudstream3.ui.player.SubtitleOrigin
-import com.lagradost.cloudstream3.utils.Coroutines.threadSafeListOf
 import okio.BufferedSource
 import okio.buffer
 import okio.sink
@@ -20,116 +11,6 @@ import okio.source
 import java.io.File
 import java.util.zip.ZipInputStream
 
-interface AbstractSubProvider {
-    val idPrefix: String
-
-    @WorkerThread
-    @Throws
-    suspend fun search(query: SubtitleSearch): List<SubtitleEntity>? {
-        throw NotImplementedError()
-    }
-
-    @WorkerThread
-    @Throws
-    suspend fun load(data: SubtitleEntity): String? {
-        throw NotImplementedError()
-    }
-
-    @WorkerThread
-    @Throws
-    suspend fun SubtitleResource.getResources(data: SubtitleEntity) {
-        this.addUrl(load(data))
-    }
-
-    @WorkerThread
-    @Throws
-    suspend fun getResource(data: SubtitleEntity): SubtitleResource {
-        return SubtitleResource().apply {
-            this.getResources(data)
-        }
-    }
-}
-
-class SubRepository(val api: AbstractSubProvider) {
-    companion object {
-        data class SavedSearchResponse(
-            val unixTime: Long,
-            val response: List<SubtitleEntity>,
-            val query: SubtitleSearch
-        )
-
-        data class SavedResourceResponse(
-            val unixTime: Long,
-            val response: SubtitleResource,
-            val query: SubtitleEntity
-        )
-
-        // maybe make this a generic struct? right now there is a lot of boilerplate
-        private val searchCache = threadSafeListOf<SavedSearchResponse>()
-        private var searchCacheIndex: Int = 0
-        private val resourceCache = threadSafeListOf<SavedResourceResponse>()
-        private var resourceCacheIndex: Int = 0
-        const val CACHE_SIZE = 20
-    }
-
-    val idPrefix: String get() = api.idPrefix
-
-    @WorkerThread
-    suspend fun getResource(data: SubtitleEntity): Resource<SubtitleResource> = safeApiCall {
-        synchronized(resourceCache) {
-            for (item in resourceCache) {
-                // 20 min save
-                if (item.query == data && (unixTime - item.unixTime) < 60 * 20) {
-                    return@safeApiCall item.response
-                }
-            }
-        }
-
-        val returnValue = api.getResource(data)
-        synchronized(resourceCache) {
-            val add = SavedResourceResponse(unixTime, returnValue, data)
-            if (resourceCache.size > CACHE_SIZE) {
-                resourceCache[resourceCacheIndex] = add // rolling cache
-                resourceCacheIndex = (resourceCacheIndex + 1) % CACHE_SIZE
-            } else {
-                resourceCache.add(add)
-            }
-        }
-        returnValue
-    }
-
-    @WorkerThread
-    suspend fun search(query: SubtitleSearch): Resource<List<SubtitleEntity>> {
-        return safeApiCall {
-            synchronized(searchCache) {
-                for (item in searchCache) {
-                    // 120 min save
-                    if (item.query == query && (unixTime - item.unixTime) < 60 * 120) {
-                        return@safeApiCall item.response
-                    }
-                }
-            }
-
-            val returnValue = api.search(query) ?: throw ErrorLoadingException("Null subtitles")
-
-            // only cache valid return values
-            if (returnValue.isNotEmpty()) {
-                val add = SavedSearchResponse(unixTime, returnValue, query)
-                synchronized(searchCache) {
-                    if (searchCache.size > CACHE_SIZE) {
-                        searchCache[searchCacheIndex] = add // rolling cache
-                        searchCacheIndex = (searchCacheIndex + 1) % CACHE_SIZE
-                    } else {
-                        searchCache.add(add)
-                    }
-                }
-            }
-            returnValue
-        }
-    }
-
-}
-
 /**
  * A builder for subtitle files.
  * @see addUrl
@@ -210,4 +91,3 @@ class SubtitleResource {
     }
 }
 
-interface AbstractSubApi : AbstractSubProvider, AuthAPI

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

@@ -1,59 +1,135 @@
 package com.lagradost.cloudstream3.syncproviders
 
-import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.getKey
-import com.lagradost.cloudstream3.AcraApplication.Companion.removeKeys
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.setKey
-import com.lagradost.cloudstream3.AcraApplication.Companion.setKey
 import com.lagradost.cloudstream3.LoadResponse
-import com.lagradost.cloudstream3.syncproviders.providers.*
+import com.lagradost.cloudstream3.syncproviders.providers.Addic7ed
+import com.lagradost.cloudstream3.syncproviders.providers.AniListApi
+import com.lagradost.cloudstream3.syncproviders.providers.KitsuApi
+import com.lagradost.cloudstream3.syncproviders.providers.LocalList
+import com.lagradost.cloudstream3.syncproviders.providers.MALApi
+import com.lagradost.cloudstream3.syncproviders.providers.OpenSubtitlesApi
+import com.lagradost.cloudstream3.syncproviders.providers.SimklApi
+import com.lagradost.cloudstream3.syncproviders.providers.SubDlApi
+import com.lagradost.cloudstream3.syncproviders.providers.SubSourceApi
+import com.lagradost.cloudstream3.utils.DataStoreHelper
+import com.lagradost.cloudstream3.utils.videoskip.AnimeSkipAuth
 import java.util.concurrent.TimeUnit
 
-abstract class AccountManager(private val defIndex: Int) : AuthAPI {
+abstract class AccountManager {
     companion object {
-        val malApi = MALApi(0).also { api ->
+        const val NONE_ID: Int = -1
-            LoadResponse.Companion.malIdPrefix = api.idPrefix
+        val malApi = MALApi()
-        }
+        val kitsuApi = KitsuApi()
-        val aniListApi = AniListApi(0).also { api ->
+        val aniListApi = AniListApi()
-            LoadResponse.Companion.aniListIdPrefix = api.idPrefix
+        val simklApi = SimklApi()
-        }
-        val simklApi = SimklApi(0).also { api ->
-            LoadResponse.Companion.simklIdPrefix = api.idPrefix
-        }
-        val openSubtitlesApi = OpenSubtitlesApi(0)
-        val addic7ed = Addic7ed()
-        val subDlApi = SubDlApi(0)
         val localListApi = LocalList()
+
+        val openSubtitlesApi = OpenSubtitlesApi()
+        val addic7ed = Addic7ed()
+        val subDlApi = SubDlApi()
         val subSourceApi = SubSourceApi()
+        val animeSkipApi = AnimeSkipAuth()
 
-        // used to login via app intent
+        var cachedAccounts: MutableMap<String, Array<AuthData>>
-        val OAuth2Apis
+        var cachedAccountIds: MutableMap<String, Int>
-            get() = listOf<OAuth2API>(
+
-                malApi, aniListApi, simklApi
+        const val ACCOUNT_TOKEN = "auth_tokens"
+        const val ACCOUNT_IDS = "auth_ids"
+
+        fun accounts(prefix: String): Array<AuthData> {
+            require(prefix != "NONE")
+            return getKey<Array<AuthData>>(
+                ACCOUNT_TOKEN,
+                "${prefix}/${DataStoreHelper.currentAccount}"
+            ) ?: arrayOf()
+        }
+
+        fun updateAccounts(prefix: String, array: Array<AuthData>) {
+            require(prefix != "NONE")
+            setKey(ACCOUNT_TOKEN, "${prefix}/${DataStoreHelper.currentAccount}", array)
+            synchronized(cachedAccounts) {
+                cachedAccounts[prefix] = array
+            }
+        }
+
+        fun updateAccountsId(prefix: String, id: Int) {
+            require(prefix != "NONE")
+            setKey(ACCOUNT_IDS, "${prefix}/${DataStoreHelper.currentAccount}", id)
+            synchronized(cachedAccountIds) {
+                cachedAccountIds[prefix] = id
+            }
+        }
+
+        val allApis = arrayOf(
+            SyncRepo(malApi),
+            SyncRepo(kitsuApi),
+            SyncRepo(aniListApi),
+            SyncRepo(simklApi),
+            SyncRepo(localListApi),
+            SubtitleRepo(openSubtitlesApi),
+            SubtitleRepo(addic7ed),
+            SubtitleRepo(subDlApi),
+            PlainAuthRepo(animeSkipApi),
+            SubtitleRepo(subSourceApi)
         )
 
-        // this needs init with context and can be accessed in settings
+        fun updateAccountIds() {
-        val accountManagers
+            val ids = mutableMapOf<String, Int>()
-            get() = listOf(
+            for (api in allApis) {
-                malApi, aniListApi, openSubtitlesApi, subDlApi, simklApi //nginxApi
+                ids.put(
+                    api.idPrefix,
+                    getKey<Int>(
+                        ACCOUNT_IDS,
+                        "${api.idPrefix}/${DataStoreHelper.currentAccount}",
+                        NONE_ID
+                    ) ?: NONE_ID
                 )
+            }
+            synchronized(cachedAccountIds) {
+                cachedAccountIds = ids
+            }
+        }
 
-        // used for active syncing
+        init {
-        val SyncApis
+            val data = mutableMapOf<String, Array<AuthData>>()
-            get() = listOf(
+            val ids = mutableMapOf<String, Int>()
-                SyncRepo(malApi), SyncRepo(aniListApi), SyncRepo(localListApi), SyncRepo(simklApi)
+            for (api in allApis) {
+                data.put(api.idPrefix, accounts(api.idPrefix))
+                ids.put(
+                    api.idPrefix,
+                    getKey<Int>(
+                        ACCOUNT_IDS,
+                        "${api.idPrefix}/${DataStoreHelper.currentAccount}",
+                        NONE_ID
+                    ) ?: NONE_ID
                 )
+            }
+            cachedAccounts = data
+            cachedAccountIds = ids
+        }
 
-        val inAppAuths
+        // I do not want to place this in the init block as JVM initialization order is weird, and it may cause exceptions
-            get() = listOf<InAppAuthAPIManager>(
+        // accessing other classes
-                openSubtitlesApi,
+        fun initMainAPI() {
-                subDlApi
+            LoadResponse.malIdPrefix = malApi.idPrefix
-                )//, nginxApi)
+            LoadResponse.kitsuIdPrefix = kitsuApi.idPrefix
+            LoadResponse.aniListIdPrefix = aniListApi.idPrefix
+            LoadResponse.simklIdPrefix = simklApi.idPrefix
+        }
 
-        val subtitleProviders
+        val subtitleProviders = arrayOf(
-            get() = listOf(
+            SubtitleRepo(openSubtitlesApi),
-                openSubtitlesApi,
+            SubtitleRepo(addic7ed),
-                addic7ed,
+            SubtitleRepo(subDlApi),
-                subDlApi,
+            SubtitleRepo(subSourceApi)
-                subSourceApi
+        )
+        val syncApis = arrayOf(
+            SyncRepo(malApi),
+            SyncRepo(kitsuApi),
+            SyncRepo(aniListApi),
+            SyncRepo(simklApi),
+            SyncRepo(localListApi)
         )
 
         const val APP_STRING = "cloudstreamapp"
@@ -66,12 +142,7 @@ abstract class AccountManager(private val defIndex: Int) : AuthAPI {
         // Instantly resume watching a show
         const val APP_STRING_RESUME_WATCHING = "cloudstreamcontinuewatching"
 
-        val unixTime: Long
+        const val APP_STRING_SHARE = "csshare"
-            get() = System.currentTimeMillis() / 1000L
-        val unixTimeMs: Long
-            get() = System.currentTimeMillis()
-
-        const val MAX_STALE = 60 * 10
 
         fun secondsToReadable(seconds: Int, completedValue: String): String {
             var secondsLong = seconds.toLong()
@@ -93,57 +164,4 @@ abstract class AccountManager(private val defIndex: Int) : AuthAPI {
             return "${if (days != 0L) "$days" + "d " else ""}${if (hours != 0L) "$hours" + "h " else ""}${minutes}m"
         }
     }
-
-    var accountIndex = defIndex
-    private var lastAccountIndex = defIndex
-    protected val accountId get() = "${idPrefix}_account_$accountIndex"
-    private val accountActiveKey get() = "${idPrefix}_active"
-
-    // int array of all accounts indexes
-    private val accountsKey get() = "${idPrefix}_accounts"
-
-    protected fun removeAccountKeys() {
-        removeKeys(accountId)
-        val accounts = getAccounts()?.toMutableList() ?: mutableListOf()
-        accounts.remove(accountIndex)
-        setKey(accountsKey, accounts.toIntArray())
-
-        init()
-    }
-
-    fun getAccounts(): IntArray? {
-        return getKey(accountsKey, intArrayOf())
-    }
-
-    fun init() {
-        accountIndex = getKey(accountActiveKey, defIndex)!!
-        val accounts = getAccounts()
-        if (accounts?.isNotEmpty() == true && this.loginInfo() == null) {
-            accountIndex = accounts.first()
-        }
-    }
-
-    protected fun switchToNewAccount() {
-        val accounts = getAccounts()
-        lastAccountIndex = accountIndex
-        accountIndex = (accounts?.maxOrNull() ?: 0) + 1
-    }
-    protected fun switchToOldAccount() {
-        accountIndex = lastAccountIndex
-    }
-
-    protected fun registerAccount() {
-        setKey(accountActiveKey, accountIndex)
-        val accounts = getAccounts()?.toMutableList() ?: mutableListOf()
-        if (!accounts.contains(accountIndex)) {
-            accounts.add(accountIndex)
-        }
-
-        setKey(accountsKey, accounts.toIntArray())
-    }
-
-    fun changeAccount(index: Int) {
-        accountIndex = index
-        setKey(accountActiveKey, index)
-    }
 }

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

@@ -1,20 +1,262 @@
 package com.lagradost.cloudstream3.syncproviders
 
-interface AuthAPI {
+import com.fasterxml.jackson.annotation.JsonAlias
-    val name: String
+import com.fasterxml.jackson.annotation.JsonProperty
-    val icon: Int?
+import com.lagradost.cloudstream3.APIHolder
+import com.lagradost.cloudstream3.APIHolder.unixTime
+import com.lagradost.cloudstream3.APIHolder.unixTimeMS
+import com.lagradost.cloudstream3.base64Encode
+import com.lagradost.cloudstream3.splitUrlParameters
+import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.APP_STRING
+import kotlinx.serialization.ExperimentalSerializationApi
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.json.JsonNames
+import java.security.SecureRandom
 
-    val requiresLogin: Boolean
+data class AuthLoginPage(
+    /** The website to open to authenticate */
+    val url: String,
+    /**
+     * State/control code to verify against the redirectUrl to make sure the request is valid.
+     * This parameter will be saved, and then used in AuthAPI::login.
+     */
+    val payload: String? = null,
+)
 
-    val createAccountUrl : String?
+@Serializable
+data class AuthToken(
+    /**
+     * This is the general access tokens/api token representing a logged in user.
+     * Access tokens are the thing that applications use to make API requests on behalf of a user.
+     */
+    @JsonProperty("accessToken") @SerialName("accessToken")
+    val accessToken: String? = null,
+    /** For OAuth a special refresh token is issues to refresh the access token. */
+    @JsonProperty("refreshToken") @SerialName("refreshToken")
+    val refreshToken: String? = null,
+    /** In UnixTime (sec) when it expires */
+    @JsonProperty("accessTokenLifetime") @SerialName("accessTokenLifetime")
+    val accessTokenLifetime: Long? = null,
+    /** In UnixTime (sec) when it expires */
+    @JsonProperty("refreshTokenLifetime") @SerialName("refreshTokenLifetime")
+    val refreshTokenLifetime: Long? = null,
+    /**
+     * Sometimes AuthToken needs to be customized to store e.g. username/password,
+     * this acts as a catch all to store text or JSON data.
+     */
+    @JsonProperty("payload") @SerialName("payload")
+    val payload: String? = null,
+) {
+    fun isAccessTokenExpired(marginSec: Long = 10L) =
+        accessTokenLifetime != null && unixTime + marginSec >= accessTokenLifetime
 
-    // don't change this as all keys depend on it
+    fun isRefreshTokenExpired(marginSec: Long = 10L) =
-    val idPrefix: String
+        refreshTokenLifetime != null && unixTime + marginSec >= refreshTokenLifetime
+}
 
-    // if this returns null then you are not logged in
+@OptIn(ExperimentalSerializationApi::class) // JsonNames is an experimental annotation for now
-    fun loginInfo(): LoginInfo?
+@Serializable
-    fun logOut()
+data class AuthUser(
+    /** Account display-name, can also be email if name does not exist */
+    @JsonProperty("name") @SerialName("name")
+    val name: String?,
+    /**
+     * Unique account identifier. If a subsequent login is done then it
+     * will be refused if another account with the same id exists.
+     */
+    @JsonProperty("id") @SerialName("id")
+    val id: Int,
+    /** Profile picture URL */
+    @JsonProperty("profilePicture") @SerialName("profilePicture")
+    val profilePicture: String? = null,
+    /** Profile picture Headers of the URL */
+    @JsonProperty("profilePictureHeaders") @JsonAlias("profilePictureHeader")
+    @SerialName("profilePictureHeaders") @JsonNames("profilePictureHeader")
+    val profilePictureHeaders: Map<String, String>? = null,
+)
 
+/**
+ * Stores all information that should be used to authorize access.
+ * Be aware that token and user may change independently when a refresh is needed,
+ * and as such there should be no strong pairing between the two.
+ *
+ * Any local set/get key should use user.id.toString(),
+ * as token.accessToken (even hashed) is unsecure, and will rotate.
+ */
+@Serializable
+data class AuthData(
+    @JsonProperty("user") @SerialName("user") val user: AuthUser,
+    @JsonProperty("token") @SerialName("token") val token: AuthToken,
+)
+
+data class AuthPinData(
+    val deviceCode: String,
+    val userCode: String,
+    /** QR Code url */
+    val verificationUrl: String,
+    /** In seconds */
+    val expiresIn: Int,
+    /** Check if the code has been verified interval */
+    val interval: Int,
+)
+
+/** The login field requirements to display to the user */
+data class AuthLoginRequirement(
+    val password: Boolean = false,
+    val username: Boolean = false,
+    val email: Boolean = false,
+    val server: Boolean = false,
+)
+
+/** What the user responds to the AuthLoginRequirement */
+@Serializable
+data class AuthLoginResponse(
+    @JsonProperty("password") @SerialName("password") val password: String?,
+    @JsonProperty("username") @SerialName("username") val username: String?,
+    @JsonProperty("email") @SerialName("email") val email: String?,
+    @JsonProperty("server") @SerialName("server") val server: String?,
+)
+
+/** Stateless Authentication class used for all personalized content */
+abstract class AuthAPI {
+    open val name: String = "NONE"
+    open val idPrefix: String = "NONE"
+
+    /** Drawable icon of the service */
+    open val icon: Int? = null
+
+    /** If this service requires an account to use */
+    open val requiresLogin: Boolean = true
+
+    /** Link to a website for creating a new account */
+    open val createAccountUrl: String? = null
+
+    /** The sensitive redirect URL from OAuth should contain "/redirectUrlIdentifier" to trigger the login */
+    open val redirectUrlIdentifier: String? = null
+
+    /** Has OAuth2 login support, including login, loginRequest and refreshToken */
+    open val hasOAuth2: Boolean = false
+
+    /** Has on device pin support, aka login with a QR code */
+    open val hasPin: Boolean = false
+
+    /** Has in app login support, aka login with a dialog */
+    open val hasInApp: Boolean = false
+
+    /** The requirements to login in app */
+    open val inAppLoginRequirement: AuthLoginRequirement? = null
+
+    companion object {
+        @Deprecated(
+            message = "Use APIHolder.unixTime instead",
+            replaceWith = ReplaceWith(
+                expression = "APIHolder.unixTime",
+                imports = ["com.lagradost.cloudstream3.APIHolder"]
+            ),
+            level = DeprecationLevel.WARNING,
+        )
+        val unixTime: Long
+            get() = APIHolder.unixTime
+
+        @Deprecated(
+            message = "Use APIHolder.unixTimeMS instead",
+            replaceWith = ReplaceWith(
+                expression = "unixTimeMS",
+                imports = ["com.lagradost.cloudstream3.APIHolder.unixTimeMS"]
+            ),
+            level = DeprecationLevel.WARNING,
+        )
+        val unixTimeMs: Long
+            get() = unixTimeMS
+
+        fun splitRedirectUrl(redirectUrl: String): Map<String, String> {
+            return splitUrlParameters(
+                redirectUrl.replace(APP_STRING, "https").replace("/#", "?")
+            )
+        }
+
+        fun generateCodeVerifier(): String {
+            // It is recommended to use a URL-safe string as code_verifier.
+            // See section 4 of RFC 7636 for more details.
+            val secureRandom = SecureRandom()
+            val codeVerifierBytes = ByteArray(96) // base64 has 6bit per char; (8/6)*96 = 128
+            secureRandom.nextBytes(codeVerifierBytes)
+            return base64Encode(codeVerifierBytes).trimEnd('=')
+                .replace("+", "-").replace("/", "_").replace("\n", "")
+        }
+    }
+
+    /** Is this url a valid redirect url for this service? */
+    @Throws
+    open fun isValidRedirectUrl(url: String): Boolean =
+        redirectUrlIdentifier != null && url.contains("/$redirectUrlIdentifier")
+
+    /** OAuth2 login from a valid redirectUrl, and payload given in loginRequest */
+    @Throws
+    open suspend fun login(redirectUrl: String, payload: String?): AuthToken? =
+        throw NotImplementedError()
+
+    /** OAuth2 login request, asking the service to provide a url to open in the browser */
+    @Throws
+    open fun loginRequest(): AuthLoginPage? = throw NotImplementedError()
+
+    /** Pin login request, asking the service to provide an verificationUrl to display with a QR code */
+    @Throws
+    open suspend fun pinRequest(): AuthPinData? = throw NotImplementedError()
+
+    /** OAuth2 token refresh, this ensures that all token passed to other functions will be valid */
+    @Throws
+    open suspend fun refreshToken(token: AuthToken): AuthToken? = throw NotImplementedError()
+
+    /** Pin login, this will be called periodically while logging in to check if the pin has been verified by the user */
+    @Throws
+    open suspend fun login(payload: AuthPinData): AuthToken? = throw NotImplementedError()
+
+    /** In app login */
+    @Throws
+    open suspend fun login(form: AuthLoginResponse): AuthToken? = throw NotImplementedError()
+
+    /** Get the visible user account */
+    @Throws
+    open suspend fun user(token: AuthToken?): AuthUser? = throw NotImplementedError()
+
+    /**
+     * An optional security measure to make sure that even if an attacker gets ahold of the token, it will be invalid.
+     *
+     * Note that this will currently only be called *once* on logout,
+     * and as such any network issues it will fail silently, and the token will not be revoked.
+     */
+    @Throws
+    open suspend fun invalidateToken(token: AuthToken): Nothing = throw NotImplementedError()
+
+    @Throws
+    @Deprecated("Please use the new API for AuthAPI", level = DeprecationLevel.ERROR)
+    fun toRepo(): AuthRepo = when (this) {
+        is SubtitleAPI -> SubtitleRepo(this)
+        is SyncAPI -> SyncRepo(this)
+        else -> throw NotImplementedError("Unknown inheritance from AuthAPI")
+    }
+
+    @Suppress("DEPRECATION_ERROR")
+    @Deprecated("Please use the new API for AuthAPI", level = DeprecationLevel.ERROR)
+    fun loginInfo(): LoginInfo? {
+        return this.toRepo().authUser()?.let { user ->
+            LoginInfo(
+                profilePicture = user.profilePicture,
+                name = user.name,
+                accountIndex = -1,
+            )
+        }
+    }
+
+    @Deprecated("Please use the new API for AuthAPI", level = DeprecationLevel.ERROR)
+    suspend fun getPersonalLibrary(): SyncAPI.LibraryMetadata? {
+        @Suppress("DEPRECATION_ERROR")
+        return (this.toRepo() as? SyncRepo)?.library()?.getOrThrow()
+    }
+
+    @Deprecated("Please use the new API for AuthAPI", level = DeprecationLevel.ERROR)
     class LoginInfo(
         val profilePicture: String? = null,
         val name: String?,

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

@@ -0,0 +1,168 @@
+package com.lagradost.cloudstream3.syncproviders
+
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.openBrowser
+import com.lagradost.cloudstream3.CommonActivity.showToast
+import com.lagradost.cloudstream3.ErrorLoadingException
+import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.mvvm.logError
+import com.lagradost.cloudstream3.mvvm.safe
+import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.NONE_ID
+import com.lagradost.cloudstream3.utils.txt
+
+/** General-purpose repo */
+class PlainAuthRepo(api: AuthAPI) : AuthRepo(api)
+
+/** Safe abstraction for AuthAPI that provides both a catching interface, and automatic token management. */
+abstract class AuthRepo(open val api: AuthAPI) {
+    fun isValidRedirectUrl(url: String) = safe { api.isValidRedirectUrl(url) } ?: false
+    val idPrefix get() = api.idPrefix
+    val name get() = api.name
+    val icon get() = api.icon
+    val requiresLogin get() = api.requiresLogin
+    val createAccountUrl get() = api.createAccountUrl
+    val hasOAuth2 get() = api.hasOAuth2
+    val hasPin get() = api.hasPin
+    val hasInApp get() = api.hasInApp
+    val inAppLoginRequirement get() = api.inAppLoginRequirement
+    val isAvailable get() = !api.requiresLogin || authUser() != null
+
+    companion object {
+        private val oauthPayload: MutableMap<String, String?> = mutableMapOf()
+    }
+
+    @Throws
+    protected suspend fun freshAuth(): AuthData? {
+        val data = authData() ?: return null
+        if (data.token.isAccessTokenExpired()) {
+            val newToken = api.refreshToken(data.token) ?: return null
+            val newAuth = AuthData(user = data.user, token = newToken)
+            refreshUser(newAuth)
+            return newAuth
+        }
+        return data
+    }
+
+    @Throws
+    fun openOAuth2Page(): Boolean {
+        val page = api.loginRequest() ?: return false
+        synchronized(oauthPayload) {
+            oauthPayload.put(idPrefix, page.payload)
+        }
+        openBrowser(page.url)
+        return true
+    }
+
+    fun openOAuth2PageWithToast() {
+        try {
+            if (!openOAuth2Page()) {
+                showToast(txt(R.string.authenticated_user_fail, api.name))
+            }
+        } catch (t: Throwable) {
+            logError(t)
+            if (t is ErrorLoadingException && t.message != null) {
+                showToast(t.message)
+                return
+            }
+            showToast(txt(R.string.authenticated_user_fail, api.name))
+        }
+    }
+
+    suspend fun logout(from: AuthUser) {
+        val currentAccounts = AccountManager.accounts(idPrefix)
+        val (newAccounts, oldAccounts) = currentAccounts.partition { it.user.id != from.id }
+        if (newAccounts.size < currentAccounts.size) {
+            AccountManager.updateAccounts(idPrefix, newAccounts.toTypedArray())
+            AccountManager.updateAccountsId(idPrefix, 0)
+        }
+
+        for (oldAccount in oldAccounts) {
+            try {
+                api.invalidateToken(oldAccount.token)
+            } catch (_: NotImplementedError) {
+                // no-op
+            } catch (t: Throwable) {
+                logError(t)
+            }
+        }
+    }
+
+    fun refreshUser(newAuth: AuthData) {
+        val currentAccounts = AccountManager.accounts(idPrefix)
+        val newAccounts = currentAccounts.map {
+            if (it.user.id == newAuth.user.id) {
+                newAuth
+            } else {
+                it
+            }
+        }.toTypedArray()
+        AccountManager.updateAccounts(idPrefix, newAccounts)
+    }
+
+    fun authData(): AuthData? = synchronized(AccountManager.cachedAccountIds) {
+        AccountManager.cachedAccountIds[idPrefix]?.let { id ->
+            AccountManager.cachedAccounts[idPrefix]?.firstOrNull { data -> data.user.id == id }
+        }
+    }
+
+    fun authToken(): AuthToken? = authData()?.token
+
+    fun authUser(): AuthUser? = authData()?.user
+
+    val accounts
+        get() = synchronized(AccountManager.cachedAccounts) {
+            AccountManager.cachedAccounts[idPrefix] ?: emptyArray()
+        }
+    var accountId
+        get() = synchronized(AccountManager.cachedAccountIds) {
+            AccountManager.cachedAccountIds[idPrefix] ?: NONE_ID
+        }
+        set(value) {
+            AccountManager.updateAccountsId(idPrefix, value)
+        }
+
+    @Throws
+    suspend fun pinRequest() =
+        api.pinRequest()
+
+    @Throws
+    private suspend fun setupLogin(token: AuthToken): Boolean {
+        val user = api.user(token) ?: return false
+
+        val newAccount = AuthData(
+            token = token,
+            user = user,
+        )
+
+        val currentAccounts = AccountManager.accounts(idPrefix)
+        if (currentAccounts.any { it.user.id == newAccount.user.id }) {
+            throw ErrorLoadingException("Already logged into this account")
+        }
+
+        val newAccounts = currentAccounts + newAccount
+        AccountManager.updateAccounts(idPrefix, newAccounts)
+        AccountManager.updateAccountsId(idPrefix, user.id)
+        if (this is SyncRepo) {
+            requireLibraryRefresh = true
+        }
+        return true
+    }
+
+    @Throws
+    suspend fun login(form: AuthLoginResponse): Boolean {
+        return setupLogin(api.login(form) ?: return false)
+    }
+
+    @Throws
+    suspend fun login(payload: AuthPinData): Boolean {
+        return setupLogin(api.login(payload) ?: return false)
+    }
+
+    @Throws
+    suspend fun login(redirectUrl: String): Boolean {
+        return setupLogin(
+            api.login(
+                redirectUrl,
+                synchronized(oauthPayload) { oauthPayload[api.idPrefix] }) ?: return false
+        )
+    }
+}

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

@@ -0,0 +1,14 @@
+package com.lagradost.cloudstream3.syncproviders
+
+/** Work in progress */
+abstract class BackupAPI : AuthAPI() {
+    open val filename : String = "cloudstream-backup.json"
+
+    /** Get the backup file as a JSON string from the remote storage. Return null if not found/empty */
+    @Throws
+    open suspend fun downloadFile(auth: AuthData?) : String? = throw NotImplementedError()
+
+    /** Get the backup file as a JSON string from the remote storage. */
+    @Throws
+    open suspend fun uploadFile(auth: AuthData?, data : String) : String? = throw NotImplementedError()
+}

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

@@ -1,66 +0,0 @@
-package com.lagradost.cloudstream3.syncproviders
-
-import androidx.annotation.WorkerThread
-
-interface InAppAuthAPI : AuthAPI {
-    data class LoginData(
-        val username: String? = null,
-        val password: String? = null,
-        val server: String? = null,
-        val email: String? = null,
-    )
-
-    // this is for displaying the UI
-    val requiresPassword: Boolean
-    val requiresUsername: Boolean
-    val requiresServer: Boolean
-    val requiresEmail: Boolean
-
-    // if this is false we can assume that getLatestLoginData returns null and wont be called
-    // this is used in case for some reason it is not preferred to store any login data besides the "token" or encrypted data
-    val storesPasswordInPlainText: Boolean
-
-    // return true if logged in successfully
-    suspend fun login(data: LoginData): Boolean
-
-    // used to fill the UI if you want to edit any data about your login info
-    fun getLatestLoginData(): LoginData?
-}
-
-abstract class InAppAuthAPIManager(defIndex: Int) : AccountManager(defIndex), InAppAuthAPI {
-    override val requiresPassword = false
-    override val requiresUsername = false
-    override val requiresEmail = false
-    override val requiresServer = false
-    override val storesPasswordInPlainText = true
-    override val requiresLogin = true
-
-    // runs on startup
-    @WorkerThread
-    open suspend fun initialize() {
-    }
-
-    override fun logOut() {
-        throw NotImplementedError()
-    }
-
-    override val idPrefix: String
-        get() = throw NotImplementedError()
-
-    override val name: String
-        get() = throw NotImplementedError()
-
-    override val icon: Int? = null
-
-    override suspend fun login(data: InAppAuthAPI.LoginData): Boolean {
-        throw NotImplementedError()
-    }
-
-    override fun getLatestLoginData(): InAppAuthAPI.LoginData? {
-        throw NotImplementedError()
-    }
-
-    override fun loginInfo(): AuthAPI.LoginInfo? {
-        throw NotImplementedError()
-    }
-}

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

@@ -1,27 +0,0 @@
-package com.lagradost.cloudstream3.syncproviders
-
-import androidx.fragment.app.FragmentActivity
-
-interface OAuth2API : AuthAPI {
-    val key: String
-    val redirectUrl: String
-    val supportDeviceAuth: Boolean
-
-    suspend fun handleRedirect(url: String) : Boolean
-    fun authenticate(activity: FragmentActivity?)
-    suspend fun getDevicePin() : PinAuthData? {
-        return null
-    }
-
-    suspend fun handleDeviceAuth(pinAuthData: PinAuthData) : Boolean {
-        return false
-    }
-
-    data class PinAuthData(
-        val deviceCode: String,
-        val userCode: String,
-        val verificationUrl: String,
-        val expiresIn: Int,
-        val interval: Int,
-    )
-}

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

@@ -0,0 +1,37 @@
+package com.lagradost.cloudstream3.syncproviders
+
+import androidx.annotation.WorkerThread
+import com.lagradost.cloudstream3.subtitles.AbstractSubtitleEntities.SubtitleEntity
+import com.lagradost.cloudstream3.subtitles.AbstractSubtitleEntities.SubtitleSearch
+import com.lagradost.cloudstream3.subtitles.SubtitleResource
+
+/**
+ * Stateless subtitle class for external subtitles.
+ *
+ * All non-null `AuthToken` will be non-expired when each function is called.
+ */
+abstract class SubtitleAPI : AuthAPI() {
+    @WorkerThread
+    @Throws
+    open suspend fun search(auth: AuthData?, query: SubtitleSearch): List<SubtitleEntity>? =
+        throw NotImplementedError()
+
+    @WorkerThread
+    @Throws
+    open suspend fun load(auth: AuthData?, subtitle: SubtitleEntity): String? =
+        throw NotImplementedError()
+
+    @WorkerThread
+    @Throws
+    open suspend fun SubtitleResource.getResources(auth: AuthData?, subtitle: SubtitleEntity) {
+        this.addUrl(load(auth, subtitle))
+    }
+
+    @WorkerThread
+    @Throws
+    suspend fun resource(auth: AuthData?, subtitle: SubtitleEntity): SubtitleResource {
+        return SubtitleResource().apply {
+            this.getResources(auth, subtitle)
+        }
+    }
+}

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

@@ -0,0 +1,95 @@
+package com.lagradost.cloudstream3.syncproviders
+
+import androidx.annotation.WorkerThread
+import com.lagradost.cloudstream3.APIHolder.unixTime
+import com.lagradost.cloudstream3.subtitles.AbstractSubtitleEntities.SubtitleEntity
+import com.lagradost.cloudstream3.subtitles.AbstractSubtitleEntities.SubtitleSearch
+import com.lagradost.cloudstream3.subtitles.SubtitleResource
+import com.lagradost.cloudstream3.utils.Coroutines.atomicListOf
+
+/** Stateless safe abstraction of SubtitleAPI */
+class SubtitleRepo(override val api: SubtitleAPI) : AuthRepo(api) {
+    companion object {
+        data class SavedSearchResponse(
+            val unixTime: Long,
+            val response: List<SubtitleEntity>,
+            val query: SubtitleSearch,
+            val idPrefix: String,
+        )
+
+        data class SavedResourceResponse(
+            val unixTime: Long,
+            val response: SubtitleResource,
+            val query: SubtitleEntity
+        )
+
+        // maybe make this a generic struct? right now there is a lot of boilerplate
+        private val searchCache = atomicListOf<SavedSearchResponse>()
+        private var searchCacheIndex: Int = 0
+        private val resourceCache = atomicListOf<SavedResourceResponse>()
+        private var resourceCacheIndex: Int = 0
+        const val CACHE_SIZE = 20
+    }
+
+    @WorkerThread
+    suspend fun resource(data: SubtitleEntity): Result<SubtitleResource> = runCatching {
+        val cached = resourceCache.withLock {
+            var found: SubtitleResource? = null
+            for (item in resourceCache) {
+                // 20 min save
+                if (item.query == data && (unixTime - item.unixTime) < 60 * 20) {
+                    found = item.response
+                    break
+                }
+            }
+            found
+        }
+        if (cached != null) return@runCatching cached
+
+        val returnValue = api.resource(freshAuth(), data)
+        resourceCache.withLock {
+            val add = SavedResourceResponse(unixTime, returnValue, data)
+            if (resourceCache.size > CACHE_SIZE) {
+                resourceCache[resourceCacheIndex] = add // rolling cache
+                resourceCacheIndex = (resourceCacheIndex + 1) % CACHE_SIZE
+            } else {
+                resourceCache.add(add)
+            }
+        }
+        returnValue
+    }
+
+    @WorkerThread
+    suspend fun search(query: SubtitleSearch): Result<List<SubtitleEntity>> {
+        return runCatching {
+            val cached = searchCache.withLock {
+                var found: List<SubtitleEntity>? = null
+                for (item in searchCache) {
+                    // 120 min save
+                    if (item.idPrefix == idPrefix && item.query == query && (unixTime - item.unixTime) < 60 * 120) {
+                        found = item.response
+                        break
+                    }
+                }
+                found
+            }
+
+            if (cached != null) return@runCatching cached
+            val returnValue = api.search(freshAuth(), query) ?: emptyList()
+
+            // only cache valid return values
+            if (returnValue.isNotEmpty()) {
+                val add = SavedSearchResponse(unixTime, returnValue, query, idPrefix)
+                searchCache.withLock {
+                    if (searchCache.size > CACHE_SIZE) {
+                        searchCache[searchCacheIndex] = add // rolling cache
+                        searchCacheIndex = (searchCacheIndex + 1) % CACHE_SIZE
+                    } else {
+                        searchCache.add(add)
+                    }
+                }
+            }
+            returnValue
+        }
+    }
+}

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

@@ -1,45 +1,74 @@
 package com.lagradost.cloudstream3.syncproviders
 
-import com.lagradost.cloudstream3.*
+import androidx.annotation.WorkerThread
+import com.lagradost.cloudstream3.ActorData
+import com.lagradost.cloudstream3.NextAiring
+import com.lagradost.cloudstream3.Score
+import com.lagradost.cloudstream3.SearchQuality
+import com.lagradost.cloudstream3.SearchResponse
+import com.lagradost.cloudstream3.ShowStatus
+import com.lagradost.cloudstream3.TvType
 import com.lagradost.cloudstream3.ui.SyncWatchType
 import com.lagradost.cloudstream3.ui.library.ListSorting
+import com.lagradost.cloudstream3.utils.Levenshtein
 import com.lagradost.cloudstream3.utils.UiText
-import me.xdrop.fuzzywuzzy.FuzzySearch
 import java.util.Date
 
-interface SyncAPI : OAuth2API {
+/**
+ * Stateless synchronization class, used for syncing status about a specific movie/show.
+ *
+ * All non-null `AuthToken` will be non-expired when each function is called.
+ */
+abstract class SyncAPI : AuthAPI() {
     /**
      * Set this to true if the user updates something on the list like watch status or score
      **/
-    var requireLibraryRefresh: Boolean
+    open var requireLibraryRefresh: Boolean = true
-    val mainUrl: String
+    open val mainUrl: String = "NONE"
 
+    /** Currently unused, but will be used to correctly render the UI.
+     * This should specify what sync watch types can be used with this service. */
+    open val supportedWatchTypes: Set<SyncWatchType> = SyncWatchType.entries.toSet()
     /**
      * Allows certain providers to open pages from
      * library links.
      **/
-    val syncIdName: SyncIdName
+    open val syncIdName: SyncIdName? = null
 
-    /**
+    /** Modify the current status of an item */
-    -1 -> None
+    @Throws
-    0 -> Watching
+    @WorkerThread
-    1 -> Completed
+    open suspend fun updateStatus(
-    2 -> OnHold
+        auth: AuthData?,
-    3 -> Dropped
+        id: String,
-    4 -> PlanToWatch
+        newStatus: AbstractSyncStatus
-    5 -> ReWatching
+    ): Boolean = throw NotImplementedError()
-     */
-    suspend fun score(id: String, status: AbstractSyncStatus): Boolean
 
-    suspend fun getStatus(id: String): AbstractSyncStatus?
+    /** Get the current status of an item */
+    @Throws
+    @WorkerThread
+    open suspend fun status(auth: AuthData?, id: String): AbstractSyncStatus? =
+        throw NotImplementedError()
 
-    suspend fun getResult(id: String): SyncResult?
+    /** Get metadata about an item */
+    @Throws
+    @WorkerThread
+    open suspend fun load(auth: AuthData?, id: String): SyncResult? = throw NotImplementedError()
 
-    suspend fun search(name: String): List<SyncSearchResult>?
+    /** Search this service for any results for a given query */
+    @Throws
+    @WorkerThread
+    open suspend fun search(auth: AuthData?, query: String): List<SyncSearchResult>? =
+        throw NotImplementedError()
 
-    suspend fun getPersonalLibrary(): LibraryMetadata?
+    /** Get the current library/bookmarks of this service */
+    @Throws
+    @WorkerThread
+    open suspend fun library(auth: AuthData?): LibraryMetadata? = throw NotImplementedError()
 
-    fun getIdFromUrl(url: String): String
+    /** Helper function, may be used in the future */
+    @Throws
+    open fun urlToId(url: String): String? = null
 
     data class SyncSearchResult(
         override val name: String,
@@ -51,23 +80,20 @@ interface SyncAPI : OAuth2API {
         override var quality: SearchQuality? = null,
         override var posterHeaders: Map<String, String>? = null,
         override var id: Int? = null,
+        override var score: Score? = null,
     ) : SearchResponse
 
     abstract class AbstractSyncStatus {
         abstract var status: SyncWatchType
-
+        abstract var score: Score?
-        /** 1-10 */
-        abstract var score: Int?
         abstract var watchedEpisodes: Int?
         abstract var isFavorite: Boolean?
         abstract var maxEpisodes: Int?
     }
 
-
     data class SyncStatus(
         override var status: SyncWatchType,
-        /** 1-10 */
+        override var score: Score?,
-        override var score: Int?,
         override var watchedEpisodes: Int?,
         override var isFavorite: Boolean? = null,
         override var maxEpisodes: Int? = null,
@@ -80,8 +106,7 @@ interface SyncAPI : OAuth2API {
         var totalEpisodes: Int? = null,
 
         var title: String? = null,
-        /**1-1000*/
+        var publicScore: Score? = null,
-        var publicScore: Int? = null,
         /**In minutes*/
         var duration: Int? = null,
         var synopsis: String? = null,
@@ -105,7 +130,6 @@ interface SyncAPI : OAuth2API {
         var actors: List<ActorData>? = null,
     )
 
-
     data class Page(
         val title: UiText, var items: List<LibraryItem>
     ) {
@@ -114,13 +138,14 @@ interface SyncAPI : OAuth2API {
                 ListSorting.Query ->
                     if (query != null) {
                         items.sortedBy {
-                            -FuzzySearch.partialRatio(
+                            -Levenshtein.partialRatio(
                                 query.lowercase(), it.name.lowercase()
                             )
                         }
                     } else items
-                ListSorting.RatingHigh -> items.sortedBy { -(it.personalRating ?: 0) }
+
-                ListSorting.RatingLow -> items.sortedBy { (it.personalRating ?: 0) }
+                ListSorting.RatingHigh -> items.sortedBy { -(it.personalRating?.toInt(100) ?: 0) }
+                ListSorting.RatingLow -> items.sortedBy { (it.personalRating?.toInt(100) ?: 0) }
                 ListSorting.AlphabeticalA -> items.sortedBy { it.name }
                 ListSorting.AlphabeticalZ -> items.sortedBy { it.name }.reversed()
                 ListSorting.UpdatedNew -> items.sortedBy { it.lastUpdatedUnixTime?.times(-1) }
@@ -153,8 +178,7 @@ interface SyncAPI : OAuth2API {
         val syncId: String,
         val episodesCompleted: Int?,
         val episodesTotal: Int?,
-        /** Out of 100 */
+        val personalRating: Score?,
-        val personalRating: Int?,
         val lastUpdatedUnixTime: Long?,
         override val apiName: String,
         override var type: TvType?,
@@ -164,7 +188,7 @@ interface SyncAPI : OAuth2API {
         val releaseDate: Date?,
         override var id: Int? = null,
         val plot: String? = null,
-        val rating: Int? = null,
+        override var score: Score? = null,
         val tags: List<String>? = null
     ) : SearchResponse
 }

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

@@ -1,48 +1,30 @@
 package com.lagradost.cloudstream3.syncproviders
 
-import com.lagradost.cloudstream3.ErrorLoadingException
+/** Stateless safe abstraction of SyncAPI */
-import com.lagradost.cloudstream3.mvvm.Resource
+class SyncRepo(override val api: SyncAPI) : AuthRepo(api) {
-import com.lagradost.cloudstream3.mvvm.normalSafeApiCall
+    val syncIdName = api.syncIdName
-import com.lagradost.cloudstream3.mvvm.safeApiCall
-
-class SyncRepo(private val repo: SyncAPI) {
-    val idPrefix = repo.idPrefix
-    val name = repo.name
-    val icon = repo.icon
-    val mainUrl = repo.mainUrl
-    val requiresLogin = repo.requiresLogin
-    val syncIdName = repo.syncIdName
     var requireLibraryRefresh: Boolean
-        get() = repo.requireLibraryRefresh
+        get() = api.requireLibraryRefresh
         set(value) {
-            repo.requireLibraryRefresh = value
+            api.requireLibraryRefresh = value
         }
 
-    suspend fun score(id: String, status: SyncAPI.AbstractSyncStatus): Resource<Boolean> {
+    suspend fun updateStatus(id: String, newStatus: SyncAPI.AbstractSyncStatus): Result<Boolean> =
-        return safeApiCall { repo.score(id, status) }
+        runCatching {
+            val status = api.updateStatus(freshAuth() ?: return@runCatching false, id, newStatus)
+            requireLibraryRefresh = true
+            status
         }
 
-    suspend fun getStatus(id: String): Resource<SyncAPI.AbstractSyncStatus> {
+    suspend fun status(id: String): Result<SyncAPI.AbstractSyncStatus?> = runCatching {
-        return safeApiCall { repo.getStatus(id) ?: throw ErrorLoadingException("No data") }
+        api.status(freshAuth(), id)
     }
 
-    suspend fun getResult(id: String): Resource<SyncAPI.SyncResult> {
+    suspend fun load(id: String): Result<SyncAPI.SyncResult?> = runCatching {
-        return safeApiCall { repo.getResult(id) ?: throw ErrorLoadingException("No data") }
+        api.load(freshAuth(), id)
     }
 
-    suspend fun search(query: String): Resource<List<SyncAPI.SyncSearchResult>> {
+    suspend fun library(): Result<SyncAPI.LibraryMetadata?> = runCatching {
-        return safeApiCall { repo.search(query) ?: throw ErrorLoadingException() }
+        api.library(freshAuth())
-    }
-
-    suspend fun getPersonalLibrary(): Resource<SyncAPI.LibraryMetadata> {
-        return safeApiCall { repo.getPersonalLibrary() ?: throw ErrorLoadingException() }
-    }
-
-    fun hasAccount(): Boolean {
-        return normalSafeApiCall { repo.loginInfo() != null } ?: false
-    }
-
-    fun getIdFromUrl(url: String): String? = normalSafeApiCall {
-        repo.getIdFromUrl(url)
     }
 }

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

@@ -1,108 +1,205 @@
 package com.lagradost.cloudstream3.syncproviders.providers
 
-import com.lagradost.cloudstream3.TvType
+import com.lagradost.cloudstream3.AllLanguagesName
 import com.lagradost.cloudstream3.app
-import com.lagradost.cloudstream3.subtitles.AbstractSubApi
+import com.lagradost.cloudstream3.subtitles.AbstractSubtitleEntities.SubtitleEntity
-import com.lagradost.cloudstream3.subtitles.AbstractSubtitleEntities
+import com.lagradost.cloudstream3.subtitles.AbstractSubtitleEntities.SubtitleSearch
-import com.lagradost.cloudstream3.utils.SubtitleHelper
+import com.lagradost.cloudstream3.syncproviders.AuthData
+import com.lagradost.cloudstream3.syncproviders.SubtitleAPI
+import com.lagradost.cloudstream3.TvType
+import com.lagradost.cloudstream3.utils.SubtitleHelper.fromTagToEnglishLanguageName
 
-class Addic7ed : AbstractSubApi {
+class Addic7ed : SubtitleAPI() {
     override val name = "Addic7ed"
     override val idPrefix = "addic7ed"
     override val requiresLogin = false
-    override val icon: Nothing? = null
-    override val createAccountUrl: Nothing? = null
-
-    override fun loginInfo(): Nothing? = null
-
-    override fun logOut() {}
 
     companion object {
         const val HOST = "https://www.addic7ed.com"
         const val TAG = "ADDIC7ED"
     }
 
-    private fun fixUrl(url: String): String {
+    private fun String.fixUrl(): String {
+        val url = this
         return if (url.startsWith("/")) HOST + url
         else if (!url.startsWith("http")) "$HOST/$url"
         else url
-
     }
 
-    override suspend fun search(query: AbstractSubtitleEntities.SubtitleSearch): List<AbstractSubtitleEntities.SubtitleEntity> {
+    override suspend fun search(
-        val lang = query.lang
+        auth: AuthData?,
-        val queryLang = SubtitleHelper.fromTwoLettersToLanguage(lang.toString())
+        query: SubtitleSearch
-        val queryText = query.query.trim()
+    ): List<SubtitleEntity>? {
+        val langTagIETF = query.lang ?: AllLanguagesName
+        val langNumAddic7ed =
+            langTagIETF2Addic7ed[langTagIETF]?.first ?: 0 // all languages = 0
+        val langName =
+            langTagIETF2Addic7ed[langTagIETF]?.second ?:
+            fromTagToEnglishLanguageName(langTagIETF) ?:
+            "Completed" // this bypasses language filtering
+        val title = query.query.trim()
         val epNum = query.epNumber ?: 0
         val seasonNum = query.seasonNumber ?: 0
         val yearNum = query.year ?: 0
+        val searchQuery = if (seasonNum > 0) "$title $seasonNum $epNum" else title
+        var downloadPage = ""
 
-        fun cleanResources(
+        fun newSubtitleEntity (
-            results: MutableList<AbstractSubtitleEntities.SubtitleEntity>,
+            displayName: String?,
-            name: String,
+            link: String?,
-            link: String,
-            headers: Map<String, String>,
             isHearingImpaired: Boolean
-        ) {
+        ): SubtitleEntity? {
-            results.add(
+            if (displayName.isNullOrBlank() || link.isNullOrBlank()) return null
-                AbstractSubtitleEntities.SubtitleEntity(
+            return SubtitleEntity(
-                    idPrefix = idPrefix,
+                idPrefix = this.idPrefix,
-                    name = name,
+                name = displayName,
-                    lang = queryLang.toString(),
+                lang = langTagIETF,
                 data = link,
                 source = this.name,
                 type = if (seasonNum > 0) TvType.TvSeries else TvType.Movie,
                 epNumber = epNum,
                 seasonNumber = seasonNum,
                 year = yearNum,
-                    headers = headers,
+                headers = mapOf("referer" to "$HOST/"),
                 isHearingImpaired = isHearingImpaired
             )
-            )
         }
 
-        val title = queryText.substringBefore("(").trim()
+        val response = app.get(url = "$HOST/search.php?search=$searchQuery&Submit=Search")
-        val url = "$HOST/search.php?search=${title}&Submit=Search"
+        val hostDocument = response.document
-        val hostDocument = app.get(url).document
+
-        var searchResult = ""
+        // 1st case: found one movie or episode. Redirected to $HOST/movie/1234 or $HOST/serie/show-name/$seasonNum/$epNum/ep-name
-        if (!hostDocument.select("span:contains($title)").isNullOrEmpty()) searchResult = url
+        if (response.url.contains("/movie/") || response.url.contains("/serie/"))
-        else if (!hostDocument.select("table.tabel")
+            downloadPage = response.url
-                .isNullOrEmpty()
+
-        ) searchResult = hostDocument.select("a:contains($title)").attr("href").toString()
+        // 2nd case: found tv series ep list. Redirected to $HOST/show/1234
-        else {
+        else if (response.url.contains("/show/")) {
-            val show =
+            val showId = response.url.substringAfterLast("/")
-                hostDocument.selectFirst("#sl button")?.attr("onmouseup")?.substringAfter("(")
-                    ?.substringBefore(",")
             val doc = app.get(
-                "$HOST/ajax_loadShow.php?show=$show&season=$seasonNum&langs=&hd=undefined&hi=undefined",
+                "$HOST/ajax_loadShow.php?show=$showId&season=$seasonNum&langs=|$langNumAddic7ed|&hd=0&hi=0",
                 referer = "$HOST/"
             ).document
-            doc.select("#season tr:contains($queryLang)").mapNotNull { node ->
-                if (node.selectFirst("td")?.text()
-                        ?.toIntOrNull() == seasonNum && node.select("td:eq(1)")
-                        .text()
-                        .toIntOrNull() == epNum
-                ) searchResult = fixUrl(node.select("a").attr("href"))
-            }
-        }
-        val results = mutableListOf<AbstractSubtitleEntities.SubtitleEntity>()
-        val document = app.get(
-            url = fixUrl(searchResult),
-        ).document
 
-        document.select(".tabel95 .tabel95 tr:contains($queryLang)").mapNotNull { node ->
+            // get direct subtitles links from list
-            val name = if (seasonNum > 0) "${document.select(".titulo").text().replace("Subtitle","").trim()}${
+            return doc.select("#season tbody tr").mapNotNull { node ->
+                if (node.select("td:eq(1)").text().toIntOrNull() == epNum)
+                    newSubtitleEntity(
+                        displayName = node.select("td:eq(2)").text() + "\n" + node.select("td:eq(4)").text(),
+                        link = node.selectFirst("a[href~=updated\\/|original\\/]")?.attr("href")?.fixUrl(),
+                        isHearingImpaired = node.select("td:eq(6)").text().isNotEmpty()
+                    )
+                else null
+            }
+        // 3rd case: found several or no results. Still in $HOST/search.php?search=title
+        } else {// (response.url.contains("/search.php"))
+            downloadPage = hostDocument.select("table.tabel a").selectFirst({
+                // tv series
+                if (seasonNum > 0) "a[href~=serie\\/.+\\/$seasonNum\\/$epNum\\/\\w]"
+                // movie + year
+                else if( yearNum > 0) "a[href~=movie\\/]:contains($yearNum)"
+                // movie
+                else "a[href~=movie\\/]"
+            }())?.attr("href")?.fixUrl() ?: return null
+        }
+
+        // filter download page by language. Do not work for movies :/
+        if (downloadPage.contains("/serie/"))
+            downloadPage = downloadPage.substringBeforeLast("/") + "/$langNumAddic7ed"
+        val doc = app.get(url = downloadPage).document
+
+        // get subtitles links from download page
+        return doc.select(".tabel95 .tabel95 tr:has(.language):contains($langName)").mapNotNull { node ->
+            val displayName =
+                doc.selectFirst("span.titulo")?.text()?.substringBefore(" Subtitle") + "\n" +
                 node.parent()!!.select(".NewsTitle").text().substringAfter("Version ").substringBefore(", Duration")
-            }" else "${document.select(".titulo").text().replace("Subtitle","").trim()}${node.parent()!!.select(".NewsTitle").text().substringAfter("Version").substringBefore(", Duration")}"
+            val link =
-            val link = fixUrl(node.select("a.buttonDownload").attr("href"))
+                node.selectFirst("a[href~=updated\\/|original\\/]")?.attr("href")?.fixUrl()
             val isHearingImpaired =
-                !node.parent()!!.select("tr:last-child [title=\"Hearing Impaired\"]").isNullOrEmpty()
+                node.parent()!!.select("tr:last-child [title=\"Hearing Impaired\"]").isNotEmpty()
-            cleanResources(results, name, link, mapOf("referer" to "$HOST/"), isHearingImpaired)
+
+            newSubtitleEntity(displayName, link, isHearingImpaired)
         }
-        return results
     }
 
-    override suspend fun load(data: AbstractSubtitleEntities.SubtitleEntity): String {
+    override suspend fun load(
-        return data.data
+        auth: AuthData?,
+        subtitle: SubtitleEntity
+    ): String? {
+        return subtitle.data
     }
+
+    // Missing (?_?)
+    // Pair("2", ""),
+    // Pair("3", ""),
+    // Pair("33", ""),
+    // Pair("34", ""),
+    // Do not modify unless Addic7ed changes them!
+    // as they are the exact values from their website
+    private val langTagIETF2Addic7ed = mapOf(
+        "ar"      to Pair("38", "Arabic"),
+        "az"      to Pair("48", "Azerbaijani"),
+        "bg"      to Pair("35", "Bulgarian"),
+        "bn"      to Pair("47", "Bengali"),
+        "bs"      to Pair("44", "Bosnian"),
+        "ca"      to Pair("12", "Català"),
+        "cs"      to Pair("14", "Czech"),
+        "cy"      to Pair("65", "Welsh"),
+        "da"      to Pair("30", "Danish"),
+        "de"      to Pair("11", "German"),
+        "el"      to Pair("27", "Greek"),
+        "en"      to Pair("1", "English"),
+        "es-419"  to Pair("6", "Spanish (Latin America)"),
+        "es-ar"   to Pair("69", "Spanish (Argentina)"),
+        "es-es"   to Pair("5", "Spanish (Spain)"),
+        "es"      to Pair("4", "Spanish"),
+        "et"      to Pair("54", "Estonian"),
+        "eu"      to Pair("13", "Euskera"),
+        "fa"      to Pair("43", "Persian"),
+        "fi"      to Pair("28", "Finnish"),
+        "fr-ca"   to Pair("53", "French (Canadian)"),
+        "fr"      to Pair("8", "French"),
+        "gl"      to Pair("15", "Galego"),
+        "he"      to Pair("23", "Hebrew"),
+        "hi"      to Pair("55", "Hindi"),
+        "hr"      to Pair("31", "Croatian"),
+        "hu"      to Pair("20", "Hungarian"),
+        "hy"      to Pair("50", "Armenian"),
+        "id"      to Pair("37", "Indonesian"),
+        "is"      to Pair("56", "Icelandic"),
+        "it"      to Pair("7", "Italian"),
+        "ja"      to Pair("32", "Japanese"),
+        "kn"      to Pair("66", "Kannada"),
+        "ko"      to Pair("42", "Korean"),
+        "lt"      to Pair("58", "Lithuanian"),
+        "lv"      to Pair("57", "Latvian"),
+        "mk"      to Pair("49", "Macedonian"),
+        "ml"      to Pair("67", "Malayalam"),
+        "mr"      to Pair("62", "Marathi"),
+        "ms"      to Pair("40", "Malay"),
+        "nl"      to Pair("17", "Dutch"),
+        "no"      to Pair("29", "Norwegian"),
+        "pl"      to Pair("21", "Polish"),
+        "pt-br"   to Pair("10", "Portuguese (Brazilian)"),
+        "pt"      to Pair("9", "Portuguese"),
+        "ro"      to Pair("26", "Romanian"),
+        "ru"      to Pair("19", "Russian"),
+        "si"      to Pair("60", "Sinhala"),
+        "sk"      to Pair("25", "Slovak"),
+        "sl"      to Pair("22", "Slovenian"),
+        "sq"      to Pair("52", "Albanian"),
+        "sr-latn" to Pair("36", "Serbian (Latin)"),
+        "sr"      to Pair("39", "Serbian (Cyrillic)"),
+        "sv"      to Pair("18", "Swedish"),
+        "ta"      to Pair("59", "Tamil"),
+        "te"      to Pair("63", "Telugu"),
+        "th"      to Pair("46", "Thai"),
+        "tl"      to Pair("68", "Tagalog"),
+        "tlh"     to Pair("61", "Klingon"),
+        "tr"      to Pair("16", "Turkish"),
+        "uk"      to Pair("51", "Ukrainian"),
+        "vi"      to Pair("45", "Vietnamese"),
+        "yue"     to Pair("64", "Cantonese"),
+        "zh-hans" to Pair("41", "Chinese (Simplified)"),
+        "zh-hant" to Pair("24", "Chinese (Traditional)"),
+    )
 }

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

@@ -1,35 +0,0 @@
-package com.lagradost.cloudstream3.syncproviders.providers
-
-import androidx.fragment.app.FragmentActivity
-import com.lagradost.cloudstream3.syncproviders.AuthAPI
-import com.lagradost.cloudstream3.syncproviders.OAuth2API
-
-//TODO dropbox sync
-class Dropbox : OAuth2API {
-    override val idPrefix = "dropbox"
-    override var name = "Dropbox"
-    override val key = "zlqsamadlwydvb2"
-    override val redirectUrl = "dropboxlogin"
-    override val requiresLogin = true
-    override val supportDeviceAuth = false
-    override val createAccountUrl: String? = null
-
-    override val icon: Int
-        get() = TODO("Not yet implemented")
-
-    override fun authenticate(activity: FragmentActivity?) {
-        TODO("Not yet implemented")
-    }
-
-    override suspend fun handleRedirect(url: String): Boolean {
-        TODO("Not yet implemented")
-    }
-
-    override fun logOut() {
-        TODO("Not yet implemented")
-    }
-
-    override fun loginInfo(): AuthAPI.LoginInfo? {
-        TODO("Not yet implemented")
-    }
-}

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

@@ -1,8 +1,658 @@
 package com.lagradost.cloudstream3.syncproviders.providers
 
+import androidx.annotation.StringRes
 import com.fasterxml.jackson.annotation.JsonProperty
+import com.lagradost.cloudstream3.APIHolder
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.getKey
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.setKey
+import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.Score
+import com.lagradost.cloudstream3.ShowStatus
+import com.lagradost.cloudstream3.TvType
 import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.mvvm.logError
+import com.lagradost.cloudstream3.syncproviders.AuthData
+import com.lagradost.cloudstream3.syncproviders.AuthLoginRequirement
+import com.lagradost.cloudstream3.syncproviders.AuthLoginResponse
+import com.lagradost.cloudstream3.syncproviders.AuthToken
+import com.lagradost.cloudstream3.syncproviders.AuthUser
+import com.lagradost.cloudstream3.syncproviders.SyncAPI
+import com.lagradost.cloudstream3.syncproviders.SyncIdName
+import com.lagradost.cloudstream3.ui.SyncWatchType
+import com.lagradost.cloudstream3.ui.library.ListSorting
+import com.lagradost.cloudstream3.utils.AppUtils.toJson
+import com.lagradost.cloudstream3.utils.txt
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import okhttp3.Interceptor
+import okhttp3.Request
+import okhttp3.RequestBody.Companion.toRequestBody
+import okhttp3.Response
+import java.text.SimpleDateFormat
+import java.time.LocalDate
+import java.time.ZoneId
+import java.util.Date
+import java.util.Locale
+
+const val KITSU_MAX_SEARCH_LIMIT = 20
+
+class KitsuApi: SyncAPI() {
+    override var name = "Kitsu"
+    override val idPrefix = "kitsu"
+
+    private val apiUrl = "https://kitsu.io/api/edge"
+    private val fallbackApiUrl = "https://kitsu.app/api/edge"
+    private val oauthUrl = "https://kitsu.io/api/oauth"
+    private val fallbackOauthUrl = "https://kitsu.app/api/oauth"
+    override val hasInApp = true
+    override val mainUrl = "https://kitsu.app"
+    override val icon = R.drawable.kitsu_icon
+    override val syncIdName = SyncIdName.Kitsu
+    override val createAccountUrl = mainUrl
+
+    override val supportedWatchTypes = setOf(
+        SyncWatchType.WATCHING,
+        SyncWatchType.COMPLETED,
+        SyncWatchType.PLANTOWATCH,
+        SyncWatchType.DROPPED,
+        SyncWatchType.ONHOLD,
+        SyncWatchType.NONE
+    )
+
+    override val inAppLoginRequirement = AuthLoginRequirement(
+        password = true,
+        email = true
+    )
+
+    private class FallbackInterceptor(private val apiUrl: String, private val fallbackApiUrl: String) : Interceptor {
+        override fun intercept(chain: Interceptor.Chain): Response {
+            val request: Request = chain.request()
+
+            try {
+                val response = chain.proceed(request);
+                if (response.isSuccessful) return response
+                response.close()
+            } catch (_: Exception) {
+            }
+
+            val fallbackRequest: Request = request.newBuilder()
+                .url(request.url.toString().replaceFirst(apiUrl, fallbackApiUrl))
+                .build()
+
+            return chain.proceed(fallbackRequest)
+        }
+    }
+
+    private val apiFallbackInterceptor = FallbackInterceptor(apiUrl, fallbackApiUrl)
+    private val oauthFallbackInterceptor = FallbackInterceptor(oauthUrl, fallbackOauthUrl)
+
+    override suspend fun login(form: AuthLoginResponse): AuthToken? {
+        val username = form.email ?: return null
+        val password = form.password ?: return null
+
+        val grantType = "password"
+
+        val token = app.post(
+            "$oauthUrl/token",
+            data = mapOf(
+                "grant_type" to grantType,
+                "username" to username,
+                "password" to password
+            ),
+            interceptor = oauthFallbackInterceptor
+        ).parsed<ResponseToken>()
+
+        return AuthToken(
+            accessTokenLifetime = APIHolder.unixTime + token.expiresIn.toLong(),
+            refreshToken = token.refreshToken,
+            accessToken = token.accessToken,
+        )
+    }
+
+    override suspend fun refreshToken(token: AuthToken): AuthToken {
+        val res = app.post(
+            "$oauthUrl/token",
+            data = mapOf(
+                "grant_type" to "refresh_token",
+                "refresh_token" to token.refreshToken!!
+            ),
+            interceptor = oauthFallbackInterceptor
+        ).parsed<ResponseToken>()
+
+        return AuthToken(
+            accessToken = res.accessToken,
+            refreshToken = res.refreshToken,
+            accessTokenLifetime = APIHolder.unixTime + res.expiresIn.toLong()
+        )
+    }
+
+    override suspend fun user(token: AuthToken?): AuthUser? {
+        val user = app.get(
+            "$apiUrl/users?filter[self]=true",
+            headers = mapOf(
+                "Authorization" to "Bearer ${token?.accessToken ?: return null}"
+            ), cacheTime = 0,
+            interceptor = apiFallbackInterceptor
+        ).parsed<KitsuResponse>()
+
+        if (user.data.isEmpty()) {
+           return null
+        }
+
+        return AuthUser(
+            id = user.data[0].id.toInt(),
+            name = user.data[0].attributes.name,
+            profilePicture = user.data[0].attributes.avatar?.original
+        )
+    }
+
+    override suspend fun search(auth: AuthData?, query: String): List<SyncSearchResult>? {
+        val auth = auth?.token?.accessToken ?: return null
+        val animeSelectedFields = arrayOf("titles","canonicalTitle","posterImage","episodeCount")
+        val url = "$apiUrl/anime?filter[text]=$query&page[limit]=$KITSU_MAX_SEARCH_LIMIT&fields[anime]=${animeSelectedFields.joinToString(",")}"
+
+        val res = app.get(
+            url, headers = mapOf(
+                "Authorization" to "Bearer $auth",
+            ), cacheTime = 0,
+            interceptor = apiFallbackInterceptor
+        ).parsed<KitsuResponse>()
+
+        return res.data.map {
+            val attributes = it.attributes
+
+            val title = attributes.canonicalTitle ?: attributes.titles?.enJp ?: attributes.titles?.jaJp ?: "No title"
+
+            SyncSearchResult(
+                title,
+                this.name,
+                it.id,
+                "$mainUrl/anime/${it.id}/",
+                attributes.posterImage?.large ?: attributes.posterImage?.medium
+            )
+        }
+    }
+
+    override suspend fun load(auth : AuthData?, id: String): SyncResult? {
+        val auth = auth?.token?.accessToken ?: return null
+        if (id.toIntOrNull() == null) {
+            return null
+        }
+
+        @Serializable
+        data class KitsuResponse(
+            @JsonProperty("data") @SerialName("data") val data: KitsuNode,
+        )
+
+        val url =
+            "$apiUrl/anime/$id"
+
+        val anime = app.get(
+            url, headers = mapOf(
+                "Authorization" to "Bearer $auth"
+            ),
+            interceptor = apiFallbackInterceptor
+        ).parsed<KitsuResponse>().data.attributes
+
+        return SyncResult(
+            id = id,
+            totalEpisodes = anime.episodeCount,
+            title = anime.canonicalTitle ?: anime.titles?.enJp ?: anime.titles?.jaJp.orEmpty(),
+            publicScore =  Score.from(anime.ratingTwenty, 20),
+            duration = anime.episodeLength,
+            synopsis = anime.synopsis,
+            airStatus = when (anime.status) {
+                "finished" -> ShowStatus.Completed
+                "current" -> ShowStatus.Ongoing
+                else -> null
+            },
+            nextAiring = null,
+            studio = null,
+            genres = null,
+            trailers = null,
+            startDate = LocalDate.parse(anime.startDate).toEpochDay(),
+            endDate = LocalDate.parse(anime.endDate).toEpochDay(),
+            recommendations = null,
+            nextSeason =null,
+            prevSeason = null,
+            actors = null,
+        )
+    }
+
+    override suspend fun status(auth : AuthData?, id: String): AbstractSyncStatus? {
+        val accessToken = auth?.token?.accessToken ?: return null
+        val userId = auth.user.id
+
+        val selectedFields = arrayOf("status","ratingTwenty", "progress")
+
+        val url =
+            "$apiUrl/library-entries?filter[userId]=$userId&filter[animeId]=$id&fields[libraryEntries]=${selectedFields.joinToString(",")}"
+
+        val anime = app.get(
+            url, headers = mapOf(
+                "Authorization" to "Bearer $accessToken"
+            ),
+            interceptor = apiFallbackInterceptor
+        ).parsed<KitsuResponse>().data.firstOrNull()?.attributes
+
+        if (anime == null) {
+            return SyncStatus(
+                score = null,
+                status = SyncWatchType.NONE,
+                isFavorite = null,
+                watchedEpisodes = null
+            )
+        }
+
+        return SyncStatus(
+            score = Score.from(anime.ratingTwenty, 20),
+            status = SyncWatchType.fromInternalId(kitsuStatusAsString.indexOf(anime.status)),
+            isFavorite = null,
+            watchedEpisodes = anime.progress,
+        )
+    }
+
+    suspend fun getAnimeIdByTitle(title: String): String? {
+        val animeSelectedFields = arrayOf("titles","canonicalTitle")
+        val url = "$apiUrl/anime?filter[text]=$title&page[limit]=$KITSU_MAX_SEARCH_LIMIT&fields[anime]=${animeSelectedFields.joinToString(",")}"
+
+        val res = app.get(url, interceptor = apiFallbackInterceptor).parsed<KitsuResponse>()
+        return res.data.firstOrNull()?.id
+    }
+
+    override fun urlToId(url: String): String? =
+        Regex("""/anime/((.*)/|(.*))""").find(url)?.groupValues?.first()
+
+    override suspend fun updateStatus(
+        auth : AuthData?,
+        id: String,
+        newStatus: AbstractSyncStatus
+    ): Boolean {
+        return setScoreRequest(
+            auth ?: return false,
+            id.toIntOrNull() ?: return false,
+            fromIntToAnimeStatus(newStatus.status),
+            newStatus.score?.toInt(20),
+            newStatus.watchedEpisodes
+        )
+    }
+
+    private suspend fun setScoreRequest(
+        auth: AuthData,
+        id: Int,
+        status: KitsuStatusType? = null,
+        score: Int? = null,
+        numWatchedEpisodes: Int? = null,
+    ): Boolean {
+        val libraryEntryId = getAnimeLibraryEntryId(auth, id)
+
+        // Exists entry for anime in library
+        if (libraryEntryId != null) {
+            // Delete anime from library
+            if (status == null || status == KitsuStatusType.None) {
+                val res = app.delete(
+                    "$apiUrl/library-entries/$libraryEntryId",
+                    headers = mapOf(
+                        "Authorization" to "Bearer ${auth.token.accessToken}"
+                    ),
+                    interceptor = apiFallbackInterceptor
+                )
+
+                return res.isSuccessful
+            }
+
+            return setScoreRequest(
+                auth,
+                libraryEntryId,
+                kitsuStatusAsString[maxOf(0, status.value)],
+                score,
+                numWatchedEpisodes
+            )
+        }
+
+        val data = mapOf(
+            "data" to mapOf(
+                "type" to "libraryEntries",
+                "attributes" to mapOf(
+                    "ratingTwenty" to score,
+                    "progress" to numWatchedEpisodes,
+                    "status" to if (status == null) null else kitsuStatusAsString[maxOf(0, status.value)],
+                ),
+                "relationships" to mapOf(
+                    "anime" to mapOf(
+                        "data" to mapOf(
+                            "type" to "anime",
+                            "id" to id.toString()
+                        )
+                    ),
+                    "user" to mapOf(
+                        "data" to mapOf(
+                            "type" to "users",
+                            "id" to auth.user.id
+                        )
+                    )
+                )
+            )
+        )
+
+        val res = app.post(
+            "$apiUrl/library-entries",
+            headers = mapOf(
+                "content-type" to "application/vnd.api+json",
+                "Authorization" to "Bearer ${auth.token.accessToken}"
+            ),
+            requestBody = data.toJson().toRequestBody(),
+            interceptor = apiFallbackInterceptor
+        )
+
+        return res.isSuccessful
+    }
+
+    @Suppress("UNCHECKED_CAST")
+    private suspend fun setScoreRequest(
+        auth : AuthData,
+        id: Int,
+        status: String? = null,
+        score: Int? = null,
+        numWatchedEpisodes: Int? = null,
+    ):  Boolean {
+        val data = mapOf(
+            "data" to mapOf(
+                "type" to "libraryEntries",
+                "id" to id.toString(),
+                "attributes" to mapOf(
+                    "ratingTwenty" to score,
+                    "progress" to numWatchedEpisodes,
+                    "status" to status
+                )
+            )
+        )
+
+        val res = app.patch(
+            "$apiUrl/library-entries/$id",
+            headers = mapOf(
+                "content-type" to "application/vnd.api+json",
+                "Authorization" to "Bearer ${auth.token.accessToken}"
+            ),
+            requestBody = data.toJson().toRequestBody(),
+            interceptor = apiFallbackInterceptor
+        )
+
+        return res.isSuccessful
+    }
+
+    private suspend fun getAnimeLibraryEntryId(auth: AuthData, id: Int): Int? {
+        val userId = auth.user.id
+        val res = app.get(
+            "$apiUrl/library-entries?filter[userId]=$userId&filter[animeId]=$id",
+            headers = mapOf(
+                "Authorization" to "Bearer ${auth.token.accessToken}"
+            ),
+            interceptor = apiFallbackInterceptor
+        ).parsed<KitsuResponse>().data.firstOrNull() ?: return null
+
+        return res.id.toInt()
+    }
+
+    override suspend fun library(auth : AuthData?): LibraryMetadata? {
+        val list = getKitsuAnimeListSmart(auth ?: return null)?.groupBy {
+            convertToStatus(it.attributes.status ?: "").stringRes
+        }?.mapValues { group ->
+            group.value.map { it.toLibraryItem() }
+        } ?: emptyMap()
+
+        // To fill empty lists when Kitsu does not return them
+        val baseMap =
+            KitsuStatusType.entries.filter { it.value >= 0 }.associate {
+                it.stringRes to emptyList<LibraryItem>()
+            }
+
+        return LibraryMetadata(
+            (baseMap + list).map { LibraryList(txt(it.key), it.value) },
+            setOf(
+                ListSorting.AlphabeticalA,
+                ListSorting.AlphabeticalZ,
+                ListSorting.UpdatedNew,
+                ListSorting.UpdatedOld,
+                ListSorting.ReleaseDateNew,
+                ListSorting.ReleaseDateOld,
+                ListSorting.RatingHigh,
+                ListSorting.RatingLow,
+            )
+        )
+    }
+
+    private suspend fun getKitsuAnimeListSmart(auth : AuthData): Array<KitsuNode>? {
+        return if (requireLibraryRefresh) {
+            val list = getKitsuAnimeList(auth.token, auth.user.id)
+            setKey(KITSU_CACHED_LIST, auth.user.id.toString(), list)
+            list
+        } else {
+            getKey<Array<KitsuNode>>(KITSU_CACHED_LIST, auth.user.id.toString()) as? Array<KitsuNode>
+        }
+    }
+
+    private suspend fun getKitsuAnimeList(token: AuthToken, userId: Int): Array<KitsuNode> {
+        val animeSelectedFields = arrayOf("titles","canonicalTitle","posterImage","synopsis","startDate","endDate","episodeCount")
+        val libraryEntriesSelectedFields = arrayOf("progress","ratingTwenty","updatedAt", "status")
+        val limit = 500
+        var url = "$apiUrl/library-entries?filter[userId]=$userId&filter[kind]=anime&include=anime&page[limit]=$limit&page[offset]=0&fields[anime]=${animeSelectedFields.joinToString(",")}&fields[libraryEntries]=${libraryEntriesSelectedFields.joinToString(",")}"
+
+        val fullList = mutableListOf<KitsuNode>()
+
+        while (true) {
+            val data: KitsuResponse = getKitsuAnimeListSlice(token, url)
+            data.data.forEachIndexed { index, value ->
+                value.anime = data.included?.get(index)
+            }
+
+            fullList.addAll(data.data)
+            url = data.links?.next ?: break
+        }
+
+        return fullList.toTypedArray()
+    }
+
+    private suspend fun getKitsuAnimeListSlice(token: AuthToken, url: String): KitsuResponse {
+        return app.get(
+            url, headers = mapOf(
+                "Authorization" to "Bearer ${token.accessToken}",
+            ),
+            interceptor = apiFallbackInterceptor
+        ).parsed<KitsuResponse>()
+    }
+
+    @Serializable
+    data class ResponseToken(
+        @JsonProperty("token_type") @SerialName("token_type") val tokenType: String,
+        @JsonProperty("expires_in") @SerialName("expires_in") val expiresIn: Int,
+        @JsonProperty("access_token") @SerialName("access_token") val accessToken: String,
+        @JsonProperty("refresh_token") @SerialName("refresh_token") val refreshToken: String,
+    )
+
+    @Serializable
+    data class KitsuNode(
+        @JsonProperty("id") @SerialName("id") val id: String,
+        @JsonProperty("attributes") @SerialName("attributes") val attributes: KitsuNodeAttributes,
+        /* User list anime node */
+        @JsonProperty("relationships") @SerialName("relationships") val relationships: KitsuRelationships?,
+        @JsonProperty("anime") @SerialName("anime") var anime: KitsuAnimeData?,
+    ) {
+        fun toLibraryItem(): LibraryItem {
+            val animeItem = this.anime
+
+            val numEpisodes = animeItem?.attributes?.episodeCount
+
+            val startDate = animeItem?.attributes?.startDate
+
+            val posterImage = animeItem?.attributes?.posterImage
+
+            val canonicalTitle = animeItem?.attributes?.canonicalTitle
+            val titles = animeItem?.attributes?.titles
+
+            val animeId = animeItem?.id
+
+            val synopsis: String? = animeItem?.attributes?.synopsis
+
+            return LibraryItem(
+                canonicalTitle ?: titles?.enJp ?: titles?.jaJp.orEmpty(),
+                "https://kitsu.app/anime/${animeId}/",
+                this.id,
+                this.attributes.progress,
+                numEpisodes,
+                Score.from(this.attributes.ratingTwenty, 20),
+                parseDateLong(this.attributes.updatedAt),
+                "Kitsu",
+                TvType.Anime,
+                posterImage?.large ?: posterImage?.medium,
+                null,
+                null,
+                plot = synopsis,
+                releaseDate = if (startDate == null) null else try {
+                    Date.from(LocalDate.parse(startDate).atStartOfDay()
+                        .atZone(ZoneId.systemDefault())
+                        .toInstant())
+                } catch (_: RuntimeException) {
+                    null
+                }
+            )
+        }
+
+    }
+
+    @Serializable
+    data class KitsuAnimeAttributes(
+        @JsonProperty("titles") @SerialName("titles") val titles: KitsuTitles?,
+        @JsonProperty("canonicalTitle") @SerialName("canonicalTitle") val canonicalTitle: String?,
+        @JsonProperty("posterImage") @SerialName("posterImage") val posterImage: KitsuPosterImage?,
+        @JsonProperty("synopsis") @SerialName("synopsis") val synopsis: String?,
+        @JsonProperty("startDate") @SerialName("startDate") val startDate: String?,
+        @JsonProperty("endDate") @SerialName("endDate") val endDate: String?,
+        @JsonProperty("episodeCount") @SerialName("episodeCount") val episodeCount: Int?,
+        @JsonProperty("episodeLength") @SerialName("episodeLength") val episodeLength: Int?,
+    )
+
+    @Serializable
+    data class KitsuAnimeData(
+        @JsonProperty("id") @SerialName("id") val id: String,
+        @JsonProperty("attributes") @SerialName("attributes") val attributes: KitsuAnimeAttributes,
+    )
+
+    @Serializable
+    data class KitsuNodeAttributes(
+        /* General attributes */
+        @JsonProperty("titles") @SerialName("titles") val titles: KitsuTitles?,
+        @JsonProperty("canonicalTitle") @SerialName("canonicalTitle") val canonicalTitle: String?,
+        @JsonProperty("posterImage") @SerialName("posterImage") val posterImage: KitsuPosterImage?,
+        @JsonProperty("synopsis") @SerialName("synopsis") val synopsis: String?,
+        @JsonProperty("startDate") @SerialName("startDate") val startDate: String?,
+        @JsonProperty("endDate") @SerialName("endDate") val endDate: String?,
+        @JsonProperty("episodeCount") @SerialName("episodeCount") val episodeCount: Int?,
+        @JsonProperty("episodeLength") @SerialName("episodeLength") val episodeLength: Int?,
+        /* User attributes */
+        @JsonProperty("name") @SerialName("name") val name: String?,
+        @JsonProperty("location") @SerialName("location") val location: String?,
+        @JsonProperty("createdAt") @SerialName("createdAt") val createdAt: String?,
+        @JsonProperty("avatar") @SerialName("avatar") val avatar: KitsuUserAvatar?,
+        /* User list anime attributes */
+        @JsonProperty("progress") @SerialName("progress") val progress: Int?,
+        @JsonProperty("ratingTwenty") @SerialName("ratingTwenty") val ratingTwenty: Int?,
+        @JsonProperty("updatedAt") @SerialName("updatedAt") val updatedAt: String?,
+        @JsonProperty("status") @SerialName("status") val status: String?,
+    )
+
+    @Serializable
+    data class KitsuRelationships(
+        @JsonProperty("anime") @SerialName("anime") val anime: KitsuRelationshipsAnime?,
+    )
+
+    @Serializable
+    data class KitsuRelationshipsAnime(
+        @JsonProperty("links") @SerialName("links") val links: KitsuLinks?,
+    )
+
+    @Serializable
+    data class KitsuPosterImage(
+        @JsonProperty("large") @SerialName("large") val large: String?,
+        @JsonProperty("medium") @SerialName("medium") val medium: String?,
+    )
+
+    @Serializable
+    data class KitsuTitles(
+        @JsonProperty("en_jp") @SerialName("en_jp") val enJp: String?,
+        @JsonProperty("ja_jp") @SerialName("ja_jp") val jaJp: String?,
+    )
+
+    @Serializable
+    data class KitsuUserAvatar(
+        @JsonProperty("original") @SerialName("original") val original: String?,
+    )
+
+    @Serializable
+    data class KitsuLinks(
+        /* Pagination */
+        @JsonProperty("first") @SerialName("first") val first: String?,
+        @JsonProperty("next") @SerialName("next") val next: String?,
+        @JsonProperty("last") @SerialName("last") val last: String?,
+        /* Relationships */
+        @JsonProperty("related") @SerialName("related") val related: String?,
+    )
+
+    @Serializable
+    data class KitsuResponse(
+        @JsonProperty("links") @SerialName("links") val links: KitsuLinks?,
+        @JsonProperty("data") @SerialName("data") val data: List<KitsuNode>,
+        /* When requesting related info (User library entry -> anime) */
+        @JsonProperty("included") @SerialName("included") val included: List<KitsuAnimeData>?,
+    )
+
+    companion object {
+        const val KITSU_CACHED_LIST: String = "kitsu_cached_list"
+        private fun parseDateLong(string: String?): Long? {
+            return try {
+                SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", Locale.getDefault()).parse(
+                    string ?: return null
+                )?.time?.div(1000)
+            } catch (_: Exception) {
+                null
+            }
+        }
+
+        private val kitsuStatusAsString =
+            arrayOf("current", "completed", "on_hold", "dropped", "planned")
+        private fun fromIntToAnimeStatus(inp: SyncWatchType): KitsuStatusType {
+            return when (inp) {
+                SyncWatchType.NONE -> KitsuStatusType.None
+                SyncWatchType.WATCHING -> KitsuStatusType.Watching
+                SyncWatchType.COMPLETED -> KitsuStatusType.Completed
+                SyncWatchType.ONHOLD -> KitsuStatusType.OnHold
+                SyncWatchType.DROPPED -> KitsuStatusType.Dropped
+                SyncWatchType.PLANTOWATCH -> KitsuStatusType.PlanToWatch
+                SyncWatchType.REWATCHING -> KitsuStatusType.Watching
+            }
+        }
+
+        enum class KitsuStatusType(var value: Int, @StringRes val stringRes: Int) {
+            Watching(0, R.string.type_watching),
+            Completed(1, R.string.type_completed),
+            OnHold(2, R.string.type_on_hold),
+            Dropped(3, R.string.type_dropped),
+            PlanToWatch(4, R.string.type_plan_to_watch),
+            None(-1, R.string.type_none)
+        }
+
+        private fun convertToStatus(string: String): KitsuStatusType {
+            return when (string) {
+                "current" -> KitsuStatusType.Watching
+                "completed" -> KitsuStatusType.Completed
+                "on_hold" -> KitsuStatusType.OnHold
+                "dropped" -> KitsuStatusType.Dropped
+                "planned" -> KitsuStatusType.PlanToWatch
+                else -> KitsuStatusType.None
+            }
+        }
+    }
+}
 
 // modified code from from https://github.com/saikou-app/saikou/blob/main/app/src/main/java/ani/saikou/others/Kitsu.kt
 // GNU General Public License v3.0 https://github.com/saikou-app/saikou/blob/main/LICENSE.md
@@ -20,7 +670,7 @@ object Kitsu {
             "https://kitsu.io/api/graphql",
             headers = headers,
             data = mapOf("query" to query)
-        ).parsed()
+        ).parsed<KitsuResponse>()
     }
 
     private val cache: MutableMap<Pair<String, String>, Map<Int, KitsuResponse.Node>> =
@@ -102,44 +752,52 @@ query {
         return map
     }
 
+    @Serializable
     data class KitsuResponse(
-        val data: Data? = null
+        @JsonProperty("data") @SerialName("data") val data: Data? = null,
     ) {
+        @Serializable
         data class Data(
-            val lookupMapping: LookupMapping? = null
+            @JsonProperty("lookupMapping") @SerialName("lookupMapping") val lookupMapping: LookupMapping? = null,
         )
 
+        @Serializable
         data class LookupMapping(
-            val id: String? = null,
+            @JsonProperty("id") @SerialName("id") val id: String? = null,
-            val episodes: Episodes? = null
+            @JsonProperty("episodes") @SerialName("episodes") val episodes: Episodes? = null,
         )
 
+        @Serializable
         data class Episodes(
-            val nodes: List<Node?>? = null
+            @JsonProperty("nodes") @SerialName("nodes") val nodes: List<Node?>? = null,
         )
 
+        @Serializable
         data class Node(
-            @JsonProperty("number")
+            @JsonProperty("number") @SerialName("number") val num: Int? = null,
-            val num: Int? = null,
+            @JsonProperty("titles") @SerialName("titles") val titles: Titles? = null,
-            val titles: Titles? = null,
+            @JsonProperty("description") @SerialName("description") val description: Description? = null,
-            val description: Description? = null,
+            @JsonProperty("thumbnail") @SerialName("thumbnail") val thumbnail: Thumbnail? = null,
-            val thumbnail: Thumbnail? = null
         )
 
+        @Serializable
         data class Description(
-            val en: String? = null
+            @JsonProperty("en") @SerialName("en") val en: String? = null,
         )
 
+        @Serializable
         data class Thumbnail(
-            val original: Original? = null
+            @JsonProperty("original") @SerialName("original") val original: Original? = null,
         )
 
+        @Serializable
         data class Original(
-            val url: String? = null
+            @JsonProperty("url") @SerialName("url") val url: String? = null,
         )
 
+        @Serializable
         data class Titles(
-            val canonical: String? = null
+            @JsonProperty("canonical") @SerialName("canonical") val canonical: String? = null,
         )
     }
 }

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

@@ -1,13 +1,11 @@
 package com.lagradost.cloudstream3.syncproviders.providers
 
-import androidx.fragment.app.FragmentActivity
 import com.lagradost.cloudstream3.R
-import com.lagradost.cloudstream3.syncproviders.AuthAPI
+import com.lagradost.cloudstream3.syncproviders.AuthData
 import com.lagradost.cloudstream3.syncproviders.SyncAPI
 import com.lagradost.cloudstream3.syncproviders.SyncIdName
 import com.lagradost.cloudstream3.ui.WatchType
 import com.lagradost.cloudstream3.ui.library.ListSorting
-import com.lagradost.cloudstream3.utils.txt
 import com.lagradost.cloudstream3.ui.settings.Globals.TV
 import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
 import com.lagradost.cloudstream3.utils.Coroutines.ioWork
@@ -16,56 +14,19 @@ import com.lagradost.cloudstream3.utils.DataStoreHelper.getAllSubscriptions
 import com.lagradost.cloudstream3.utils.DataStoreHelper.getAllWatchStateIds
 import com.lagradost.cloudstream3.utils.DataStoreHelper.getBookmarkedData
 import com.lagradost.cloudstream3.utils.DataStoreHelper.getResultWatchState
+import com.lagradost.cloudstream3.utils.txt
 
-class LocalList : SyncAPI {
+class LocalList : SyncAPI() {
     override val name = "Local"
+    override val idPrefix = "local"
+
     override val icon: Int = R.drawable.ic_baseline_storage_24
     override val requiresLogin = false
-    override val supportDeviceAuth = false
+    override val createAccountUrl = null
-    override val createAccountUrl: Nothing? = null
-    override val idPrefix = "local"
     override var requireLibraryRefresh = true
-
-    override fun loginInfo(): AuthAPI.LoginInfo {
-        return AuthAPI.LoginInfo(
-            null,
-            null,
-            0
-        )
-    }
-
-    override fun logOut() {
-
-    }
-
-    override val key: String = ""
-    override val redirectUrl = ""
-    override suspend fun handleRedirect(url: String): Boolean {
-        return true
-    }
-
-    override fun authenticate(activity: FragmentActivity?) {
-    }
-
-    override val mainUrl = ""
     override val syncIdName = SyncIdName.LocalList
-    override suspend fun score(id: String, status: SyncAPI.AbstractSyncStatus): Boolean {
-        return true
-    }
 
-    override suspend fun getStatus(id: String): SyncAPI.AbstractSyncStatus? {
+    override suspend fun library(auth : AuthData?): SyncAPI.LibraryMetadata? {
-        return null
-    }
-
-    override suspend fun getResult(id: String): SyncAPI.SyncResult? {
-        return null
-    }
-
-    override suspend fun search(name: String): List<SyncAPI.SyncSearchResult>? {
-        return null
-    }
-
-    override suspend fun getPersonalLibrary(): SyncAPI.LibraryMetadata? {
         val watchStatusIds = ioWork {
             getAllWatchStateIds()?.map { id ->
                 Pair(id, getResultWatchState(id))
@@ -102,7 +63,8 @@ class LocalList : SyncAPI {
             val result = if (isTrueTv) {
                 baseMap + watchStatusMap + favoritesMap
             } else {
-                val subscriptionsMap = mapOf(R.string.subscription_list_name to getAllSubscriptions().mapNotNull {
+                val subscriptionsMap =
+                    mapOf(R.string.subscription_list_name to getAllSubscriptions().mapNotNull {
                         it.toLibraryItem()
                     })
 
@@ -112,8 +74,8 @@ class LocalList : SyncAPI {
             result
         }
 
-        return SyncAPI.LibraryMetadata(
+        return LibraryMetadata(
-            list.map { SyncAPI.LibraryList(txt(it.key), it.value) },
+            list.map { LibraryList(txt(it.key), it.value) },
             setOf(
                 ListSorting.AlphabeticalA,
                 ListSorting.AlphabeticalZ,
@@ -127,8 +89,4 @@ class LocalList : SyncAPI {
             )
         )
     }
-
-    override fun getIdFromUrl(url: String): String {
-        return url
-    }
 }

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

@@ -2,188 +2,112 @@ package com.lagradost.cloudstream3.syncproviders.providers
 
 import android.util.Log
 import com.fasterxml.jackson.annotation.JsonProperty
-import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
+import com.lagradost.cloudstream3.APIHolder
-import com.lagradost.cloudstream3.AcraApplication.Companion.removeKey
+import com.lagradost.cloudstream3.APIHolder.unixTimeMS
-import com.lagradost.cloudstream3.AcraApplication.Companion.setKey
 import com.lagradost.cloudstream3.ErrorLoadingException
 import com.lagradost.cloudstream3.R
-import com.lagradost.cloudstream3.TvType
 import com.lagradost.cloudstream3.app
-import com.lagradost.cloudstream3.mvvm.logError
-import com.lagradost.cloudstream3.subtitles.AbstractSubApi
 import com.lagradost.cloudstream3.subtitles.AbstractSubtitleEntities
-import com.lagradost.cloudstream3.syncproviders.AuthAPI
+import com.lagradost.cloudstream3.syncproviders.AuthData
-import com.lagradost.cloudstream3.syncproviders.InAppAuthAPI
+import com.lagradost.cloudstream3.syncproviders.AuthLoginRequirement
-import com.lagradost.cloudstream3.syncproviders.InAppAuthAPIManager
+import com.lagradost.cloudstream3.syncproviders.AuthLoginResponse
+import com.lagradost.cloudstream3.syncproviders.AuthToken
+import com.lagradost.cloudstream3.syncproviders.AuthUser
+import com.lagradost.cloudstream3.syncproviders.SubtitleAPI
+import com.lagradost.cloudstream3.TvType
 import com.lagradost.cloudstream3.utils.AppUtils
-import okhttp3.Interceptor
+import com.lagradost.cloudstream3.utils.AppUtils.parseJson
-import okhttp3.Response
+import com.lagradost.cloudstream3.utils.AppUtils.toJson
+import com.lagradost.cloudstream3.utils.SubtitleHelper.fromCodeToLangTagIETF
+import com.lagradost.cloudstream3.utils.SubtitleHelper.fromCodeToOpenSubtitlesTag
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 
-class OpenSubtitlesApi(index: Int) : InAppAuthAPIManager(index), AbstractSubApi {
+class OpenSubtitlesApi : SubtitleAPI() {
-    override val idPrefix = "opensubtitles"
     override val name = "OpenSubtitles"
+    override val idPrefix = "opensubtitles"
+
     override val icon = R.drawable.open_subtitles_icon
-    override val requiresPassword = true
+    override val hasInApp = true
-    override val requiresUsername = true
+    override val inAppLoginRequirement = AuthLoginRequirement(
+        password = true,
+        username = true,
+    )
+
     override val createAccountUrl = "https://www.opensubtitles.com/en/users/sign_up"
 
     companion object {
-        const val OPEN_SUBTITLES_USER_KEY: String = "open_subtitles_user" // user data like profile
         const val API_KEY = "uyBLgFD17MgrYmA0gSXoKllMJBelOYj2"
         const val HOST = "https://api.opensubtitles.com/api/v1"
         const val TAG = "OPENSUBS"
         const val COOLDOWN_DURATION: Long = 1000L * 30L // CoolDown if 429 error code in ms
         var currentCoolDown: Long = 0L
-        var currentSession: SubtitleOAuthEntity? = null
+        const val userAgent = "Cloudstream3 v0.2"
-    }
+        val headers = mapOf("user-agent" to userAgent, "Api-Key" to API_KEY)
-
-    private val headerInterceptor = OpenSubtitleInterceptor()
-
-    /** Automatically adds required api headers */
-    private class OpenSubtitleInterceptor : Interceptor {
-        /** Required user agent! */
-        private val userAgent = "Cloudstream3 v0.2"
-        override fun intercept(chain: Interceptor.Chain): Response {
-            return chain.proceed(
-                chain.request().newBuilder()
-                    .removeHeader("user-agent")
-                    .addHeader("user-agent", userAgent)
-                    .addHeader("Api-Key", API_KEY)
-                    .build()
-            )
-        }
     }
 
     private fun canDoRequest(): Boolean {
-        return unixTimeMs > currentCoolDown
+        return unixTimeMS > currentCoolDown
     }
 
     private fun throwIfCantDoRequest() {
         if (!canDoRequest()) {
-            throw ErrorLoadingException("Too many requests wait for ${(currentCoolDown - unixTimeMs) / 1000L}s")
+            throw ErrorLoadingException("Too many requests wait for ${(currentCoolDown - unixTimeMS) / 1000L}s")
         }
     }
 
     private fun throwGotTooManyRequests() {
-        currentCoolDown = unixTimeMs + COOLDOWN_DURATION
+        currentCoolDown = unixTimeMS + COOLDOWN_DURATION
         throw ErrorLoadingException("Too many requests")
     }
 
-    private fun getAuthKey(): SubtitleOAuthEntity? {
+    override suspend fun refreshToken(token: AuthToken): AuthToken? {
-        return getKey(accountId, OPEN_SUBTITLES_USER_KEY)
+        return login(parseJson<AuthLoginResponse>(token.payload ?: return null))
     }
 
-    private fun setAuthKey(data: SubtitleOAuthEntity?) {
+    override suspend fun user(token: AuthToken?): AuthUser? {
-        if (data == null) removeKey(accountId, OPEN_SUBTITLES_USER_KEY)
+        val user = parseJson<AuthLoginResponse>(token?.payload ?: return null)
-        currentSession = data
+        val username = user.username ?: return null
-        setKey(accountId, OPEN_SUBTITLES_USER_KEY, data)
+        return AuthUser(
-    }
+            id = username.hashCode(),
-
+            name = username
-    override fun loginInfo(): AuthAPI.LoginInfo? {
-        getAuthKey()?.let { user ->
-            return AuthAPI.LoginInfo(
-                profilePicture = null,
-                name = user.user,
-                accountIndex = accountIndex
         )
     }
-        return null
-    }
 
-    override fun getLatestLoginData(): InAppAuthAPI.LoginData? {
+    override suspend fun login(form: AuthLoginResponse): AuthToken? {
-        val current = getAuthKey() ?: return null
+        val username = form.username ?: return null
-        return InAppAuthAPI.LoginData(username = current.user, current.pass)
+        val password = form.password ?: return null
-    }
 
-    /*
-        Authorize app to connect to API, using username/password.
-        Required to run at startup.
-        Returns OAuth entity with valid access token.
-    */
-    override suspend fun initialize() {
-        currentSession = getAuthKey() ?: return // just in case the following fails
-        initLogin(currentSession?.user ?: return, currentSession?.pass ?: return)
-    }
-
-    override fun logOut() {
-        setAuthKey(null)
-        removeAccountKeys()
-        currentSession = getAuthKey()
-    }
-
-    private suspend fun initLogin(username: String, password: String): Boolean {
-        //Log.i(TAG, "DATA = [$username] [$password]")
         val response = app.post(
             url = "$HOST/login",
             headers = mapOf(
                 "Content-Type" to "application/json",
-            ),
+            ) + headers,
             json = mapOf(
                 "username" to username,
                 "password" to password
             ),
-            interceptor = headerInterceptor
+        ).parsed<OAuthToken>()
+
+        return AuthToken(
+            accessToken = response.token
+                ?: throw ErrorLoadingException("Invalid password or username"),
+            /// JWT token is valid 24 hours after successfully authentication of user
+            accessTokenLifetime = APIHolder.unixTime + 60 * 60 * 24,
+            payload = form.toJson()
         )
-        //Log.i(TAG, "Responsecode = ${response.code}")
-        //Log.i(TAG, "Result => ${response.text}")
-
-        if (response.isSuccessful) {
-            AppUtils.tryParseJson<OAuthToken>(response.text)?.let { token ->
-                setAuthKey(
-                    SubtitleOAuthEntity(
-                        user = username,
-                        pass = password,
-                        accessToken = token.token ?: run {
-                            return false
-                        })
-                )
-            }
-            return true
-        }
-        return false
-    }
-
-    override suspend fun login(data: InAppAuthAPI.LoginData): Boolean {
-        val username = data.username ?: throw ErrorLoadingException("Requires Username")
-        val password = data.password ?: throw ErrorLoadingException("Requires Password")
-        switchToNewAccount()
-        try {
-            if (initLogin(username, password)) {
-                registerAccount()
-                return true
-            }
-        } catch (e: Exception) {
-            logError(e)
-            switchToOldAccount()
-        }
-        switchToOldAccount()
-        return false
-    }
-
-    /**
-     * Some languages do not use the normal country codes on OpenSubtitles
-     * */
-    private val languageExceptions = mapOf<String, String>(
-//        "pt" to "pt-PT",
-//        "pt" to "pt-BR"
-    )
-
-    private fun fixLanguage(language: String?): String? {
-        return languageExceptions[language] ?: language
-    }
-
-    // O(n) but good enough, BiMap did not want to work properly
-    private fun fixLanguageReverse(language: String?): String? {
-        return languageExceptions.entries.firstOrNull { it.value == language }?.key ?: language
     }
 
     /**
      * Fetch subtitles using token authenticated on previous method (see authorize).
      * Returns list of Subtitles which user can select to download (see load).
-     * */
+     */
-    override suspend fun search(query: AbstractSubtitleEntities.SubtitleSearch): List<AbstractSubtitleEntities.SubtitleEntity>? {
+    override suspend fun search(
+        auth : AuthData?,
+        query: AbstractSubtitleEntities.SubtitleSearch
+    ): List<AbstractSubtitleEntities.SubtitleEntity>? {
         throwIfCantDoRequest()
-        val fixedLang = fixLanguage(query.lang)
+        val langOpenSubTag = fromCodeToOpenSubtitlesTag(query.lang) ?: query.lang ?: ""
 
         val imdbId = query.imdbId?.replace("tt", "")?.toInt() ?: 0
         val queryText = query.query
@@ -196,17 +120,17 @@ class OpenSubtitlesApi(index: Int) : InAppAuthAPIManager(index), AbstractSubApi
 
         val searchQueryUrl = when (imdbId > 0) {
             //Use imdb_id to search if its valid
-            true -> "$HOST/subtitles?imdb_id=$imdbId&languages=${fixedLang}$yearQuery$epQuery$seasonQuery"
+            true -> "$HOST/subtitles?imdb_id=$imdbId&languages=${langOpenSubTag}$yearQuery$epQuery$seasonQuery"
-            false -> "$HOST/subtitles?query=${queryText}&languages=${fixedLang}$yearQuery$epQuery$seasonQuery"
+            false -> "$HOST/subtitles?query=${queryText}&languages=${langOpenSubTag}$yearQuery$epQuery$seasonQuery"
         }
 
         val req = app.get(
             url = searchQueryUrl,
             headers = mapOf(
                 Pair("Content-Type", "application/json")
-            ),
+            ) + headers,
-            interceptor = headerInterceptor
         )
+        Log.i(TAG, "searchQueryUrl => ${searchQueryUrl}")
         Log.i(TAG, "Search Req => ${req.text}")
         if (!req.isSuccessful) {
             if (req.code == 429)
@@ -227,7 +151,7 @@ class OpenSubtitlesApi(index: Int) : InAppAuthAPIManager(index), AbstractSubApi
                 //Use any valid name/title in hierarchy
                 val name = filename ?: featureDetails?.movieName ?: featureDetails?.title
                 ?: featureDetails?.parentTitle ?: attr.release ?: query.query
-                val lang = fixLanguageReverse(attr.language) ?: ""
+                val langTagIETF = fromCodeToLangTagIETF(attr.language) ?: ""
                 val resEpNum = featureDetails?.episodeNumber ?: query.epNumber
                 val resSeasonNum = featureDetails?.seasonNumber ?: query.seasonNumber
                 val year = featureDetails?.year ?: query.year
@@ -241,7 +165,7 @@ class OpenSubtitlesApi(index: Int) : InAppAuthAPIManager(index), AbstractSubApi
                         AbstractSubtitleEntities.SubtitleEntity(
                             idPrefix = this.idPrefix,
                             name = name,
-                            lang = lang,
+                            lang = langTagIETF,
                             data = resultData,
                             type = type,
                             source = this.name,
@@ -257,11 +181,15 @@ class OpenSubtitlesApi(index: Int) : InAppAuthAPIManager(index), AbstractSubApi
         return results
     }
 
-    /*
+    /**
-        Process data returned from search.
+     * Process data returned from search.
-        Returns string url for the subtitle file.
+     * Returns string url for the subtitle file.
      */
-    override suspend fun load(data: AbstractSubtitleEntities.SubtitleEntity): String? {
+    override suspend fun load(
+        auth : AuthData?,
+        subtitle: AbstractSubtitleEntities.SubtitleEntity
+    ): String? {
+        if (auth == null) return null
         throwIfCantDoRequest()
 
         val req = app.post(
@@ -269,15 +197,14 @@ class OpenSubtitlesApi(index: Int) : InAppAuthAPIManager(index), AbstractSubApi
             headers = mapOf(
                 Pair(
                     "Authorization",
-                    "Bearer ${currentSession?.accessToken ?: throw ErrorLoadingException("No access token active in current session")}"
+                    "Bearer ${auth.token.accessToken ?: throw ErrorLoadingException("No access token active in current session")}"
                 ),
                 Pair("Content-Type", "application/json"),
                 Pair("Accept", "*/*")
-            ),
+            ) + headers,
             data = mapOf(
-                Pair("file_id", data.data)
+                Pair("file_id", subtitle.data)
-            ),
+            )
-            interceptor = headerInterceptor
         )
         Log.i(TAG, "Request result  => (${req.code}) ${req.text}")
         //Log.i(TAG, "Request headers => ${req.headers}")
@@ -294,64 +221,64 @@ class OpenSubtitlesApi(index: Int) : InAppAuthAPIManager(index), AbstractSubApi
         return null
     }
 
-
+    @Serializable
-    data class SubtitleOAuthEntity(
-        var user: String,
-        var pass: String,
-        var accessToken: String,
-    )
-
     data class OAuthToken(
-        @JsonProperty("token") var token: String? = null,
+        @JsonProperty("token") @SerialName("token") var token: String? = null,
-        @JsonProperty("status") var status: Int? = null
+        @JsonProperty("status") @SerialName("status") var status: Int? = null,
     )
 
+    @Serializable
     data class Results(
-        @JsonProperty("data") var data: List<ResultData>? = listOf()
+        @JsonProperty("data") @SerialName("data") var data: List<ResultData>? = listOf(),
     )
 
+    @Serializable
     data class ResultData(
-        @JsonProperty("id") var id: String? = null,
+        @JsonProperty("id") @SerialName("id") var id: String? = null,
-        @JsonProperty("type") var type: String? = null,
+        @JsonProperty("type") @SerialName("type") var type: String? = null,
-        @JsonProperty("attributes") var attributes: ResultAttributes? = ResultAttributes()
+        @JsonProperty("attributes") @SerialName("attributes") var attributes: ResultAttributes? = ResultAttributes(),
     )
 
+    @Serializable
     data class ResultAttributes(
-        @JsonProperty("subtitle_id") var subtitleId: String? = null,
+        @JsonProperty("subtitle_id") @SerialName("subtitle_id") var subtitleId: String? = null,
-        @JsonProperty("language") var language: String? = null,
+        @JsonProperty("language") @SerialName("language") var language: String? = null,
-        @JsonProperty("release") var release: String? = null,
+        @JsonProperty("release") @SerialName("release") var release: String? = null,
-        @JsonProperty("url") var url: String? = null,
+        @JsonProperty("url") @SerialName("url") var url: String? = null,
-        @JsonProperty("files") var files: List<ResultFiles>? = listOf(),
+        @JsonProperty("files") @SerialName("files") var files: List<ResultFiles>? = listOf(),
-        @JsonProperty("feature_details") var featDetails: ResultFeatureDetails? = ResultFeatureDetails(),
+        @JsonProperty("feature_details") @SerialName("feature_details") var featDetails: ResultFeatureDetails? = ResultFeatureDetails(),
-        @JsonProperty("hearing_impaired") var hearingImpaired: Boolean? = null,
+        @JsonProperty("hearing_impaired") @SerialName("hearing_impaired") var hearingImpaired: Boolean? = null,
     )
 
+    @Serializable
     data class ResultFiles(
-        @JsonProperty("file_id") var fileId: Int? = null,
+        @JsonProperty("file_id") @SerialName("file_id") var fileId: Int? = null,
-        @JsonProperty("file_name") var fileName: String? = null
+        @JsonProperty("file_name") @SerialName("file_name") var fileName: String? = null,
     )
 
+    @Serializable
     data class ResultDownloadLink(
-        @JsonProperty("link") var link: String? = null,
+        @JsonProperty("link") @SerialName("link") var link: String? = null,
-        @JsonProperty("file_name") var fileName: String? = null,
+        @JsonProperty("file_name") @SerialName("file_name") var fileName: String? = null,
-        @JsonProperty("requests") var requests: Int? = null,
+        @JsonProperty("requests") @SerialName("requests") var requests: Int? = null,
-        @JsonProperty("remaining") var remaining: Int? = null,
+        @JsonProperty("remaining") @SerialName("remaining") var remaining: Int? = null,
-        @JsonProperty("message") var message: String? = null,
+        @JsonProperty("message") @SerialName("message") var message: String? = null,
-        @JsonProperty("reset_time") var resetTime: String? = null,
+        @JsonProperty("reset_time") @SerialName("reset_time") var resetTime: String? = null,
-        @JsonProperty("reset_time_utc") var resetTimeUtc: String? = null
+        @JsonProperty("reset_time_utc") @SerialName("reset_time_utc") var resetTimeUtc: String? = null,
     )
 
+    @Serializable
     data class ResultFeatureDetails(
-        @JsonProperty("year") var year: Int? = null,
+        @JsonProperty("year") @SerialName("year") var year: Int? = null,
-        @JsonProperty("title") var title: String? = null,
+        @JsonProperty("title") @SerialName("title") var title: String? = null,
-        @JsonProperty("movie_name") var movieName: String? = null,
+        @JsonProperty("movie_name") @SerialName("movie_name") var movieName: String? = null,
-        @JsonProperty("imdb_id") var imdbId: Int? = null,
+        @JsonProperty("imdb_id") @SerialName("imdb_id") var imdbId: Int? = null,
-        @JsonProperty("tmdb_id") var tmdbId: Int? = null,
+        @JsonProperty("tmdb_id") @SerialName("tmdb_id") var tmdbId: Int? = null,
-        @JsonProperty("season_number") var seasonNumber: Int? = null,
+        @JsonProperty("season_number") @SerialName("season_number") var seasonNumber: Int? = null,
-        @JsonProperty("episode_number") var episodeNumber: Int? = null,
+        @JsonProperty("episode_number") @SerialName("episode_number") var episodeNumber: Int? = null,
-        @JsonProperty("parent_imdb_id") var parentImdbId: Int? = null,
+        @JsonProperty("parent_imdb_id") @SerialName("parent_imdb_id") var parentImdbId: Int? = null,
-        @JsonProperty("parent_title") var parentTitle: String? = null,
+        @JsonProperty("parent_title") @SerialName("parent_title") var parentTitle: String? = null,
-        @JsonProperty("parent_tmdb_id") var parentTmdbId: Int? = null,
+        @JsonProperty("parent_tmdb_id") @SerialName("parent_tmdb_id") var parentTmdbId: Int? = null,
-        @JsonProperty("parent_feature_id") var parentFeatureId: Int? = null
+        @JsonProperty("parent_feature_id") @SerialName("parent_feature_id") var parentFeatureId: Int? = null,
     )
 }

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

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

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

@@ -1,89 +1,73 @@
 package com.lagradost.cloudstream3.syncproviders.providers
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
-import com.lagradost.cloudstream3.AcraApplication.Companion.removeKey
-import com.lagradost.cloudstream3.AcraApplication.Companion.setKey
-import com.lagradost.cloudstream3.ErrorLoadingException
-import com.lagradost.cloudstream3.R
-import com.lagradost.cloudstream3.TvType
 import com.lagradost.cloudstream3.app
-import com.lagradost.cloudstream3.mvvm.logError
+import com.lagradost.cloudstream3.R
-import com.lagradost.cloudstream3.subtitles.AbstractSubApi
 import com.lagradost.cloudstream3.subtitles.AbstractSubtitleEntities
 import com.lagradost.cloudstream3.subtitles.SubtitleResource
-import com.lagradost.cloudstream3.syncproviders.AuthAPI.LoginInfo
+import com.lagradost.cloudstream3.syncproviders.AuthData
-import com.lagradost.cloudstream3.syncproviders.InAppAuthAPI
+import com.lagradost.cloudstream3.syncproviders.AuthLoginRequirement
-import com.lagradost.cloudstream3.syncproviders.InAppAuthAPIManager
+import com.lagradost.cloudstream3.syncproviders.AuthLoginResponse
+import com.lagradost.cloudstream3.syncproviders.AuthToken
+import com.lagradost.cloudstream3.syncproviders.AuthUser
+import com.lagradost.cloudstream3.syncproviders.SubtitleAPI
+import com.lagradost.cloudstream3.TvType
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 
-class SubDlApi(index: Int) : InAppAuthAPIManager(index), AbstractSubApi {
+class SubDlApi : SubtitleAPI() {
-    override val idPrefix = "subdl"
     override val name = "SubDL"
+    override val idPrefix = "subdl"
+
     override val icon = R.drawable.subdl_logo_big
-    override val requiresPassword = true
+    override val hasInApp = true
-    override val requiresEmail = true
+    override val inAppLoginRequirement = AuthLoginRequirement(password = true, email = true)
+    override val requiresLogin = true
     override val createAccountUrl = "https://subdl.com/panel/register"
 
     companion object {
-        const val APIURL = "https://apiold.subdl.com"
+        const val APIURL = "https://api.subdl.com"
         const val APIENDPOINT = "$APIURL/api/v1/subtitles"
         const val DOWNLOADENDPOINT = "https://dl.subdl.com"
-        const val SUBDL_SUBTITLES_USER_KEY: String = "subdl_user"
-        var currentSession: SubtitleOAuthEntity? = null
     }
 
-    override suspend fun initialize() {
+    override suspend fun login(form: AuthLoginResponse): AuthToken? {
-        currentSession = getAuthKey()
+        val email = form.email ?: return null
-    }
+        val password = form.password ?: return null
-
+        val tokenResponse = app.post(
-    override fun logOut() {
+            url = "$APIURL/login",
-        setAuthKey(null)
+            json = mapOf(
-        removeAccountKeys()
+                "email" to email,
-        currentSession = getAuthKey()
+                "password" to password
-    }
-
-    override suspend fun login(data: InAppAuthAPI.LoginData): Boolean {
-        val email = data.email ?: throw ErrorLoadingException("Requires Email")
-        val password = data.password ?: throw ErrorLoadingException("Requires Password")
-        switchToNewAccount()
-        try {
-            if (initLogin(email, password)) {
-                registerAccount()
-                return true
-            }
-        } catch (e: Exception) {
-            logError(e)
-            switchToOldAccount()
-        }
-        switchToOldAccount()
-        return false
-    }
-
-    override fun getLatestLoginData(): InAppAuthAPI.LoginData? {
-        val current = getAuthKey() ?: return null
-        return InAppAuthAPI.LoginData(
-            email = current.userEmail,
-            password = current.pass
             )
-    }
+        ).parsed<OAuthTokenResponse>()
 
-    override fun loginInfo(): LoginInfo? {
+        val apiResponse = app.get(
-        getAuthKey()?.let { user ->
+            url = "$APIURL/user/userApi",
-            return LoginInfo(
+            headers = mapOf(
-                profilePicture = null,
+                "Authorization" to "Bearer ${tokenResponse.token}"
-                name = user.name ?: user.userEmail,
-                accountIndex = accountIndex
             )
-        }
+        ).parsed<ApiKeyResponse>()
-        return null
+
+        return AuthToken(accessToken = apiResponse.apiKey, payload = email)
     }
 
-    override suspend fun search(query: AbstractSubtitleEntities.SubtitleSearch): List<AbstractSubtitleEntities.SubtitleEntity>? {
+    override suspend fun user(token: AuthToken?): AuthUser? {
+        val name = token?.payload ?: return null
+        return AuthUser(id = name.hashCode(), name = name)
+    }
 
+    override suspend fun search(
+        auth : AuthData?,
+        query: AbstractSubtitleEntities.SubtitleSearch
+    ): List<AbstractSubtitleEntities.SubtitleEntity>? {
+        if (auth == null) return null
+        val apiKey = auth.token.accessToken ?: return null
         val queryText = query.query
         val epNum = query.epNumber ?: 0
         val seasonNum = query.seasonNumber ?: 0
         val yearNum = query.year ?: 0
+        val langSubdlCode = langTagIETF2subdl[query.lang.toString()] ?: query.lang
 
         val idQuery = when {
             query.imdbId != null -> "&imdb_id=${query.imdbId}"
@@ -97,8 +81,8 @@ class SubDlApi(index: Int) : InAppAuthAPIManager(index), AbstractSubApi {
 
         val searchQueryUrl = when (idQuery) {
             //Use imdb/tmdb id to search if its valid
-            null -> "$APIENDPOINT?api_key=${currentSession?.apiKey}&film_name=$queryText&languages=${query.lang}$epQuery$seasonQuery$yearQuery"
+            null -> "$APIENDPOINT?api_key=${apiKey}&film_name=$queryText&languages=$langSubdlCode$epQuery$seasonQuery$yearQuery"
-            else -> "$APIENDPOINT?api_key=${currentSession?.apiKey}$idQuery&languages=${query.lang}$epQuery$seasonQuery$yearQuery"
+            else -> "$APIENDPOINT?api_key=${apiKey}$idQuery&languages=$langSubdlCode$epQuery$seasonQuery$yearQuery"
         }
 
         val req = app.get(
@@ -110,7 +94,9 @@ class SubDlApi(index: Int) : InAppAuthAPIManager(index), AbstractSubApi {
 
         return req.parsedSafe<ApiResponse>()?.subtitles?.map { subtitle ->
 
-            val lang = subtitle.lang.replaceFirstChar { it.uppercase() }
+            val langTagIETF =
+                langTagIETF2subdl.entries.find { it.value == subtitle.lang }?.key ?:
+                subtitle.lang
             val resEpNum = subtitle.episode ?: query.epNumber
             val resSeasonNum = subtitle.season ?: query.seasonNumber
             val type = if ((resSeasonNum ?: 0) > 0) TvType.TvSeries else TvType.Movie
@@ -118,7 +104,7 @@ class SubDlApi(index: Int) : InAppAuthAPIManager(index), AbstractSubApi {
             AbstractSubtitleEntities.SubtitleEntity(
                 idPrefix = this.idPrefix,
                 name = subtitle.releaseName,
-                lang = lang,
+                lang = langTagIETF,
                 data = "${DOWNLOADENDPOINT}${subtitle.url}",
                 type = type,
                 source = this.name,
@@ -129,120 +115,155 @@ class SubDlApi(index: Int) : InAppAuthAPIManager(index), AbstractSubApi {
         }
     }
 
-    override suspend fun SubtitleResource.getResources(data: AbstractSubtitleEntities.SubtitleEntity) {
+    override suspend fun SubtitleResource.getResources(
-        this.addZipUrl(data.data) { name, _ ->
+        auth: AuthData?,
+        subtitle: AbstractSubtitleEntities.SubtitleEntity
+    ) {
+        this.addZipUrl(subtitle.data) { name, _ ->
             name
         }
     }
 
-    private suspend fun initLogin(useremail: String, password: String): Boolean {
+    @Serializable
-
-        val tokenResponse = app.post(
-            url = "$APIURL/login",
-            json = mapOf(
-                "email" to useremail,
-                "password" to password
-            )
-        ).parsedSafe<OAuthTokenResponse>()
-
-        if (tokenResponse?.token == null) return false
-
-        val apiResponse = app.get(
-            url = "$APIURL/user/userApi",
-            headers = mapOf(
-                "Authorization" to "Bearer ${tokenResponse.token}"
-            )
-        ).parsedSafe<ApiKeyResponse>()
-
-        if (apiResponse?.ok == false) return false
-
-        setAuthKey(
-            SubtitleOAuthEntity(
-                userEmail = useremail,
-                pass = password,
-                name = tokenResponse.userData?.username ?: tokenResponse.userData?.name,
-                accessToken = tokenResponse.token,
-                apiKey = apiResponse?.apiKey
-            )
-        )
-        return true
-    }
-
-    private fun getAuthKey(): SubtitleOAuthEntity? {
-        return getKey(accountId, SUBDL_SUBTITLES_USER_KEY)
-    }
-
-    private fun setAuthKey(data: SubtitleOAuthEntity?) {
-        if (data == null) removeKey(
-            accountId,
-            SUBDL_SUBTITLES_USER_KEY
-        )
-        currentSession = data
-        setKey(accountId, SUBDL_SUBTITLES_USER_KEY, data)
-    }
-
     data class SubtitleOAuthEntity(
-        @JsonProperty("userEmail") var userEmail: String,
+        @JsonProperty("userEmail") @SerialName("userEmail") var userEmail: String,
-        @JsonProperty("pass") var pass: String,
+        @JsonProperty("pass") @SerialName("pass") var pass: String,
-        @JsonProperty("name") var name: String? = null,
+        @JsonProperty("name") @SerialName("name") var name: String? = null,
-        @JsonProperty("accessToken") var accessToken: String? = null,
+        @JsonProperty("accessToken") @SerialName("accessToken") var accessToken: String? = null,
-        @JsonProperty("apiKey") var apiKey: String? = null,
+        @JsonProperty("apiKey") @SerialName("apiKey") var apiKey: String? = null,
     )
 
+    @Serializable
     data class OAuthTokenResponse(
-        @JsonProperty("token") val token: String? = null,
+        @JsonProperty("token") @SerialName("token") val token: String,
-        @JsonProperty("userData") val userData: UserData? = null,
+        @JsonProperty("userData") @SerialName("userData") val userData: UserData? = null,
-        @JsonProperty("status") val status: Boolean? = null,
+        @JsonProperty("status") @SerialName("status") val status: Boolean? = null,
-        @JsonProperty("message") val message: String? = null,
+        @JsonProperty("message") @SerialName("message") val message: String? = null,
     )
 
+    @Serializable
     data class UserData(
-        @JsonProperty("email") val email: String,
+        @JsonProperty("email") @SerialName("email") val email: String,
-        @JsonProperty("name") val name: String,
+        @JsonProperty("name") @SerialName("name") val name: String,
-        @JsonProperty("country") val country: String,
+        @JsonProperty("country") @SerialName("country") val country: String,
-        @JsonProperty("scStepCode") val scStepCode: String,
+        @JsonProperty("scStepCode") @SerialName("scStepCode") val scStepCode: String,
-        @JsonProperty("scVerified") val scVerified: Boolean,
+        @JsonProperty("scVerified") @SerialName("scVerified") val scVerified: Boolean,
-        @JsonProperty("username") val username: String? = null,
+        @JsonProperty("username") @SerialName("username") val username: String? = null,
-        @JsonProperty("scUsername") val scUsername: String,
+        @JsonProperty("scUsername") @SerialName("scUsername") val scUsername: String,
     )
 
+    @Serializable
     data class ApiKeyResponse(
-        @JsonProperty("ok") val ok: Boolean? = false,
+        @JsonProperty("ok") @SerialName("ok") val ok: Boolean? = false,
-        @JsonProperty("api_key") val apiKey: String? = null,
+        @JsonProperty("api_key") @SerialName("api_key") val apiKey: String,
-        @JsonProperty("usage") val usage: Usage? = null,
+        @JsonProperty("usage") @SerialName("usage") val usage: Usage? = null,
     )
 
+    @Serializable
     data class Usage(
-        @JsonProperty("total") val total: Long? = 0,
+        @JsonProperty("total") @SerialName("total") val total: Long? = 0,
-        @JsonProperty("today") val today: Long? = 0,
+        @JsonProperty("today") @SerialName("today") val today: Long? = 0,
     )
 
+    @Serializable
     data class ApiResponse(
-        @JsonProperty("status") val status: Boolean? = null,
+        @JsonProperty("status") @SerialName("status") val status: Boolean? = null,
-        @JsonProperty("results") val results: List<Result>? = null,
+        @JsonProperty("results") @SerialName("results") val results: List<Result>? = null,
-        @JsonProperty("subtitles") val subtitles: List<Subtitle>? = null,
+        @JsonProperty("subtitles") @SerialName("subtitles") val subtitles: List<Subtitle>? = null,
     )
 
+    @Serializable
     data class Result(
-        @JsonProperty("sd_id") val sdId: Int? = null,
+        @JsonProperty("sd_id") @SerialName("sd_id") val sdId: Int? = null,
-        @JsonProperty("type") val type: String? = null,
+        @JsonProperty("type") @SerialName("type") val type: String? = null,
-        @JsonProperty("name") val name: String? = null,
+        @JsonProperty("name") @SerialName("name") val name: String? = null,
-        @JsonProperty("imdb_id") val imdbId: String? = null,
+        @JsonProperty("imdb_id") @SerialName("imdb_id") val imdbId: String? = null,
-        @JsonProperty("tmdb_id") val tmdbId: Long? = null,
+        @JsonProperty("tmdb_id") @SerialName("tmdb_id") val tmdbId: Long? = null,
-        @JsonProperty("first_air_date") val firstAirDate: String? = null,
+        @JsonProperty("first_air_date") @SerialName("first_air_date") val firstAirDate: String? = null,
-        @JsonProperty("year") val year: Int? = null,
+        @JsonProperty("year") @SerialName("year") val year: Int? = null,
     )
 
+    @Serializable
     data class Subtitle(
-        @JsonProperty("release_name") val releaseName: String,
+        @JsonProperty("release_name") @SerialName("release_name") val releaseName: String,
-        @JsonProperty("name") val name: String,
+        @JsonProperty("name") @SerialName("name") val name: String,
-        @JsonProperty("lang") val lang: String,
+        @JsonProperty("lang") @SerialName("lang") val lang: String, // subdl language code
-        @JsonProperty("author") val author: String? = null,
+        @JsonProperty("author") @SerialName("author") val author: String? = null,
-        @JsonProperty("url") val url: String? = null,
+        @JsonProperty("url") @SerialName("url") val url: String? = null,
-        @JsonProperty("subtitlePage") val subtitlePage: String? = null,
+        @JsonProperty("subtitlePage") @SerialName("subtitlePage") val subtitlePage: String? = null,
-        @JsonProperty("season") val season: Int? = null,
+        @JsonProperty("season") @SerialName("season") val season: Int? = null,
-        @JsonProperty("episode") val episode: Int? = null,
+        @JsonProperty("episode") @SerialName("episode") val episode: Int? = null,
-        @JsonProperty("language") val language: String? = null,
+        @JsonProperty("language") @SerialName("language") val language: String? = null, // full language name
-        @JsonProperty("hi") val hearingImpaired: Boolean? = null,
+        @JsonProperty("hi") @SerialName("hi") val hearingImpaired: Boolean? = null,
+    )
+
+    // https://subdl.com/api-files/language_list.json
+    // most of it is IETF BPC 47 conformant tag
+    // but there are some exceptions
+    private val langTagIETF2subdl = mapOf(
+        "en-bg" to "BG_EN", // "Bulgarian_English"
+        "en-de" to "EN_DE", // "English_German"
+        "en-hu" to "HU_EN", // "Hungarian_English"
+        "en-nl" to "NL_EN", // "Dutch_English"
+        "pt-br" to "BR_PT", // "Brazillian Portuguese"
+        "zh-hant" to "ZH_BG", // "Big 5 code" -> traditional Chinese (?_?)
+        // "ar" to "AR", // "Arabic"
+        // "az" to "AZ", // "Azerbaijani"
+        // "be" to "BE", // "Belarusian"
+        // "bg" to "BG", // "Bulgarian"
+        // "bn" to "BN", // "Bengali"
+        // "bs" to "BS", // "Bosnian"
+        // "ca" to "CA", // "Catalan"
+        // "cs" to "CS", // "Czech"
+        // "da" to "DA", // "Danish"
+        // "de" to "DE", // "German"
+        // "el" to "EL", // "Greek"
+        // "en" to "EN", // "English"
+        // "eo" to "EO", // "Esperanto"
+        // "es" to "ES", // "Spanish"
+        // "et" to "ET", // "Estonian"
+        // "fa" to "FA", // "Farsi_Persian"
+        // "fi" to "FI", // "Finnish"
+        // "fr" to "FR", // "French"
+        // "he" to "HE", // "Hebrew"
+        // "hi" to "HI", // "Hindi"
+        // "hr" to "HR", // "Croatian"
+        // "hu" to "HU", // "Hungarian"
+        // "id" to "ID", // "Indonesian"
+        // "is" to "IS", // "Icelandic"
+        // "it" to "IT", // "Italian"
+        // "ja" to "JA", // "Japanese"
+        // "ka" to "KA", // "Georgian"
+        // "kl" to "KL", // "Greenlandic"
+        // "ko" to "KO", // "Korean"
+        // "ku" to "KU", // "Kurdish"
+        // "lt" to "LT", // "Lithuanian"
+        // "lv" to "LV", // "Latvian"
+        // "mk" to "MK", // "Macedonian"
+        // "ml" to "ML", // "Malayalam"
+        // "mni" to "MNI", // "Manipuri"
+        // "ms" to "MS", // "Malay"
+        // "my" to "MY", // "Burmese"
+        // "nl" to "NL", // "Dutch"
+        // "no" to "NO", // "Norwegian"
+        // "pl" to "PL", // "Polish"
+        // "pt" to "PT", // "Portuguese"
+        // "ro" to "RO", // "Romanian"
+        // "ru" to "RU", // "Russian"
+        // "si" to "SI", // "Sinhala"
+        // "sk" to "SK", // "Slovak"
+        // "sl" to "SL", // "Slovenian"
+        // "sq" to "SQ", // "Albanian"
+        // "sr" to "SR", // "Serbian"
+        // "sv" to "SV", // "Swedish"
+        // "ta" to "TA", // "Tamil"
+        // "te" to "TE", // "Telugu"
+        // "th" to "TH", // "Thai"
+        // "tl" to "TL", // "Tagalog"
+        // "tr" to "TR", // "Turkish"
+        // "uk" to "UK", // "Ukranian"
+        // "ur" to "UR", // "Urdu"
+        // "vi" to "VI", // "Vietnamese"
+        // "zh" to "ZH", // "Chinese BG code"
     )
 }

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

@@ -9,23 +9,29 @@ import com.lagradost.cloudstream3.LoadResponse
 import com.lagradost.cloudstream3.MainAPI
 import com.lagradost.cloudstream3.MainActivity.Companion.afterPluginsLoadedEvent
 import com.lagradost.cloudstream3.MainPageRequest
-import com.lagradost.cloudstream3.SearchResponse
+import com.lagradost.cloudstream3.SearchResponseList
 import com.lagradost.cloudstream3.SubtitleFile
 import com.lagradost.cloudstream3.TvType
 import com.lagradost.cloudstream3.fixUrl
 import com.lagradost.cloudstream3.mvvm.Resource
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.mvvm.safeApiCall
-import com.lagradost.cloudstream3.utils.Coroutines.threadSafeListOf
+import com.lagradost.cloudstream3.newSearchResponseList
+import com.lagradost.cloudstream3.utils.Coroutines.atomicListOf
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.DelicateCoroutinesApi
-import kotlinx.coroutines.GlobalScope.coroutineContext
 import kotlinx.coroutines.async
 import kotlinx.coroutines.delay
+import kotlinx.coroutines.withTimeout
 
 class APIRepository(val api: MainAPI) {
     companion object {
+        // 2 minute timeout to prevent bad extensions/extractors from hogging the resources
+        // No real provider should take longer, so we hard kill them.
+        private const val DEFAULT_TIMEOUT = 120_000L
+        private const val MAX_TIMEOUT = 4 * DEFAULT_TIMEOUT
+        private const val MIN_TIMEOUT = 5_000L
+
         var dubStatusActive = HashSet<DubStatus>()
 
         val noneApi = object : MainAPI() {
@@ -49,18 +55,20 @@ class APIRepository(val api: MainAPI) {
             val hash: Pair<String, String>
         )
 
-        private val cache = threadSafeListOf<SavedLoadResponse>()
+        private val cache = atomicListOf<SavedLoadResponse>()
         private var cacheIndex: Int = 0
         const val CACHE_SIZE = 20
+
+        fun getTimeout(desired: Long?): Long {
+            return (desired ?: DEFAULT_TIMEOUT).coerceIn(MIN_TIMEOUT, MAX_TIMEOUT)
+        }
     }
 
     private fun afterPluginsLoaded(forceReload: Boolean) {
         if (forceReload) {
-            synchronized(cache) {
             cache.clear()
         }
     }
-    }
 
     init {
         afterPluginsLoadedEvent += ::afterPluginsLoaded
@@ -76,25 +84,30 @@ class APIRepository(val api: MainAPI) {
 
     suspend fun load(url: String): Resource<LoadResponse> {
         return safeApiCall {
+            withTimeout(getTimeout(api.loadTimeoutMs)) {
                 if (isInvalidData(url)) throw ErrorLoadingException()
                 val fixedUrl = api.fixUrl(url)
                 val lookingForHash = Pair(api.name, fixedUrl)
 
-            synchronized(cache) {
+                val cached = cache.withLock {
+                    var found: LoadResponse? = null
                     for (item in cache) {
                         // 10 min save
                         if (item.hash == lookingForHash && (unixTime - item.unixTime) < 60 * 10) {
-                        return@safeApiCall item.response
+                            found = item.response
+                            break
                         }
                     }
+                    found
                 }
 
+                if (cached != null) return@withTimeout cached
                 api.load(fixedUrl)?.also { response ->
                     // Remove all blank tags as early as possible
                     response.tags = response.tags?.filter { it.isNotBlank() }
                     val add = SavedLoadResponse(unixTime, response, lookingForHash)
 
-                synchronized(cache) {
+                    cache.withLock {
                         if (cache.size > CACHE_SIZE) {
                             cache[cacheIndex] = add // rolling cache
                             cacheIndex = (cacheIndex + 1) % CACHE_SIZE
@@ -105,25 +118,32 @@ class APIRepository(val api: MainAPI) {
                 } ?: throw ErrorLoadingException()
             }
         }
+    }
 
-    suspend fun search(query: String): Resource<List<SearchResponse>> {
+    suspend fun search(query: String, page: Int): Resource<SearchResponseList> {
         if (query.isEmpty())
-            return Resource.Success(emptyList())
+            return Resource.Success(newSearchResponseList(emptyList()))
 
         return safeApiCall {
-            return@safeApiCall (api.search(query)
+            withTimeout(getTimeout(api.searchTimeoutMs)) {
+                (api.search(query, page)
                     ?: throw ErrorLoadingException())
                 //                .filter { typesActive.contains(it.type) }
-                .toList()
+            }
         }
     }
 
-    suspend fun quickSearch(query: String): Resource<List<SearchResponse>> {
+    suspend fun quickSearch(query: String): Resource<SearchResponseList> {
         if (query.isEmpty())
-            return Resource.Success(emptyList())
+            return Resource.Success(newSearchResponseList(emptyList()))
 
         return safeApiCall {
-            api.quickSearch(query) ?: throw ErrorLoadingException()
+            withTimeout(getTimeout(api.quickSearchTimeoutMs)) {
+                newSearchResponseList(
+                    api.quickSearch(query) ?: throw ErrorLoadingException(),
+                    false
+                )
+            }
         }
     }
 
@@ -133,9 +153,9 @@ class APIRepository(val api: MainAPI) {
         delay(delta)
     }
 
-    @OptIn(DelicateCoroutinesApi::class)
     suspend fun getMainPage(page: Int, nameIndex: Int? = null): Resource<List<HomePageResponse?>> {
         return safeApiCall {
+            withTimeout(getTimeout(api.getMainPageTimeoutMs)) {
                 api.lastHomepageRequest = unixTimeMS
 
                 nameIndex?.let { api.mainPage.getOrNull(it) }?.let { data ->
@@ -173,6 +193,7 @@ class APIRepository(val api: MainAPI) {
                 }
             }
         }
+    }
 
     suspend fun extractorVerifierJob(extractorData: String?) {
         safeApiCall {
@@ -188,7 +209,9 @@ class APIRepository(val api: MainAPI) {
     ): Boolean {
         if (isInvalidData(data)) return false // this makes providers cleaner
         return try {
+            withTimeout(getTimeout(api.loadLinksTimeoutMs)) {
                 api.loadLinks(data, isCasting, subtitleCallback, callback)
+            }
         } catch (throwable: Throwable) {
             logError(throwable)
             return false

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

@@ -1,34 +1,55 @@
 package com.lagradost.cloudstream3.ui
 
+import android.content.Context
 import android.view.View
 import android.view.ViewGroup
+import android.widget.ImageView
 import androidx.core.view.children
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.viewModels
-import androidx.lifecycle.ViewModel
 import androidx.recyclerview.widget.AsyncDifferConfig
 import androidx.recyclerview.widget.AsyncListDiffer
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.RecyclerView.ViewHolder
 import androidx.viewbinding.ViewBinding
+import coil3.dispose
+import java.util.WeakHashMap
 import java.util.concurrent.CopyOnWriteArrayList
 
 open class ViewHolderState<T>(val view: ViewBinding) : ViewHolder(view.root) {
     open fun save(): T? = null
     open fun restore(state: T) = Unit
-    open fun onViewAttachedToWindow() = Unit
-    open fun onViewDetachedFromWindow() = Unit
-    open fun onViewRecycled() = Unit
 }
 
+abstract class NoStateAdapter<T : Any>(
+    diffCallback: DiffUtil.ItemCallback<T> = BaseDiffCallback()
+) : BaseAdapter<T, Any>(0, diffCallback)
 
-// Based of the concept https://github.com/brahmkshatriya/echo/blob/main/app%2Fsrc%2Fmain%2Fjava%2Fdev%2Fbrahmkshatriya%2Fecho%2Fui%2Fadapters%2FMediaItemsContainerAdapter.kt#L108-L154
+/** Creates a new shared pool, using the supplied lambda as a constructor.
-class StateViewModel : ViewModel() {
+ *
-    val layoutManagerStates = hashMapOf<Int, HashMap<Int, Any?>>()
+ * The reason for this complicated structure is that a pool should not be shared between contexts
+ * as it makes coil fuck up, and theming.
+ * */
+fun newSharedPool(lambda: RecyclerView.RecycledViewPool.() -> Unit = { }): Pair<WeakHashMap<Context, RecyclerView.RecycledViewPool>, RecyclerView.RecycledViewPool.() -> Unit> =
+    WeakHashMap<Context, RecyclerView.RecycledViewPool>() to lambda
+
+/** Sets the shared pool of the recyclerview */
+fun RecyclerView.setRecycledViewPool(pool: Pair<WeakHashMap<Context, RecyclerView.RecycledViewPool>, RecyclerView.RecycledViewPool.() -> Unit>) {
+    val ctx = context ?: return
+    synchronized(pool.first) {
+        this.setRecycledViewPool(pool.first.getOrPut(ctx) {
+            RecyclerView.RecycledViewPool().apply(pool.second)
+        })
+    }
 }
 
-abstract class NoStateAdapter<T : Any>(fragment: Fragment) : BaseAdapter<T, Any>(fragment, 0)
+/** Clears the shared pool of views */
+fun Pair<WeakHashMap<Context, RecyclerView.RecycledViewPool>, RecyclerView.RecycledViewPool.() -> Unit>.clear() {
+    synchronized(this.first) {
+        for (pool in this.first.values) {
+            pool?.clear()
+        }
+    }
+}
 
 /**
  * BaseAdapter is a persistent state stored adapter that supports headers and footers.
@@ -49,13 +70,14 @@ abstract class NoStateAdapter<T : Any>(fragment: Fragment) : BaseAdapter<T, Any>
 abstract class BaseAdapter<
         T : Any,
         S : Any>(
-    fragment: Fragment,
     val id: Int = 0,
     diffCallback: DiffUtil.ItemCallback<T> = BaseDiffCallback()
 ) : RecyclerView.Adapter<ViewHolderState<S>>() {
     open val footers: Int = 0
     open val headers: Int = 0
 
+    val immutableCurrentList: List<T> get() = mDiffer.currentList
+
     fun getItem(position: Int): T {
         return mDiffer.currentList[position]
     }
@@ -85,9 +107,33 @@ abstract class BaseAdapter<
         AsyncDifferConfig.Builder(diffCallback).build()
     )
 
-    open fun submitList(list: List<T>?) {
+    /**
+     * Instantly submits a **new and fresh** list. This means that no changes like moves are done as
+     * we assume the new list is not the same thing as the old list, nothing is shared.
+     *
+     * The views are rendered instantly as a result, so no fade/pop-ins or similar.
+     *
+     * Use `submitList` for general use, as that can reuse old views.
+     * */
+    open fun submitIncomparableList(list: List<T>?, commitCallback : Runnable? = null) {
+        // This leverages a quirk in the submitList function that has a fast case for null arrays
+        // What this implies is that as long as we do a double submit we can ensure no pop-ins,
+        // as the changes are the entire list instead of calculating deltas
+        submitList(null)
+        submitList(list, commitCallback)
+    }
+
+    /**
+     * @param commitCallback Optional runnable that is executed when the List is committed, if it is committed.
+     * This is needed for some tasks as submitList will use a background thread for diff
+     * */
+    open fun submitList(list: Collection<T>?, commitCallback : Runnable? = null) {
         // deep copy at least the top list, because otherwise adapter can go crazy
-        mDiffer.submitList(list?.let { CopyOnWriteArrayList(it) })
+        if (list.isNullOrEmpty()) {
+            mDiffer.submitList(null, commitCallback) // It is "faster" to submit null than emptyList()
+        } else {
+            mDiffer.submitList(CopyOnWriteArrayList(list), commitCallback)
+        }
     }
 
     override fun getItemCount(): Int {
@@ -101,16 +147,25 @@ abstract class BaseAdapter<
     open fun onBindFooter(holder: ViewHolderState<S>) = Unit
     open fun onBindHeader(holder: ViewHolderState<S>) = Unit
     open fun onCreateContent(parent: ViewGroup): ViewHolderState<S> = throw NotImplementedError()
+    open fun onCreateCustomContent(
+        parent: ViewGroup,
+        viewType: Int
+    ) = onCreateContent(parent)
+
     open fun onCreateFooter(parent: ViewGroup): ViewHolderState<S> = throw NotImplementedError()
+    open fun onCreateCustomFooter(
+        parent: ViewGroup,
+        viewType: Int
+    ) = onCreateFooter(parent)
+
     open fun onCreateHeader(parent: ViewGroup): ViewHolderState<S> = throw NotImplementedError()
+    open fun onCreateCustomHeader(
+        parent: ViewGroup,
+        viewType: Int
+    ) = onCreateHeader(parent)
 
-    override fun onViewAttachedToWindow(holder: ViewHolderState<S>) {
+    override fun onViewAttachedToWindow(holder: ViewHolderState<S>) {}
-        holder.onViewAttachedToWindow()
+    override fun onViewDetachedFromWindow(holder: ViewHolderState<S>) {}
-    }
-
-    override fun onViewDetachedFromWindow(holder: ViewHolderState<S>) {
-        holder.onViewDetachedFromWindow()
-    }
 
     @Suppress("UNCHECKED_CAST")
     fun save(recyclerView: RecyclerView) {
@@ -121,21 +176,20 @@ abstract class BaseAdapter<
         }
     }
 
-    fun clear() {
+    fun clearState() {
-        stateViewModel.layoutManagerStates[id]?.clear()
+        layoutManagerStates[id]?.clear()
     }
 
     @Suppress("UNCHECKED_CAST")
     private fun getState(holder: ViewHolderState<S>): S? =
-        stateViewModel.layoutManagerStates[id]?.get(holder.absoluteAdapterPosition) as? S
+        layoutManagerStates[id]?.get(holder.absoluteAdapterPosition) as? S
 
     private fun setState(holder: ViewHolderState<S>) {
         if (id == 0) return
-
+        if (!layoutManagerStates.contains(id)) {
-        if (!stateViewModel.layoutManagerStates.contains(id)) {
+            layoutManagerStates[id] = HashMap()
-            stateViewModel.layoutManagerStates[id] = HashMap()
         }
-        stateViewModel.layoutManagerStates[id]?.let { map ->
+        layoutManagerStates[id]?.let { map ->
             map[holder.absoluteAdapterPosition] = holder.save()
         }
     }
@@ -158,30 +212,40 @@ abstract class BaseAdapter<
         super.onDetachedFromRecyclerView(recyclerView)
     }
 
+    open fun customContentViewType(item: T): Int = 0
+    open fun customFooterViewType(): Int = 0
+    open fun customHeaderViewType(): Int = 0
+
     final override fun getItemViewType(position: Int): Int {
         if (position < headers) {
-            return HEADER
+            return HEADER or customHeaderViewType()
         }
-        if (position - headers >= mDiffer.currentList.size) {
+        val realPosition = position - headers
-            return FOOTER
+        if (realPosition >= mDiffer.currentList.size) {
+            return FOOTER or customFooterViewType()
         }
-
+        return CONTENT or customContentViewType(getItem(realPosition))
-        return CONTENT
     }
 
-    private val stateViewModel: StateViewModel by fragment.viewModels()
-
     final override fun onViewRecycled(holder: ViewHolderState<S>) {
         setState(holder)
-        holder.onViewRecycled()
+        onClearView(holder)
         super.onViewRecycled(holder)
     }
 
+    /** Same as onViewRecycled, but for the purpose of cleaning the view of any relevant data.
+     *
+     * If an item view has large or expensive data bound to it such as large bitmaps, this may be a good place to release those resources.
+     *
+     * Use this with `clearImage`
+     * */
+    open fun onClearView(holder: ViewHolderState<S>) {}
+
     final override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolderState<S> {
-        return when (viewType) {
+        return when (viewType and TYPE_MASK) {
-            CONTENT -> onCreateContent(parent)
+            CONTENT -> onCreateCustomContent(parent, viewType and CUSTOM_MASK)
-            HEADER -> onCreateHeader(parent)
+            HEADER -> onCreateCustomHeader(parent, viewType and CUSTOM_MASK)
-            FOOTER -> onCreateFooter(parent)
+            FOOTER -> onCreateCustomFooter(parent, viewType and CUSTOM_MASK)
             else -> throw NotImplementedError()
         }
     }
@@ -196,7 +260,7 @@ abstract class BaseAdapter<
             super.onBindViewHolder(holder, position, payloads)
             return
         }
-        when (getItemViewType(position)) {
+        when (getItemViewType(position) and TYPE_MASK) {
             CONTENT -> {
                 val realPosition = position - headers
                 val item = getItem(realPosition)
@@ -214,7 +278,7 @@ abstract class BaseAdapter<
     }
 
     final override fun onBindViewHolder(holder: ViewHolderState<S>, position: Int) {
-        when (getItemViewType(position)) {
+        when (getItemViewType(position) and TYPE_MASK) {
             CONTENT -> {
                 val realPosition = position - headers
                 val item = getItem(realPosition)
@@ -236,9 +300,20 @@ abstract class BaseAdapter<
     }
 
     companion object {
-        private const val HEADER: Int = 1
+        val layoutManagerStates = hashMapOf<Int, HashMap<Int, Any?>>()
-        private const val FOOTER: Int = 2
+        fun clearImage(image: ImageView?) {
-        private const val CONTENT: Int = 0
+            image?.dispose()
+        }
+
+        // Use the lowermost MASK_SIZE bits for the custom content,
+        // use the uppermost 32 - MASK_SIZE to the type
+        private const val MASK_SIZE = 28
+        private const val CUSTOM_MASK = (1 shl MASK_SIZE) - 1
+        private const val TYPE_MASK = CUSTOM_MASK.inv()
+        const val HEADER: Int = 3 shl MASK_SIZE
+        const val FOOTER: Int = 2 shl MASK_SIZE
+        /** For custom content, write `CONTENT or X` when calling setMaxRecycledViews  */
+        const val CONTENT: Int = 1 shl MASK_SIZE
     }
 }
 
@@ -248,5 +323,5 @@ class BaseDiffCallback<T : Any>(
 ) : DiffUtil.ItemCallback<T>() {
     override fun areItemsTheSame(oldItem: T, newItem: T): Boolean = itemSame(oldItem, newItem)
     override fun areContentsTheSame(oldItem: T, newItem: T): Boolean = contentSame(oldItem, newItem)
-    override fun getChangePayload(oldItem: T, newItem: T): Any = Any()
+    override fun getChangePayload(oldItem: T, newItem: T): Any? = Any()
 }

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

@@ -0,0 +1,278 @@
+package com.lagradost.cloudstream3.ui
+
+import android.content.res.Configuration
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Toast
+import androidx.annotation.LayoutRes
+import androidx.fragment.app.DialogFragment
+import androidx.fragment.app.Fragment
+import androidx.preference.PreferenceFragmentCompat
+import androidx.viewbinding.ViewBinding
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment
+import com.lagradost.cloudstream3.CommonActivity.showToast
+import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.mvvm.logError
+import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setSystemBarsPadding
+import com.lagradost.cloudstream3.utils.txt
+
+/**
+ * A base Fragment class that simplifies ViewBinding usage and handles view inflation safely.
+ *
+ * This class allows two modes of creating ViewBinding:
+ * 1. Inflate: Using the standard `inflate()` method provided by generated ViewBinding classes.
+ * 2. Bind: Using `bind()` on an existing root view.
+ *
+ * It also provides hooks for:
+ * - Safe initialization of the binding (`onBindingCreated`)
+ * - Automatic padding adjustment for system bars (`fixPadding`)
+ * - Optional layout resource selection via `pickLayout()`
+ *
+ * @param T The type of ViewBinding for this Fragment.
+ * @param bindingCreator The strategy used to create the binding instance.
+ */
+private interface BaseFragmentHelper<T : ViewBinding> {
+    val bindingCreator: BaseFragment.BindingCreator<T>
+
+    var _binding: T?
+    val binding: T? get() = _binding
+
+    fun createBinding(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        val layoutId = pickLayout()
+        val root: View? = layoutId?.let { inflater.inflate(it, container, false) }
+        _binding = try {
+            when (val creator = bindingCreator) {
+                is BaseFragment.BindingCreator.Inflate -> creator.fn(inflater, container, false)
+                is BaseFragment.BindingCreator.Bind -> {
+                    if (root != null) creator.fn(root)
+                    else throw IllegalStateException("Root view is null for bind()")
+                }
+            }
+        } catch (t: Throwable) {
+            showToast(
+                txt(R.string.unable_to_inflate, t.message ?: ""),
+                Toast.LENGTH_LONG
+            )
+            logError(t)
+            null
+        }
+
+        return _binding?.root ?: root
+    }
+
+    /**
+     * Called after the fragment's view has been created.
+     *
+     * This method is `final` to ensure that the binding is properly initialized and
+     * system bar padding adjustments are applied before any subclass logic runs.
+     * Subclasses should use [onBindingCreated] instead of overriding this method directly.
+     */
+    fun onViewReady(view: View, savedInstanceState: Bundle?) {
+        fixLayout(view)
+        binding?.let { onBindingCreated(it, savedInstanceState) }
+    }
+
+    /**
+     * Called when the binding is safely created and view is ready.
+     * Can be overridden to provide fragment-specific initialization.
+     *
+     * @param binding The safely created ViewBinding.
+     * @param savedInstanceState Saved state bundle or null.
+     */
+    fun onBindingCreated(binding: T, savedInstanceState: Bundle?) {
+        onBindingCreated(binding)
+    }
+
+    /**
+     * Called when the binding is safely created and view is ready.
+     * Overload without savedInstanceState for convenience.
+     *
+     * @param binding The safely created ViewBinding.
+     */
+    fun onBindingCreated(binding: T) {}
+
+    /**
+     * Pick a layout resource ID for the fragment.
+     *
+     * Return `null` by default. Override to provide a layout resource when using
+     * `BindingCreator.Bind`. Not needed if using `BindingCreator.Inflate`.
+     *
+     * @return Layout resource ID or null.
+     */
+    @LayoutRes
+    fun pickLayout(): Int? = null
+
+    /**
+     * Ensures the layout of the root view is correctly adjusted for the current configuration.
+     *
+     * This may include applying padding for system bars, adjusting insets, or performing other
+     * layout updates. `fixLayout` should remain idempotent, as it can be called multiple
+     * times on the same view, such as during configuration changes (e.g. device rotation) or when
+     * the view is recreated.
+     *
+     * @param view The root view to adjust.
+     */
+    fun fixLayout(view: View)
+}
+
+abstract class BaseFragment<T : ViewBinding>(
+    override val bindingCreator: BindingCreator<T>
+) : Fragment(), BaseFragmentHelper<T> {
+    override var _binding: T? = null
+
+    /** Safer activity?.onBackPressedDispatcher?.onBackPressed() with fallback behavior instead of app crash */
+    fun dispatchBackPressed() {
+        try {
+            activity?.onBackPressedDispatcher?.onBackPressed()
+        } catch (_: IllegalStateException) {
+            // FragmentManager is already executing transactions, so try again
+            delayedDispatchBackPressed(5)
+        } catch (t: Throwable) {
+            logError(t)
+        }
+    }
+
+    /** Recursive back press when available */
+    private fun delayedDispatchBackPressed(remaining: Int) {
+        if (remaining <= 0) return
+        binding?.root?.postDelayed({
+            try {
+                activity?.onBackPressedDispatcher?.onBackPressed()
+            } catch (_: IllegalStateException) {
+                // FragmentManager is already executing transactions, so try again
+                delayedDispatchBackPressed(remaining - 1)
+            } catch (t: Throwable) {
+                logError(t)
+            }
+        }, 200)
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? = createBinding(inflater, container, savedInstanceState)
+
+    final override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        onViewReady(view, savedInstanceState)
+    }
+
+    /**
+     * Called when the device configuration changes (e.g., orientation).
+     * Re-applies system bar padding fixes to the root view to ensure it
+     * readjusts for orientation changes.
+     */
+    override fun onConfigurationChanged(newConfig: Configuration) {
+        super.onConfigurationChanged(newConfig)
+        view?.let { fixLayout(it) }
+    }
+
+    /** Cleans up the binding reference when the view is destroyed to avoid memory leaks. */
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+
+    /**
+     * Sealed class representing the two strategies for creating a ViewBinding instance.
+     */
+    sealed class BindingCreator<T : ViewBinding> {
+
+        /**
+         * Use the standard inflate() method for creating the binding.
+         *
+         * @param fn Lambda that inflates the binding.
+         */
+        class Inflate<T : ViewBinding>(
+            val fn: (LayoutInflater, ViewGroup?, Boolean) -> T
+        ) : BindingCreator<T>()
+
+        /**
+         * Use bind() on an existing root view to create the binding. This should
+         * be used if you are differing per device layouts, such as different
+         * layouts for TV and Phone.
+         *
+         * @param fn Lambda that binds the root view.
+         */
+        class Bind<T : ViewBinding>(
+            val fn: (View) -> T
+        ) : BindingCreator<T>()
+    }
+}
+
+abstract class BaseDialogFragment<T : ViewBinding>(
+    override val bindingCreator: BaseFragment.BindingCreator<T>
+) : DialogFragment(), BaseFragmentHelper<T> {
+    override var _binding: T? = null
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? = createBinding(inflater, container, savedInstanceState)
+
+    final override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        onViewReady(view, savedInstanceState)
+    }
+
+    /** @see [BaseFragment.onConfigurationChanged] for documentation. */
+    override fun onConfigurationChanged(newConfig: Configuration) {
+        super.onConfigurationChanged(newConfig)
+        view?.let { fixLayout(it) }
+    }
+
+    /** Cleans up the binding reference when the view is destroyed to avoid memory leaks. */
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+}
+
+abstract class BaseBottomSheetDialogFragment<T : ViewBinding>(
+    override val bindingCreator: BaseFragment.BindingCreator<T>
+) : BottomSheetDialogFragment(), BaseFragmentHelper<T> {
+    override var _binding: T? = null
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? = createBinding(inflater, container, savedInstanceState)
+
+    final override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        onViewReady(view, savedInstanceState)
+    }
+
+    /** @see [BaseFragment.onConfigurationChanged] for documentation. */
+    override fun onConfigurationChanged(newConfig: Configuration) {
+        super.onConfigurationChanged(newConfig)
+        view?.let { fixLayout(it) }
+    }
+
+    /** Cleans up the binding reference when the view is destroyed to avoid memory leaks. */
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+}
+
+abstract class BasePreferenceFragmentCompat() : PreferenceFragmentCompat() {
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        setSystemBarsPadding()
+    }
+
+    override fun onConfigurationChanged(newConfig: Configuration) {
+        super.onConfigurationChanged(newConfig)
+        setSystemBarsPadding()
+    }
+}

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

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

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

@@ -3,6 +3,7 @@ package com.lagradost.cloudstream3.ui
 import android.content.Context
 import android.util.AttributeSet
 import android.view.View
+import androidx.core.content.withStyledAttributes
 import androidx.core.view.children
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.RecyclerView
@@ -154,10 +155,9 @@ class AutofitRecyclerView @JvmOverloads constructor(context: Context, attrs: Att
 
     init {
         if (attrs != null) {
-            val attrsArray = intArrayOf(android.R.attr.columnWidth)
+            context.withStyledAttributes(attrs, intArrayOf(android.R.attr.columnWidth)) {
-            val array = context.obtainStyledAttributes(attrs, attrsArray)
+                columnWidth = getDimensionPixelSize(0, -1)
-            columnWidth = array.getDimensionPixelSize(0, -1)
+            }
-            array.recycle()
         }
 
         layoutManager = manager

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

@@ -1,97 +0,0 @@
-// https://github.com/googlecodelabs/android-kotlin-animation-property-animation/tree/master/begin
-
-package com.lagradost.cloudstream3.ui
-
-import android.animation.Animator
-import android.animation.AnimatorListenerAdapter
-import android.animation.AnimatorSet
-import android.animation.ObjectAnimator
-import android.os.Bundle
-import android.os.Handler
-import android.view.View
-import android.view.animation.AccelerateInterpolator
-import android.view.animation.LinearInterpolator
-import android.widget.FrameLayout
-import androidx.appcompat.app.AppCompatActivity
-import androidx.appcompat.widget.AppCompatImageView
-import androidx.core.view.isVisible
-import com.lagradost.cloudstream3.R
-import com.lagradost.cloudstream3.databinding.ActivityEasterEggMonkeBinding
-
-class EasterEggMonke : AppCompatActivity() {
-
-    lateinit var binding : ActivityEasterEggMonkeBinding
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        binding = ActivityEasterEggMonkeBinding.inflate(layoutInflater)
-        setContentView(binding.root)
-
-        val handler = Handler(mainLooper)
-        lateinit var runnable: Runnable
-        runnable = Runnable {
-            shower()
-            handler.postDelayed(runnable, 300)
-        }
-        handler.postDelayed(runnable, 1000)
-    }
-
-    private fun shower() {
-
-        val containerW = binding.frame.width
-        val containerH = binding.frame.height
-        var starW: Float = binding.monke.width.toFloat()
-        var starH: Float = binding.monke.height.toFloat()
-
-        val newStar = AppCompatImageView(this)
-        val idx = (monkeys.size * Math.random()).toInt()
-        newStar.setImageResource(monkeys[idx])
-        newStar.isVisible = true
-        newStar.layoutParams = FrameLayout.LayoutParams(FrameLayout.LayoutParams.WRAP_CONTENT,
-            FrameLayout.LayoutParams.WRAP_CONTENT)
-        binding.frame.addView(newStar)
-
-        newStar.scaleX += Math.random().toFloat() * 1.5f
-        newStar.scaleY = newStar.scaleX
-        starW *= newStar.scaleX
-        starH *= newStar.scaleY
-
-        newStar.translationX = Math.random().toFloat() * containerW - starW / 2
-
-        val mover = ObjectAnimator.ofFloat(newStar, View.TRANSLATION_Y, -starH, containerH + starH)
-        mover.interpolator = AccelerateInterpolator(1f)
-
-        val rotator = ObjectAnimator.ofFloat(newStar, View.ROTATION,
-            (Math.random() * 1080).toFloat())
-        rotator.interpolator = LinearInterpolator()
-
-        val set = AnimatorSet()
-        set.playTogether(mover, rotator)
-        set.duration = (Math.random() * 1500 + 2500).toLong()
-
-        set.addListener(object : AnimatorListenerAdapter() {
-            override fun onAnimationEnd(animation: Animator) {
-                binding.frame.removeView(newStar)
-            }
-        })
-
-        set.start()
-    }
-
-    companion object {
-        val monkeys = listOf(
-            R.drawable.monke_benene,
-            R.drawable.monke_burrito,
-            R.drawable.monke_coco,
-            R.drawable.monke_cookie,
-            R.drawable.monke_flusdered,
-            R.drawable.monke_funny,
-            R.drawable.monke_like,
-            R.drawable.monke_party,
-            R.drawable.monke_sob,
-            R.drawable.monke_drink,
-            R.drawable.benene,
-            R.drawable.ic_launcher_foreground
-        )
-    }
-}

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

@@ -0,0 +1,177 @@
+package com.lagradost.cloudstream3.ui
+
+import android.animation.Animator
+import android.animation.AnimatorListenerAdapter
+import android.animation.ObjectAnimator
+import android.annotation.SuppressLint
+import android.view.MotionEvent
+import android.view.View
+import android.view.animation.AccelerateInterpolator
+import android.view.animation.LinearInterpolator
+import android.widget.FrameLayout
+import android.widget.ImageView
+import androidx.core.view.isVisible
+import androidx.lifecycle.lifecycleScope
+import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.databinding.FragmentEasterEggMonkeBinding
+import com.lagradost.cloudstream3.utils.UIHelper.hideSystemUI
+import com.lagradost.cloudstream3.utils.UIHelper.showSystemUI
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.isActive
+import kotlinx.coroutines.launch
+import kotlin.random.Random
+
+class EasterEggMonkeFragment : BaseFragment<FragmentEasterEggMonkeBinding>(
+    BaseFragment.BindingCreator.Inflate(FragmentEasterEggMonkeBinding::inflate)
+) {
+
+    // planet of monks
+    private val monkeys: List<Int> = listOf(
+        R.drawable.monke_benene,
+        R.drawable.monke_burrito,
+        R.drawable.monke_coco,
+        R.drawable.monke_cookie,
+        R.drawable.monke_flusdered,
+        R.drawable.monke_funny,
+        R.drawable.monke_like,
+        R.drawable.monke_party,
+        R.drawable.monke_sob,
+        R.drawable.monke_drink,
+        R.drawable.benene,
+        R.drawable.ic_launcher_foreground,
+        R.drawable.quick_novel_icon,
+    )
+
+    private val activeMonkeys = mutableListOf<ImageView>()
+    private var spawningJob: Job? = null
+
+    override fun fixLayout(view: View) = Unit
+
+    override fun onBindingCreated(binding: FragmentEasterEggMonkeBinding) {
+        activity?.hideSystemUI()
+        spawningJob = lifecycleScope.launch {
+            delay(1000)
+            while (isActive) {
+                spawnMonkey(binding)
+                delay(500)
+            }
+        }
+    }
+
+    private fun spawnMonkey(binding: FragmentEasterEggMonkeBinding) {
+        val newMonkey = ImageView(context ?: return).apply {
+            setImageResource(monkeys.random())
+            isVisible = true
+        }
+
+        val initialScale = Random.nextFloat() * 1.5f + 0.5f
+        newMonkey.scaleX = initialScale
+        newMonkey.scaleY = initialScale
+
+        newMonkey.measure(View.MeasureSpec.UNSPECIFIED, View.MeasureSpec.UNSPECIFIED)
+        val monkeyW = newMonkey.measuredWidth * initialScale
+        val monkeyH = newMonkey.measuredHeight * initialScale
+
+        newMonkey.x = Random.nextFloat() * (binding.frame.width.toFloat() - monkeyW)
+        newMonkey.y = Random.nextFloat() * (binding.frame.height.toFloat() - monkeyH)
+
+        binding.frame.addView(newMonkey, FrameLayout.LayoutParams(
+            FrameLayout.LayoutParams.WRAP_CONTENT, FrameLayout.LayoutParams.WRAP_CONTENT
+        ))
+
+        activeMonkeys.add(newMonkey)
+
+        newMonkey.alpha = 0f
+        ObjectAnimator.ofFloat(newMonkey, View.ALPHA, 0f, 1f).apply {
+            duration = Random.nextLong(1000, 2500)
+            interpolator = AccelerateInterpolator()
+            start()
+        }
+
+        @SuppressLint("ClickableViewAccessibility")
+        newMonkey.setOnTouchListener { view, event -> handleTouch(view, event, binding) }
+
+        startFloatingAnimation(newMonkey, binding)
+    }
+
+    private fun startFloatingAnimation(monkey: ImageView, binding: FragmentEasterEggMonkeBinding) {
+        val floatUpAnimator = ObjectAnimator.ofFloat(
+            monkey, View.TRANSLATION_Y, monkey.y, -monkey.height.toFloat()
+        ).apply {
+            duration = Random.nextLong(8000, 15000)
+            interpolator = LinearInterpolator()
+        }
+
+        floatUpAnimator.addListener(object : AnimatorListenerAdapter() {
+            override fun onAnimationEnd(animation: Animator) {
+                binding.frame.removeView(monkey)
+                activeMonkeys.remove(monkey)
+            }
+        })
+
+        floatUpAnimator.start()
+        monkey.tag = floatUpAnimator
+    }
+
+    private fun handleTouch(
+        view: View,
+        event: MotionEvent,
+        binding: FragmentEasterEggMonkeBinding
+    ): Boolean {
+        val monkey = view as ImageView
+        when (event.action) {
+            MotionEvent.ACTION_DOWN -> {
+                (monkey.tag as? ObjectAnimator)?.pause()
+                return true
+            }
+
+            MotionEvent.ACTION_MOVE -> {
+                // Update both X and Y positions properly
+                monkey.x = event.rawX - monkey.width / 2
+                monkey.y = event.rawY - monkey.height / 2
+
+                // Check if monkey touches the screen edge
+                if (isTouchingEdge(monkey, binding)) {
+                    removeMonkey(monkey, binding)
+                }
+                return true
+            }
+
+            MotionEvent.ACTION_UP, MotionEvent.ACTION_CANCEL -> {
+                if (isTouchingEdge(monkey, binding)) {
+                    removeMonkey(monkey, binding)
+                } else {
+                    startFloatingAnimation(monkey, binding)
+                }
+                return true
+            }
+        }
+        return false
+    }
+
+    private fun isTouchingEdge(monkey: ImageView, binding: FragmentEasterEggMonkeBinding): Boolean {
+        return monkey.x <= 0 || monkey.x + monkey.width >= binding.frame.width ||
+                monkey.y <= 0 || monkey.y + monkey.height >= binding.frame.height
+    }
+
+    private fun removeMonkey(monkey: ImageView, binding: FragmentEasterEggMonkeBinding) {
+        // Fade out and remove the monkey
+        ObjectAnimator.ofFloat(monkey, View.ALPHA, 1f, 0f).apply {
+            duration = 300
+            addListener(object : AnimatorListenerAdapter() {
+                override fun onAnimationEnd(animation: Animator) {
+                    binding.frame.removeView(monkey)
+                    activeMonkeys.remove(monkey)
+                }
+            })
+            start()
+        }
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        activity?.showSystemUI()
+        spawningJob?.cancel()
+    }
+}

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

@@ -1,42 +0,0 @@
-package com.lagradost.cloudstream3.ui
-
-import android.graphics.Canvas
-import android.graphics.Rect
-import android.view.View
-import androidx.recyclerview.widget.RecyclerView
-
-class HeaderViewDecoration(private val customView: View) : RecyclerView.ItemDecoration() {
-    override fun onDraw(c: Canvas, parent: RecyclerView, state: RecyclerView.State) {
-        super.onDraw(c, parent, state)
-        customView.layout(parent.left, 0, parent.right, customView.measuredHeight)
-        for (i in 0 until parent.childCount) {
-            val view = parent.getChildAt(i)
-            if (parent.getChildAdapterPosition(view) == 0) {
-                c.save()
-                val height = customView.measuredHeight
-                val top = view.top - height
-                c.translate(0f, top.toFloat())
-                customView.draw(c)
-                c.restore()
-                break
-            }
-        }
-    }
-
-    override fun getItemOffsets(
-        outRect: Rect,
-        view: View,
-        parent: RecyclerView,
-        state: RecyclerView.State
-    ) {
-        if (parent.getChildAdapterPosition(view) == 0) {
-            customView.measure(
-                View.MeasureSpec.makeMeasureSpec(parent.measuredWidth, View.MeasureSpec.AT_MOST),
-                View.MeasureSpec.makeMeasureSpec(parent.measuredHeight, View.MeasureSpec.AT_MOST)
-            )
-            outRect.set(0, customView.measuredHeight, 0, 0)
-        } else {
-            outRect.setEmpty()
-        }
-    }
-}

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

@@ -7,12 +7,12 @@ import android.view.View
 import android.widget.LinearLayout
 import android.widget.ProgressBar
 import android.widget.RelativeLayout
+import androidx.core.content.withStyledAttributes
 import com.google.android.gms.cast.framework.media.widget.MiniControllerFragment
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.utils.UIHelper.adjustAlpha
 import com.lagradost.cloudstream3.utils.UIHelper.colorFromAttribute
 import com.lagradost.cloudstream3.utils.UIHelper.toPx
-import java.lang.ref.WeakReference
 
 
 class MyMiniControllerFragment : MiniControllerFragment() {
@@ -25,28 +25,17 @@ class MyMiniControllerFragment : MiniControllerFragment() {
 
     // I KNOW, KINDA SPAGHETTI SOLUTION, BUT IT WORKS
     override fun onInflate(context: Context, attributeSet: AttributeSet, bundle: Bundle?) {
-        super.onInflate(context, attributeSet, bundle)
-
-        // somehow this leaks and I really dont know why, it seams like if you go back to a fragment with this, it leaks????
         if (currentColor == 0) {
-            WeakReference(
+            context.withStyledAttributes(attributeSet, R.styleable.CustomCast, 0, 0) {
-                context.obtainStyledAttributes(
+                if (hasValue(R.styleable.CustomCast_customCastBackgroundColor)) {
-                    attributeSet,
+                    currentColor = getColor(R.styleable.CustomCast_customCastBackgroundColor, 0)
-                    R.styleable.CustomCast
-                )
-            ).apply {
-                if (get()
-                        ?.hasValue(R.styleable.CustomCast_customCastBackgroundColor) == true
-                ) {
-                    currentColor =
-                        get()
-                            ?.getColor(R.styleable.CustomCast_customCastBackgroundColor, 0) ?: 0
                 }
-                get()?.recycle()
-            }.clear()
             }
         }
 
+        super.onInflate(context, attributeSet, bundle)
+    }
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 

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

@@ -18,15 +18,6 @@ enum class WatchType(val internalId: Int, @StringRes val stringRes: Int, @Drawab
 }
 
 enum class SyncWatchType(val internalId: Int, @StringRes val stringRes: Int, @DrawableRes val iconRes: Int) {
-    /*
-          -1 -> None
-          0 -> Watching
-          1 -> Completed
-          2 -> OnHold
-          3 -> Dropped
-          4 -> PlanToWatch
-          5 -> ReWatching
-          */
     NONE(-1, R.string.type_none, R.drawable.ic_baseline_add_24),
     WATCHING(0, R.string.type_watching, R.drawable.ic_baseline_bookmark_24),
     COMPLETED(1, R.string.type_completed, R.drawable.ic_baseline_bookmark_24),

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

@@ -1,17 +1,12 @@
 package com.lagradost.cloudstream3.ui
 
 import android.os.Bundle
-import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
 import android.webkit.JavascriptInterface
 import android.webkit.WebResourceRequest
 import android.webkit.WebView
 import android.webkit.WebViewClient
-import androidx.annotation.OptIn
-import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
-import androidx.media3.common.util.UnstableApi
 import androidx.navigation.fragment.findNavController
 import com.lagradost.cloudstream3.MainActivity
 import com.lagradost.cloudstream3.USER_AGENT
@@ -19,19 +14,18 @@ import com.lagradost.cloudstream3.databinding.FragmentWebviewBinding
 import com.lagradost.cloudstream3.network.WebViewResolver
 import com.lagradost.cloudstream3.utils.AppContextUtils.loadRepository
 
+class WebviewFragment : BaseFragment<FragmentWebviewBinding>(
+    BaseFragment.BindingCreator.Inflate(FragmentWebviewBinding::inflate)
+) {
 
-class WebviewFragment : Fragment() {
+    override fun fixLayout(view: View) = Unit
 
-    var binding: FragmentWebviewBinding? = null
+    override fun onBindingCreated(binding: FragmentWebviewBinding) {
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
         val url = arguments?.getString(WEBVIEW_URL) ?: "".also {
             findNavController().popBackStack()
         }
 
-        binding?.webView?.webViewClient = object : WebViewClient() {
+        binding.webView.webViewClient = object : WebViewClient() {
-            @OptIn(UnstableApi::class)
             override fun shouldOverrideUrlLoading(
                 view: WebView?,
                 request: WebResourceRequest?
@@ -46,28 +40,17 @@ class WebviewFragment : Fragment() {
                 return super.shouldOverrideUrlLoading(view, request)
             }
         }
-        binding?.webView?.apply {
+
+        binding.webView.apply {
             WebViewResolver.webViewUserAgent = settings.userAgentString
 
             addJavascriptInterface(RepoApi(activity), "RepoApi")
             settings.javaScriptEnabled = true
             settings.userAgentString = USER_AGENT
             settings.domStorageEnabled = true
-//        WebView.setWebContentsDebuggingEnabled(true)
 
             loadUrl(url)
         }
-
-    }
-
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        val localBinding = FragmentWebviewBinding.inflate(inflater, container, false)
-        binding = localBinding
-        // Inflate the layout for this fragment
-        return localBinding.root//inflater.inflate(R.layout.fragment_webview, container, false)
     }
 
     companion object {

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

@@ -1,16 +1,17 @@
 package com.lagradost.cloudstream3.ui.account
 
+import android.os.Build
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.core.content.ContextCompat
 import androidx.core.view.isVisible
-import androidx.recyclerview.widget.RecyclerView
-import androidx.viewbinding.ViewBinding
 import coil3.transform.RoundedCornersTransformation
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.databinding.AccountListItemAddBinding
 import com.lagradost.cloudstream3.databinding.AccountListItemBinding
 import com.lagradost.cloudstream3.databinding.AccountListItemEditBinding
+import com.lagradost.cloudstream3.ui.NoStateAdapter
+import com.lagradost.cloudstream3.ui.ViewHolderState
 import com.lagradost.cloudstream3.ui.account.AccountHelper.showAccountEditDialog
 import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR
 import com.lagradost.cloudstream3.ui.settings.Globals.TV
@@ -19,34 +20,39 @@ import com.lagradost.cloudstream3.utils.DataStoreHelper
 import com.lagradost.cloudstream3.utils.ImageLoader.loadImage
 
 class AccountAdapter(
-    private val accounts: List<DataStoreHelper.Account>,
     private val accountSelectCallback: (DataStoreHelper.Account) -> Unit,
     private val accountCreateCallback: (DataStoreHelper.Account) -> Unit,
     private val accountEditCallback: (DataStoreHelper.Account) -> Unit,
     private val accountDeleteCallback: (DataStoreHelper.Account) -> Unit
-) : RecyclerView.Adapter<AccountAdapter.AccountViewHolder>() {
+) : NoStateAdapter<DataStoreHelper.Account>() {
 
     companion object {
         const val VIEW_TYPE_SELECT_ACCOUNT = 0
-        const val VIEW_TYPE_ADD_ACCOUNT = 1
         const val VIEW_TYPE_EDIT_ACCOUNT = 2
     }
 
-    inner class AccountViewHolder(private val binding: ViewBinding) :
-        RecyclerView.ViewHolder(binding.root) {
 
-        fun bind(account: DataStoreHelper.Account?) {
+    override val footers: Int = 1
-            when (binding) {
+    var viewType = VIEW_TYPE_SELECT_ACCOUNT
+
+    override fun customContentViewType(item: DataStoreHelper.Account): Int {
+        return viewType
+    }
+
+    override fun onBindContent(
+        holder: ViewHolderState<Any>,
+        item: DataStoreHelper.Account,
+        position: Int
+    ) {
+        when (val binding = holder.view) {
             is AccountListItemBinding -> binding.apply {
-                    if (account == null) return@apply
-
                 val isTv = isLayout(TV or EMULATOR) || !root.isInTouchMode
 
-                    val isLastUsedAccount = account.keyIndex == DataStoreHelper.selectedKeyIndex
+                val isLastUsedAccount = item.keyIndex == DataStoreHelper.selectedKeyIndex
 
-                    accountName.text = account.name
+                accountName.text = item.name
-                    accountImage.loadImage(account.image)
+                accountImage.loadImage(item.image)
-                    lockIcon.isVisible = account.lockPin != null
+                lockIcon.isVisible = item.lockPin != null
                 outline.isVisible = !isTv && isLastUsedAccount
 
                 if (isTv) {
@@ -56,18 +62,28 @@ class AccountAdapter(
                         root.requestFocus()
                     }
 
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
                         root.foreground = ContextCompat.getDrawable(
                             root.context,
                             R.drawable.outline_drawable
                         )
+                    }
                 } else {
                     root.setOnLongClickListener {
                         showAccountEditDialog(
                             context = root.context,
-                                account = account,
+                            account = item,
                             isNewAccount = false,
-                                accountEditCallback = { account -> accountEditCallback.invoke(account) },
+                            accountEditCallback = { account ->
-                                accountDeleteCallback = { account -> accountDeleteCallback.invoke(account) }
+                                accountEditCallback.invoke(
+                                    account
+                                )
+                            },
+                            accountDeleteCallback = { account ->
+                                accountDeleteCallback.invoke(
+                                    account
+                                )
+                            }
                         )
 
                         true
@@ -75,22 +91,20 @@ class AccountAdapter(
                 }
 
                 root.setOnClickListener {
-                        accountSelectCallback.invoke(account)
+                    accountSelectCallback.invoke(item)
                 }
             }
 
             is AccountListItemEditBinding -> binding.apply {
-                    if (account == null) return@apply
-
                 val isTv = isLayout(TV or EMULATOR) || !root.isInTouchMode
 
-                    val isLastUsedAccount = account.keyIndex == DataStoreHelper.selectedKeyIndex
+                val isLastUsedAccount = item.keyIndex == DataStoreHelper.selectedKeyIndex
 
-                    accountName.text = account.name
+                accountName.text = item.name
-                    accountImage.loadImage(account.image) {
+                accountImage.loadImage(item.image) {
                     RoundedCornersTransformation(10f)
                 }
-                    lockIcon.isVisible = account.lockPin != null
+                lockIcon.isVisible = item.lockPin != null
                 outline.isVisible = !isTv && isLastUsedAccount
 
                 if (isTv) {
@@ -100,31 +114,47 @@ class AccountAdapter(
                         root.requestFocus()
                     }
 
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
                         root.foreground = ContextCompat.getDrawable(
                             root.context,
                             R.drawable.outline_drawable
                         )
                     }
+                }
 
                 root.setOnClickListener {
                     showAccountEditDialog(
                         context = root.context,
-                            account = account,
+                        account = item,
                         isNewAccount = false,
                         accountEditCallback = { account -> accountEditCallback.invoke(account) },
-                            accountDeleteCallback = { account -> accountDeleteCallback.invoke(account) }
+                        accountDeleteCallback = { account ->
+                            accountDeleteCallback.invoke(
+                                account
+                            )
+                        }
                     )
                 }
             }
+        }
+    }
 
-                is AccountListItemAddBinding -> binding.apply {
+    override fun onBindFooter(holder: ViewHolderState<Any>) {
+        val binding = holder.view as? AccountListItemAddBinding ?: return
+        binding.apply {
             root.setOnClickListener {
+                val accounts = this@AccountAdapter.immutableCurrentList
+
                 val remainingImages =
                     DataStoreHelper.profileImages.toSet() - accounts.filter { it.customImage == null }
-                                .mapNotNull { DataStoreHelper.profileImages.getOrNull(it.defaultImageIndex) }.toSet()
+                        .mapNotNull { DataStoreHelper.profileImages.getOrNull(it.defaultImageIndex) }
+                        .toSet()
 
                 val image =
-                            DataStoreHelper.profileImages.indexOf(remainingImages.randomOrNull() ?: DataStoreHelper.profileImages.random())
+                    DataStoreHelper.profileImages.indexOf(
+                        remainingImages.randomOrNull()
+                            ?: DataStoreHelper.profileImages.random()
+                    )
                 val keyIndex = (accounts.maxOfOrNull { it.keyIndex } ?: 0) + 1
 
                 val accountName = root.context.getString(R.string.account)
@@ -144,12 +174,20 @@ class AccountAdapter(
             }
         }
     }
-        }
+
+    override fun onCreateFooter(parent: ViewGroup): ViewHolderState<Any> {
+        return ViewHolderState(
+            AccountListItemAddBinding.inflate(
+                LayoutInflater.from(parent.context),
+                parent,
+                false
+            )
+        )
     }
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): AccountViewHolder =
+    override fun onCreateContent(parent: ViewGroup): ViewHolderState<Any> {
-        AccountViewHolder(
+        return ViewHolderState(
-            binding = when (viewType) {
+            when (viewType) {
                 VIEW_TYPE_SELECT_ACCOUNT -> {
                     AccountListItemBinding.inflate(
                         LayoutInflater.from(parent.context),
@@ -157,13 +195,7 @@ class AccountAdapter(
                         false
                     )
                 }
-                VIEW_TYPE_ADD_ACCOUNT -> {
+
-                    AccountListItemAddBinding.inflate(
-                        LayoutInflater.from(parent.context),
-                        parent,
-                        false
-                    )
-                }
                 VIEW_TYPE_EDIT_ACCOUNT -> {
                     AccountListItemEditBinding.inflate(
                         LayoutInflater.from(parent.context),
@@ -171,28 +203,9 @@ class AccountAdapter(
                         false
                     )
                 }
+
                 else -> throw IllegalArgumentException("Invalid view type")
             }
         )
-
-    override fun onBindViewHolder(holder: AccountViewHolder, position: Int) {
-        holder.bind(accounts.getOrNull(position))
-    }
-
-    var viewType = 0
-
-    override fun getItemViewType(position: Int): Int {
-        if (viewType != 0 && position != accounts.count()) {
-            return viewType
-        }
-
-        return when (position) {
-            accounts.count() -> VIEW_TYPE_ADD_ACCOUNT
-            else -> VIEW_TYPE_SELECT_ACCOUNT
-        }
-    }
-
-    override fun getItemCount(): Int {
-        return accounts.count() + 1
     }
 }

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

@@ -3,11 +3,12 @@ package com.lagradost.cloudstream3.ui.account
 import android.app.Activity
 import android.content.Context
 import android.content.DialogInterface
-import android.content.Intent
+import android.os.Bundle
 import android.text.Editable
 import android.view.LayoutInflater
 import android.view.inputmethod.EditorInfo
 import android.widget.TextView
+import android.widget.Toast
 import androidx.annotation.StringRes
 import androidx.appcompat.app.AlertDialog
 import androidx.core.view.isGone
@@ -16,12 +17,17 @@ import androidx.core.widget.doOnTextChanged
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
+import coil3.ImageLoader
+import coil3.request.ImageRequest
+import coil3.request.allowHardware
 import com.google.android.material.bottomsheet.BottomSheetDialog
-import com.lagradost.cloudstream3.AcraApplication.Companion.getActivity
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.getActivity
+import com.lagradost.cloudstream3.CommonActivity.showToast
 import com.lagradost.cloudstream3.MainActivity
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.databinding.AccountEditDialogBinding
 import com.lagradost.cloudstream3.databinding.AccountSelectLinearBinding
+import com.lagradost.cloudstream3.databinding.BottomInputDialogBinding
 import com.lagradost.cloudstream3.databinding.LockPinDialogBinding
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.mvvm.observe
@@ -31,7 +37,10 @@ import com.lagradost.cloudstream3.utils.DataStoreHelper
 import com.lagradost.cloudstream3.utils.DataStoreHelper.getDefaultAccount
 import com.lagradost.cloudstream3.utils.ImageLoader.loadImage
 import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
+import com.lagradost.cloudstream3.utils.UIHelper.hideProgress
+import com.lagradost.cloudstream3.utils.UIHelper.navigate
 import com.lagradost.cloudstream3.utils.UIHelper.showInputMethod
+import com.lagradost.cloudstream3.utils.UIHelper.showProgress
 
 object AccountHelper {
     fun showAccountEditDialog(
@@ -93,6 +102,7 @@ object AccountHelper {
         binding.accountImage.loadImage(account.image)
         binding.accountImage.setOnClickListener {
             // Roll the image forwards once
+            currentEditAccount = currentEditAccount.copy(customImage = null)
             currentEditAccount =
                 currentEditAccount.copy(defaultImageIndex = (currentEditAccount.defaultImageIndex + 1) % DataStoreHelper.profileImages.size)
             binding.accountImage.loadImage(currentEditAccount.image)
@@ -155,6 +165,57 @@ object AccountHelper {
         }
 
         canSetPin = true
+
+        binding.editProfilePhotoButton.setOnClickListener {
+            val bottomSheetDialog = BottomSheetDialog(context)
+            val sheetBinding = BottomInputDialogBinding.inflate(LayoutInflater.from(context))
+            bottomSheetDialog.setContentView(sheetBinding.root)
+            bottomSheetDialog.show()
+
+            sheetBinding.apply {
+                text1.text = context.getString(R.string.edit_profile_image_title)
+                nginxTextInput.hint = context.getString(R.string.edit_profile_image_hint)
+
+                applyBtt.setOnClickListener {
+                    val url = sheetBinding.nginxTextInput.text.toString()
+                    if (url.isEmpty()) {
+                        showToast(R.string.edit_profile_image_error_empty, Toast.LENGTH_SHORT)
+                        return@setOnClickListener
+                    }
+                    applyBtt.showProgress()
+                    val imageLoader = ImageLoader(context)
+                    val request = ImageRequest.Builder(context)
+                        .data(url)
+                        .allowHardware(false)
+                        .listener(
+                            onSuccess = { _, _ ->
+                                currentEditAccount = currentEditAccount.copy(customImage = url)
+                                binding.accountImage.loadImage(url)
+                                showToast(
+                                    R.string.edit_profile_image_success,
+                                    Toast.LENGTH_SHORT
+                                )
+                                bottomSheetDialog.dismissSafe()
+                            },
+                            onError = { _, _ ->
+                                showToast(
+                                    R.string.edit_profile_image_error_invalid,
+                                    Toast.LENGTH_SHORT
+                                )
+                                applyBtt.hideProgress()
+                            },
+                            onCancel = {
+                                applyBtt.hideProgress()
+                            }
+                        )
+                        .build()
+                    imageLoader.enqueue(request)
+                }
+                sheetBinding.cancelBtt.setOnClickListener {
+                    bottomSheetDialog.dismissSafe()
+                }
+            }
+        }
     }
 
     fun showPinInputDialog(
@@ -217,7 +278,7 @@ object AccountHelper {
                 val activity = context.getActivity()
                 if (activity is AccountSelectActivity) {
                     isPinValid = true
-                    activity.viewModel.handleAccountSelect(getDefaultAccount(context), activity)
+                    activity.accountViewModel.handleAccountSelect(getDefaultAccount(context), activity)
                 }
             }
         }
@@ -307,9 +368,10 @@ object AccountHelper {
         builder.show()
 
         binding.manageAccountsButton.setOnClickListener {
-            val accountSelectIntent = Intent(activity, AccountSelectActivity::class.java)
+            activity.navigate(
-            accountSelectIntent.putExtra("isEditingFromMainActivity", true)
+                R.id.accountSelectActivity,
-            activity.startActivity(accountSelectIntent)
+                Bundle().apply { putBoolean("isEditingFromMainActivity", true) }
+            )
             builder.dismissSafe()
         }
 
@@ -336,7 +398,6 @@ object AccountHelper {
 
         activity.observe(viewModel.accounts) { liveAccounts ->
             recyclerView.adapter = AccountAdapter(
-                liveAccounts,
                 accountSelectCallback = { account ->
                     viewModel.handleAccountSelect(account, activity)
                     builder.dismissSafe()
@@ -344,7 +405,9 @@ object AccountHelper {
                 accountCreateCallback = { viewModel.handleAccountUpdate(it, activity) },
                 accountEditCallback = { viewModel.handleAccountUpdate(it, activity) },
                 accountDeleteCallback = { viewModel.handleAccountDelete(it, activity) }
-            )
+            ).apply {
+                submitList(liveAccounts)
+            }
 
             activity.observe(viewModel.selectedKeyIndex) { selectedKeyIndex ->
                 // Scroll to current account (which is focused by default)

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

@@ -1,11 +1,10 @@
 package com.lagradost.cloudstream3.ui.account
 
 import android.annotation.SuppressLint
-import android.content.Intent
 import android.os.Bundle
 import android.util.Log
-import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.FragmentActivity
-import androidx.lifecycle.ViewModelProvider
+import androidx.activity.viewModels
 import androidx.preference.PreferenceManager
 import androidx.recyclerview.widget.GridLayoutManager
 import com.lagradost.cloudstream3.CommonActivity
@@ -32,19 +31,22 @@ import com.lagradost.cloudstream3.utils.BiometricAuthenticator.startBiometricAut
 import com.lagradost.cloudstream3.utils.DataStoreHelper.accounts
 import com.lagradost.cloudstream3.utils.DataStoreHelper.selectedKeyIndex
 import com.lagradost.cloudstream3.utils.DataStoreHelper.setAccount
-import com.lagradost.cloudstream3.utils.UIHelper.colorFromAttribute
+import com.lagradost.cloudstream3.utils.UIHelper.enableEdgeToEdgeCompat
+import com.lagradost.cloudstream3.utils.UIHelper.fixSystemBarsPadding
+import com.lagradost.cloudstream3.utils.UIHelper.openActivity
+import com.lagradost.cloudstream3.utils.UIHelper.setNavigationBarColorCompat
 
-class AccountSelectActivity : AppCompatActivity(), BiometricCallback {
+class AccountSelectActivity : FragmentActivity(), BiometricCallback {
 
-    lateinit var viewModel: AccountViewModel
+    companion object {
+        var hasLoggedIn: Boolean = false
+    }
+
+    val accountViewModel: AccountViewModel by viewModels()
 
     @SuppressLint("NotifyDataSetChanged")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        loadThemes(this)
-
-        @Suppress("DEPRECATION")
-        window.navigationBarColor = colorFromAttribute(R.attr.primaryBlackBackground)
 
         // Are we editing and coming from MainActivity?
         val isEditingFromMainActivity = intent.getBooleanExtra(
@@ -52,11 +54,23 @@ class AccountSelectActivity : AppCompatActivity(), BiometricCallback {
             false
         )
 
-        val settingsManager = PreferenceManager.getDefaultSharedPreferences(this)
+        // Sometimes we start this activity when we have already logged in
-        val skipStartup = settingsManager.getBoolean(getString(R.string.skip_startup_account_select_key), false
+        // For example when using cloudstreamsearch://
-        ) || accounts.count() <= 1
+        // In those cases we want to just go to the main activity instantly
+        if (hasLoggedIn && !isEditingFromMainActivity) {
+            navigateToMainActivity()
+            return
+        }
 
-        viewModel = ViewModelProvider(this)[AccountViewModel::class.java]
+        loadThemes(this)
+
+        enableEdgeToEdgeCompat()
+        setNavigationBarColorCompat(R.attr.primaryBlackBackground)
+
+        val settingsManager = PreferenceManager.getDefaultSharedPreferences(this)
+        val skipStartup = settingsManager.getBoolean(
+            getString(R.string.skip_startup_account_select_key), false
+        ) || accounts.count() <= 1
 
         fun askBiometricAuth() {
 
@@ -75,7 +89,7 @@ class AccountSelectActivity : AppCompatActivity(), BiometricCallback {
             }
         }
 
-        observe(viewModel.isAllowedLogin) { isAllowedLogin ->
+        observe(accountViewModel.isAllowedLogin) { isAllowedLogin ->
             if (isAllowedLogin) {
                 // We are allowed to continue to MainActivity
                 navigateToMainActivity()
@@ -88,13 +102,15 @@ class AccountSelectActivity : AppCompatActivity(), BiometricCallback {
             val currentAccount = accounts.firstOrNull { it.keyIndex == selectedKeyIndex }
             if (currentAccount?.lockPin != null) {
                 CommonActivity.init(this)
-                viewModel.handleAccountSelect(currentAccount, this, true)
+                accountViewModel.handleAccountSelect(currentAccount, this, true)
             } else {
                 if (accounts.count() > 1) {
-                    showToast(this, getString(
+                    showToast(
+                        this, getString(
                             R.string.logged_account,
                             currentAccount?.name
-                    ))
+                        )
+                    )
                 }
 
                 navigateToMainActivity()
@@ -107,20 +123,19 @@ class AccountSelectActivity : AppCompatActivity(), BiometricCallback {
 
         val binding = ActivityAccountSelectBinding.inflate(layoutInflater)
         setContentView(binding.root)
+        fixSystemBarsPadding(binding.root, padTop = false)
 
         val recyclerView: AutofitRecyclerView = binding.accountRecyclerView
 
-        observe(viewModel.accounts) { liveAccounts ->
+        observe(accountViewModel.accounts) { liveAccounts ->
             val adapter = AccountAdapter(
-                liveAccounts,
                 // Handle the selected account
                 accountSelectCallback = {
-                    viewModel.handleAccountSelect(it, this)
+                    accountViewModel.handleAccountSelect(it, this)
                 },
-                accountCreateCallback = { viewModel.handleAccountUpdate(it, this) },
+                accountCreateCallback = { accountViewModel.handleAccountUpdate(it, this) },
                 accountEditCallback = {
-                    viewModel.handleAccountUpdate(it, this)
+                    accountViewModel.handleAccountUpdate(it, this)
-
                     // We came from MainActivity, return there
                     // and switch to the edited account
                     if (isEditingFromMainActivity) {
@@ -128,8 +143,10 @@ class AccountSelectActivity : AppCompatActivity(), BiometricCallback {
                         navigateToMainActivity()
                     }
                 },
-                accountDeleteCallback = { viewModel.handleAccountDelete(it,this) }
+                accountDeleteCallback = { accountViewModel.handleAccountDelete(it, this) }
-            )
+            ).apply {
+                submitList(liveAccounts)
+            }
 
             recyclerView.adapter = adapter
 
@@ -139,13 +156,13 @@ class AccountSelectActivity : AppCompatActivity(), BiometricCallback {
                 )
             }
 
-            observe(viewModel.selectedKeyIndex) { selectedKeyIndex ->
+            observe(accountViewModel.selectedKeyIndex) { selectedKeyIndex ->
                 // Scroll to current account (which is focused by default)
                 val layoutManager = recyclerView.layoutManager as GridLayoutManager
                 layoutManager.scrollToPositionWithOffset(selectedKeyIndex, 0)
             }
 
-            observe(viewModel.isEditing) { isEditing ->
+            observe(accountViewModel.isEditing) { isEditing ->
                 if (isEditing) {
                     binding.editAccountButton.setImageResource(R.drawable.ic_baseline_close_24)
                     binding.title.setText(R.string.manage_accounts)
@@ -160,7 +177,7 @@ class AccountSelectActivity : AppCompatActivity(), BiometricCallback {
             }
 
             if (isEditingFromMainActivity) {
-                viewModel.setIsEditing(true)
+                accountViewModel.setIsEditing(true)
             }
 
             binding.editAccountButton.setOnClickListener {
@@ -171,7 +188,7 @@ class AccountSelectActivity : AppCompatActivity(), BiometricCallback {
                     return@setOnClickListener
                 }
 
-                viewModel.toggleIsEditing()
+                accountViewModel.toggleIsEditing()
             }
 
             if (isLayout(TV or EMULATOR)) {
@@ -184,9 +201,11 @@ class AccountSelectActivity : AppCompatActivity(), BiometricCallback {
         askBiometricAuth()
     }
 
+    @SuppressLint("UnsafeIntentLaunch")
     private fun navigateToMainActivity() {
-        val mainIntent = Intent(this, MainActivity::class.java)
+        hasLoggedIn = true
-        startActivity(mainIntent)
+        // We want to propagate any intent we get here to MainActivity since this is just an intermediary
+        openActivity(MainActivity::class.java, baseIntent = intent)
         finish() // Finish the account selection activity
     }
 

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

@@ -4,8 +4,8 @@ import android.content.Context
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
-import com.lagradost.cloudstream3.AcraApplication.Companion.context
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.context
-import com.lagradost.cloudstream3.AcraApplication.Companion.removeKeys
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.removeKeys
 import com.lagradost.cloudstream3.MainActivity
 import com.lagradost.cloudstream3.ui.account.AccountHelper.showPinInputDialog
 import com.lagradost.cloudstream3.utils.DataStoreHelper