Merge branch 'develop' into sync-subtitle/audio-data

.github/ISSUE_TEMPLATE/issue_report.yml

@@ -75,13 +75,10 @@ body:
     id: version
     attributes:
       label: Streamyfin Version
-      description: What version of Streamyfin are you running? On a TestFlight or development build, choose "TestFlight/Development build" and include the exact version string shown in the app's Settings.
+      description: What version of Streamyfin are you using?
       options:
         - 0.54.1
         - 0.51.0
-        - 0.47.1
-        - 0.30.2
-        - 0.28.0
         - Older
         - TestFlight/Development build
     validations:

.github/actions/refresh-pr-comment/action.yml

@@ -1,21 +0,0 @@
-name: Refresh PR build comment
-description: >-
-  Nudge artifact-comment.yml (via workflow_dispatch) so the PR build-status
-  comment reflects live per-platform progress as each build job finishes.
-
-runs:
-  using: composite
-  steps:
-    # workflow_dispatch fires even when triggered by the GITHUB_TOKEN, and
-    # artifact-comment's concurrency group collapses simultaneous nudges, so
-    # this can't spam the comment. Skipped on forks (their read-only token
-    # cannot dispatch). github.token is used because composite actions cannot
-    # read the secrets context.
-    - if: always() && github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository
-      continue-on-error: true
-      shell: bash
-      env:
-        GH_TOKEN: ${{ github.token }}
-        HEAD_REF: ${{ github.head_ref }}
-        REPO: ${{ github.repository }}
-      run: gh workflow run artifact-comment.yml --ref "$HEAD_REF" -R "$REPO"

.github/copilot-instructions.md

@@ -42,7 +42,7 @@ and provides seamless media streaming with offline capabilities and Chromecast s
 
 ## Coding Standards
 
-- Use TypeScript for ALL files (no .js files). Tooling-required exceptions: `babel.config.js`, `metro.config.js`, `react-native.config.js`, `tailwind.config.js` (their loaders cannot parse TypeScript)
+- Use TypeScript for ALL files (no .js files)
 - Use descriptive English names for variables, functions, and components
 - Prefer functional React components with hooks
 - Use Jotai atoms for global state management

.github/renovate.json

@@ -30,17 +30,9 @@
       "customType": "regex",
       "managerFilePatterns": ["/\\.ya?ml$/"],
       "matchStrings": [
-        "# renovate: datasource=(?<datasource>\\S+) depName=(?<depName>\\S+)(?: versioning=(?<versioning>\\S+))?\\s+[A-Za-z0-9._-]+:\\s*[\"']?(?<currentValue>[^\"'\\s]+)"
+        "# renovate: datasource=(?<datasource>\\S+) depName=(?<depName>\\S+)(?: versioning=(?<versioning>\\S+))?\\s+xcode-version:\\s*[\"']?(?<currentValue>[^\"'\\s]+)"
       ],
       "versioningTemplate": "{{#if versioning}}{{{versioning}}}{{else}}loose{{/if}}"
-    },
-    {
-      "customType": "regex",
-      "description": "Track the Bun version pinned in eas.json build profiles (strict JSON can't hold inline annotations)",
-      "managerFilePatterns": ["/(^|/)eas\\.json$/"],
-      "matchStrings": ["\"bun\"\\s*:\\s*\"(?<currentValue>[^\"]+)\""],
-      "datasourceTemplate": "npm",
-      "depNameTemplate": "bun"
     }
   ],
   "customDatasources": {

.github/workflows/artifact-comment.yml

@@ -18,7 +18,7 @@ jobs:
   comment-artifacts:
     if: github.event_name == 'workflow_dispatch' || github.event_name == 'pull_request' || (github.event_name == 'workflow_run' && github.event.workflow_run.event == 'pull_request')
     name: 📦 Post Build Artifacts
-    runs-on: ubuntu-26.04
+    runs-on: ubuntu-latest
     permissions:
       contents: read
       pull-requests: write
@@ -144,7 +144,7 @@ jobs:
               )
               .sort((a, b) => new Date(b.created_at) - new Date(a.created_at));
 
-            console.log(`Found ${buildRuns.length} build workflow runs for this commit`);
+            console.log(`Found ${buildRuns.length} non-cancelled build workflow runs for this commit`);
 
             // Log current status of each build for debugging
             buildRuns.forEach(run => {
@@ -184,35 +184,21 @@ jobs:
             const latestAndroidRun = findBestRun('Android APK Build');
             const latestIOSRun = findBestRun('iOS IPA Build');
 
-            // Map our build targets to their job display names. Exact name is
-            // tried first so a signed target never collides with its
-            // "(Unsigned)" sibling (whose name contains the signed name).
-            const jobMappings = {
-              'Android Phone': ['🤖 Build Android APK (Phone)'],
-              'Android TV': ['🤖 Build Android APK (TV)'],
-              'iOS': ['🍎 Build iOS IPA (Phone)'],
-              'iOS Unsigned': ['🍎 Build iOS IPA (Phone - Unsigned)'],
-              'tvOS': ['🍎 Build tvOS IPA'],
-              'tvOS Unsigned': ['🍎 Build tvOS IPA (Unsigned)']
-            };
-
-            // Prefer an exact name match over a substring match so
-            // '...(Phone)' doesn't swallow '...(Phone - Unsigned)'.
-            const findJobForTarget = (jobs, jobNames) =>
-              jobs.find(j => jobNames.some(name => j.name === name)) ||
-              jobs.find(j => jobNames.some(name => j.name.includes(name)));
-
-            // Format a millisecond duration as "Xm Ys".
-            const fmtDuration = (ms) => {
-              const min = Math.floor(ms / 60000);
-              const sec = Math.floor((ms % 60000) / 1000);
-              return `${min}m ${sec}s`;
-            };
-
             // For the consolidated workflow, get individual job statuses
             if (latestAppsRun) {
               console.log(`Getting individual job statuses for run ${latestAppsRun.id} (status: ${latestAppsRun.status}, conclusion: ${latestAppsRun.conclusion || 'none'})`);
               
+              // Map job names to our build targets. Declared outside the try so
+              // the catch fallback can reuse the same keys.
+              const jobMappings = {
+                'Android Phone': ['🤖 Build Android APK (Phone)', 'build-android-phone'],
+                'Android TV': ['🤖 Build Android APK (TV)', 'build-android-tv'],
+                'iOS': ['🍎 Build iOS IPA (Phone)', 'build-ios-phone'],
+                'iOS Unsigned': ['🍎 Build iOS IPA (Phone - Unsigned)', 'build-ios-phone-unsigned'],
+                'tvOS': ['🍎 Build tvOS IPA', 'build-ios-tv'],
+                'tvOS Unsigned': ['🍎 Build tvOS IPA (Unsigned)', 'build-ios-tv-unsigned']
+              };
+
               try {
                 // Get all jobs for this workflow run
                 const { data: jobs } = await github.rest.actions.listJobsForWorkflowRun({
@@ -243,8 +229,10 @@ jobs:
                 
                 // Create individual status for each job
                 for (const [platform, jobNames] of Object.entries(jobMappings)) {
-                  const job = findJobForTarget(jobs.jobs, jobNames);
-
+                  const job = jobs.jobs.find(j => 
+                    jobNames.some(name => j.name.includes(name) || j.name === name)
+                  );
+                  
                   if (job) {
                     buildStatuses[platform] = {
                       name: job.name,
@@ -370,43 +358,6 @@ jobs:
               console.log(`- Artifact: ${artifact.name} (from run ${artifact.workflow_run.id})`);
             });
 
-            // Pull per-job durations from the latest successful develop build so
-            // in-progress / queued targets can show a realistic ETA instead of
-            // an open-ended spinner. Best-effort: any failure just drops the ETA.
-            let referenceDurations = {};
-            try {
-              const { data: devRuns } = await github.rest.actions.listWorkflowRuns({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                workflow_id: 'build-apps.yml',
-                branch: 'develop',
-                status: 'success',
-                per_page: 1
-              });
-
-              if (devRuns.workflow_runs.length > 0) {
-                const refRun = devRuns.workflow_runs[0];
-                const { data: refJobs } = await github.rest.actions.listJobsForWorkflowRun({
-                  owner: context.repo.owner,
-                  repo: context.repo.repo,
-                  run_id: refRun.id
-                });
-
-                for (const [platform, jobNames] of Object.entries(jobMappings)) {
-                  const job = findJobForTarget(refJobs.jobs, jobNames);
-                  if (job && job.conclusion === 'success' && job.started_at && job.completed_at) {
-                    referenceDurations[platform] = new Date(job.completed_at) - new Date(job.started_at);
-                  }
-                }
-                console.log(`Reference durations from develop run ${refRun.id}:`,
-                  Object.fromEntries(Object.entries(referenceDurations).map(([k, v]) => [k, fmtDuration(v)])));
-              } else {
-                console.log('No successful develop build found for ETA reference');
-              }
-            } catch (error) {
-              console.log('Failed to fetch develop reference durations:', error.message);
-            }
-
             // Build comment body with progressive status for individual builds
             let commentBody = `## 🔧 Build Status for PR #${pr.number}\n\n`;
             commentBody += `🔗 **Commit**: [\`${targetCommitSha.substring(0, 7)}\`](https://github.com/${context.repo.owner}/${context.repo.repo}/commit/${targetCommitSha})\n\n`;            // Progressive build status and downloads table
@@ -418,9 +369,9 @@ jobs:
             const buildTargets = [
               { name: 'Android Phone', platform: '🤖', device: '📱 Phone', statusKey: 'Android Phone', artifactPattern: /android.*phone/i },
               { name: 'Android TV', platform: '🤖', device: '📺 TV', statusKey: 'Android TV', artifactPattern: /android.*tv/i },
-              { name: 'iOS', platform: '🍎', device: '📱 Phone', statusKey: 'iOS', artifactPattern: /^(?!.*unsigned).*ios.*phone.*ipa/i },
+              { name: 'iOS', platform: '🍎', device: '📱 Phone', statusKey: 'iOS', artifactPattern: /ios.*phone.*ipa(?!.*unsigned)/i },
               { name: 'iOS Unsigned', platform: '🍎', device: '📱 Phone Unsigned', statusKey: 'iOS Unsigned', artifactPattern: /ios.*phone.*unsigned/i },
-              { name: 'tvOS', platform: '🍎', device: '📺 TV', statusKey: 'tvOS', artifactPattern: /^(?!.*unsigned).*ios.*tv.*ipa/i },
+              { name: 'tvOS', platform: '🍎', device: '📺 TV', statusKey: 'tvOS', artifactPattern: /ios.*tv.*ipa(?!.*unsigned)/i },
               { name: 'tvOS Unsigned', platform: '🍎', device: '📺 TV Unsigned', statusKey: 'tvOS Unsigned', artifactPattern: /ios.*tv.*unsigned/i }
             ];
 
@@ -436,12 +387,11 @@ jobs:
               let status = '⏳ Pending';
               let downloadLink = '*Waiting for build...*';
 
-              // Signed tvOS stays disabled until EAS has tvOS provisioning
-              // profiles (app + TopShelf targets); non-interactive builds can't
-              // create them. Unsigned tvOS builds, so it flows through normally.
-              if (target.name === 'tvOS') {
+              // tvOS builds are temporarily disabled until feat/tv-interface
+              // is merged - show them as disabled instead of stuck pending.
+              if (target.name === 'tvOS' || target.name === 'tvOS Unsigned') {
                 status = '💤 Disabled';
-                downloadLink = '*Disabled — signed tvOS needs EAS provisioning profiles*';
+                downloadLink = '*Disabled until feat/tv-interface is merged*';
               } else if (matchingStatus) {
                 if (matchingStatus.conclusion === 'success' && matchingArtifact) {
                   status = '✅ Complete';
@@ -456,9 +406,11 @@ jobs:
                   let durationInfo = '';
                   if (matchingStatus.started_at && matchingStatus.completed_at) {
                     const durationMs = new Date(matchingStatus.completed_at) - new Date(matchingStatus.started_at);
-                    durationInfo = ` - ${fmtDuration(durationMs)}`;
+                    const durationMin = Math.floor(durationMs / 60000);
+                    const durationSec = Math.floor((durationMs % 60000) / 1000);
+                    durationInfo = ` - ${durationMin}m ${durationSec}s`;
                   }
-
+                  
                   downloadLink = `[📥 Download ${fileType}](${directLink}) ${sizeInfo}${durationInfo}`;
                 } else if (matchingStatus.conclusion === 'failure') {
                   status = `❌ [Failed](${matchingStatus.url})`;
@@ -468,16 +420,10 @@ jobs:
                   downloadLink = '*Build cancelled*';
                 } else if (matchingStatus.status === 'in_progress') {
                   status = `🔄 [Building...](${matchingStatus.url})`;
-                  const ref = referenceDurations[target.statusKey];
-                  downloadLink = ref
-                    ? `*Building… ~${fmtDuration(ref)} (avg on develop)*`
-                    : '*Build in progress...*';
+                  downloadLink = '*Build in progress...*';
                 } else if (matchingStatus.status === 'queued') {
                   status = `⏳ [Queued](${matchingStatus.url})`;
-                  const ref = referenceDurations[target.statusKey];
-                  downloadLink = ref
-                    ? `*Waiting to start… ~${fmtDuration(ref)} once running (avg on develop)*`
-                    : '*Waiting to start...*';
+                  downloadLink = '*Waiting to start...*';
                 } else if (matchingStatus.status === 'completed' && !matchingStatus.conclusion) {
                   // Workflow completed but conclusion not yet available (rare edge case)
                   status = `🔄 [Finishing...](${matchingStatus.url})`;
@@ -498,22 +444,7 @@ jobs:
 
             commentBody += `\n`;
 
-            // Static rundown of the build optimisations + what each artifact
-            // installs on. Always shown (even mid-build) so testers know what
-            // to expect before downloads are ready.
-            commentBody += `<details>\n`;
-            commentBody += `<summary>📦 Build details &amp; device compatibility</summary>\n\n`;
-            commentBody += `These CI builds are trimmed for size and speed. What that means for installing them:\n\n`;
-            commentBody += `| Artifact | Architectures | Installs on |\n`;
-            commentBody += `|---|---|---|\n`;
-            commentBody += `| 🤖 Android Phone APK | \`arm64-v8a\` | Every 64-bit Android phone (all since ~2017). **Not** an x86_64 emulator or a 32-bit device. |\n`;
-            commentBody += `| 📺 Android TV APK | \`arm64-v8a\` + \`armeabi-v7a\` | Modern boxes **and** older / cheap 32-bit Android TV sticks. No x86_64. |\n`;
-            commentBody += `| 🍎 iOS / tvOS IPA | \`arm64\` | iPhone / Apple TV (all current devices). |\n\n`;
-            commentBody += `**Why no x86_64?** That slice only runs on Android emulators / Chromebooks, never a real phone or TV box — dropping it shrinks the APK and speeds up the build. Local \`bun run android\` is unaffected (it still builds x86_64 from \`app.json\`).\n\n`;
-            commentBody += `**Runners:** Android on \`ubuntu-26.04\`; iOS / tvOS on Apple Silicon (\`macos-26\`). The size/speed win comes from the ABI trim above, not the runner.\n`;
-            commentBody += `</details>\n\n`;
-
-            // Installation instructions only matter once something is downloadable.
+            // Show installation instructions if we have any artifacts
             if (allArtifacts.length > 0) {
               commentBody += `### 🔧 Installation Instructions\n\n`;
               commentBody += `- **Android APK**: Download and install directly on your device (enable "Install from unknown sources")\n`;

.github/workflows/build-apps.yml

@@ -11,7 +11,7 @@ on:
   push:
     branches: [develop, master]
 
-# Exposed to `expo prebuild` (app.config.ts → extra.build) so Settings can show the
+# Exposed to `expo prebuild` (app.config.js → extra.build) so Settings can show the
 # branch + commit + Actions run a CI build was made from. EAS cloud builds use
 # EAS_BUILD_* instead. The run number maps a sideloaded build back to its Actions
 # run (artifacts + logs) without needing Expo access.
@@ -23,11 +23,10 @@ env:
 jobs:
   build-android-phone:
     if: (!contains(github.event.head_commit.message, '[skip ci]'))
-    runs-on: ubuntu-26.04
+    runs-on: ubuntu-24.04
     name: 🤖 Build Android APK (Phone)
     permissions:
       contents: read
-      actions: write # dispatch artifact-comment.yml to refresh the PR comment
 
     steps:
       - name: 🗑️ Free Disk Space
@@ -38,12 +37,12 @@ jobs:
           android: false
           dotnet: true
           haskell: true
-          large-packages: false
+          large-packages: true
           docker-images: true
           swap-storage: false
 
       - name: 📥 Checkout code
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           ref: ${{ github.event.pull_request.head.sha || github.sha }}
           fetch-depth: 0
@@ -53,58 +52,45 @@ jobs:
       - name: 🍞 Setup Bun
         uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0
         with:
-          # renovate: datasource=npm depName=bun
-          bun-version: "1.3.14"
+          bun-version: latest
 
       - name: 💾 Cache Bun dependencies
-        uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
+        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
         with:
           path: ~/.bun/install/cache
-          key: ${{ runner.os }}-${{ runner.arch }}-bun-${{ hashFiles('bun.lock') }}
+          key: ${{ runner.os }}-${{ runner.arch }}-bun-develop-${{ hashFiles('bun.lock') }}
           restore-keys: |
-            ${{ runner.os }}-${{ runner.arch }}-bun-
+            ${{ runner.os }}-${{ runner.arch }}-bun-develop
+            ${{ runner.os }}-bun-develop
 
       - name: 📦 Install dependencies and reload submodules
         run: |
           bun install --frozen-lockfile
           bun run submodule-reload
 
-      - name: ☕ Set up JDK 17
-        # ubuntu-26.04 defaults to JDK 25, which breaks the RN/AGP native build
-        # (Kotlin falls back to JVM_23, the foojay toolchain + CMake configure
-        # fail). Pin Temurin 17 for a deterministic Android build.
-        uses: actions/setup-java@ad2b38190b15e4d6bdf0c97fb4fca8412226d287 # v5.3.0
-        with:
-          distribution: temurin
-          java-version: "17"
-
       - name: 💾 Cache Gradle global
-        uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
+        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
         with:
           path: |
-            ~/.gradle/caches/modules-2
+            ~/.gradle/caches
             ~/.gradle/wrapper
-          key: ${{ runner.os }}-${{ runner.arch }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
           restore-keys: |
-            ${{ runner.os }}-${{ runner.arch }}-gradle-
+            ${{ runner.os }}-gradle-
 
       - name: 🛠️ Generate project files
         run: bun run prebuild
 
       - name: 💾 Cache project Gradle (.gradle)
-        uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
+        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
         with:
           path: android/.gradle
-          key: ${{ runner.os }}-${{ runner.arch }}-android-gradle-develop-${{ hashFiles('android/**/build.gradle', 'android/gradle/wrapper/gradle-wrapper.properties') }}
-          restore-keys: ${{ runner.os }}-${{ runner.arch }}-android-gradle-develop
+          key: ${{ runner.os }}-android-gradle-develop-${{ hashFiles('android/**/build.gradle', 'android/gradle/wrapper/gradle-wrapper.properties') }}
+          restore-keys: ${{ runner.os }}-android-gradle-develop
 
       - name: 🚀 Build APK
         env:
           EXPO_TV: 0
-          # CI artifact ships arm64 only (phones; emulators/Chromebooks not a
-          # sideload target). Overrides app.json buildArchs for this build only,
-          # so local `bun run android` (x86_64 emulator) is unaffected.
-          ORG_GRADLE_PROJECT_reactNativeArchitectures: arm64-v8a
         run: bun run build:android:local
 
       - name: 📅 Set date tag
@@ -118,16 +104,12 @@ jobs:
             android/app/build/outputs/apk/release/*.apk
           retention-days: 7
 
-      - name: 🔄 Refresh PR build comment
-        uses: ./.github/actions/refresh-pr-comment
-
   build-android-tv:
     if: (!contains(github.event.head_commit.message, '[skip ci]'))
-    runs-on: ubuntu-26.04
+    runs-on: ubuntu-24.04
     name: 🤖 Build Android APK (TV)
     permissions:
       contents: read
-      actions: write # dispatch artifact-comment.yml to refresh the PR comment
 
     steps:
       - name: 🗑️ Free Disk Space
@@ -138,12 +120,12 @@ jobs:
           android: false
           dotnet: true
           haskell: true
-          large-packages: false
+          large-packages: true
           docker-images: true
           swap-storage: false
 
       - name: 📥 Checkout code
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           ref: ${{ github.event.pull_request.head.sha || github.sha }}
           fetch-depth: 0
@@ -153,57 +135,45 @@ jobs:
       - name: 🍞 Setup Bun
         uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0
         with:
-          # renovate: datasource=npm depName=bun
-          bun-version: "1.3.14"
+          bun-version: latest
 
       - name: 💾 Cache Bun dependencies
-        uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
+        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
         with:
           path: ~/.bun/install/cache
-          key: ${{ runner.os }}-${{ runner.arch }}-bun-${{ hashFiles('bun.lock') }}
+          key: ${{ runner.os }}-${{ runner.arch }}-bun-develop-${{ hashFiles('bun.lock') }}
           restore-keys: |
-            ${{ runner.os }}-${{ runner.arch }}-bun-
+            ${{ runner.os }}-${{ runner.arch }}-bun-develop
+            ${{ runner.os }}-bun-develop
 
       - name: 📦 Install dependencies and reload submodules
         run: |
           bun install --frozen-lockfile
           bun run submodule-reload
 
-      - name: ☕ Set up JDK 17
-        # ubuntu-26.04 defaults to JDK 25, which breaks the RN/AGP native build
-        # (Kotlin falls back to JVM_23, the foojay toolchain + CMake configure
-        # fail). Pin Temurin 17 for a deterministic Android build.
-        uses: actions/setup-java@ad2b38190b15e4d6bdf0c97fb4fca8412226d287 # v5.3.0
-        with:
-          distribution: temurin
-          java-version: "17"
-
       - name: 💾 Cache Gradle global
-        uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
+        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
         with:
           path: |
-            ~/.gradle/caches/modules-2
+            ~/.gradle/caches
             ~/.gradle/wrapper
-          key: ${{ runner.os }}-${{ runner.arch }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
           restore-keys: |
-            ${{ runner.os }}-${{ runner.arch }}-gradle-
+            ${{ runner.os }}-gradle-
 
       - name: 🛠️ Generate project files
         run: bun run prebuild:tv
 
       - name: 💾 Cache project Gradle (.gradle)
-        uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
+        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
         with:
           path: android/.gradle
-          key: ${{ runner.os }}-${{ runner.arch }}-android-gradle-develop-${{ hashFiles('android/**/build.gradle', 'android/gradle/wrapper/gradle-wrapper.properties') }}
-          restore-keys: ${{ runner.os }}-${{ runner.arch }}-android-gradle-develop
+          key: ${{ runner.os }}-android-gradle-develop-${{ hashFiles('android/**/build.gradle', 'android/gradle/wrapper/gradle-wrapper.properties') }}
+          restore-keys: ${{ runner.os }}-android-gradle-develop
 
       - name: 🚀 Build APK
         env:
           EXPO_TV: 1
-          # TV artifact keeps armeabi-v7a too: many older/cheap Android TV boxes
-          # and sticks are still 32-bit ARM. Drops only x86_64. CI build only.
-          ORG_GRADLE_PROJECT_reactNativeArchitectures: arm64-v8a,armeabi-v7a
         run: bun run build:android:local
 
       - name: 📅 Set date tag
@@ -217,20 +187,16 @@ jobs:
             android/app/build/outputs/apk/release/*.apk
           retention-days: 7
 
-      - name: 🔄 Refresh PR build comment
-        uses: ./.github/actions/refresh-pr-comment
-
   build-ios-phone:
     if: (!contains(github.event.head_commit.message, '[skip ci]') && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'streamyfin/streamyfin'))
     runs-on: macos-26
     name: 🍎 Build iOS IPA (Phone)
     permissions:
       contents: read
-      actions: write # dispatch artifact-comment.yml to refresh the PR comment
 
     steps:
       - name: 📥 Checkout code
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           ref: ${{ github.event.pull_request.head.sha || github.sha }}
           fetch-depth: 0
@@ -240,16 +206,15 @@ jobs:
       - name: 🍞 Setup Bun
         uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0
         with:
-          # renovate: datasource=npm depName=bun
-          bun-version: "1.3.14"
+          bun-version: latest
 
       - name: 💾 Cache Bun dependencies
-        uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
+        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
         with:
           path: ~/.bun/install/cache
-          key: ${{ runner.os }}-${{ runner.arch }}-bun-${{ hashFiles('bun.lock') }}
+          key: ${{ runner.os }}-bun-cache-${{ hashFiles('bun.lock') }}
           restore-keys: |
-            ${{ runner.os }}-${{ runner.arch }}-bun-
+            ${{ runner.os }}-bun-cache
 
       - name: 📦 Install dependencies and reload submodules
         run: |
@@ -289,20 +254,16 @@ jobs:
           path: build-*.ipa
           retention-days: 7
 
-      - name: 🔄 Refresh PR build comment
-        uses: ./.github/actions/refresh-pr-comment
-
   build-ios-phone-unsigned:
     if: (!contains(github.event.head_commit.message, '[skip ci]'))
     runs-on: macos-26
     name: 🍎 Build iOS IPA (Phone - Unsigned)
     permissions:
       contents: read
-      actions: write # dispatch artifact-comment.yml to refresh the PR comment
 
     steps:
       - name: 📥 Checkout code
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           ref: ${{ github.event.pull_request.head.sha || github.sha }}
           fetch-depth: 0
@@ -312,16 +273,15 @@ jobs:
       - name: 🍞 Setup Bun
         uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0
         with:
-          # renovate: datasource=npm depName=bun
-          bun-version: "1.3.14"
+          bun-version: latest
 
       - name: 💾 Cache Bun dependencies
-        uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
+        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
         with:
           path: ~/.bun/install/cache
-          key: ${{ runner.os }}-${{ runner.arch }}-bun-${{ hashFiles('bun.lock') }}
+          key: ${{ runner.os }}-bun-cache-${{ hashFiles('bun.lock') }}
           restore-keys: |
-            ${{ runner.os }}-${{ runner.arch }}-bun-
+            ${{ runner.os }}-bun-cache
 
       - name: 📦 Install dependencies and reload submodules
         run: |
@@ -352,24 +312,18 @@ jobs:
           path: build/*.ipa
           retention-days: 7
 
-      - name: 🔄 Refresh PR build comment
-        uses: ./.github/actions/refresh-pr-comment
-
   build-ios-tv:
-    # Disabled: EAS has no provisioning profiles / distribution cert for the tvOS
-    # targets (app + StreamyfinTopShelf extension), so non-interactive signed
-    # builds fail. Set up tvOS credentials in EAS (`eas credentials`), then remove
-    # the `false &&` prefix below. Unsigned tvOS builds run (see job below).
+    # Temporarily disabled until feat/tv-interface is merged (TV UI not ready).
+    # Re-enable by removing the `false &&` prefix below.
     if: false && (!contains(github.event.head_commit.message, '[skip ci]') && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'streamyfin/streamyfin'))
     runs-on: macos-26
     name: 🍎 Build tvOS IPA
     permissions:
       contents: read
-      actions: write # dispatch artifact-comment.yml to refresh the PR comment
 
     steps:
       - name: 📥 Checkout code
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           ref: ${{ github.event.pull_request.head.sha || github.sha }}
           fetch-depth: 0
@@ -379,16 +333,15 @@ jobs:
       - name: 🍞 Setup Bun
         uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0
         with:
-          # renovate: datasource=npm depName=bun
-          bun-version: "1.3.14"
+          bun-version: latest
 
       - name: 💾 Cache Bun dependencies
-        uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
+        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
         with:
           path: ~/.bun/install/cache
-          key: ${{ runner.os }}-${{ runner.arch }}-bun-${{ hashFiles('bun.lock') }}
+          key: ${{ runner.os }}-bun-cache-${{ hashFiles('bun.lock') }}
           restore-keys: |
-            ${{ runner.os }}-${{ runner.arch }}-bun-
+            ${{ runner.os }}-bun-cache
 
       - name: 📦 Install dependencies and reload submodules
         run: |
@@ -435,11 +388,10 @@ jobs:
     name: 🍎 Build tvOS IPA (Unsigned)
     permissions:
       contents: read
-      actions: write # dispatch artifact-comment.yml to refresh the PR comment
 
     steps:
       - name: 📥 Checkout code
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           ref: ${{ github.event.pull_request.head.sha || github.sha }}
           fetch-depth: 0
@@ -449,16 +401,15 @@ jobs:
       - name: 🍞 Setup Bun
         uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0
         with:
-          # renovate: datasource=npm depName=bun
-          bun-version: "1.3.14"
+          bun-version: latest
 
       - name: 💾 Cache Bun dependencies
-        uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
+        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
         with:
           path: ~/.bun/install/cache
-          key: ${{ runner.os }}-${{ runner.arch }}-bun-${{ hashFiles('bun.lock') }}
+          key: ${{ runner.os }}-bun-cache-${{ hashFiles('bun.lock') }}
           restore-keys: |
-            ${{ runner.os }}-${{ runner.arch }}-bun-
+            ${{ runner.os }}-bun-cache
 
       - name: 📦 Install dependencies and reload submodules
         run: |
@@ -488,6 +439,3 @@ jobs:
           name: streamyfin-ios-tv-unsigned-ipa-${{ env.DATE_TAG }}
           path: build/*.ipa
           retention-days: 7
-
-      - name: 🔄 Refresh PR build comment
-        uses: ./.github/actions/refresh-pr-comment

.github/workflows/check-lockfile.yml

@@ -13,13 +13,13 @@ concurrency:
 jobs:
   check-lockfile:
     name: 🔍 Check bun.lock and package.json consistency
-    runs-on: ubuntu-26.04
+    runs-on: ubuntu-24.04
     permissions:
       contents: read
 
     steps:
       - name: 📥 Checkout repository
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           ref: ${{ github.event.pull_request.head.sha || github.sha }}
           show-progress: false
@@ -29,17 +29,14 @@ jobs:
       - name: 🍞 Setup Bun
         uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0
         with:
-          # renovate: datasource=npm depName=bun
-          bun-version: "1.3.14"
+          bun-version: latest
 
       - name: 💾 Cache Bun dependencies
-        uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
+        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
         with:
           path: |
             ~/.bun/install/cache
-          key: ${{ runner.os }}-${{ runner.arch }}-bun-${{ hashFiles('bun.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-${{ runner.arch }}-bun-
+          key: ${{ runner.os }}-bun-${{ hashFiles('bun.lock') }}
 
       - name: 🛡️ Verify lockfile consistency
         run: |

.github/workflows/ci-codeql.yml

@@ -8,14 +8,11 @@ on:
   schedule:
     - cron: '24 2 * * *'
 
-concurrency:
-  group: codeql-${{ github.ref }}
-  cancel-in-progress: true
 
 jobs:
   analyze:
     name: 🔎 Analyze with CodeQL
-    runs-on: ubuntu-26.04
+    runs-on: ubuntu-24.04
     permissions:
       contents: read
       security-events: write
@@ -27,7 +24,7 @@ jobs:
 
     steps:
       - name: 📥 Checkout repository
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
 
       - name: 🏁 Initialize CodeQL
         uses: github/codeql-action/init@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4.36.2

.github/workflows/conflict.yml

@@ -10,7 +10,7 @@ on:
 jobs:
   label:
     name: 🏷️ Labeling Merge Conflicts
-    runs-on: ubuntu-26.04
+    runs-on: ubuntu-24.04
     if: ${{ github.repository == 'streamyfin/streamyfin' }}
     permissions:
       contents: read

.github/workflows/crowdin.yml

@@ -19,16 +19,16 @@ permissions:
 
 jobs:
   sync-translations:
-    runs-on: ubuntu-26.04
+    runs-on: ubuntu-latest
 
     steps:
       - name: 📥 Checkout Repository
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           fetch-depth: 0
 
       - name: 🌐 Sync Translations with Crowdin
-        uses: crowdin/github-action@52aa776766211d83d975df51f3b9c53c2f8ba35f # v2.16.3
+        uses: crowdin/github-action@8868a33591d21088edfc398968173a3b98d51706 # v2.16.2
         with:
           upload_sources: true
           upload_translations: true

.github/workflows/detect-duplicate.yml

@@ -15,22 +15,21 @@ jobs:
   detect:
     name: 🔍 Find similar issues
     if: github.actor != 'github-actions[bot]'
-    runs-on: ubuntu-26.04
+    runs-on: ubuntu-24.04
     permissions:
       issues: write
       contents: read
     steps:
       - name: 📥 Checkout repository
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
 
       - name: 🍞 Setup Bun
         uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0
         with:
-          # renovate: datasource=npm depName=bun
-          bun-version: "1.3.14"
+          bun-version: latest
 
       - name: 🔍 Detect duplicate issues
-        run: bun scripts/detect-duplicate-issue.ts
+        run: bun scripts/detect-duplicate-issue.mjs
         env:
           GH_TOKEN: ${{ github.token }}
           GITHUB_REPOSITORY: ${{ github.repository }}

.github/workflows/linting.yml

@@ -15,7 +15,7 @@ jobs:
   validate_pr_title:
     name: "📝 Validate PR Title"
     if: github.event_name == 'pull_request'
-    runs-on: ubuntu-26.04
+    runs-on: ubuntu-24.04
     permissions:
       pull-requests: write
       contents: read
@@ -46,12 +46,12 @@ jobs:
 
   dependency-review:
     name: 🔍 Vulnerable Dependencies
-    runs-on: ubuntu-26.04
+    runs-on: ubuntu-24.04
     permissions:
       contents: read
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           ref: ${{ github.event.pull_request.head.sha || github.sha }}
           fetch-depth: 0
@@ -65,10 +65,11 @@ jobs:
 
   expo-doctor:
     name: 🚑 Expo Doctor Check
-    runs-on: ubuntu-26.04
+    if: false
+    runs-on: ubuntu-24.04
     steps:
       - name: 🛒 Checkout repository
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           ref: ${{ github.event.pull_request.head.sha || github.sha }}
           submodules: recursive
@@ -77,21 +78,17 @@ jobs:
       - name: 🍞 Setup Bun
         uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0
         with:
-          # renovate: datasource=npm depName=bun
-          bun-version: "1.3.14"
+          bun-version: latest
 
       - name: 📦 Install dependencies (bun)
         run: bun install --frozen-lockfile
 
       - name: 🚑 Run Expo Doctor
-        # Re-enabled but non-blocking: surfaces doctor warnings in the logs
-        # without failing the gate (some checks are known-noisy for this setup).
-        continue-on-error: true
         run: bun expo-doctor
 
   code_quality:
     name: "🔍 Lint & Test (${{ matrix.command }})"
-    runs-on: ubuntu-26.04
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
       matrix:
@@ -104,7 +101,7 @@ jobs:
 
     steps:
       - name: "📥 Checkout PR code"
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           ref: ${{ github.event.pull_request.head.sha || github.sha }}
           submodules: recursive
@@ -113,14 +110,12 @@ jobs:
       - name: "🟢 Setup Node.js"
         uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
-          # renovate: datasource=node-version depName=node versioning=node
-          node-version: "24.18.0"
+          node-version: '24.x'
 
       - name: "🍞 Setup Bun"
         uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0
         with:
-          # renovate: datasource=npm depName=bun
-          bun-version: "1.3.14"
+          bun-version: latest
 
       - name: "📦 Install dependencies"
         run: bun install --frozen-lockfile

.github/workflows/notification.yml

@@ -12,7 +12,7 @@ on:
 
 jobs:
   notify:
-    runs-on: ubuntu-26.04
+    runs-on: ubuntu-24.04
     if: github.event_name == 'pull_request'
     steps:
       - name: 🛎️ Notify Discord
@@ -29,7 +29,7 @@ jobs:
             🔗 ${{ github.event.pull_request.html_url }}
 
   notify-on-failure:
-    runs-on: ubuntu-26.04
+    runs-on: ubuntu-24.04
     if: github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'failure'
     steps:
       - name: 🚨 Notify Discord on Failure

.github/workflows/release.yml

@@ -22,9 +22,8 @@ on:
 jobs:
   approve:
     name: 🔐 Approve release
-    runs-on: ubuntu-26.04
+    runs-on: ubuntu-24.04
     environment: production
-    permissions: {}
     steps:
       - name: ✅ Release approved
         run: echo "Release approved for ${{ github.sha }}"
@@ -32,7 +31,7 @@ jobs:
   build:
     name: 🚀 ${{ matrix.name }}
     needs: approve
-    runs-on: ubuntu-26.04
+    runs-on: ubuntu-24.04
     permissions:
       contents: read
     strategy:
@@ -64,7 +63,7 @@ jobs:
 
     steps:
       - name: 📥 Checkout code
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           fetch-depth: 0
           submodules: recursive
@@ -73,16 +72,15 @@ jobs:
       - name: 🍞 Setup Bun
         uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0
         with:
-          # renovate: datasource=npm depName=bun
-          bun-version: "1.3.14"
+          bun-version: latest
 
       - name: 💾 Cache Bun dependencies
-        uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
+        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
         with:
           path: ~/.bun/install/cache
-          key: ${{ runner.os }}-${{ runner.arch }}-bun-${{ hashFiles('bun.lock') }}
+          key: ${{ runner.os }}-bun-cache-${{ hashFiles('bun.lock') }}
           restore-keys: |
-            ${{ runner.os }}-${{ runner.arch }}-bun-
+            ${{ runner.os }}-bun-cache
 
       - name: 📦 Install dependencies and reload submodules
         run: |
@@ -178,13 +176,13 @@ jobs:
     name: 📦 Draft GitHub Release
     needs: build
     if: ${{ !cancelled() }}
-    runs-on: ubuntu-26.04
+    runs-on: ubuntu-24.04
     permissions:
       contents: write
       actions: read # required for `gh run download` to list/fetch this run's artifacts
     steps:
       - name: 📥 Checkout code
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           fetch-depth: 0
           show-progress: false

.github/workflows/trivy-scan.yml

@@ -21,17 +21,27 @@ concurrency:
 jobs:
   trivy:
     name: 🔎 Filesystem scan
-    runs-on: ubuntu-26.04
+    runs-on: ubuntu-24.04
     permissions:
       contents: read
       security-events: write # upload SARIF to code scanning
     steps:
       - name: 📥 Checkout repository
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+
+      # Rotate the DB cache weekly (matches the scheduled scan): cache hits within the week
+      # instead of a fresh immutable entry per run, still refreshing the DB every week.
+      - name: 🗓️ Compute weekly Trivy cache key
+        id: trivy-cache-key
+        run: echo "value=trivy-db-${{ runner.os }}-$(date -u +%G-%V)" >> "$GITHUB_OUTPUT"
+
+      - name: 💾 Cache Trivy vulnerability DB
+        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        with:
+          path: ~/.cache/trivy
+          key: ${{ steps.trivy-cache-key.outputs.value }}
+          restore-keys: trivy-db-${{ runner.os }}-
 
-      # Trivy's own action caches the vulnerability DB + binary internally
-      # (cache-trivy-* / trivy-binary-* entries), so no manual ~/.cache/trivy
-      # step is needed — it only duplicated the cache.
       - name: 🔎 Run Trivy filesystem scan
         uses: aquasecurity/trivy-action@ed142fd0673e97e23eac54620cfb913e5ce36c25 # v0.36.0
         with:

.github/workflows/update-issue-form.yml

@@ -1,103 +1,67 @@
-name: 🐛 Update Issue Form Versions
+name: 🐛 Update Bug Report Template
 
 on:
   release:
-    # Only full releases populate the dropdown (no drafts/prereleases).
-    types: [released]
-  schedule:
-    - cron: "0 3 * * 1" # Weekly safety net (Mondays 03:00 UTC) in case a release event was missed
-  workflow_dispatch:
+    types: [published]  # Run on every published release on any branch
 
-# Fixed group so a release event and the weekly cron can't race on the same
-# ci/update-issue-form branch — runs queue instead of force-pushing over each other.
 concurrency:
-  group: update-issue-form
-  cancel-in-progress: false
-
-permissions:
-  contents: read
+   group: update-issue-form-${{ github.event.release.tag_name || github.run_id }}
+   cancel-in-progress: true
 
 jobs:
-  update-issue-form:
-    name: 🔢 Populate version dropdown
-    runs-on: ubuntu-26.04
+  update-bug-report:
     permissions:
       contents: write
       pull-requests: write
+      issues: write
+    runs-on: ubuntu-24.04
+
     steps:
       - name: 📥 Checkout repository
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+
+      - name: "🟢 Setup Node.js"
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
-          # On `release` events GITHUB_SHA is the tagged commit — without this the
-          # script would regenerate the form from the tag's (stale) copy and the bot
-          # PR would revert any form edits made on develop since that release.
-          ref: develop
+          node-version: '24.x'
+          cache: 'npm'
 
-      - name: 🍞 Setup Bun
-        uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0
+      - name: 🔍 Extract minor version from app.json
+        id: minor
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # main
         with:
-          # renovate: datasource=npm depName=bun
-          bun-version: "1.3.14"
+          result-encoding: string
+          script: |
+            const fs = require('fs-extra');
+            const semver = require('semver');
+            const content = fs.readJsonSync('./app.json');
+            const version = content.expo.version;
+            const minorVersion = semver.minor(version);
+            return minorVersion.toString();
 
-      - name: 🔢 Populate version dropdown from GitHub releases
-        id: populate
-        run: bun scripts/update-issue-form.mjs
-        env:
-          GH_TOKEN: ${{ github.token }}
-          GITHUB_REPOSITORY: ${{ github.repository }}
+      - name: 📝 Update bug report version
+        uses: ShaMan123/gha-populate-form-version@be012141ca560dbb92156e3fe098c46035f6260d #v2.0.5
+        with:
+          semver: '^0.${{ steps.minor.outputs.result }}.0'
+          dry_run: no-push
 
-      - name: 📬 Create pull request
-        id: cpr
+      - name: ⚙️ Update bug report node version dropdown
+        uses: ShaMan123/gha-populate-form-version@be012141ca560dbb92156e3fe098c46035f6260d #v2.0.5
+        with:
+          dropdown: _node_version
+          package: node
+          semver: '>=24.0.0'
+          dry_run: no-push
+
+      - name: 📬 Commit and create pull request
         uses: peter-evans/create-pull-request@5f6978faf089d4d20b00c7766989d076bb2fc7f1 # v8.1.1
         with:
-          add-paths: .github/ISSUE_TEMPLATE/issue_report.yml
-          branch: ci/update-issue-form
+          add-paths: .github/ISSUE_TEMPLATE/bug_report.yml
+          branch: ci-update-bug-report
           base: develop
           delete-branch: true
           labels: ⚙️ ci, 🤖 github-actions
-          commit-message: "chore: update issue form version dropdown"
-          title: "chore: update issue form version dropdown"
-          # Follows .github/pull_request_template.md so the bot PR isn't flagged by PR validation.
+          title: 'chore(): Update bug report template to match release version'
           body: |
-            # 📦 Pull Request
-
-            ## 📝 Description
-
-            Automated update of the **Streamyfin Version** dropdown in `.github/ISSUE_TEMPLATE/issue_report.yml`, populated from the latest published GitHub releases by `scripts/update-issue-form.mjs`.
-
-            **Version dropdown now lists:** ${{ steps.populate.outputs.versions }}
-
-            Triggered by `${{ github.event_name }}`${{ github.event.release.tag_name && format(' — release {0}', github.event.release.tag_name) || '' }} · [run ${{ github.run_id }}](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}).
-
-            ## 🏷️ Ticket / Issue
-
-            N/A — automated maintenance.
-
-            ### 🖼️ Screenshots / GIFs (if UI)
-
-            N/A — issue-template metadata only, no app UI.
-
-            ## ✅ Checklist
-
-            - [x] I’ve read the [contribution guidelines](CONTRIBUTING.md)
-            - [x] Verified that changes behave as expected for all platforms
-            - [x] Code passes lint/formatting and type checks (`tsc`/`biome`)
-            - [x] No secrets, hardcoded credentials, or private config files are included
-            - [x] I've declared if AI was used to assist with this PR (by uncommenting the line at the bottom, or not)
-
-            ## 🔍 Testing Instructions
-
-            N/A — generated by CI from published releases; review the dropdown diff in `issue_report.yml`.
-
-      - name: 🔀 Enable auto-merge
-        if: steps.cpr.outputs.pull-request-operation == 'created'
-        env:
-          GH_TOKEN: ${{ github.token }}
-        # Known limitation: PRs created with GITHUB_TOKEN don't trigger CI workflows
-        # (GitHub anti-recursion), so the required checks stay "Expected" until a
-        # maintainer kicks them (close/reopen the PR, or push an empty commit).
-        # Auto-merge is still worth enabling: once checks run and reviews land,
-        # the PR merges itself.
-        run: |
-          gh pr merge --squash --auto "${{ steps.cpr.outputs.pull-request-number }}" \
-            || echo "::warning::Could not enable auto-merge — enable 'Allow auto-merge' in repo settings (and branch protection); merge the PR manually for now."
+            Automated update to `.github/ISSUE_TEMPLATE/bug_report.yml`
+            Triggered by workflow run [${{ github.run_id }}](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }})

.gitignore

@@ -12,6 +12,10 @@ web-build/
 # Platform-specific Build Directories
 /ios
 /android
+/iostv
+/iosmobile
+/androidmobile
+/androidtv
 
 # Gradle caches (top-level + per-module native projects)
 **/.gradle/

CLAUDE.md

@@ -152,7 +152,7 @@ import { apiAtom } from "@/providers/JellyfinProvider";
 
 ## Coding Standards
 
-- Use TypeScript for all files (no .js). Tooling-required exceptions: `babel.config.js`, `metro.config.js`, `react-native.config.js`, `tailwind.config.js` (their loaders cannot parse TypeScript)
+- Use TypeScript for all files (no .js)
 - Use functional React components with hooks
 - Use Jotai atoms for global state, React Query for server state
 - Follow BiomeJS formatting rules (2-space indent, semicolons, LF line endings)

GLOBAL_MODAL_GUIDE.md

@@ -143,6 +143,14 @@ interface ModalOptions {
 }
 ```
 
+## Examples
+
+See `components/ExampleGlobalModalUsage.tsx` for comprehensive examples including:
+- Simple content modal
+- Modal with custom snap points
+- Complex component in modal
+- Success/error modals triggered from functions
+
 ## Default Styling
 
 The modal uses these default styles (can be overridden via options):

README.md

@@ -73,7 +73,7 @@ Thanks to [@Alexk2309](https://github.com/Alexk2309) for the hard work building
 
 ## 🛣️ Roadmap
 
-Check out our [Roadmap](https://github.com/orgs/streamyfin/projects/3/views/1) to see what we're working on next, we are always open to feedback and suggestions. Please let us know if you have any ideas or feature requests.
+Check out our [Roadmap](https://github.com/users/fredrikburmester/projects/5) To see what we're working on next, we are always open to feedback and suggestions. Please let us know if you have any ideas or feature requests.
 
 ## 📥 Download Streamyfin
 

app.config.js

@@ -1,13 +1,9 @@
-// Registers the tsx require hook so the TypeScript config plugins referenced
-// from app.json ("./plugins/*.ts") can be loaded by Node during config evaluation.
-import "tsx/cjs";
-import { execFileSync } from "node:child_process";
-import type { ConfigContext, ExpoConfig } from "expo/config";
+const { execFileSync } = require("node:child_process");
 
 // Build metadata, injected into `extra.build` and read at runtime via
 // expo-constants (see utils/version.ts). Sources in priority order:
 // EAS cloud build → GitHub Actions → explicit EXPO_PUBLIC_* → local git → null.
-const git = (args: string[]): string | null => {
+const git = (args) => {
   try {
     return execFileSync("git", args, { stdio: ["ignore", "pipe", "ignore"] })
       .toString()
@@ -46,16 +42,16 @@ const buildMeta = {
   builtAt: new Date().toISOString(),
 };
 
-export default ({ config }: ConfigContext): ExpoConfig => {
+module.exports = ({ config }) => {
   if (process.env.EXPO_TV !== "1") {
-    config.plugins?.push("expo-background-task");
+    config.plugins.push("expo-background-task");
 
-    config.plugins?.push([
+    config.plugins.push([
       "react-native-google-cast",
       { useDefaultExpandedMediaControls: true },
     ]);
 
-    config.plugins?.push([
+    config.plugins.push([
       "expo-camera",
       {
         cameraPermission:
@@ -65,7 +61,7 @@ export default ({ config }: ConfigContext): ExpoConfig => {
   }
 
   // Only override googleServicesFile if env var is set
-  const androidConfig: { googleServicesFile?: string } = {};
+  const androidConfig = {};
   if (process.env.GOOGLE_SERVICES_JSON) {
     androidConfig.googleServicesFile = process.env.GOOGLE_SERVICES_JSON;
   }
@@ -75,5 +71,5 @@ export default ({ config }: ConfigContext): ExpoConfig => {
   return {
     ...(Object.keys(androidConfig).length > 0 && { android: androidConfig }),
     ...config,
-  } as ExpoConfig;
+  };
 };

app.json

@@ -71,8 +71,8 @@
       ],
       "expo-router",
       "expo-font",
-      "./plugins/withExcludeMedia3Dash.ts",
-      "./plugins/withTVUserManagement.ts",
+      "./plugins/withExcludeMedia3Dash.js",
+      "./plugins/withTVUserManagement.js",
       [
         "expo-build-properties",
         {
@@ -107,9 +107,6 @@
       ],
       "expo-localization",
       "expo-asset",
-      "expo-audio",
-      "expo-image",
-      "expo-sharing",
       [
         "react-native-edge-to-edge",
         {
@@ -134,17 +131,17 @@
         }
       ],
       "expo-web-browser",
-      ["./plugins/with-runtime-framework-headers.ts"],
-      ["./plugins/withChangeNativeAndroidTextToWhite.ts"],
-      ["./plugins/withAndroidAlertColors.ts"],
-      ["./plugins/withAndroidManifest.ts"],
-      ["./plugins/withTrustLocalCerts.ts"],
-      ["./plugins/withGradleProperties.ts"],
-      ["./plugins/withTVOSAppIcon.ts"],
-      ["./plugins/withTVOSTopShelf.ts"],
-      ["./plugins/withTVXcodeEnv.ts"],
+      ["./plugins/with-runtime-framework-headers.js"],
+      ["./plugins/withChangeNativeAndroidTextToWhite.js"],
+      ["./plugins/withAndroidAlertColors.js"],
+      ["./plugins/withAndroidManifest.js"],
+      ["./plugins/withTrustLocalCerts.js"],
+      ["./plugins/withGradleProperties.js"],
+      ["./plugins/withTVOSAppIcon.js"],
+      ["./plugins/withTVOSTopShelf.js"],
+      ["./plugins/withTVXcodeEnv.js"],
       [
-        "./plugins/withGitPod.ts",
+        "./plugins/withGitPod.js",
         {
           "podName": "MPVKit",
           "podspecUrl": "https://raw.githubusercontent.com/mpv-ios/MPVKit/0.41.0-av/MPVKit.podspec"

app/(auth)/(tabs)/(search)/index.tsx

@@ -305,8 +305,6 @@ export default function SearchPage() {
         },
         hideWhenScrolling: false,
         autoFocus: false,
-        // Android: color of the user-typed text (was dark and unreadable on the dark header)
-        textColor: "#fff",
         // Android: placeholder and icon color
         hintTextColor: "#fff",
         headerIconColor: "#fff",

app/(auth)/(tabs)/_layout.tsx

@@ -3,24 +3,16 @@ import {
   type NativeBottomTabNavigationEventMap,
   type NativeBottomTabNavigationOptions,
 } from "@bottom-tabs/react-navigation";
-import { Stack, useSegments, withLayoutContext } from "expo-router";
+import { withLayoutContext } from "expo-router";
 import type {
   ParamListBase,
   TabNavigationState,
 } from "expo-router/react-navigation";
-import { useCallback, useEffect, useMemo } from "react";
 import { useTranslation } from "react-i18next";
 import { Platform, View } from "react-native";
 import { SystemBars } from "react-native-edge-to-edge";
-import type { TVNavBarTab } from "@/components/tv/TVNavBar";
-import { TVNavBar } from "@/components/tv/TVNavBar";
 import { Colors } from "@/constants/Colors";
-import useRouter from "@/hooks/useAppRouter";
-import {
-  isTabRoute,
-  useTVHomeBackHandler,
-  useTVTabRootBackHandler,
-} from "@/hooks/useTVBackHandler";
+import { useTVHomeBackHandler } from "@/hooks/useTVBackHandler";
 import { useSettings } from "@/utils/atoms/settings";
 import { eventBus } from "@/utils/eventBus";
 
@@ -41,108 +33,13 @@ export const NativeTabs = withLayoutContext<
   NativeBottomTabNavigationEventMap
 >(Navigator);
 
-const IS_ANDROID_TV = Platform.isTV && Platform.OS === "android";
-
-function TVTabLayout() {
-  const { settings } = useSettings();
-  const { t } = useTranslation();
-  const segments = useSegments();
-  const router = useRouter();
-
-  const currentTab = segments.find(isTabRoute);
-  const lastSegment = segments[segments.length - 1] ?? "";
-  const atTabRoot = isTabRoute(lastSegment) || lastSegment === "index";
-
-  const tabs: TVNavBarTab[] = useMemo(
-    () =>
-      [
-        { key: "(home)", label: t("tabs.home") },
-        { key: "(search)", label: t("tabs.search") },
-        { key: "(favorites)", label: t("tabs.favorites") },
-        !settings?.streamyStatsServerUrl || settings?.hideWatchlistsTab
-          ? null
-          : { key: "(watchlists)", label: t("watchlists.title") },
-        { key: "(libraries)", label: t("tabs.library") },
-        !settings?.showCustomMenuLinks
-          ? null
-          : { key: "(custom-links)", label: t("tabs.custom_links") },
-        { key: "(settings)", label: t("tabs.settings") },
-      ].filter((tab): tab is TVNavBarTab => tab !== null),
-    [
-      settings?.streamyStatsServerUrl,
-      settings?.hideWatchlistsTab,
-      settings?.showCustomMenuLinks,
-      t,
-    ],
-  );
-
-  const activeTabKey = currentTab ?? "(home)";
-
-  const visibleKeys = useMemo(
-    () => new Set(tabs.map((tab) => tab.key)),
-    [tabs],
-  );
-
-  const handleTabChange = useCallback(
-    (key: string) => {
-      if (key === currentTab) return;
-
-      if (key === "(home)") eventBus.emit("scrollToTop");
-      if (key === "(search)") eventBus.emit("searchTabPressed");
-
-      router.replace(`/(auth)/(tabs)/${key}`);
-    },
-    [currentTab, router],
-  );
-
-  const navigateHome = useCallback(() => {
-    router.replace("/(auth)/(tabs)/(home)");
-  }, [router]);
-  useTVTabRootBackHandler(navigateHome, atTabRoot, currentTab);
-
-  // If current tab is no longer visible (setting changed), navigate to home
-  useEffect(() => {
-    if (!visibleKeys.has(activeTabKey) && activeTabKey !== "(home)") {
-      router.replace("/(auth)/(tabs)/(home)");
-    }
-  }, [visibleKeys, activeTabKey, router]);
-
-  return (
-    <View style={{ flex: 1 }}>
-      <SystemBars hidden={false} style='light' />
-      <Stack
-        screenOptions={{ headerShown: false, animation: "none" }}
-        initialRouteName='(home)'
-      >
-        <Stack.Screen name='index' redirect />
-      </Stack>
-      <TVNavBar
-        tabs={tabs}
-        activeTabKey={activeTabKey}
-        onTabChange={handleTabChange}
-        style={{
-          position: "absolute",
-          top: 0,
-          left: 0,
-          right: 0,
-          zIndex: 1000,
-        }}
-      />
-    </View>
-  );
-}
-
 export default function TabLayout() {
   const { settings } = useSettings();
   const { t } = useTranslation();
 
-  // Must be called before any conditional return (rules of hooks)
+  // Handle TV back button - prevent app exit when at root
   useTVHomeBackHandler();
 
-  if (IS_ANDROID_TV) {
-    return <TVTabLayout />;
-  }
-
   return (
     <View style={{ flex: 1 }}>
       <SystemBars hidden={false} style='light' />

app/(auth)/player/direct-player.tsx

@@ -56,8 +56,8 @@ import { getDefaultPlaySettings } from "@/utils/jellyfin/getDefaultPlaySettings"
 import { getPrimaryImageUrl } from "@/utils/jellyfin/image/getPrimaryImageUrl";
 import { getStreamUrl } from "@/utils/jellyfin/media/getStreamUrl";
 import {
-  applyMpvSubtitleSelection,
   getMpvAudioId,
+  getMpvSubtitleId,
 } from "@/utils/jellyfin/subtitleUtils";
 import { writeToLog } from "@/utils/log";
 import { msToTicks, ticksToSeconds } from "@/utils/time";
@@ -147,9 +147,9 @@ export default function DirectPlayerPage() {
   const audioIndexFromUrl = audioIndexStr
     ? Number.parseInt(audioIndexStr, 10)
     : undefined;
-  const subtitleIndex = subtitleIndexStr
+  const subtitleIndexFromUrl = subtitleIndexStr
     ? Number.parseInt(subtitleIndexStr, 10)
-    : -1;
+    : undefined;
   const bitrateValue = bitrateValueStr
     ? Number.parseInt(bitrateValueStr, 10)
     : BITRATES[0].value;
@@ -185,6 +185,23 @@ export default function DirectPlayerPage() {
     return undefined;
   }, [audioIndexFromUrl, offline, downloadedItem?.userData?.audioStreamIndex]);
 
+  // Resolve subtitle index: use URL param if provided, otherwise use stored index for offline playback
+  const subtitleIndex = useMemo(() => {
+    if (subtitleIndexFromUrl !== undefined) {
+      return subtitleIndexFromUrl;
+    }
+    if (
+      offline &&
+      downloadedItem?.userData?.subtitleStreamIndex !== undefined
+    ) {
+      return downloadedItem.userData.subtitleStreamIndex;
+    }
+    return -1;
+  }, [
+    subtitleIndexFromUrl,
+    offline,
+    downloadedItem?.userData?.subtitleStreamIndex,
+  ]);
   // Initialize TV audio/subtitle indices from URL params.
   // No undefined guard: when a new episode's URL omits audioIndex, reset to
   // undefined (media default) rather than leaking the previous episode's track.
@@ -456,23 +473,10 @@ export default function DirectPlayerPage() {
     });
     reportPlaybackStopped();
     setIsPlaybackStopped(true);
-    // Synchronously destroy the mpv instance + decoder + surface buffers
-    // BEFORE the screen unmounts. Otherwise the next screen (or the next
-    // episode's player) mounts while the old 4K decoder is still alive,
-    // causing OOM on low-RAM devices. Native stop() is idempotent so the
-    // later React unmount cleanup is still safe.
-    videoRef.current?.destroy().catch(() => {});
-    // Pre-libmpv-1.0 used `stop()`:
-    // videoRef.current?.stop();
+    videoRef.current?.pause();
     revalidateProgressCache();
     // Resume inactivity timer when leaving player (TV only)
     resumeInactivityTimer();
-    // Release the keep-awake wakelock acquired during playback so it
-    // doesn't follow us back to the home screen and block the TV
-    // screensaver. activateKeepAwakeAsync() is tag-scoped to this module
-    // and only released on the "paused" event; without this, navigating
-    // away mid-play leaves FLAG_KEEP_SCREEN_ON set on the window.
-    deactivateKeepAwake();
   }, [videoRef, reportPlaybackStopped, progress, resumeInactivityTimer]);
 
   useEffect(() => {
@@ -639,9 +643,12 @@ export default function DirectPlayerPage() {
       ).map((s) => s.DeliveryUrl!);
     }
 
-    // Audio maps positionally (audio tracks aren't reordered or hidden like
-    // subtitles). The subtitle selection is applied later, once MPV's real track
-    // list is known — see applySubtitleSelection / onTracksReady.
+    // Calculate track IDs for initial selection
+    const initialSubtitleId = getMpvSubtitleId(
+      mediaSource,
+      subtitleIndex,
+      isTranscoding,
+    );
     const initialAudioId = getMpvAudioId(
       mediaSource,
       audioIndex,
@@ -659,6 +666,7 @@ export default function DirectPlayerPage() {
       url: stream.url,
       startPosition: startPos,
       autoplay: true,
+      initialSubtitleId,
       initialAudioId,
       // Pass cache/buffer settings from user preferences
       cacheConfig: {
@@ -706,6 +714,7 @@ export default function DirectPlayerPage() {
     playbackPositionFromUrl,
     api?.basePath,
     api?.accessToken,
+    subtitleIndex,
     audioIndex,
     offline,
     settings.mpvCacheEnabled,
@@ -903,41 +912,30 @@ export default function DirectPlayerPage() {
   );
 
   // TV subtitle track change handler
-  /**
-   * Resolve a Jellyfin subtitle index against MPV's *real* track list and apply
-   * it. Identity-based (external by filename, embedded by language/title) so it
-   * stays correct across external/embedded reordering and server-hidden embedded
-   * subs — unlike positional mapping. Reused for initial selection (onTracksReady,
-   * fired again after each external sub-add) and runtime changes.
-   */
-  const applySubtitleSelection = useCallback(
-    async (jellyfinSubtitleIndex: number) => {
-      const subtitleStreams = stream?.mediaSource?.MediaStreams?.filter(
-        (s) => s.Type === "Subtitle",
-      );
-      await applyMpvSubtitleSelection(videoRef.current, {
-        subtitleStreams,
-        jellyfinSubtitleIndex,
-        // The exact URL each external sub was loaded into MPV with — mirrors the
-        // externalSubtitles array built in videoSource (online: basePath +
-        // DeliveryUrl, offline: local DeliveryUrl).
-        getExpectedExternalUrl: (s) => {
-          if (!s.DeliveryUrl) return undefined;
-          if (offline) return s.DeliveryUrl;
-          return api?.basePath ? `${api.basePath}${s.DeliveryUrl}` : undefined;
-        },
-      });
-    },
-    [stream?.mediaSource, offline, api?.basePath],
-  );
-
-  // TV/mobile subtitle track change handler
   const handleSubtitleIndexChange = useCallback(
     async (index: number) => {
       setCurrentSubtitleIndex(index);
-      await applySubtitleSelection(index);
+
+      // Check if we're transcoding
+      const isTranscoding = Boolean(stream?.mediaSource?.TranscodingUrl);
+
+      if (index === -1) {
+        // Disable subtitles
+        await videoRef.current?.disableSubtitles?.();
+      } else {
+        // Convert Jellyfin index to MPV track ID
+        const mpvTrackId = getMpvSubtitleId(
+          stream?.mediaSource,
+          index,
+          isTranscoding,
+        );
+
+        if (mpvTrackId !== undefined && mpvTrackId !== -1) {
+          await videoRef.current?.setSubtitleTrack?.(mpvTrackId);
+        }
+      }
     },
-    [applySubtitleSelection],
+    [stream?.mediaSource],
   );
 
   // Technical info toggle handler
@@ -1124,15 +1122,6 @@ export default function DirectPlayerPage() {
         nextItem.UserData?.PlaybackPositionTicks?.toString() ?? "",
     }).toString();
 
-    // Destroy the current mpv instance BEFORE navigating so the old 4K
-    // decoder + surface buffers are freed before the new player screen
-    // mounts. Without this, Expo Router briefly holds two simultaneous
-    // mpv instances during the transition (~768 MB of surface buffers
-    // for two 4K HDR10+ decoders) and OOM-kills the app on low-RAM
-    // devices. Native stop() is idempotent so the subsequent React
-    // unmount cleanup is still safe.
-    videoRef.current?.destroy().catch(() => {});
-
     router.replace(`player/direct-player?${queryParams}` as any);
   }, [
     nextItem,
@@ -1143,7 +1132,6 @@ export default function DirectPlayerPage() {
     bitrateValue,
     router,
     isPlaybackStopped,
-    videoRef,
   ]);
 
   // Apply subtitle settings when video loads
@@ -1302,10 +1290,6 @@ export default function DirectPlayerPage() {
                 }}
                 onTracksReady={() => {
                   setTracksReady(true);
-                  // Fired after embedded tracks enumerate and again after each
-                  // external sub-add; re-resolve so the final fire (full track
-                  // list) selects the right track by identity.
-                  void applySubtitleSelection(currentSubtitleIndex);
                 }}
               />
               {!hasPlaybackStarted && (

app/_layout.tsx

@@ -7,7 +7,6 @@ import { onlineManager, QueryClient } from "@tanstack/react-query";
 import { PersistQueryClientProvider } from "@tanstack/react-query-persist-client";
 import * as BackgroundTask from "expo-background-task";
 import * as Device from "expo-device";
-import { Image } from "expo-image";
 import { DarkTheme, ThemeProvider } from "expo-router/react-navigation";
 import { Platform } from "react-native";
 import { GlobalModal } from "@/components/GlobalModal";
@@ -101,22 +100,6 @@ SplashScreen.setOptions({
   fade: true,
 });
 
-// Cap expo-image's in-memory cache. Default is unbounded (maxMemoryCost=0),
-// which on a 2GB Android TV box leads to ~200MB of decoded backdrops/posters
-// pinned in RAM after browsing. Caps are intentionally tighter on TV (which
-// has less RAM and runs alongside libmpv/MediaCodec) than on mobile.
-// Cost is measured in bytes of decoded bitmap (ARGB8888 = 4 bytes/pixel).
-try {
-  Image.configureCache({
-    maxMemoryCost: Platform.isTV
-      ? 8 * 1024 * 1024 // ~8 MB on TV
-      : 128 * 1024 * 1024, // ~128 MB on mobile
-    maxDiskSize: 200 * 1024 * 1024, // 200 MB disk cache on all platforms
-  });
-} catch {
-  // configureCache is a no-op on some platforms/versions; safe to ignore.
-}
-
 function useNotificationObserver() {
   const router = useRouter();
 

augmentations/index.ts

@@ -1,3 +1,4 @@
 export * from "./api";
 export * from "./mmkv";
 export * from "./number";
+export * from "./string";

augmentations/number.ts

@@ -3,6 +3,7 @@ declare global {
     bytesToReadable(decimals?: number): string;
     secondsToMilliseconds(): number;
     minutesToMilliseconds(): number;
+    hoursToMilliseconds(): number;
   }
 }
 
@@ -27,4 +28,8 @@ Number.prototype.minutesToMilliseconds = function () {
   return this.valueOf() * (60).secondsToMilliseconds();
 };
 
+Number.prototype.hoursToMilliseconds = function () {
+  return this.valueOf() * (60).minutesToMilliseconds();
+};
+
 export {};

augmentations/string.ts

@@ -0,0 +1,14 @@
+declare global {
+  interface String {
+    toTitle(): string;
+  }
+}
+
+String.prototype.toTitle = function () {
+  return this.replaceAll("_", " ").replace(
+    /\w\S*/g,
+    (text) => text.charAt(0).toUpperCase() + text.substring(1).toLowerCase(),
+  );
+};
+
+export {};

components/ExampleGlobalModalUsage.tsx

@@ -0,0 +1,203 @@
+/**
+ * Example Usage of Global Modal
+ *
+ * This file demonstrates how to use the global modal system from anywhere in your app.
+ * You can delete this file after understanding how it works.
+ */
+
+import { Ionicons } from "@expo/vector-icons";
+import { TouchableOpacity, View } from "react-native";
+import { Text } from "@/components/common/Text";
+import { useGlobalModal } from "@/providers/GlobalModalProvider";
+
+/**
+ * Example 1: Simple Content Modal
+ */
+export const SimpleModalExample = () => {
+  const { showModal } = useGlobalModal();
+
+  const handleOpenModal = () => {
+    showModal(
+      <View className='p-6'>
+        <Text className='text-2xl font-bold mb-4 text-white'>Simple Modal</Text>
+        <Text className='text-white mb-4'>
+          This is a simple modal with just some text content.
+        </Text>
+        <Text className='text-neutral-400'>
+          Swipe down or tap outside to close.
+        </Text>
+      </View>,
+    );
+  };
+
+  return (
+    <TouchableOpacity
+      onPress={handleOpenModal}
+      className='bg-purple-600 px-4 py-2 rounded-lg'
+    >
+      <Text className='text-white font-semibold'>Open Simple Modal</Text>
+    </TouchableOpacity>
+  );
+};
+
+/**
+ * Example 2: Modal with Custom Snap Points
+ */
+export const CustomSnapPointsExample = () => {
+  const { showModal } = useGlobalModal();
+
+  const handleOpenModal = () => {
+    showModal(
+      <View className='p-6' style={{ minHeight: 400 }}>
+        <Text className='text-2xl font-bold mb-4 text-white'>
+          Custom Snap Points
+        </Text>
+        <Text className='text-white mb-4'>
+          This modal has custom snap points (25%, 50%, 90%).
+        </Text>
+        <View className='bg-neutral-800 p-4 rounded-lg'>
+          <Text className='text-white'>
+            Try dragging the modal to different heights!
+          </Text>
+        </View>
+      </View>,
+      {
+        snapPoints: ["25%", "50%", "90%"],
+        enableDynamicSizing: false,
+      },
+    );
+  };
+
+  return (
+    <TouchableOpacity
+      onPress={handleOpenModal}
+      className='bg-blue-600 px-4 py-2 rounded-lg'
+    >
+      <Text className='text-white font-semibold'>Custom Snap Points</Text>
+    </TouchableOpacity>
+  );
+};
+
+/**
+ * Example 3: Complex Component in Modal
+ */
+const SettingsModalContent = () => {
+  const { hideModal } = useGlobalModal();
+
+  const settings = [
+    {
+      id: 1,
+      title: "Notifications",
+      icon: "notifications-outline" as const,
+      enabled: true,
+    },
+    { id: 2, title: "Dark Mode", icon: "moon-outline" as const, enabled: true },
+    {
+      id: 3,
+      title: "Auto-play",
+      icon: "play-outline" as const,
+      enabled: false,
+    },
+  ];
+
+  return (
+    <View className='p-6'>
+      <Text className='text-2xl font-bold mb-6 text-white'>Settings</Text>
+
+      {settings.map((setting, index) => (
+        <View
+          key={setting.id}
+          className={`flex-row items-center justify-between py-4 ${
+            index !== settings.length - 1 ? "border-b border-neutral-700" : ""
+          }`}
+        >
+          <View className='flex-row items-center gap-3'>
+            <Ionicons name={setting.icon} size={24} color='white' />
+            <Text className='text-white text-lg'>{setting.title}</Text>
+          </View>
+          <View
+            className={`w-12 h-7 rounded-full ${
+              setting.enabled ? "bg-purple-600" : "bg-neutral-600"
+            }`}
+          >
+            <View
+              className={`w-5 h-5 rounded-full bg-white shadow-md transform ${
+                setting.enabled ? "translate-x-6" : "translate-x-1"
+              }`}
+              style={{ marginTop: 4 }}
+            />
+          </View>
+        </View>
+      ))}
+
+      <TouchableOpacity
+        onPress={hideModal}
+        className='bg-purple-600 px-4 py-3 rounded-lg mt-6'
+      >
+        <Text className='text-white font-semibold text-center'>Close</Text>
+      </TouchableOpacity>
+    </View>
+  );
+};
+
+export const ComplexModalExample = () => {
+  const { showModal } = useGlobalModal();
+
+  const handleOpenModal = () => {
+    showModal(<SettingsModalContent />);
+  };
+
+  return (
+    <TouchableOpacity
+      onPress={handleOpenModal}
+      className='bg-green-600 px-4 py-2 rounded-lg'
+    >
+      <Text className='text-white font-semibold'>Complex Component</Text>
+    </TouchableOpacity>
+  );
+};
+
+/**
+ * Example 4: Modal Triggered from Function (e.g., API response)
+ */
+export const useShowSuccessModal = () => {
+  const { showModal } = useGlobalModal();
+
+  return (message: string) => {
+    showModal(
+      <View className='p-6 items-center'>
+        <View className='bg-green-500 rounded-full p-4 mb-4'>
+          <Ionicons name='checkmark' size={48} color='white' />
+        </View>
+        <Text className='text-2xl font-bold mb-2 text-white'>Success!</Text>
+        <Text className='text-white text-center'>{message}</Text>
+      </View>,
+    );
+  };
+};
+
+/**
+ * Main Demo Component
+ */
+export const GlobalModalDemo = () => {
+  const showSuccess = useShowSuccessModal();
+
+  return (
+    <View className='p-6 gap-4'>
+      <Text className='text-2xl font-bold mb-4 text-white'>
+        Global Modal Examples
+      </Text>
+
+      <SimpleModalExample />
+      <CustomSnapPointsExample />
+      <ComplexModalExample />
+
+      <TouchableOpacity
+        onPress={() => showSuccess("Operation completed successfully!")}
+        className='bg-orange-600 px-4 py-2 rounded-lg'
+      >
+        <Text className='text-white font-semibold'>Show Success Modal</Text>
+      </TouchableOpacity>
+    </View>
+  );
+};

components/ItemContent.tsx

@@ -24,6 +24,7 @@ import useDefaultPlaySettings from "@/hooks/useDefaultPlaySettings";
 import { useImageColorsReturn } from "@/hooks/useImageColorsReturn";
 import { useOrientation } from "@/hooks/useOrientation";
 import * as ScreenOrientation from "@/packages/expo-screen-orientation";
+import { useDownload } from "@/providers/DownloadProvider";
 import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
 import { useOfflineMode } from "@/providers/OfflineModeProvider";
 import { useSettings } from "@/utils/atoms/settings";
@@ -59,6 +60,9 @@ const ItemContentMobile: React.FC<ItemContentProps> = ({
 }) => {
   const [api] = useAtom(apiAtom);
   const isOffline = useOfflineMode();
+  const { getDownloadedItemById } = useDownload();
+  const downloadedItem =
+    isOffline && item?.Id ? getDownloadedItemById(item.Id) : null;
   const { settings } = useSettings();
   const { orientation } = useOrientation();
   const navigation = useNavigation();
@@ -105,17 +109,30 @@ const ItemContentMobile: React.FC<ItemContentProps> = ({
 
   // Needs to automatically change the selected to the default values for default indexes.
   useEffect(() => {
+    // When offline, use the indices stored in userData (the last-used tracks for this file)
+    // rather than the server's defaults, so MediaSourceButton reflects what will actually play.
+    const offlineUserData = downloadedItem?.userData;
+
     setSelectedOptions(() => ({
       bitrate: defaultBitrate,
       mediaSource: defaultMediaSource ?? undefined,
-      subtitleIndex: defaultSubtitleIndex ?? -1,
-      audioIndex: defaultAudioIndex,
+      subtitleIndex:
+        offlineUserData && !offlineUserData.isTranscoded
+          ? offlineUserData.subtitleStreamIndex
+          : (defaultSubtitleIndex ?? -1),
+      audioIndex:
+        offlineUserData && !offlineUserData.isTranscoded
+          ? offlineUserData.audioStreamIndex
+          : defaultAudioIndex,
     }));
   }, [
     defaultAudioIndex,
     defaultBitrate,
     defaultSubtitleIndex,
     defaultMediaSource,
+    downloadedItem?.userData?.audioStreamIndex,
+    downloadedItem?.userData?.subtitleStreamIndex,
+    downloadedItem?.userData?.isTranscoded,
   ]);
 
   useEffect(() => {

components/ItemContent.tv.tsx

@@ -56,7 +56,6 @@ import { useSettings } from "@/utils/atoms/settings";
 import type { TVOptionItem } from "@/utils/atoms/tvOptionModal";
 import { getLogoImageUrlById } from "@/utils/jellyfin/image/getLogoImageUrlById";
 import { getPrimaryImageUrlById } from "@/utils/jellyfin/image/getPrimaryImageUrlById";
-import { compareTracksForMenu } from "@/utils/jellyfin/subtitleUtils";
 import { formatDuration, runtimeTicksToMinutes } from "@/utils/time";
 
 const { width: SCREEN_WIDTH, height: SCREEN_HEIGHT } = Dimensions.get("window");
@@ -233,13 +232,12 @@ export const ItemContentTV: React.FC<ItemContentTVProps> = React.memo(
       return streams ?? [];
     }, [selectedOptions?.mediaSource]);
 
-    // Get available subtitle tracks (raw MediaStream[] for label lookup),
-    // ordered like jellyfin-web (embedded first, externals last, forced/default up).
+    // Get available subtitle tracks (raw MediaStream[] for label lookup)
     const subtitleStreams = useMemo(() => {
       const streams = selectedOptions?.mediaSource?.MediaStreams?.filter(
         (s) => s.Type === "Subtitle",
       );
-      return streams ? [...streams].sort(compareTracksForMenu) : [];
+      return streams ?? [];
     }, [selectedOptions?.mediaSource]);
 
     // Store handleSubtitleChange in a ref for stable callback reference
@@ -413,13 +411,11 @@ export const ItemContentTV: React.FC<ItemContentTVProps> = React.memo(
             )
           : freshItem.MediaSources?.[0];
 
-        // Get subtitle streams from the fresh data, ordered like jellyfin-web
-        // (embedded first, externals last) — same as the initial list.
-        const streams = [
-          ...(mediaSource?.MediaStreams?.filter(
+        // Get subtitle streams from the fresh data
+        const streams =
+          mediaSource?.MediaStreams?.filter(
             (s: MediaStream) => s.Type === "Subtitle",
-          ) ?? []),
-        ].sort(compareTracksForMenu);
+          ) ?? [];
 
         // Convert to Track[] with setTrack callbacks
         const tracks: Track[] = streams.map((stream) => ({

components/MediaSourceButton.tsx

@@ -7,7 +7,8 @@ import { useCallback, useEffect, useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { ActivityIndicator, TouchableOpacity, View } from "react-native";
 import type { ThemeColors } from "@/hooks/useImageColorsReturn";
-import { compareTracksForMenu } from "@/utils/jellyfin/subtitleUtils";
+import { useDownload } from "@/providers/DownloadProvider";
+import { useOfflineMode } from "@/providers/OfflineModeProvider";
 import { BITRATES } from "./BitRateSheet";
 import type { SelectedOptions } from "./ItemContent";
 import { type OptionGroup, PlatformDropdown } from "./PlatformDropdown";
@@ -29,6 +30,14 @@ export const MediaSourceButton: React.FC<Props> = ({
 }: Props) => {
   const { t } = useTranslation();
   const [open, setOpen] = useState(false);
+  const isOffline = useOfflineMode();
+  const { getDownloadedItemById } = useDownload();
+
+  // For transcoded downloads there's only one burned-in track — nothing to pick
+  const isTranscodedDownload = useMemo(() => {
+    if (!isOffline || !item?.Id) return false;
+    return getDownloadedItemById(item.Id)?.userData?.isTranscoded === true;
+  }, [isOffline, item?.Id, getDownloadedItemById]);
 
   const effectiveColors = colors || {
     primary: "#7c3aed",
@@ -64,46 +73,45 @@ export const MediaSourceButton: React.FC<Props> = ({
 
   const subtitleStreams = useMemo(
     () =>
-      // Order like jellyfin-web (embedded first, externals last, forced/default up).
-      [
-        ...(selectedOptions.mediaSource?.MediaStreams?.filter(
-          (x) => x.Type === "Subtitle",
-        ) || []),
-      ].sort(compareTracksForMenu),
+      selectedOptions.mediaSource?.MediaStreams?.filter(
+        (x) => x.Type === "Subtitle",
+      ) || [],
     [selectedOptions.mediaSource],
   );
 
   const optionGroups: OptionGroup[] = useMemo(() => {
     const groups: OptionGroup[] = [];
 
-    // Bitrate group
-    groups.push({
-      title: t("item_card.quality"),
-      options: BITRATES.map((bitrate) => ({
-        type: "radio" as const,
-        label: bitrate.key,
-        value: bitrate,
-        selected: bitrate.value === selectedOptions.bitrate?.value,
-        onPress: () =>
-          setSelectedOptions((prev) => prev && { ...prev, bitrate }),
-      })),
-    });
-
-    // Media Source group (only if multiple sources)
-    if (item?.MediaSources && item.MediaSources.length > 1) {
+    if (!isOffline) {
+      // Bitrate group
       groups.push({
-        title: t("item_card.video"),
-        options: item.MediaSources.map((source) => ({
+        title: t("item_card.quality"),
+        options: BITRATES.map((bitrate) => ({
           type: "radio" as const,
-          label: getMediaSourceDisplayName(source),
-          value: source,
-          selected: source.Id === selectedOptions.mediaSource?.Id,
+          label: bitrate.key,
+          value: bitrate,
+          selected: bitrate.value === selectedOptions.bitrate?.value,
           onPress: () =>
-            setSelectedOptions(
-              (prev) => prev && { ...prev, mediaSource: source },
-            ),
+            setSelectedOptions((prev) => prev && { ...prev, bitrate }),
         })),
       });
+
+      // Media Source group (only if multiple sources)
+      if (item?.MediaSources && item.MediaSources.length > 1) {
+        groups.push({
+          title: t("item_card.video"),
+          options: item.MediaSources.map((source) => ({
+            type: "radio" as const,
+            label: getMediaSourceDisplayName(source),
+            value: source,
+            selected: source.Id === selectedOptions.mediaSource?.Id,
+            onPress: () =>
+              setSelectedOptions(
+                (prev) => prev && { ...prev, mediaSource: source },
+              ),
+          })),
+        });
+      }
     }
 
     // Audio track group
@@ -154,6 +162,7 @@ export const MediaSourceButton: React.FC<Props> = ({
     return groups;
   }, [
     item,
+    isOffline,
     selectedOptions,
     audioStreams,
     subtitleStreams,
@@ -182,6 +191,8 @@ export const MediaSourceButton: React.FC<Props> = ({
     </TouchableOpacity>
   );
 
+  if (isTranscodedDownload) return null;
+
   return (
     <PlatformDropdown
       groups={optionGroups}

components/PlayButton.tsx

@@ -96,14 +96,23 @@ export const PlayButton: React.FC<Props> = ({
 
     const queryParams = new URLSearchParams({
       itemId: item.Id!,
-      audioIndex: selectedOptions.audioIndex?.toString() ?? "",
-      subtitleIndex: selectedOptions.subtitleIndex?.toString() ?? "",
       mediaSourceId: selectedOptions.mediaSource?.Id ?? "",
       bitrateValue: selectedOptions.bitrate?.value?.toString() ?? "",
       playbackPosition: item.UserData?.PlaybackPositionTicks?.toString() ?? "0",
       offline: isOffline ? "true" : "false",
     });
 
+    if (selectedOptions.audioIndex !== undefined) {
+      queryParams.set("audioIndex", selectedOptions.audioIndex.toString());
+    }
+
+    if (selectedOptions.subtitleIndex !== undefined) {
+      queryParams.set(
+        "subtitleIndex",
+        selectedOptions.subtitleIndex.toString(),
+      );
+    }
+
     const queryString = queryParams.toString();
 
     if (!client) {
@@ -292,6 +301,29 @@ export const PlayButton: React.FC<Props> = ({
     t,
   ]);
 
+  const buildOfflineQueryParams = useCallback(
+    (downloadedItem: NonNullable<ReturnType<typeof getDownloadedItemById>>) => {
+      const isTranscoded = downloadedItem.userData?.isTranscoded === true;
+      const audioIdx = isTranscoded
+        ? downloadedItem.userData?.audioStreamIndex
+        : selectedOptions.audioIndex;
+      const subtitleIdx = isTranscoded
+        ? downloadedItem.userData?.subtitleStreamIndex
+        : selectedOptions.subtitleIndex;
+      const params = new URLSearchParams({
+        itemId: item.Id!,
+        offline: "true",
+        playbackPosition:
+          item.UserData?.PlaybackPositionTicks?.toString() ?? "0",
+      });
+      if (audioIdx !== undefined) params.set("audioIndex", audioIdx.toString());
+      if (subtitleIdx !== undefined)
+        params.set("subtitleIndex", subtitleIdx.toString());
+      return params;
+    },
+    [item, selectedOptions],
+  );
+
   const onPress = useCallback(async () => {
     if (!item) return;
 
@@ -302,13 +334,7 @@ export const PlayButton: React.FC<Props> = ({
 
     // If already in offline mode, play downloaded file directly
     if (isOffline && downloadedItem) {
-      const queryParams = new URLSearchParams({
-        itemId: item.Id!,
-        offline: "true",
-        playbackPosition:
-          item.UserData?.PlaybackPositionTicks?.toString() ?? "0",
-      });
-      goToPlayer(queryParams.toString());
+      goToPlayer(buildOfflineQueryParams(downloadedItem).toString());
       return;
     }
 
@@ -331,13 +357,9 @@ export const PlayButton: React.FC<Props> = ({
                 <Button
                   onPress={() => {
                     hideModal();
-                    const queryParams = new URLSearchParams({
-                      itemId: item.Id!,
-                      offline: "true",
-                      playbackPosition:
-                        item.UserData?.PlaybackPositionTicks?.toString() ?? "0",
-                    });
-                    goToPlayer(queryParams.toString());
+                    goToPlayer(
+                      buildOfflineQueryParams(downloadedItem).toString(),
+                    );
                   }}
                   color='purple'
                 >
@@ -374,13 +396,7 @@ export const PlayButton: React.FC<Props> = ({
             {
               text: t("player.downloaded_file_yes"),
               onPress: () => {
-                const queryParams = new URLSearchParams({
-                  itemId: item.Id!,
-                  offline: "true",
-                  playbackPosition:
-                    item.UserData?.PlaybackPositionTicks?.toString() ?? "0",
-                });
-                goToPlayer(queryParams.toString());
+                goToPlayer(buildOfflineQueryParams(downloadedItem).toString());
               },
               isPreferred: true,
             },

components/SubtitleTrackSelector.tsx

@@ -2,7 +2,6 @@ import type { MediaSourceInfo } from "@jellyfin/sdk/lib/generated-client/models"
 import { useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { Platform, TouchableOpacity, View } from "react-native";
-import { compareTracksForMenu } from "@/utils/jellyfin/subtitleUtils";
 import { tc } from "@/utils/textTools";
 import { Text } from "./common/Text";
 import { type OptionGroup, PlatformDropdown } from "./PlatformDropdown";
@@ -23,9 +22,7 @@ export const SubtitleTrackSelector: React.FC<Props> = ({
   const [open, setOpen] = useState(false);
 
   const subtitleStreams = useMemo(() => {
-    const subs = source?.MediaStreams?.filter((x) => x.Type === "Subtitle");
-    // Order like jellyfin-web (embedded first, externals last, forced/default up).
-    return subs ? [...subs].sort(compareTracksForMenu) : subs;
+    return source?.MediaStreams?.filter((x) => x.Type === "Subtitle");
   }, [source]);
 
   const selectedSubtitleSteam = useMemo(

components/TrackSheet.tsx

@@ -26,7 +26,7 @@ export const TrackSheet: React.FC<Props> = ({
 
   const streams = useMemo(
     () => source?.MediaStreams?.filter((x) => x.Type === streamType),
-    [source, streamType],
+    [source],
   );
 
   const selectedSteam = useMemo(

components/common/LargePoster.tsx

@@ -0,0 +1,20 @@
+import { Image } from "expo-image";
+import { View } from "react-native";
+
+export const LargePoster: React.FC<{ url?: string | null }> = ({ url }) => {
+  if (!url)
+    return (
+      <View className='p-4 rounded-xl overflow-hidden '>
+        <View className='w-full aspect-video rounded-xl overflow-hidden border border-neutral-800' />
+      </View>
+    );
+
+  return (
+    <View className='p-4 rounded-xl overflow-hidden '>
+      <Image
+        source={{ uri: url }}
+        className='w-full aspect-video rounded-xl overflow-hidden border border-neutral-800'
+      />
+    </View>
+  );
+};

components/common/VerticalSkeleton.tsx

@@ -0,0 +1,28 @@
+import { View, type ViewProps } from "react-native";
+
+interface Props extends ViewProps {
+  index: number;
+}
+
+export const VerticalSkeleton: React.FC<Props> = ({ index, ...props }) => {
+  return (
+    <View
+      key={index}
+      style={{
+        width: "32%",
+      }}
+      className='flex flex-col'
+      {...props}
+    >
+      <View
+        style={{
+          aspectRatio: "10/15",
+        }}
+        className='w-full bg-neutral-800 mb-2 rounded-lg'
+      />
+      <View className='h-2 bg-neutral-800 rounded-full mb-1' />
+      <View className='h-2 bg-neutral-800 rounded-full mb-1' />
+      <View className='h-2 bg-neutral-800 rounded-full mb-2 w-1/2' />
+    </View>
+  );
+};

components/home/Home.tv.tsx

@@ -140,11 +140,9 @@ export const Home = () => {
     let isCancelled = false;
 
     const performCrossfade = async () => {
-      // Prefetch to disk only - the full-size 1920x1080 backdrop (~8MB
-      // decoded ARGB) is too large to pin in the memory cache on every
-      // focus change. Disk cache is fast enough for a 500ms crossfade.
+      // Prefetch the image before starting the crossfade
       try {
-        await Image.prefetch(backdropUrl, "disk");
+        await Image.prefetch(backdropUrl);
       } catch {
         // Continue even if prefetch fails
       }

components/home/InfiniteScrollingCollectionList.tv.tsx

@@ -326,9 +326,9 @@ export const InfiniteScrollingCollectionList: React.FC<Props> = ({
           showsHorizontalScrollIndicator={false}
           onEndReached={handleEndReached}
           onEndReachedThreshold={0.5}
-          initialNumToRender={4}
-          maxToRenderPerBatch={2}
-          windowSize={3}
+          initialNumToRender={5}
+          maxToRenderPerBatch={3}
+          windowSize={5}
           removeClippedSubviews={false}
           maintainVisibleContentPosition={{ minIndexForVisible: 0 }}
           style={{ overflow: "visible" }}

components/home/TVHeroCarousel.tsx

@@ -256,11 +256,8 @@ export const TVHeroCarousel: React.FC<TVHeroCarouselProps> = ({
     let isCancelled = false;
 
     const performCrossfade = async () => {
-      // Disk-only prefetch: backdrops are ~8MB decoded ARGB; keeping them
-      // out of the memory cache avoids bloat when the user cycles through
-      // hero items quickly.
       try {
-        await Image.prefetch(backdropUrl, "disk");
+        await Image.prefetch(backdropUrl);
       } catch {
         // Continue even if prefetch fails
       }
@@ -382,7 +379,7 @@ export const TVHeroCarousel: React.FC<TVHeroCarouselProps> = ({
   if (items.length === 0) return null;
 
   // Extra top padding for tvOS to clear the menu bar
-  const tvosTopPadding = scaleSize(145);
+  const tvosTopPadding = Platform.OS === "ios" ? scaleSize(145) : 0;
   const heroHeight = SCREEN_HEIGHT * sizes.padding.heroHeight;
 
   return (

components/library/LibraryItemCard.tsx

@@ -51,7 +51,7 @@ export const LibraryItemCard: React.FC<Props> = ({ library, ...props }) => {
         api,
         item: library,
       }),
-    [api, library],
+    [library],
   );
 
   const itemType = useMemo(() => {

components/navigation/TabBarIcon.tsx

@@ -0,0 +1,12 @@
+// You can explore the built-in icon families and icons on the web at https://icons.expo.fyi/
+
+import type { IconProps } from "@expo/vector-icons/build/createIconSet";
+import Ionicons from "@expo/vector-icons/Ionicons";
+import type { ComponentProps } from "react";
+
+export function TabBarIcon({
+  style,
+  ...rest
+}: IconProps<ComponentProps<typeof Ionicons>["name"]>) {
+  return <Ionicons size={26} style={[{ marginBottom: -3 }, style]} {...rest} />;
+}

components/persons/TVActorPage.tsx

@@ -156,9 +156,9 @@ export const TVActorPage: React.FC<TVActorPageProps> = ({ personId }) => {
     let isCancelled = false;
 
     const performCrossfade = async () => {
-      // Disk-only prefetch to avoid pinning large backdrops in memory cache.
+      // Prefetch the image before starting the crossfade
       try {
-        await Image.prefetch(backdropUrl, "disk");
+        await Image.prefetch(backdropUrl);
       } catch {
         // Continue even if prefetch fails
       }

components/posters/EpisodePoster.tsx

@@ -0,0 +1,63 @@
+import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
+import { Image } from "expo-image";
+import { useAtom } from "jotai";
+import { useMemo, useState } from "react";
+import { View } from "react-native";
+import { WatchedIndicator } from "@/components/WatchedIndicator";
+import { apiAtom } from "@/providers/JellyfinProvider";
+
+type MoviePosterProps = {
+  item: BaseItemDto;
+  showProgress?: boolean;
+};
+
+export const EpisodePoster: React.FC<MoviePosterProps> = ({
+  item,
+  showProgress = false,
+}) => {
+  const [api] = useAtom(apiAtom);
+
+  const url = useMemo(() => {
+    if (item.Type === "Episode") {
+      return `${api?.basePath}/Items/${item.ParentBackdropItemId}/Images/Thumb?fillHeight=389&quality=80&tag=${item.ParentThumbImageTag}`;
+    }
+  }, [item]);
+
+  const [progress, _setProgress] = useState(
+    item.UserData?.PlayedPercentage || 0,
+  );
+
+  const blurhash = useMemo(() => {
+    const key = item.ImageTags?.Primary as string;
+    return item.ImageBlurHashes?.Primary?.[key];
+  }, [item]);
+
+  return (
+    <View className='relative rounded-lg overflow-hidden border border-neutral-900'>
+      <Image
+        placeholder={{
+          blurhash,
+        }}
+        key={item.Id}
+        id={item.Id}
+        source={
+          url
+            ? {
+                uri: url,
+              }
+            : null
+        }
+        cachePolicy={"memory-disk"}
+        contentFit='cover'
+        style={{
+          aspectRatio: "10/15",
+          width: "100%",
+        }}
+      />
+      <WatchedIndicator item={item} />
+      {showProgress && progress > 0 && (
+        <View className='h-1 bg-red-600 w-full' />
+      )}
+    </View>
+  );
+};

components/posters/ParentPoster.tsx

@@ -0,0 +1,48 @@
+import { Image } from "expo-image";
+import { useAtom } from "jotai";
+import { useMemo } from "react";
+import { View } from "react-native";
+import { apiAtom } from "@/providers/JellyfinProvider";
+
+type PosterProps = {
+  id?: string;
+  showProgress?: boolean;
+};
+
+const ParentPoster: React.FC<PosterProps> = ({ id }) => {
+  const [api] = useAtom(apiAtom);
+
+  const url = useMemo(
+    () => `${api?.basePath}/Items/${id}/Images/Primary`,
+    [id],
+  );
+
+  if (!url || !id)
+    return (
+      <View
+        className='border border-neutral-900'
+        style={{
+          aspectRatio: "10/15",
+        }}
+      />
+    );
+
+  return (
+    <View className='rounded-lg overflow-hidden border border-neutral-900'>
+      <Image
+        key={id}
+        id={id}
+        source={{
+          uri: url,
+        }}
+        cachePolicy={"memory-disk"}
+        contentFit='cover'
+        style={{
+          aspectRatio: "10/15",
+        }}
+      />
+    </View>
+  );
+};
+
+export default ParentPoster;

components/settings/Dashboard.tsx

@@ -0,0 +1,29 @@
+import { useTranslation } from "react-i18next";
+import { View } from "react-native";
+import useRouter from "@/hooks/useAppRouter";
+import { useSessions, type useSessionsProps } from "@/hooks/useSessions";
+import { useSettings } from "@/utils/atoms/settings";
+import { ListGroup } from "../list/ListGroup";
+import { ListItem } from "../list/ListItem";
+
+export const Dashboard = () => {
+  const { settings } = useSettings();
+  const { sessions = [] } = useSessions({} as useSessionsProps);
+  const router = useRouter();
+
+  const { t } = useTranslation();
+
+  if (!settings) return null;
+  return (
+    <View>
+      <ListGroup title={t("home.settings.dashboard.title")} className='mt-4'>
+        <ListItem
+          className={sessions.length !== 0 ? "bg-purple-900" : ""}
+          onPress={() => router.push("/settings/dashboard/sessions")}
+          title={t("home.settings.dashboard.sessions_title")}
+          showArrow
+        />
+      </ListGroup>
+    </View>
+  );
+};

components/settings/DownloadSettings.tsx

@@ -0,0 +1,3 @@
+export default function DownloadSettings() {
+  return null;
+}

components/settings/DownloadSettings.tv.tsx

@@ -0,0 +1,3 @@
+export default function DownloadSettings() {
+  return null;
+}

components/settings/Jellyseerr.tsx

@@ -115,6 +115,9 @@ export const JellyseerrSettings = () => {
           </>
         ) : (
           <View className='flex flex-col rounded-xl overflow-hidden p-4 bg-neutral-900'>
+            <Text className='text-xs text-red-600 mb-2'>
+              {t("home.settings.plugins.jellyseerr.jellyseerr_warning")}
+            </Text>
             <Text className='font-bold mb-1'>
               {t("home.settings.plugins.jellyseerr.server_url")}
             </Text>

components/tv/TVNavBar.tsx

@@ -1,155 +0,0 @@
-import React from "react";
-import {
-  Animated,
-  Pressable,
-  ScrollView,
-  StyleProp,
-  View,
-  ViewStyle,
-} from "react-native";
-import { useSafeAreaInsets } from "react-native-safe-area-context";
-import { Text } from "@/components/common/Text";
-import { useTVFocusAnimation } from "@/components/tv/hooks/useTVFocusAnimation";
-import { TVPadding } from "@/constants/TVSizes";
-import { useScaledTVTypography } from "@/constants/TVTypography";
-import { scaleSize } from "@/utils/scaleSize";
-
-export interface TVNavBarTab {
-  key: string;
-  label: string;
-}
-
-export interface TVNavBarProps {
-  tabs: TVNavBarTab[];
-  activeTabKey: string;
-  onTabChange: (key: string) => void;
-  style?: StyleProp<ViewStyle>;
-}
-
-const TVNavBarTabItem: React.FC<{
-  label: string;
-  isActive: boolean;
-  onSelect: () => void;
-  onLayout: (e: {
-    nativeEvent: { layout: { x: number; width: number } };
-  }) => void;
-  hasTVPreferredFocus: boolean;
-}> = ({ label, isActive, onSelect, onLayout, hasTVPreferredFocus }) => {
-  const typography = useScaledTVTypography();
-  const { focused, handleFocus, handleBlur, animatedStyle } =
-    useTVFocusAnimation({
-      scaleAmount: 1.05,
-      duration: 120,
-    });
-
-  const bg = focused
-    ? "rgba(255, 255, 255, 0.95)"
-    : isActive
-      ? "rgba(255, 255, 255, 0.15)"
-      : "transparent";
-
-  const textColor = focused
-    ? "#000"
-    : isActive
-      ? "#fff"
-      : "rgba(255, 255, 255, 0.7)";
-
-  return (
-    <Pressable
-      onPress={onSelect}
-      onFocus={handleFocus}
-      onBlur={handleBlur}
-      hasTVPreferredFocus={hasTVPreferredFocus}
-      onLayout={onLayout}
-    >
-      <Animated.View
-        style={[
-          animatedStyle,
-          {
-            backgroundColor: bg,
-            borderRadius: scaleSize(24),
-            borderWidth: isActive && !focused ? 1 : 0,
-            borderColor: "rgba(255, 255, 255, 0.3)",
-            paddingHorizontal: scaleSize(28),
-            paddingVertical: scaleSize(14),
-          },
-        ]}
-      >
-        <Text
-          style={{
-            fontSize: typography.heading,
-            color: textColor,
-            fontWeight: isActive || focused ? "600" : "400",
-          }}
-        >
-          {label}
-        </Text>
-      </Animated.View>
-    </Pressable>
-  );
-};
-
-export const TVNavBar: React.FC<TVNavBarProps> = ({
-  tabs,
-  activeTabKey,
-  onTabChange,
-  style,
-}) => {
-  const scrollRef = React.useRef<ScrollView>(null);
-  const tabLayouts = React.useRef<Record<string, { x: number; width: number }>>(
-    {},
-  );
-  const insets = useSafeAreaInsets();
-
-  const handleTabLayout = React.useCallback(
-    (key: string) =>
-      (e: { nativeEvent: { layout: { x: number; width: number } } }) => {
-        tabLayouts.current[key] = e.nativeEvent.layout;
-      },
-    [],
-  );
-
-  const handleTabChange = React.useCallback(
-    (key: string) => {
-      onTabChange(key);
-
-      const layout = tabLayouts.current[key];
-      if (layout && scrollRef.current) {
-        scrollRef.current.scrollTo({
-          x: Math.max(0, layout.x - TVPadding.horizontal / 2),
-          animated: true,
-        });
-      }
-    },
-    [onTabChange],
-  );
-
-  if (tabs.length === 0) return null;
-
-  return (
-    <View style={[{ paddingTop: insets.top + 16, paddingBottom: 8 }, style]}>
-      <ScrollView
-        ref={scrollRef}
-        horizontal
-        showsHorizontalScrollIndicator={false}
-        keyboardShouldPersistTaps='handled'
-        contentContainerStyle={{
-          flexGrow: 1,
-          justifyContent: "center",
-          gap: scaleSize(12),
-        }}
-      >
-        {tabs.map((tab) => (
-          <TVNavBarTabItem
-            key={tab.key}
-            label={tab.label}
-            isActive={tab.key === activeTabKey}
-            onSelect={() => handleTabChange(tab.key)}
-            onLayout={handleTabLayout(tab.key)}
-            hasTVPreferredFocus={tab.key === activeTabKey}
-          />
-        ))}
-      </ScrollView>
-    </View>
-  );
-};

components/tv/TVPosterCard.tsx

@@ -448,8 +448,8 @@ export const TVPosterCard: React.FC<TVPosterCardProps> = ({
         <Image
           placeholder={{ blurhash }}
           key={item.Id}
+          id={item.Id}
           source={{ uri: imageUrl }}
-          recyclingKey={item.Id}
           cachePolicy='memory-disk'
           contentFit='cover'
           style={{

components/tv/index.ts

@@ -35,8 +35,6 @@ export type { TVLanguageCardProps } from "./TVLanguageCard";
 export { TVLanguageCard } from "./TVLanguageCard";
 export type { TVMetadataBadgesProps } from "./TVMetadataBadges";
 export { TVMetadataBadges } from "./TVMetadataBadges";
-export type { TVNavBarProps, TVNavBarTab } from "./TVNavBar";
-export { TVNavBar } from "./TVNavBar";
 export type { TVNextEpisodeCountdownProps } from "./TVNextEpisodeCountdown";
 export { TVNextEpisodeCountdown } from "./TVNextEpisodeCountdown";
 export type { TVOptionButtonProps } from "./TVOptionButton";

components/video-player/controls/Controls.tv.tsx

@@ -51,7 +51,6 @@ import { useOfflineMode } from "@/providers/OfflineModeProvider";
 import { useSettings } from "@/utils/atoms/settings";
 import type { TVOptionItem } from "@/utils/atoms/tvOptionModal";
 import { getDefaultPlaySettings } from "@/utils/jellyfin/getDefaultPlaySettings";
-import { compareTracksForMenu } from "@/utils/jellyfin/subtitleUtils";
 import { formatTimeString, msToTicks, ticksToMs } from "@/utils/time";
 import { CONTROLS_CONSTANTS } from "./constants";
 import { useVideoContext } from "./contexts/VideoContext";
@@ -318,10 +317,8 @@ export const Controls: FC<Props> = ({
     try {
       const streams = (await onRefreshSubtitleTracks?.()) ?? [];
       // Skip streams without a real index: `?? -1` would alias them to the
-      // "disable subtitles" sentinel and mis-route selection. Order like
-      // jellyfin-web (embedded first, externals last, forced/default up).
-      return [...streams]
-        .sort(compareTracksForMenu)
+      // "disable subtitles" sentinel and mis-route selection.
+      return streams
         .filter((stream) => typeof stream.Index === "number")
         .map((stream) => {
           const index = stream.Index as number;

components/video-player/controls/TVSubtitleSheet.tsx

@@ -33,7 +33,6 @@ import {
   type SubtitleSearchResult,
   useRemoteSubtitles,
 } from "@/hooks/useRemoteSubtitles";
-import { compareTracksForMenu } from "@/utils/jellyfin/subtitleUtils";
 import { COMMON_SUBTITLE_LANGUAGES } from "@/utils/opensubtitles/api";
 
 interface TVSubtitleSheetProps {
@@ -97,19 +96,13 @@ export const TVSubtitleSheet: React.FC<TVSubtitleSheetProps> = ({
   const overlayOpacity = useRef(new Animated.Value(0)).current;
   const sheetTranslateY = useRef(new Animated.Value(300)).current;
 
-  // Order like jellyfin-web (embedded first, externals last, forced/default up).
-  const sortedTracks = useMemo(
-    () => [...subtitleTracks].sort(compareTracksForMenu),
-    [subtitleTracks],
-  );
-
   const initialSelectedTrackIndex = useMemo(() => {
     if (currentSubtitleIndex === -1) return 0;
-    const trackIdx = sortedTracks.findIndex(
+    const trackIdx = subtitleTracks.findIndex(
       (t) => t.Index === currentSubtitleIndex,
     );
     return trackIdx >= 0 ? trackIdx + 1 : 0;
-  }, [sortedTracks, currentSubtitleIndex]);
+  }, [subtitleTracks, currentSubtitleIndex]);
 
   useEffect(() => {
     if (visible) {
@@ -222,7 +215,7 @@ export const TVSubtitleSheet: React.FC<TVSubtitleSheetProps> = ({
       value: -1,
       selected: currentSubtitleIndex === -1,
     };
-    const options = sortedTracks.map((track) => ({
+    const options = subtitleTracks.map((track) => ({
       label:
         track.DisplayTitle || `${track.Language || "Unknown"} (${track.Codec})`,
       sublabel: track.Codec?.toUpperCase(),
@@ -230,7 +223,7 @@ export const TVSubtitleSheet: React.FC<TVSubtitleSheetProps> = ({
       selected: track.Index === currentSubtitleIndex,
     }));
     return [noneOption, ...options];
-  }, [sortedTracks, currentSubtitleIndex, t]);
+  }, [subtitleTracks, currentSubtitleIndex, t]);
 
   if (!visible) return null;
 

components/video-player/controls/TechnicalInfoOverlay.tsx

@@ -342,12 +342,6 @@ export const TechnicalInfoOverlay: FC<TechnicalInfoOverlayProps> = memo(
           {info?.cacheSeconds !== undefined && (
             <Text style={textStyle}>
               Buffer: {info.cacheSeconds.toFixed(1)}s
-              {info?.demuxerMaxBytes !== undefined
-                ? ` (cap ${info.demuxerMaxBytes}MB` +
-                  `${info.demuxerMaxBackBytes !== undefined ? ` / ${info.demuxerMaxBackBytes}MB back` : ""}` +
-                  `${info?.cacheSecsLimit !== undefined && info.cacheSecsLimit < 3600 ? ` · ${info.cacheSecsLimit.toFixed(0)}s` : ""}` +
-                  ")"
-                : ""}
             </Text>
           )}
           {info?.voDriver && (
@@ -356,12 +350,6 @@ export const TechnicalInfoOverlay: FC<TechnicalInfoOverlayProps> = memo(
               {info.hwdec ? ` / ${info.hwdec}` : ""}
             </Text>
           )}
-          {info?.estimatedVfFps !== undefined && (
-            <Text style={textStyle}>
-              Output FPS: {info.estimatedVfFps.toFixed(2)}
-              {info?.fps ? ` (container ${formatFps(info.fps)})` : ""}
-            </Text>
-          )}
           {info?.droppedFrames !== undefined && info.droppedFrames > 0 && (
             <Text style={[textStyle, styles.warningText]}>
               Dropped: {info.droppedFrames} frames

components/video-player/controls/contexts/VideoContext.tsx

@@ -23,29 +23,32 @@
  *    - Used to report playback state to Jellyfin server
  *    - Value of -1 means disabled/none
  *
- * 2. PLAYER TRACK (selected by IDENTITY, not position)
- *    - Selection resolves the server Index against MPV's REAL track list via
- *      applyMpvSubtitleSelection: externals matched by external-filename,
- *      embedded by language/title. `track.mpvIndex` is no longer used to select
- *      (kept -1) — positional mapping mis-selected when externals/embedded were
- *      reordered or the server hid embedded subs (#954 et al.).
+ * 2. MPV INDEX (track.mpvIndex)
+ *    - MPV's internal track ID
+ *    - MPV orders tracks as: [all embedded, then all external]
+ *    - IDs: 1..embeddedCount for embedded, embeddedCount+1.. for external
+ *    - Value of -1 means track needs replacePlayer() (e.g., burned-in sub)
  *
  * ============================================================================
  * SUBTITLE HANDLING
  * ============================================================================
  *
- * Embedded & External:
- *   - Selected via applyMpvSubtitleSelection (identity match against the live
- *     track list). Menu order matches jellyfin-web (compareTracksForMenu:
- *     embedded first, externals last, forced/default float up).
+ * Embedded (DeliveryMethod.Embed):
+ *   - Already in MPV's track list
+ *   - Select via setSubtitleTrack(mpvId)
+ *
+ * External (DeliveryMethod.External):
+ *   - Loaded into MPV on video start
+ *   - Select via setSubtitleTrack(embeddedCount + externalPosition + 1)
  *
  * Image-based during transcoding:
- *   - Burned into video by Jellyfin, not in MPV → replacePlayer() to change.
+ *   - Burned into video by Jellyfin, not in MPV
+ *   - Requires replacePlayer() to change
  */
 
+import { SubtitleDeliveryMethod } from "@jellyfin/sdk/lib/generated-client";
 import { File } from "expo-file-system";
 import { useLocalSearchParams } from "expo-router";
-import { useAtomValue } from "jotai";
 import type React from "react";
 import {
   createContext,
@@ -58,14 +61,9 @@ import {
 import { Platform } from "react-native";
 import useRouter from "@/hooks/useAppRouter";
 import type { MpvAudioTrack } from "@/modules";
-import { apiAtom } from "@/providers/JellyfinProvider";
 import { useOfflineMode } from "@/providers/OfflineModeProvider";
 import { getSubtitlesForItem } from "@/utils/atoms/downloadedSubtitles";
-import {
-  applyMpvSubtitleSelection,
-  compareTracksForMenu,
-  isImageBasedSubtitle,
-} from "@/utils/jellyfin/subtitleUtils";
+import { isImageBasedSubtitle } from "@/utils/jellyfin/subtitleUtils";
 import type { Track } from "../types";
 import { usePlayerContext, usePlayerControls } from "./PlayerContext";
 
@@ -89,7 +87,6 @@ export const VideoProvider: React.FC<{ children: ReactNode }> = ({
   const { tracksReady, mediaSource, downloadedItem } = usePlayerContext();
   const playerControls = usePlayerControls();
   const offline = useOfflineMode();
-  const api = useAtomValue(apiAtom);
   const router = useRouter();
 
   const { itemId, audioIndex, bitrateValue, subtitleIndex, playbackPosition } =
@@ -144,19 +141,6 @@ export const VideoProvider: React.FC<{ children: ReactNode }> = ({
   useEffect(() => {
     if (!tracksReady) return;
 
-    // Guard every state commit against stale runs: api?.basePath /
-    // isCurrentSubImageBased can flip mid-run and restart this effect, and an
-    // earlier async run (which captured an old `api`) must not finish later and
-    // overwrite the fresh track list with callbacks bound to stale closures.
-    // The cleanup flips `cancelled`, so any late commit from a dead run is dropped.
-    let cancelled = false;
-    const commitSubtitleTracks = (next: Track[]) => {
-      if (!cancelled) setSubtitleTracks(next);
-    };
-    const commitAudioTracks = (next: Track[]) => {
-      if (!cancelled) setAudioTracks(next);
-    };
-
     const fetchTracks = async () => {
       // Check if this is offline transcoded content
       // For transcoded offline content, only ONE audio track exists in the file
@@ -182,10 +166,10 @@ export const VideoProvider: React.FC<{ children: ReactNode }> = ({
               },
             },
           ];
-          commitAudioTracks(audio);
+          setAudioTracks(audio);
         } else {
           // Fallback: show no audio tracks if the stored track wasn't found
-          commitAudioTracks([]);
+          setAudioTracks([]);
         }
 
         // For subtitles in transcoded offline content:
@@ -195,24 +179,6 @@ export const VideoProvider: React.FC<{ children: ReactNode }> = ({
           downloadedItem.userData.subtitleStreamIndex;
         const subs: Track[] = [];
 
-        // If an IMAGE subtitle was burned into the transcoded download it's in the
-        // video pixels — it can't be turned off or swapped. Show only that entry
-        // instead of advertising "Disable"/text controls that can't affect it.
-        const burnedInSub = allSubs.find(
-          (s) => s.Index === downloadedSubtitleIndex,
-        );
-        if (burnedInSub && isImageBasedSubtitle(burnedInSub)) {
-          commitSubtitleTracks([
-            {
-              name: `${burnedInSub.DisplayTitle || "Unknown"} (burned in)`,
-              index: burnedInSub.Index ?? -1,
-              mpvIndex: -1,
-              setTrack: () => {},
-            },
-          ]);
-          return;
-        }
-
         // Add "Disable" option
         subs.push({
           name: "Disable",
@@ -224,82 +190,123 @@ export const VideoProvider: React.FC<{ children: ReactNode }> = ({
           },
         });
 
-        // Text subs are muxed into the transcoded file and switchable; resolve by
-        // identity against MPV's real track list (same as online). Order matches web.
-        // Image subs aren't in the transcoded file (only the burned one was, handled
-        // above), so skip them here.
-        for (const sub of [...allSubs].sort(compareTracksForMenu)) {
-          if (!isImageBasedSubtitle(sub)) {
+        // For text-based subs, they should still be available in the file
+        let subIdx = 1;
+        for (const sub of allSubs) {
+          if (sub.IsTextSubtitleStream) {
             subs.push({
               name: sub.DisplayTitle || "Unknown",
               index: sub.Index ?? -1,
-              mpvIndex: -1,
+              mpvIndex: subIdx,
               setTrack: () => {
+                playerControls.setSubtitleTrack(subIdx);
+                router.setParams({ subtitleIndex: String(sub.Index) });
+              },
+            });
+            subIdx++;
+          } else if (sub.Index === downloadedSubtitleIndex) {
+            // This image-based sub was burned in - show it but indicate it's active
+            subs.push({
+              name: `${sub.DisplayTitle || "Unknown"} (burned in)`,
+              index: sub.Index ?? -1,
+              mpvIndex: -1, // Can't be changed
+              setTrack: () => {
+                // Already burned in, just update params
                 router.setParams({ subtitleIndex: String(sub.Index) });
-                void applyMpvSubtitleSelection(playerControls, {
-                  subtitleStreams: allSubs,
-                  jellyfinSubtitleIndex: sub.Index ?? -1,
-                  getExpectedExternalUrl: (s) => {
-                    if (!s.DeliveryUrl) return undefined;
-                    if (offline) return s.DeliveryUrl;
-                    return api?.basePath
-                      ? `${api.basePath}${s.DeliveryUrl}`
-                      : undefined;
-                  },
-                });
               },
             });
           }
         }
 
-        commitSubtitleTracks(subs);
+        setSubtitleTracks(subs.sort((a, b) => a.index - b.index));
         return;
       }
 
       // MPV track handling
       const audioData = await playerControls.getAudioTracks().catch(() => null);
-      if (cancelled) return;
       const playerAudio = (audioData as MpvAudioTrack[]) ?? [];
 
+      // Separate embedded vs external subtitles from Jellyfin's list
+      // MPV orders tracks as: [all embedded, then all external]
+      const embeddedSubs = allSubs.filter(
+        (s) => s.DeliveryMethod === SubtitleDeliveryMethod.Embed,
+      );
+      const externalSubs = allSubs.filter(
+        (s) => s.DeliveryMethod === SubtitleDeliveryMethod.External,
+      );
+
+      // Count embedded subs that will be in MPV
+      // (excludes image-based subs during transcoding as they're burned in)
+      const embeddedInPlayer = embeddedSubs.filter(
+        (s) => !isTranscoding || !isImageBasedSubtitle(s),
+      );
+
       const subs: Track[] = [];
 
-      // Process all Jellyfin subtitles. Selection resolves against MPV's real
-      // track list by identity (applyMpvSubtitleSelection) — never positional
-      // index math, which mis-selects across external/embedded reordering and
-      // server-hidden embedded subs (#954/#1690/#618/#1467/#976/#1451).
-      // Order matches jellyfin-web (embedded first, externals last, forced/default up).
-      for (const sub of [...allSubs].sort(compareTracksForMenu)) {
-        // Image-based subs during transcoding are burned into the video by the
-        // server; both switching TO one and switching AWAY from a currently
-        // active one require a player refresh (re-transcode), not a track change.
-        const needsReplace =
-          isTranscoding &&
-          (isImageBasedSubtitle(sub) || isCurrentSubImageBased);
+      // Process all Jellyfin subtitles
+      for (const sub of allSubs) {
+        const isEmbedded = sub.DeliveryMethod === SubtitleDeliveryMethod.Embed;
+        const isExternal =
+          sub.DeliveryMethod === SubtitleDeliveryMethod.External;
+
+        // For image-based subs during transcoding, need to refresh player
+        if (isTranscoding && isImageBasedSubtitle(sub)) {
+          subs.push({
+            name: sub.DisplayTitle || "Unknown",
+            index: sub.Index ?? -1,
+            mpvIndex: -1,
+            setTrack: () => {
+              replacePlayer({ subtitleIndex: String(sub.Index) });
+            },
+          });
+          continue;
+        }
+
+        // Calculate MPV track ID based on type
+        // MPV IDs: [1..embeddedCount] for embedded, [embeddedCount+1..] for external
+        let mpvId = -1;
+
+        if (isEmbedded) {
+          // Find position among embedded subs that are in player
+          const embeddedPosition = embeddedInPlayer.findIndex(
+            (s) => s.Index === sub.Index,
+          );
+          if (embeddedPosition !== -1) {
+            mpvId = embeddedPosition + 1; // 1-based ID
+          }
+        } else if (isExternal) {
+          // Find position among external subs, offset by embedded count
+          const externalPosition = externalSubs.findIndex(
+            (s) => s.Index === sub.Index,
+          );
+          if (externalPosition !== -1) {
+            mpvId = embeddedInPlayer.length + externalPosition + 1;
+          }
+        }
 
         subs.push({
           name: sub.DisplayTitle || "Unknown",
           index: sub.Index ?? -1,
-          mpvIndex: -1,
+          mpvIndex: mpvId,
           setTrack: () => {
-            if (needsReplace) {
+            // Transcoding + switching to/from image-based sub
+            if (
+              isTranscoding &&
+              (isImageBasedSubtitle(sub) || isCurrentSubImageBased)
+            ) {
               replacePlayer({ subtitleIndex: String(sub.Index) });
               return;
             }
-            router.setParams({ subtitleIndex: String(sub.Index) });
-            void applyMpvSubtitleSelection(playerControls, {
-              subtitleStreams: allSubs,
-              jellyfinSubtitleIndex: sub.Index ?? -1,
-              // Mirror how external subs are loaded into MPV (online: basePath +
-              // DeliveryUrl, offline: local DeliveryUrl) so identity matching by
-              // external-filename lines up.
-              getExpectedExternalUrl: (s) => {
-                if (!s.DeliveryUrl) return undefined;
-                if (offline) return s.DeliveryUrl;
-                return api?.basePath
-                  ? `${api.basePath}${s.DeliveryUrl}`
-                  : undefined;
-              },
-            });
+
+            // Direct switch in player
+            if (mpvId !== -1) {
+              playerControls.setSubtitleTrack(mpvId);
+              router.setParams({ subtitleIndex: String(sub.Index) });
+              return;
+            }
+
+            // Fallback - refresh player
+            replacePlayer({ subtitleIndex: String(sub.Index) });
           },
         });
       }
@@ -367,29 +374,12 @@ export const VideoProvider: React.FC<{ children: ReactNode }> = ({
         }
       }
 
-      // Already in jellyfin-web order (sorted iteration above); "Disable" stays
-      // at the front (unshifted), local downloaded subs at the end.
-      commitSubtitleTracks(subs);
-      commitAudioTracks(audio);
+      setSubtitleTracks(subs.sort((a, b) => a.index - b.index));
+      setAudioTracks(audio);
     };
 
     fetchTracks();
-    return () => {
-      cancelled = true;
-    };
-    // api?.basePath: setTrack builds external-sub URLs from it — rebuild once the
-    // API is ready so online externals don't resolve with undefined.
-    // isCurrentSubImageBased: setTrack closes over it for the transcode replacePlayer
-    // decision — rebuild when it flips so we refresh the stream when we should.
-  }, [
-    tracksReady,
-    mediaSource,
-    offline,
-    downloadedItem,
-    itemId,
-    api?.basePath,
-    isCurrentSubImageBased,
-  ]);
+  }, [tracksReady, mediaSource, offline, downloadedItem, itemId]);
 
   return (
     <VideoContext.Provider value={{ subtitleTracks, audioTracks }}>

constants/Languages.ts

@@ -0,0 +1,39 @@
+import type { DefaultLanguageOption } from "@/utils/atoms/settings";
+
+export const LANGUAGES: DefaultLanguageOption[] = [
+  { label: "English", value: "eng" },
+  { label: "Spanish", value: "spa" },
+  { label: "Chinese (Mandarin)", value: "cmn" },
+  { label: "Hindi", value: "hin" },
+  { label: "Arabic", value: "ara" },
+  { label: "French", value: "fra" },
+  { label: "Russian", value: "rus" },
+  { label: "Portuguese", value: "por" },
+  { label: "Japanese", value: "jpn" },
+  { label: "German", value: "deu" },
+  { label: "Italian", value: "ita" },
+  { label: "Korean", value: "kor" },
+  { label: "Turkish", value: "tur" },
+  { label: "Dutch", value: "nld" },
+  { label: "Polish", value: "pol" },
+  { label: "Vietnamese", value: "vie" },
+  { label: "Thai", value: "tha" },
+  { label: "Indonesian", value: "ind" },
+  { label: "Greek", value: "ell" },
+  { label: "Swedish", value: "swe" },
+  { label: "Danish", value: "dan" },
+  { label: "Norwegian", value: "nor" },
+  { label: "Finnish", value: "fin" },
+  { label: "Czech", value: "ces" },
+  { label: "Hungarian", value: "hun" },
+  { label: "Romanian", value: "ron" },
+  { label: "Ukrainian", value: "ukr" },
+  { label: "Hebrew", value: "heb" },
+  { label: "Bengali", value: "ben" },
+  { label: "Punjabi", value: "pan" },
+  { label: "Tagalog", value: "tgl" },
+  { label: "Swahili", value: "swa" },
+  { label: "Malay", value: "msa" },
+  { label: "Persian", value: "fas" },
+  { label: "Urdu", value: "urd" },
+];

constants/MediaTypes.js

@@ -3,13 +3,9 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-const MediaTypes = {
+export default {
   Audio: "Audio",
   Video: "Video",
   Photo: "Photo",
   Book: "Book",
-} as const;
-
-export type MediaType = (typeof MediaTypes)[keyof typeof MediaTypes];
-
-export default MediaTypes;
+};

docs/tv-discovery.md

@@ -28,7 +28,7 @@ Apple TV uses a Top Shelf extension target, not the main app process.
 
 Relevant files:
 
-- [plugins/withTVOSTopShelf.ts](../plugins/withTVOSTopShelf.ts)
+- [plugins/withTVOSTopShelf.js](../plugins/withTVOSTopShelf.js)
 - [targets/StreamyfinTopShelf/TopShelfProvider.swift](../targets/StreamyfinTopShelf/TopShelfProvider.swift)
 - [modules/top-shelf-cache/ios/TopShelfCacheModule.swift](../modules/top-shelf-cache/ios/TopShelfCacheModule.swift)
 - [utils/topshelf/cache.ts](../utils/topshelf/cache.ts)

eas.json

@@ -52,7 +52,7 @@
       }
     },
     "production": {
-      "bun": "1.3.14",
+      "bun": "1.3.5",
       "environment": "production",
       "autoIncrement": true,
       "android": {
@@ -64,7 +64,7 @@
       }
     },
     "production-apk": {
-      "bun": "1.3.14",
+      "bun": "1.3.5",
       "environment": "production",
       "autoIncrement": true,
       "android": {
@@ -74,7 +74,7 @@
       }
     },
     "production-apk-tv": {
-      "bun": "1.3.14",
+      "bun": "1.3.5",
       "environment": "production",
       "autoIncrement": true,
       "android": {
@@ -87,7 +87,7 @@
       }
     },
     "production_tv": {
-      "bun": "1.3.14",
+      "bun": "1.3.5",
       "environment": "production",
       "autoIncrement": true,
       "env": {

hooks/useControlsVisibility.ts

@@ -0,0 +1,37 @@
+import { useCallback, useEffect, useRef } from "react";
+import { useSharedValue } from "react-native-reanimated";
+
+export const useControlsVisibility = (timeout = 3000) => {
+  const opacity = useSharedValue(1);
+
+  const hideControlsTimerRef = useRef<ReturnType<typeof setTimeout> | null>(
+    null,
+  );
+
+  const showControls = useCallback(() => {
+    opacity.value = 1;
+    if (hideControlsTimerRef.current) {
+      clearTimeout(hideControlsTimerRef.current);
+    }
+    hideControlsTimerRef.current = setTimeout(() => {
+      opacity.value = 0;
+    }, timeout);
+  }, [timeout]);
+
+  const hideControls = useCallback(() => {
+    opacity.value = 0;
+    if (hideControlsTimerRef.current) {
+      clearTimeout(hideControlsTimerRef.current);
+    }
+  }, []);
+
+  useEffect(() => {
+    return () => {
+      if (hideControlsTimerRef.current) {
+        clearTimeout(hideControlsTimerRef.current);
+      }
+    };
+  }, []);
+
+  return { opacity, showControls, hideControls };
+};

hooks/useDownloadedFileOpener.ts

@@ -0,0 +1,51 @@
+import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client";
+import { useCallback } from "react";
+import useRouter from "@/hooks/useAppRouter";
+import { getDownloadedItemById } from "@/providers/Downloads/database";
+import { usePlaySettings } from "@/providers/PlaySettingsProvider";
+import { writeToLog } from "@/utils/log";
+
+export const useDownloadedFileOpener = () => {
+  const router = useRouter();
+  const { setPlayUrl, setOfflineSettings } = usePlaySettings();
+
+  const openFile = useCallback(
+    async (item: BaseItemDto) => {
+      if (!item.Id) {
+        writeToLog("ERROR", "Attempted to open a file without an ID.");
+        console.error("Attempted to open a file without an ID.");
+        return;
+      }
+      const downloadedItem = getDownloadedItemById(item.Id);
+      const queryParams = new URLSearchParams({
+        itemId: item.Id,
+        offline: "true",
+        playbackPosition:
+          item.UserData?.PlaybackPositionTicks?.toString() ?? "0",
+      });
+
+      if (downloadedItem?.userData?.audioStreamIndex !== undefined) {
+        queryParams.set(
+          "audioIndex",
+          downloadedItem.userData.audioStreamIndex.toString(),
+        );
+      }
+      if (downloadedItem?.userData?.subtitleStreamIndex !== undefined) {
+        queryParams.set(
+          "subtitleIndex",
+          downloadedItem.userData.subtitleStreamIndex.toString(),
+        );
+      }
+
+      try {
+        router.push(`/player/direct-player?${queryParams.toString()}`);
+      } catch (error) {
+        writeToLog("ERROR", "Error opening file", error);
+        console.error("Error opening file:", error);
+      }
+    },
+    [setOfflineSettings, setPlayUrl, router],
+  );
+
+  return { openFile };
+};

hooks/useImageColors.ts

@@ -0,0 +1,120 @@
+import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client";
+import { useAtom, useAtomValue } from "jotai";
+import { useEffect, useMemo } from "react";
+import { Platform } from "react-native";
+import type * as ImageColorsType from "react-native-image-colors";
+import { apiAtom } from "@/providers/JellyfinProvider";
+
+// Conditionally import react-native-image-colors only on non-TV platforms
+const ImageColors = Platform.isTV
+  ? null
+  : (require("react-native-image-colors") as typeof ImageColorsType);
+
+import {
+  adjustToNearBlack,
+  calculateTextColor,
+  isCloseToBlack,
+  itemThemeColorAtom,
+} from "@/utils/atoms/primaryColor";
+import { getItemImage } from "@/utils/getItemImage";
+import { storage } from "@/utils/mmkv";
+
+/**
+ * Custom hook to extract and manage image colors for a given item.
+ *
+ * @param item - The BaseItemDto object representing the item.
+ * @param disabled - A boolean flag to disable color extraction.
+ *
+ */
+export const useImageColors = ({
+  item,
+  url,
+  disabled,
+}: {
+  item?: BaseItemDto | null;
+  url?: string | null;
+  disabled?: boolean;
+}) => {
+  const api = useAtomValue(apiAtom);
+  const [, setPrimaryColor] = useAtom(itemThemeColorAtom);
+
+  const isTv = Platform.isTV;
+
+  const source = useMemo(() => {
+    if (!api) return;
+    if (url) return { uri: url };
+    if (item)
+      return getItemImage({
+        item,
+        api,
+        variant: "Primary",
+        quality: 80,
+        width: 300,
+      });
+    return null;
+  }, [api, item, url]);
+
+  useEffect(() => {
+    if (isTv) return;
+    if (disabled) return;
+    if (source?.uri) {
+      const _primary = storage.getString(`${source.uri}-primary`);
+      const _text = storage.getString(`${source.uri}-text`);
+
+      if (_primary && _text) {
+        setPrimaryColor({
+          primary: _primary,
+          text: _text,
+        });
+        return;
+      }
+
+      // Extract colors from the image
+      if (!ImageColors?.getColors) return;
+
+      ImageColors.getColors(source.uri, {
+        fallback: "#fff",
+        cache: false,
+      })
+        .then((colors: ImageColorsType.ImageColorsResult) => {
+          let primary = "#fff";
+          let text = "#000";
+          let backup = "#fff";
+
+          // Select the appropriate color based on the platform
+          if (colors.platform === "android") {
+            primary = colors.dominant;
+            backup = colors.vibrant;
+          } else if (colors.platform === "ios") {
+            primary = colors.detail;
+            backup = colors.primary;
+          }
+
+          // Adjust the primary color if it's too close to black
+          if (primary && isCloseToBlack(primary)) {
+            if (backup && !isCloseToBlack(backup)) primary = backup;
+            primary = adjustToNearBlack(primary);
+          }
+
+          // Calculate the text color based on the primary color
+          if (primary) text = calculateTextColor(primary);
+
+          setPrimaryColor({
+            primary,
+            text,
+          });
+
+          // Cache the colors in storage
+          if (source.uri && primary) {
+            storage.set(`${source.uri}-primary`, primary);
+            storage.set(`${source.uri}-text`, text);
+          }
+        })
+        .catch((error: any) => {
+          console.error("Error getting colors", error);
+        });
+    }
+  }, [isTv, source?.uri, setPrimaryColor, disabled]);
+
+  if (isTv) return;
+};

hooks/usePlaybackManager.ts

@@ -191,6 +191,20 @@ export const usePlaybackManager = ({
                 : playedPercentage,
           },
         },
+        // Sync selected audio/subtitle tracks so next playback resumes with
+        // the same tracks the user had active — but only for non-transcoded
+        // downloads where the user can freely switch tracks.
+        userData: localItem.userData.isTranscoded
+          ? localItem.userData
+          : {
+              ...localItem.userData,
+              audioStreamIndex:
+                playbackProgressInfo.AudioStreamIndex ??
+                localItem.userData.audioStreamIndex,
+              subtitleStreamIndex:
+                playbackProgressInfo.SubtitleStreamIndex ??
+                localItem.userData.subtitleStreamIndex,
+            },
       });
       // Force invalidate queries so they refetch from updated local database
       queryClient.invalidateQueries({ queryKey: ["item", itemId] });

hooks/useTVBackHandler.ts

@@ -4,42 +4,41 @@ import { Platform } from "react-native";
 import {
   disableTVMenuKeyInterception,
   enableTVMenuKeyInterception,
-  useTVBackPress,
 } from "./useTVBackPress";
 
 export { enableTVMenuKeyInterception } from "./useTVBackPress";
 
-/** All tab route names used in the bottom tab navigator. */
-export const TAB_ROUTES = [
-  "(home)",
-  "(search)",
-  "(favorites)",
-  "(libraries)",
-  "(watchlists)",
-  "(custom-links)",
-  "(settings)",
-] as const;
-
-export type TabRoute = (typeof TAB_ROUTES)[number];
-
-/** Check if a segment string is a tab route. */
-export function isTabRoute(s: string): s is TabRoute {
-  return (TAB_ROUTES as readonly string[]).includes(s);
-}
-
 /**
  * Check if we're at the root of a tab
  */
 function isAtTabRoot(segments: string[]): boolean {
   const lastSegment = segments[segments.length - 1];
-  return isTabRoute(lastSegment) || lastSegment === "index";
+  const tabNames = [
+    "(home)",
+    "(search)",
+    "(favorites)",
+    "(libraries)",
+    "(watchlists)",
+    "(settings)",
+    "(custom-links)",
+  ];
+  return tabNames.includes(lastSegment) || lastSegment === "index";
 }
 
 /**
  * Get the current tab name from segments
  */
-function getCurrentTab(segments: string[]): TabRoute | undefined {
-  return segments.find(isTabRoute);
+function getCurrentTab(segments: string[]): string | undefined {
+  return segments.find(
+    (s) =>
+      s === "(home)" ||
+      s === "(search)" ||
+      s === "(favorites)" ||
+      s === "(libraries)" ||
+      s === "(watchlists)" ||
+      s === "(settings)" ||
+      s === "(custom-links)",
+  );
 }
 
 /**
@@ -50,6 +49,7 @@ function getCurrentTab(segments: string[]): TabRoute | undefined {
 export function useTVHomeBackHandler() {
   const segments = useSegments();
 
+  // Get current state
   const currentTab = getCurrentTab(segments);
   const atTabRoot = isAtTabRoot(segments);
   const isOnHomeRoot = atTabRoot && currentTab === "(home)";
@@ -65,24 +65,3 @@ export function useTVHomeBackHandler() {
     enableTVMenuKeyInterception();
   }, [isOnHomeRoot]);
 }
-
-/**
- * Handles back press at a non-Home tab root on Android TV by navigating to Home.
- *
- * Without NativeTabs, the Stack navigator used for the Android TV nav bar has no
- * built-in tab-level back handling — pressing back at a tab root would pop the
- * Stack entirely and exit the tab navigator. This hook intercepts that and routes
- * to Home instead.
- */
-export function useTVTabRootBackHandler(
-  onNavigateHome: () => void,
-  isAtTabRoot: boolean,
-  currentTab: string | undefined,
-) {
-  useTVBackPress(() => {
-    if (!Platform.isTV || Platform.OS !== "android") return false;
-    if (!isAtTabRoot || currentTab === "(home)") return false;
-    onNavigateHome();
-    return true;
-  }, [isAtTabRoot, currentTab, onNavigateHome]);
-}

hooks/useWifiSSID.ts

@@ -53,6 +53,7 @@ export function useWifiSSID(): UseWifiSSIDReturn {
   const fetchSSID = useCallback(async () => {
     if (Platform.isTV) return;
     const result = await getSSID();
+    console.log("[WiFi Debug] Native module SSID:", result);
     setSSID(result);
   }, []);
 

modules/background-downloader/android/src/main/AndroidManifest.xml

@@ -2,8 +2,7 @@
   <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
   <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
   <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
-  <uses-permission android:name="android.permission.WAKE_LOCK" />
-
+  
   <application>
     <service
       android:name=".DownloadService"

modules/background-downloader/android/src/main/java/expo/modules/backgrounddownloader/DownloadService.kt

@@ -9,7 +9,6 @@ import android.content.pm.ServiceInfo
 import android.os.Binder
 import android.os.Build
 import android.os.IBinder
-import android.os.PowerManager
 import android.os.SystemClock
 import android.util.Log
 import androidx.core.app.NotificationCompat
@@ -28,7 +27,6 @@ class DownloadService : Service() {
   private var currentDownloadTitle = "Preparing download..."
   private var currentProgress = 0
   private var isForegroundStarted = false
-  private var wakeLock: PowerManager.WakeLock? = null
 
   inner class DownloadServiceBinder : Binder() {
     fun getService(): DownloadService = this@DownloadService
@@ -38,12 +36,6 @@ class DownloadService : Service() {
     super.onCreate()
     Log.d(TAG, "DownloadService created")
     createNotificationChannel()
-
-    val pm = getSystemService(PowerManager::class.java)
-    wakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "Streamyfin::DownloadWakeLock")
-    wakeLock?.acquire()
-
-    Log.d(TAG, "Wake lock acquired")
   }
 
   override fun onBind(intent: Intent?): IBinder {
@@ -101,8 +93,6 @@ class DownloadService : Service() {
   }
   
   override fun onDestroy() {
-    wakeLock?.let { if (it.isHeld) it.release() }
-    Log.d(TAG, "Wake lock released")
     Log.d(TAG, "DownloadService destroyed")
     super.onDestroy()
   }

modules/mpv-player/android/build.gradle

@@ -53,5 +53,5 @@ android {
 
 dependencies {
   // libmpv from Maven Central
-  implementation 'dev.jdtech.mpv:libmpv:1.0.0'
+  implementation 'dev.jdtech.mpv:libmpv:0.5.1'
 }

modules/mpv-player/android/src/main/java/expo/modules/mpvplayer/MPVLayerRenderer.kt

@@ -3,14 +3,13 @@ package expo.modules.mpvplayer
 import android.app.UiModeManager
 import android.content.Context
 import android.content.res.Configuration
-import android.os.Build
+import android.content.res.AssetManager
 import android.os.Handler
 import android.os.Looper
-import android.system.Os
 import android.util.Log
 import android.view.Surface
 import java.io.File
-import java.util.Locale
+import java.io.FileOutputStream
 
 /**
  * MPV renderer that wraps libmpv for video playback.
@@ -36,30 +35,6 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
         return uiModeManager.currentModeType == Configuration.UI_MODE_TYPE_TELEVISION
     }
 
-    /**
-     * True only on the Android emulator. Its goldfish/ranchu MediaCodec can't bind a
-     * decode output surface (decode opens with surface 0x0): HEVC then fails cleanly and
-     * mpv auto-falls-back to software, but H.264 "opens" deceptively and wedges the core
-     * (no fallback) — black video, then any command (seek/pause) deadlocks the UI thread
-     * → ANR. We force software decoding here.
-     *
-     * Only QEMU/SDK-exclusive signals are checked so a real device can never match — a
-     * false positive would needlessly drop shipping hardware to software decoding. The
-     * emulator reports ro.hardware=goldfish|ranchu, an sdk_* product, or a generic/
-     * emulator build fingerprint, none of which appear on real devices.
-     */
-    private fun isEmulator(): Boolean {
-        val hardware = Build.HARDWARE.lowercase()
-        if (hardware == "goldfish" || hardware == "ranchu") return true
-
-        val product = Build.PRODUCT
-        if (product == "sdk" || product.startsWith("sdk_")) return true
-
-        val fingerprint = Build.FINGERPRINT
-        return fingerprint.startsWith("generic") ||
-            fingerprint.contains("emulator", ignoreCase = true)
-    }
-
     interface Delegate {
         fun onPositionChanged(position: Double, duration: Double, cacheSeconds: Double)
         fun onPauseChanged(isPaused: Boolean)
@@ -76,15 +51,8 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
     
     private var surface: Surface? = null
     private var isRunning = false
-
-    // This renderer's own mpv handle. Per-instance (not singleton) — each
-    // player screen gets a fresh mpv handle and drops the reference on stop.
-    // We intentionally do NOT call a destroy() equivalent: libmpv 1.0's
-    // nativeDestroy has an internal use-after-free we can't fix from Kotlin,
-    // so we mirror Findroid and let the JVM GC + native finalization path
-    // reclaim resources. Only one player is alive at a time in this app.
-    private var mpv: MPVLib? = null
-
+    private var isStopping = false
+    
     // Cached state
     private var cachedPosition: Double = 0.0
     private var cachedDuration: Double = 0.0
@@ -144,108 +112,100 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
 
     fun start(voDriver: String = "gpu-next") {
         if (isRunning) return
-
+        
         try {
-            // Per-instance handle — see class-level comment. Each player gets
-            // its own mpv; we drop the reference in stop().
-            val mpv = MPVLib.create(context)
-            this.mpv = mpv
-            mpv.addObserver(this)
-
-            // Resolved once — TV gets the memory-pressure customizations
-            // (SCUDO_OPTIONS, hwdec/profile, demuxer-seekable-cache, larger
-            // audio-buffer) that would be counterproductive on higher-RAM
-            // mobile devices. Demuxer cache sizes are NOT included here —
-            // those come from user settings via load().
-            val isTV = isTvDevice()
-
-            // mpv config directory — used by the config-dir option below and
-            // as XDG_CONFIG_HOME for fontconfig.
+            MPVLib.create(context)
+            MPVLib.addObserver(this)
+            
+            /**
+             * Create mpv config directory and copy font files to ensure SubRip subtitles load properly on Android.
+             *
+             * Technical Background:
+             * ====================
+             * On Android, mpv requires access to a font file to render text-based subtitles, particularly SubRip (.srt)
+             * format subtitles. Without an available font in the config directory, mpv will fail to display subtitles
+             * even when subtitle tracks are properly detected and loaded.
+             *
+             * Why This Is Necessary:
+             * =====================
+             * 1. Android's font system is isolated from native libraries like mpv. While Android has system fonts,
+             *    mpv cannot access them directly due to sandboxing and library isolation.
+             *
+             * 2. SubRip subtitles require a font to render text overlay on video. When no font is available in the
+             *    configured directory, mpv either:
+             *    - Fails silently (subtitles don't appear)
+             *    - Falls back to a default font that may not support the required character set
+             *    - Crashes or produces rendering errors
+             *
+             * 3. By placing a font file (font.ttf) in mpv's config directory and setting that directory via
+             *    MPVLib.setOptionString("config-dir", ...), we ensure mpv has a known, accessible font source.
+             *
+             * Reference:
+             * =========
+             * This workaround is documented in the mpv-android project:
+             * https://github.com/mpv-android/mpv-android/issues/96
+             *
+             * The issue discusses that without a font in the config directory, SubRip subtitles fail to load
+             * properly on Android, and the solution is to copy a font file to a known location that mpv can access.
+             */
+            // Create mpv config directory and copy font files
             val mpvDir = File(context.getExternalFilesDir(null) ?: context.filesDir, "mpv")
+            //Log.i(TAG, "mpv config dir: $mpvDir")
             if (!mpvDir.exists()) mpvDir.mkdirs()
-
-            // Point fontconfig (new in libmpv 1.0) at writable app dirs so it
-            // persists its font index across runs instead of re-walking
-            // /system/fonts on every subtitle/seek event. Each rebuild costs
-            // ~1-2 s and ~10-30 MB of scudo:primary memory that scudo then
-            // holds onto. Without this we see "No usable fontconfig
-            // configuration file found, using fallback" on every re-init.
-            try {
-                val cacheDir = context.cacheDir.absolutePath
-                val configDir = (context.getExternalFilesDir(null) ?: context.filesDir).absolutePath
-                Os.setenv("XDG_CACHE_HOME", cacheDir, true)
-                Os.setenv("XDG_CONFIG_HOME", configDir, true)
-                Os.setenv("HOME", configDir, true)
-            } catch (e: Exception) {
-                Log.w(TAG, "Could not set XDG/HOME env for fontconfig: ${e.message}")
+            // This needs to be named `subfont.ttf` else it won't work
+            arrayOf("subfont.ttf").forEach { fileName ->
+                val file = File(mpvDir, fileName)
+                if (file.exists()) return@forEach
+                context.assets
+                    .open(fileName, AssetManager.ACCESS_STREAMING)
+                    .copyTo(FileOutputStream(file))
             }
-
-            mpv?.setOptionString("config", "yes")
-            mpv?.setOptionString("config-dir", mpvDir.path)
+            MPVLib.setOptionString("config", "yes")
+            MPVLib.setOptionString("config-dir", mpvDir.path)
             
             // Configure mpv options before initialization (based on Findroid)
             this.voDriver = voDriver
-            mpv?.setOptionString("vo", voDriver)
-            mpv?.setOptionString("gpu-context", "android")
-            mpv?.setOptionString("opengl-es", "yes")
+            MPVLib.setOptionString("vo", voDriver)
+            MPVLib.setOptionString("gpu-context", "android")
+            MPVLib.setOptionString("opengl-es", "yes")
             
-            // Hardware decoder codecs (shared)
-            mpv?.setOptionString("hwdec-codecs", "h264,hevc,mpeg4,mpeg2video,vp8,vp9,av1")
-
-            // Pause on initial cache fill (shared default). The actual
-            // cache mode, cache-secs, and demuxer cache sizes come from
-            // user preferences and are applied per-load in load().
-            mpv?.setOptionString("cache-pause-initial", "yes")
-
-            // Hardware decode path + TV-only memory options. Demuxer cache
-            // sizes and cache-secs are NOT set here — they come from user
-            // preferences via load().
-            //  - Emulator: software decode. Its MediaCodec can't bind an
-            //    output surface (surface 0x0); HEVC then fails cleanly and
-            //    mpv auto-falls-back to software, but H.264 "opens"
-            //    deceptively and wedges the core with no fallback (black
-            //    video, then any command — seek/pause — deadlocks the UI
-            //    thread → ANR). hwdec=no makes every codec render via the
-            //    gpu-next VO. Real devices unaffected.
-            //  - Real TV hardware: zero-copy `mediacodec` (fastest on
-            //    low-power devices) + fast profile.
-            //  - Real phone: `mediacodec-copy` (broadest compatibility).
-            when {
-                isEmulator() -> mpv?.setOptionString("hwdec", "no")
-                isTV -> {
-                    mpv?.setOptionString("hwdec", "mediacodec")
-                    mpv?.setOptionString("profile", "fast")
-                    // Don't retain already-played content for backward
-                    // seeking over a network source — Jellyfin can re-fetch
-                    // on demand. Saves up to ~30 MiB on long seeks and
-                    // reduces swap pressure.
-                    mpv?.setOptionString("demuxer-seekable-cache", "no")
-                    // Larger audio buffer to absorb page-fault stalls
-                    // (default ~0.2s). Cheap insurance against the audio
-                    // underruns that happen when the kernel is swap-thrashing.
-                    mpv?.setOptionString("audio-buffer", "0.5")
-                }
-                else -> mpv?.setOptionString("hwdec", "mediacodec-copy")
+            // Hardware video decoding
+            // TV: zero-copy (mediacodec) for better performance on low-power devices
+            // Mobile: copy mode (mediacodec-copy) for better compatibility
+            val isTV = isTvDevice()
+            if (isTV) {
+                MPVLib.setOptionString("hwdec", "mediacodec")
+                MPVLib.setOptionString("profile", "fast")
+            } else {
+                MPVLib.setOptionString("hwdec", "mediacodec-copy")
             }
+            MPVLib.setOptionString("hwdec-codecs", "h264,hevc,mpeg4,mpeg2video,vp8,vp9,av1")
+            
+            // Cache settings for better network streaming
+            MPVLib.setOptionString("cache", "yes")
+            MPVLib.setOptionString("cache-pause-initial", "yes")
+            MPVLib.setOptionString("demuxer-max-bytes", "150MiB")
+            MPVLib.setOptionString("demuxer-max-back-bytes", "75MiB")
+            MPVLib.setOptionString("demuxer-readahead-secs", "20")
             
             // Seeking optimization - faster seeking at the cost of less precision
             // Use keyframe seeking by default (much faster for network streams)
-            mpv?.setOptionString("hr-seek", "no")
+            MPVLib.setOptionString("hr-seek", "no")
             // Drop frames during seeking for faster response
-            mpv?.setOptionString("hr-seek-framedrop", "yes")
+            MPVLib.setOptionString("hr-seek-framedrop", "yes")
             
             // Subtitle settings
-            mpv?.setOptionString("sub-scale-with-window", "no")
-            mpv?.setOptionString("sub-use-margins", "no")
-            mpv?.setOptionString("subs-match-os-language", "yes")
-            mpv?.setOptionString("subs-fallback", "yes")
+            MPVLib.setOptionString("sub-scale-with-window", "no")
+            MPVLib.setOptionString("sub-use-margins", "no")
+            MPVLib.setOptionString("subs-match-os-language", "yes")
+            MPVLib.setOptionString("subs-fallback", "yes")
             
             // Important: Start with force-window=no, will be set to yes when surface is attached
-            mpv?.setOptionString("force-window", "no")
-            mpv?.setOptionString("keep-open", "always")
-
-            mpv.initialize()
-
+            MPVLib.setOptionString("force-window", "no")
+            MPVLib.setOptionString("keep-open", "always")
+            
+            MPVLib.initialize()
+            
             // Observe properties
             observeProperties()
             
@@ -258,68 +218,21 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
     }
     
     fun stop() {
+        if (isStopping) return
         if (!isRunning) return
+        
+        isStopping = true
         isRunning = false
-
-        val m = mpv
-        mpv = null
-
-        // Clear cached media state on the main thread so the next player
-        // screen doesn't observe stale position/duration values during the
-        // (async) teardown below.
-        currentUrl = null
-        currentHeaders = null
-        pendingExternalSubtitles = emptyList()
-        initialSubtitleId = null
-        initialAudioId = null
-        cachedPosition = 0.0
-        cachedDuration = 0.0
-        cachedCacheSeconds = 0.0
-
-        if (m == null) return
-
-        // Teardown runs on a background daemon thread. mpv's "stop" command
-        // flushes the demuxer queue and releases the MediaCodec hardware
-        // decoder — synchronous JNI work that can block for hundreds of ms
-        // on TV hardware. Running it on the main thread produced a visible
-        // delay/stutter between pressing "exit" and the confirm alert
-        // appearing. The local `m` keeps the MPVLib instance alive for the
-        // lifetime of this thread even though we've already nulled `mpv`.
-        Thread {
-            // Drop force-window BEFORE issuing stop. With keep-open=always +
-            // force-window=yes, mpv tears down the decoder at stop time but
-            // tries to keep the VO alive — which fires an internal
-            // video-reconfig. On libmpv 1.0's gpu-next/android backend that
-            // reconfig path crashes with "Missing surface pointer" because we
-            // detach the Surface below before mpv's worker reaches the
-            // reconfig step (command() is async). Setting force-window=no
-            // first makes mpv tear VO down cleanly instead of attempting a
-            // doomed re-init, eliminating the fatal VO error and the
-            // "playback won't restart" aftermath.
-            try {
-                m.setOptionString("force-window", "no")
-            } catch (e: Exception) {
-                Log.e(TAG, "Error clearing force-window: ${e.message}")
-            }
-            try {
-                // Stop playback — flushes demuxer queue and signals MediaCodec
-                // to release its hardware decoders. This is the bulk of what
-                // we can reclaim without calling destroy().
-                m.command(arrayOf("stop"))
-            } catch (e: Exception) {
-                Log.e(TAG, "Error stopping mpv playback: ${e.message}")
-            }
-            try {
-                m.removeObserver(this)
-            } catch (e: Exception) {
-                Log.e(TAG, "Error removing mpv observer: ${e.message}")
-            }
-            try {
-                m.detachSurface()
-            } catch (e: Exception) {
-                Log.e(TAG, "Error detaching mpv surface: ${e.message}")
-            }
-        }.also { it.isDaemon = true }.start()
+        
+        try {
+            MPVLib.removeObserver(this)
+            MPVLib.detachSurface()
+            MPVLib.destroy()
+        } catch (e: Exception) {
+            Log.e(TAG, "Error stopping MPV: ${e.message}")
+        }
+        
+        isStopping = false
     }
     
     /**
@@ -334,10 +247,10 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
         this.surface = surface
         Log.i(TAG, "[PiP] attachSurface — isRunning=$isRunning, vo=$voDriver, surface=${surface.hashCode()}")
         if (isRunning) {
-            mpv?.attachSurface(surface)
-            mpv?.setOptionString("force-window", "yes")
+            MPVLib.attachSurface(surface)
+            MPVLib.setOptionString("force-window", "yes")
             // Read back vo to confirm it's still active
-            val activeVo = try { mpv?.getPropertyString("vo") } catch (e: Exception) { null }
+            val activeVo = try { MPVLib.getPropertyString("vo") } catch (e: Exception) { null }
             Log.i(TAG, "[PiP] attachSurface — attached, activeVo=$activeVo")
         }
     }
@@ -357,8 +270,8 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
         this.surface = null
         Log.i(TAG, "[PiP] detachSurface — isRunning=$isRunning, vo=$voDriver")
         if (isRunning) {
-            mpv?.detachSurface()
-            val activeVo = try { mpv?.getPropertyString("vo") } catch (e: Exception) { null }
+            MPVLib.detachSurface()
+            val activeVo = try { MPVLib.getPropertyString("vo") } catch (e: Exception) { null }
             Log.i(TAG, "[PiP] detachSurface — detached, activeVo=$activeVo (should still be $voDriver)")
         }
     }
@@ -369,7 +282,7 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
      */
     fun updateSurfaceSize(width: Int, height: Int) {
         if (isRunning) {
-            mpv?.setPropertyString("android-surface-size", "${width}x$height")
+            MPVLib.setPropertyString("android-surface-size", "${width}x$height")
             Log.i(TAG, "[PiP] updateSurfaceSize — ${width}x${height}")
         } else {
             Log.w(TAG, "[PiP] updateSurfaceSize — called but renderer not running")
@@ -385,9 +298,9 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
         if (!isRunning) return
         val pos = cachedPosition
         Log.i(TAG, "[PiP] forceRedraw — stepping frame then seeking to $pos")
-        mpv?.command(arrayOf("frame-step"))
+        MPVLib.command(arrayOf("frame-step"))
         if (pos > 0) {
-            mpv?.command(arrayOf("seek", pos.toString(), "absolute"))
+            MPVLib.command(arrayOf("seek", pos.toString(), "absolute"))
         }
     }
     
@@ -397,43 +310,29 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
         startPosition: Double? = null,
         externalSubtitles: List<String>? = null,
         initialSubtitleId: Int? = null,
-        initialAudioId: Int? = null,
-        cacheEnabled: String? = null,
-        cacheSeconds: Int? = null,
-        demuxerMaxBytes: Int? = null,
-        demuxerMaxBackBytes: Int? = null
+        initialAudioId: Int? = null
     ) {
         currentUrl = url
         currentHeaders = headers
         pendingExternalSubtitles = externalSubtitles ?: emptyList()
         this.initialSubtitleId = initialSubtitleId
         this.initialAudioId = initialAudioId
-
+        
         _isLoading = true
         isReadyToSeek = false
         mainHandler.post { delegate?.onLoadingChanged(true) }
-
+        
         // Stop previous playback
-        mpv?.command(arrayOf("stop"))
-
+        MPVLib.command(arrayOf("stop"))
+        
         // Set HTTP headers if provided
         updateHttpHeaders(headers)
-
-        // Apply cache/buffer settings from user preferences (mirrors iOS).
-        // These override the conservative defaults applied in start() so the
-        // TV/mobile settings screen actually takes effect on Android.
-        cacheEnabled?.let { mpv?.setOptionString("cache", it) }
-        cacheSeconds?.let { mpv?.setOptionString("cache-secs", it.toString()) }
-        demuxerMaxBytes?.let { mpv?.setOptionString("demuxer-max-bytes", "${it}MiB") }
-        demuxerMaxBackBytes?.let { mpv?.setOptionString("demuxer-max-back-bytes", "${it}MiB") }
         
-        // Set start position. mpv's time parser requires '.' as the decimal
-        // separator; use Locale.US so devices with other default locales
-        // (e.g. ',' as decimal separator) don't break resume-from-position.
+        // Set start position
         if (startPosition != null && startPosition > 0) {
-            mpv?.setPropertyString("start", String.format(Locale.US, "%.2f", startPosition))
+            MPVLib.setPropertyString("start", String.format("%.2f", startPosition))
         } else {
-            mpv?.setPropertyString("start", "0")
+            MPVLib.setPropertyString("start", "0")
         }
         
         // Set initial audio track if specified
@@ -453,7 +352,7 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
         }
         
         // Load the file
-        mpv?.command(arrayOf("loadfile", url, "replace"))
+        MPVLib.command(arrayOf("loadfile", url, "replace"))
     }
     
     fun reloadCurrentItem() {
@@ -469,29 +368,29 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
         }
         
         val headerString = headers.entries.joinToString("\r\n") { "${it.key}: ${it.value}" }
-        mpv?.setPropertyString("http-header-fields", headerString)
+        MPVLib.setPropertyString("http-header-fields", headerString)
     }
     
     private fun observeProperties() {
-        mpv?.observeProperty("duration", MPV_FORMAT_DOUBLE)
-        mpv?.observeProperty("time-pos", MPV_FORMAT_DOUBLE)
-        mpv?.observeProperty("pause", MPV_FORMAT_FLAG)
-        mpv?.observeProperty("track-list/count", MPV_FORMAT_INT64)
-        mpv?.observeProperty("paused-for-cache", MPV_FORMAT_FLAG)
-        mpv?.observeProperty("demuxer-cache-duration", MPV_FORMAT_DOUBLE)
+        MPVLib.observeProperty("duration", MPV_FORMAT_DOUBLE)
+        MPVLib.observeProperty("time-pos", MPV_FORMAT_DOUBLE)
+        MPVLib.observeProperty("pause", MPV_FORMAT_FLAG)
+        MPVLib.observeProperty("track-list/count", MPV_FORMAT_INT64)
+        MPVLib.observeProperty("paused-for-cache", MPV_FORMAT_FLAG)
+        MPVLib.observeProperty("demuxer-cache-duration", MPV_FORMAT_DOUBLE)
         // Video dimensions for PiP aspect ratio
-        mpv?.observeProperty("video-params/w", MPV_FORMAT_INT64)
-        mpv?.observeProperty("video-params/h", MPV_FORMAT_INT64)
+        MPVLib.observeProperty("video-params/w", MPV_FORMAT_INT64)
+        MPVLib.observeProperty("video-params/h", MPV_FORMAT_INT64)
     }
-
+    
     // MARK: - Playback Controls
     
     fun play() {
-        mpv?.setPropertyBoolean("pause", false)
+        MPVLib.setPropertyBoolean("pause", false)
     }
     
     fun pause() {
-        mpv?.setPropertyBoolean("pause", true)
+        MPVLib.setPropertyBoolean("pause", true)
     }
     
     fun togglePause() {
@@ -501,22 +400,22 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
     fun seekTo(seconds: Double) {
         val clamped = maxOf(0.0, seconds)
         cachedPosition = clamped
-        mpv?.command(arrayOf("seek", clamped.toString(), "absolute"))
+        MPVLib.command(arrayOf("seek", clamped.toString(), "absolute"))
     }
     
     fun seekBy(seconds: Double) {
         val newPosition = maxOf(0.0, cachedPosition + seconds)
         cachedPosition = newPosition
-        mpv?.command(arrayOf("seek", seconds.toString(), "relative"))
+        MPVLib.command(arrayOf("seek", seconds.toString(), "relative"))
     }
     
     fun setSpeed(speed: Double) {
         _playbackSpeed = speed
-        mpv?.setPropertyDouble("speed", speed)
+        MPVLib.setPropertyDouble("speed", speed)
     }
     
     fun getSpeed(): Double {
-        return mpv?.getPropertyDouble("speed") ?: _playbackSpeed
+        return MPVLib.getPropertyDouble("speed") ?: _playbackSpeed
     }
     
     // MARK: - Subtitle Controls
@@ -524,96 +423,85 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
     fun getSubtitleTracks(): List<Map<String, Any>> {
         val tracks = mutableListOf<Map<String, Any>>()
         
-        val trackCount = mpv?.getPropertyInt("track-list/count") ?: 0
+        val trackCount = MPVLib.getPropertyInt("track-list/count") ?: 0
         
         for (i in 0 until trackCount) {
-            val trackType = mpv?.getPropertyString("track-list/$i/type") ?: continue
+            val trackType = MPVLib.getPropertyString("track-list/$i/type") ?: continue
             if (trackType != "sub") continue
             
-            val trackId = mpv?.getPropertyInt("track-list/$i/id") ?: continue
+            val trackId = MPVLib.getPropertyInt("track-list/$i/id") ?: continue
             val track = mutableMapOf<String, Any>("id" to trackId)
-
-            mpv?.getPropertyString("track-list/$i/title")?.let { track["title"] = it }
-            mpv?.getPropertyString("track-list/$i/lang")?.let { track["lang"] = it }
-            mpv?.getPropertyString("track-list/$i/codec")?.let { track["codec"] = it }
-
-            // Identity fields used to map a Jellyfin subtitle to the real track
-            // (instead of fragile positional counting). `external` + `external-filename`
-            // uniquely identify a sub-added sidecar; `ff-index` aids embedded matching.
-            val external = mpv?.getPropertyBoolean("track-list/$i/external") ?: false
-            track["external"] = external
-            mpv?.getPropertyString("track-list/$i/external-filename")?.let {
-                track["externalFilename"] = it
-            }
-            mpv?.getPropertyInt("track-list/$i/ff-index")?.let { track["ffIndex"] = it }
-
-            val selected = mpv?.getPropertyBoolean("track-list/$i/selected") ?: false
+            
+            MPVLib.getPropertyString("track-list/$i/title")?.let { track["title"] = it }
+            MPVLib.getPropertyString("track-list/$i/lang")?.let { track["lang"] = it }
+            
+            val selected = MPVLib.getPropertyBoolean("track-list/$i/selected") ?: false
             track["selected"] = selected
-
+            
             tracks.add(track)
         }
-
+        
         return tracks
     }
     
     fun setSubtitleTrack(trackId: Int) {
         Log.i(TAG, "setSubtitleTrack: setting sid to $trackId")
         if (trackId < 0) {
-            mpv?.setPropertyString("sid", "no")
+            MPVLib.setPropertyString("sid", "no")
         } else {
-            mpv?.setPropertyInt("sid", trackId)
+            MPVLib.setPropertyInt("sid", trackId)
         }
     }
     
     fun disableSubtitles() {
-        mpv?.setPropertyString("sid", "no")
+        MPVLib.setPropertyString("sid", "no")
     }
     
     fun getCurrentSubtitleTrack(): Int {
-        return mpv?.getPropertyInt("sid") ?: 0
+        return MPVLib.getPropertyInt("sid") ?: 0
     }
     
     fun addSubtitleFile(url: String, select: Boolean = true) {
         val flag = if (select) "select" else "cached"
-        mpv?.command(arrayOf("sub-add", url, flag))
+        MPVLib.command(arrayOf("sub-add", url, flag))
     }
     
     // MARK: - Subtitle Positioning
     
     fun setSubtitlePosition(position: Int) {
-        mpv?.setPropertyInt("sub-pos", position)
+        MPVLib.setPropertyInt("sub-pos", position)
     }
     
     fun setSubtitleScale(scale: Double) {
-        mpv?.setPropertyDouble("sub-scale", scale)
+        MPVLib.setPropertyDouble("sub-scale", scale)
     }
     
     fun setSubtitleMarginY(margin: Int) {
-        mpv?.setPropertyInt("sub-margin-y", margin)
+        MPVLib.setPropertyInt("sub-margin-y", margin)
     }
     
     fun setSubtitleAlignX(alignment: String) {
-        mpv?.setPropertyString("sub-align-x", alignment)
+        MPVLib.setPropertyString("sub-align-x", alignment)
     }
     
     fun setSubtitleAlignY(alignment: String) {
-        mpv?.setPropertyString("sub-align-y", alignment)
+        MPVLib.setPropertyString("sub-align-y", alignment)
     }
     
     fun setSubtitleFontSize(size: Int) {
-        mpv?.setPropertyInt("sub-font-size", size)
+        MPVLib.setPropertyInt("sub-font-size", size)
     }
 
     fun setSubtitleBorderStyle(style: String) {
-        mpv?.setPropertyString("sub-border-style", style)
+        MPVLib.setPropertyString("sub-border-style", style)
     }
 
     fun setSubtitleBackgroundColor(color: String) {
-        mpv?.setPropertyString("sub-back-color", color)
+        MPVLib.setPropertyString("sub-back-color", color)
     }
 
     fun setSubtitleAssOverride(mode: String) {
-        mpv?.setPropertyString("sub-ass-override", mode)
+        MPVLib.setPropertyString("sub-ass-override", mode)
     }
 
     // MARK: - Audio Track Controls
@@ -621,25 +509,25 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
     fun getAudioTracks(): List<Map<String, Any>> {
         val tracks = mutableListOf<Map<String, Any>>()
         
-        val trackCount = mpv?.getPropertyInt("track-list/count") ?: 0
+        val trackCount = MPVLib.getPropertyInt("track-list/count") ?: 0
         
         for (i in 0 until trackCount) {
-            val trackType = mpv?.getPropertyString("track-list/$i/type") ?: continue
+            val trackType = MPVLib.getPropertyString("track-list/$i/type") ?: continue
             if (trackType != "audio") continue
             
-            val trackId = mpv?.getPropertyInt("track-list/$i/id") ?: continue
+            val trackId = MPVLib.getPropertyInt("track-list/$i/id") ?: continue
             val track = mutableMapOf<String, Any>("id" to trackId)
             
-            mpv?.getPropertyString("track-list/$i/title")?.let { track["title"] = it }
-            mpv?.getPropertyString("track-list/$i/lang")?.let { track["lang"] = it }
-            mpv?.getPropertyString("track-list/$i/codec")?.let { track["codec"] = it }
+            MPVLib.getPropertyString("track-list/$i/title")?.let { track["title"] = it }
+            MPVLib.getPropertyString("track-list/$i/lang")?.let { track["lang"] = it }
+            MPVLib.getPropertyString("track-list/$i/codec")?.let { track["codec"] = it }
             
-            val channels = mpv?.getPropertyInt("track-list/$i/audio-channels")
+            val channels = MPVLib.getPropertyInt("track-list/$i/audio-channels")
             if (channels != null && channels > 0) {
                 track["channels"] = channels
             }
             
-            val selected = mpv?.getPropertyBoolean("track-list/$i/selected") ?: false
+            val selected = MPVLib.getPropertyBoolean("track-list/$i/selected") ?: false
             track["selected"] = selected
             
             tracks.add(track)
@@ -650,11 +538,11 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
     
     fun setAudioTrack(trackId: Int) {
         Log.i(TAG, "setAudioTrack: setting aid to $trackId")
-        mpv?.setPropertyInt("aid", trackId)
+        MPVLib.setPropertyInt("aid", trackId)
     }
     
     fun getCurrentAudioTrack(): Int {
-        return mpv?.getPropertyInt("aid") ?: 0
+        return MPVLib.getPropertyInt("aid") ?: 0
     }
 
     // MARK: - Video Scaling
@@ -663,7 +551,7 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
         // panscan: 0.0 = fit (letterbox), 1.0 = fill (crop)
         val panscanValue = if (zoomed) 1.0 else 0.0
         Log.i(TAG, "setZoomedToFill: setting panscan to $panscanValue")
-        mpv?.setPropertyDouble("panscan", panscanValue)
+        MPVLib.setPropertyDouble("panscan", panscanValue)
     }
 
     // MARK: - Technical Info
@@ -672,79 +560,58 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
         val info = mutableMapOf<String, Any>()
 
         // Video dimensions
-        mpv?.getPropertyInt("video-params/w")?.takeIf { it > 0 }?.let {
+        MPVLib.getPropertyInt("video-params/w")?.takeIf { it > 0 }?.let {
             info["videoWidth"] = it
         }
-        mpv?.getPropertyInt("video-params/h")?.takeIf { it > 0 }?.let {
+        MPVLib.getPropertyInt("video-params/h")?.takeIf { it > 0 }?.let {
             info["videoHeight"] = it
         }
 
         // Video codec
-        mpv?.getPropertyString("video-format")?.let {
+        MPVLib.getPropertyString("video-format")?.let {
             info["videoCodec"] = it
         }
 
         // Audio codec
-        mpv?.getPropertyString("audio-codec-name")?.let {
+        MPVLib.getPropertyString("audio-codec-name")?.let {
             info["audioCodec"] = it
         }
 
         // FPS (container fps)
-        mpv?.getPropertyDouble("container-fps")?.takeIf { it > 0 }?.let {
+        MPVLib.getPropertyDouble("container-fps")?.takeIf { it > 0 }?.let {
             info["fps"] = it
         }
 
         // Video bitrate (bits per second)
-        mpv?.getPropertyInt("video-bitrate")?.takeIf { it > 0 }?.let {
+        MPVLib.getPropertyInt("video-bitrate")?.takeIf { it > 0 }?.let {
             info["videoBitrate"] = it
         }
 
         // Audio bitrate (bits per second)
-        mpv?.getPropertyInt("audio-bitrate")?.takeIf { it > 0 }?.let {
+        MPVLib.getPropertyInt("audio-bitrate")?.takeIf { it > 0 }?.let {
             info["audioBitrate"] = it
         }
 
         // Demuxer cache duration (seconds of video buffered)
-        mpv?.getPropertyDouble("demuxer-cache-duration")?.let {
+        MPVLib.getPropertyDouble("demuxer-cache-duration")?.let {
             info["cacheSeconds"] = it
         }
 
-        // Configured cache limits — read back from mpv to confirm user
-        // settings actually took effect. mpv stores byte sizes as int64
-        // (bytes); convert to MiB for display.
-        mpv?.getPropertyInt("demuxer-max-bytes")?.let { bytes ->
-            info["demuxerMaxBytes"] = bytes / (1024 * 1024)
-        }
-        mpv?.getPropertyInt("demuxer-max-back-bytes")?.let { bytes ->
-            info["demuxerMaxBackBytes"] = bytes / (1024 * 1024)
-        }
-        mpv?.getPropertyDouble("cache-secs")?.let { secs ->
-            info["cacheSecsLimit"] = secs
-        }
-
         // Dropped frames
-        mpv?.getPropertyInt("frame-drop-count")?.let {
+        MPVLib.getPropertyInt("frame-drop-count")?.let {
             info["droppedFrames"] = it
         }
 
         // Active video output driver (read from MPV to confirm what's actually applied)
-        mpv?.getPropertyString("vo")?.let {
+        MPVLib.getPropertyString("vo")?.let {
             info["voDriver"] = it
         }
 
-        // Active hardware decoder.
-        // hwdec-current yields e.g. "mediacodec",
-        // "mediacodec-copy", "auto-copy" or empty when SW decoding.
-        mpv?.getPropertyString("hwdec-current")?.let {
+        // Active hardware decoder
+        MPVLib.getPropertyString("hwdec-active")?.let {
             info["hwdec"] = it
         }
 
-        // Estimated video output fps (renderer-side, after filtering).
-        // Useful for diagnosing display/pipeline drops vs container fps.
-        mpv?.getPropertyDouble("estimated-vf-fps")?.takeIf { it > 0 }?.let {
-            info["estimatedVfFps"] = it
-        }
-
         return info
     }
 
@@ -837,7 +704,7 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
                     pendingExternalSubtitles.forEachIndexed { index, subUrl ->
                         android.util.Log.d("MPVRenderer", "Adding external subtitle [$index]: $subUrl")
                         // "auto" flag = add without auto-selecting (order preserved, MPVLib.command is sync)
-                        mpv?.command(arrayOf("sub-add", subUrl, "auto"))
+                        MPVLib.command(arrayOf("sub-add", subUrl, "auto"))
                     }
                     pendingExternalSubtitles = emptyList()
                 }

modules/mpv-player/android/src/main/java/expo/modules/mpvplayer/MPVLib.kt

@@ -1,29 +1,20 @@
 package expo.modules.mpvplayer
 
 import android.content.Context
+import android.util.Log
+import android.view.Surface
 import dev.jdtech.mpv.MPVLib as LibMPV
 
 /**
- * Per-instance wrapper around the dev.jdtech.mpv.MPVLib class.
- *
- * libmpv 1.0 exposes an instance-based API: each `LibMPV.create(ctx)` returns
- * a fresh, independent handle. Each player creates its own MPVLib instance
- * (Findroid pattern) and on teardown we simply drop the reference. We do NOT
- * call `LibMPV.destroy()` — its native implementation has an internal
- * use-after-free on libmpv 1.0 that we cannot fix from Kotlin. Letting the
- * GC reach the JVM-level finalizer (or never reaching it, since the native
- * handle lives in process-global state until exit) is strictly safer than
- * crashing.
- *
- * Trade-off: mpv's native footprint (decoder + demuxer cache) for one player
- * stays allocated until the next player's allocation displaces it in scudo's
- * arena. On a TV app where the player is the dominant memory consumer and
- * only one player is alive at a time, this is acceptable.
+ * Wrapper around the dev.jdtech.mpv.MPVLib class.
+ * This provides a consistent interface for the rest of the app.
  */
-class MPVLib private constructor(private val instance: LibMPV) {
-
-    // Event observer interface — mirrors dev.jdtech.mpv.MPVLib.EventObserver
-    // so MPVLayerRenderer implements a stable, wrapper-owned signature.
+object MPVLib {
+    private const val TAG = "MPVLib"
+    
+    private var initialized = false
+    
+    // Event observer interface
     interface EventObserver {
         fun eventProperty(property: String)
         fun eventProperty(property: String, value: Long)
@@ -32,144 +23,198 @@ class MPVLib private constructor(private val instance: LibMPV) {
         fun eventProperty(property: String, value: Double)
         fun event(eventId: Int)
     }
-
+    
     private val observers = mutableListOf<EventObserver>()
-
-    // Library event observer that forwards LibMPV callbacks to our observers.
+    
+    // Library event observer that forwards to our observers
     private val libObserver = object : LibMPV.EventObserver {
-        override fun eventProperty(property: String) =
-            dispatch { it.eventProperty(property) }
-
-        override fun eventProperty(property: String, value: Long) =
-            dispatch { it.eventProperty(property, value) }
-
-        override fun eventProperty(property: String, value: Boolean) =
-            dispatch { it.eventProperty(property, value) }
-
-        override fun eventProperty(property: String, value: String) =
-            dispatch { it.eventProperty(property, value) }
-
-        override fun eventProperty(property: String, value: Double) =
-            dispatch { it.eventProperty(property, value) }
-
-        override fun event(eventId: Int) =
-            dispatch { it.event(eventId) }
-
-        private inline fun dispatch(block: (EventObserver) -> Unit) {
+        override fun eventProperty(property: String) {
             synchronized(observers) {
-                observers.forEach(block)
+                for (observer in observers) {
+                    observer.eventProperty(property)
+                }
+            }
+        }
+        
+        override fun eventProperty(property: String, value: Long) {
+            synchronized(observers) {
+                for (observer in observers) {
+                    observer.eventProperty(property, value)
+                }
+            }
+        }
+        
+        override fun eventProperty(property: String, value: Boolean) {
+            synchronized(observers) {
+                for (observer in observers) {
+                    observer.eventProperty(property, value)
+                }
+            }
+        }
+        
+        override fun eventProperty(property: String, value: String) {
+            synchronized(observers) {
+                for (observer in observers) {
+                    observer.eventProperty(property, value)
+                }
+            }
+        }
+        
+        override fun eventProperty(property: String, value: Double) {
+            synchronized(observers) {
+                for (observer in observers) {
+                    observer.eventProperty(property, value)
+                }
+            }
+        }
+        
+        override fun event(eventId: Int) {
+            synchronized(observers) {
+                for (observer in observers) {
+                    observer.event(eventId)
+                }
             }
         }
     }
-
+    
     fun addObserver(observer: EventObserver) {
-        synchronized(observers) { observers.add(observer) }
-    }
-
-    fun removeObserver(observer: EventObserver) {
-        synchronized(observers) { observers.remove(observer) }
-    }
-
-    fun initialize() {
-        instance.init()
-    }
-
-    fun attachSurface(surface: android.view.Surface) {
-        instance.attachSurface(surface)
-    }
-
-    fun detachSurface() {
-        instance.detachSurface()
-    }
-
-    fun command(cmd: Array<String>) {
-        instance.command(cmd)
-    }
-
-    fun setOptionString(name: String, value: String): Int {
-        return instance.setOptionString(name, value)
-    }
-
-    fun getPropertyInt(name: String): Int? = try {
-        instance.getPropertyInt(name)
-    } catch (e: Exception) { null }
-
-    fun getPropertyDouble(name: String): Double? = try {
-        instance.getPropertyDouble(name)
-    } catch (e: Exception) { null }
-
-    fun getPropertyBoolean(name: String): Boolean? = try {
-        instance.getPropertyBoolean(name)
-    } catch (e: Exception) { null }
-
-    fun getPropertyString(name: String): String? = try {
-        instance.getPropertyString(name)
-    } catch (e: Exception) { null }
-
-    fun setPropertyInt(name: String, value: Int) {
-        instance.setPropertyInt(name, value)
-    }
-
-    fun setPropertyDouble(name: String, value: Double) {
-        instance.setPropertyDouble(name, value)
-    }
-
-    fun setPropertyBoolean(name: String, value: Boolean) {
-        instance.setPropertyBoolean(name, value)
-    }
-
-    fun setPropertyString(name: String, value: String) {
-        instance.setPropertyString(name, value)
-    }
-
-    fun observeProperty(name: String, format: Int) {
-        instance.observeProperty(name, format)
-    }
-
-    companion object {
-        /**
-         * Create a fresh mpv handle. Each call returns an independent instance —
-         * do not share across players. Attach exactly one [EventObserver] per
-         * player via [addObserver].
-         */
-        fun create(context: Context): MPVLib {
-            val lib = LibMPV.create(context)
-                ?: throw IllegalStateException("LibMPV.create returned null")
-            val wrapper = MPVLib(lib)
-            // The libObserver is attached for the lifetime of this MPVLib
-            // instance and forwards every LibMPV callback to our observers
-            // list. Player-specific observers are added/removed via
-            // addObserver/removeObserver.
-            lib.addObserver(wrapper.libObserver)
-            return wrapper
+        synchronized(observers) {
+            observers.add(observer)
         }
-
-        // MPV Event IDs (kept here so observers can reference them without
-        // holding a reference to an instance).
-        const val MPV_EVENT_NONE = 0
-        const val MPV_EVENT_SHUTDOWN = 1
-        const val MPV_EVENT_LOG_MESSAGE = 2
-        const val MPV_EVENT_GET_PROPERTY_REPLY = 3
-        const val MPV_EVENT_SET_PROPERTY_REPLY = 4
-        const val MPV_EVENT_COMMAND_REPLY = 5
-        const val MPV_EVENT_START_FILE = 6
-        const val MPV_EVENT_END_FILE = 7
-        const val MPV_EVENT_FILE_LOADED = 8
-        const val MPV_EVENT_IDLE = 11
-        const val MPV_EVENT_TICK = 14
-        const val MPV_EVENT_CLIENT_MESSAGE = 16
-        const val MPV_EVENT_VIDEO_RECONFIG = 17
-        const val MPV_EVENT_AUDIO_RECONFIG = 18
-        const val MPV_EVENT_SEEK = 20
-        const val MPV_EVENT_PLAYBACK_RESTART = 21
-        const val MPV_EVENT_PROPERTY_CHANGE = 22
-        const val MPV_EVENT_QUEUE_OVERFLOW = 24
-
-        // End file reason
-        const val MPV_END_FILE_REASON_EOF = 0
-        const val MPV_END_FILE_REASON_STOP = 2
-        const val MPV_END_FILE_REASON_QUIT = 3
-        const val MPV_END_FILE_REASON_ERROR = 4
-        const val MPV_END_FILE_REASON_REDIRECT = 5
+    }
+    
+    fun removeObserver(observer: EventObserver) {
+        synchronized(observers) {
+            observers.remove(observer)
+        }
+    }
+    
+    // MPV Event IDs
+    const val MPV_EVENT_NONE = 0
+    const val MPV_EVENT_SHUTDOWN = 1
+    const val MPV_EVENT_LOG_MESSAGE = 2
+    const val MPV_EVENT_GET_PROPERTY_REPLY = 3
+    const val MPV_EVENT_SET_PROPERTY_REPLY = 4
+    const val MPV_EVENT_COMMAND_REPLY = 5
+    const val MPV_EVENT_START_FILE = 6
+    const val MPV_EVENT_END_FILE = 7
+    const val MPV_EVENT_FILE_LOADED = 8
+    const val MPV_EVENT_IDLE = 11
+    const val MPV_EVENT_TICK = 14
+    const val MPV_EVENT_CLIENT_MESSAGE = 16
+    const val MPV_EVENT_VIDEO_RECONFIG = 17
+    const val MPV_EVENT_AUDIO_RECONFIG = 18
+    const val MPV_EVENT_SEEK = 20
+    const val MPV_EVENT_PLAYBACK_RESTART = 21
+    const val MPV_EVENT_PROPERTY_CHANGE = 22
+    const val MPV_EVENT_QUEUE_OVERFLOW = 24
+    
+    // End file reason
+    const val MPV_END_FILE_REASON_EOF = 0
+    const val MPV_END_FILE_REASON_STOP = 2
+    const val MPV_END_FILE_REASON_QUIT = 3
+    const val MPV_END_FILE_REASON_ERROR = 4
+    const val MPV_END_FILE_REASON_REDIRECT = 5
+    
+    /**
+     * Create and initialize the MPV library
+     */
+    fun create(context: Context, configDir: String? = null) {
+        if (initialized) return
+        
+        try {
+            LibMPV.create(context)
+            LibMPV.addObserver(libObserver)
+            initialized = true
+            Log.i(TAG, "libmpv created successfully")
+        } catch (e: Exception) {
+            Log.e(TAG, "Failed to create libmpv: ${e.message}")
+            throw e
+        }
+    }
+    
+    fun initialize() {
+        LibMPV.init()
+    }
+    
+    fun destroy() {
+        if (!initialized) return
+        try {
+            LibMPV.removeObserver(libObserver)
+            LibMPV.destroy()
+        } catch (e: Exception) {
+            Log.e(TAG, "Error destroying mpv: ${e.message}")
+        }
+        initialized = false
+    }
+    
+    fun isInitialized(): Boolean = initialized
+    
+    fun attachSurface(surface: Surface) {
+        LibMPV.attachSurface(surface)
+    }
+    
+    fun detachSurface() {
+        LibMPV.detachSurface()
+    }
+    
+    fun command(cmd: Array<String?>) {
+        LibMPV.command(cmd)
+    }
+    
+    fun setOptionString(name: String, value: String): Int {
+        return LibMPV.setOptionString(name, value)
+    }
+    
+    fun getPropertyInt(name: String): Int? {
+        return try {
+            LibMPV.getPropertyInt(name)
+        } catch (e: Exception) {
+            null
+        }
+    }
+    
+    fun getPropertyDouble(name: String): Double? {
+        return try {
+            LibMPV.getPropertyDouble(name)
+        } catch (e: Exception) {
+            null
+        }
+    }
+    
+    fun getPropertyBoolean(name: String): Boolean? {
+        return try {
+            LibMPV.getPropertyBoolean(name)
+        } catch (e: Exception) {
+            null
+        }
+    }
+    
+    fun getPropertyString(name: String): String? {
+        return try {
+            LibMPV.getPropertyString(name)
+        } catch (e: Exception) {
+            null
+        }
+    }
+    
+    fun setPropertyInt(name: String, value: Int) {
+        LibMPV.setPropertyInt(name, value)
+    }
+    
+    fun setPropertyDouble(name: String, value: Double) {
+        LibMPV.setPropertyDouble(name, value)
+    }
+    
+    fun setPropertyBoolean(name: String, value: Boolean) {
+        LibMPV.setPropertyBoolean(name, value)
+    }
+    
+    fun setPropertyString(name: String, value: String) {
+        LibMPV.setPropertyString(name, value)
+    }
+    
+    fun observeProperty(name: String, format: Int) {
+        LibMPV.observeProperty(name, format)
     }
 }

modules/mpv-player/android/src/main/java/expo/modules/mpvplayer/MpvPlayerModule.kt

@@ -28,11 +28,7 @@ class MpvPlayerModule : Module() {
                 if (source == null) return@Prop
                 
                 val urlString = source["url"] as? String ?: return@Prop
-
-                // Parse cache config if provided (mirrors iOS)
-                @Suppress("UNCHECKED_CAST")
-                val cacheConfig = source["cacheConfig"] as? Map<String, Any?>
-
+                
                 @Suppress("UNCHECKED_CAST")
                 val config = VideoLoadConfig(
                     url = urlString,
@@ -42,11 +38,7 @@ class MpvPlayerModule : Module() {
                     autoplay = (source["autoplay"] as? Boolean) ?: true,
                     initialSubtitleId = (source["initialSubtitleId"] as? Number)?.toInt(),
                     initialAudioId = (source["initialAudioId"] as? Number)?.toInt(),
-                    voDriver = source["voDriver"] as? String,
-                    cacheEnabled = cacheConfig?.get("enabled") as? String,
-                    cacheSeconds = (cacheConfig?.get("cacheSeconds") as? Number)?.toInt(),
-                    demuxerMaxBytes = (cacheConfig?.get("maxBytes") as? Number)?.toInt(),
-                    demuxerMaxBackBytes = (cacheConfig?.get("maxBackBytes") as? Number)?.toInt()
+                    voDriver = source["voDriver"] as? String
                 )
                 
                 view.loadVideo(config)
@@ -68,15 +60,6 @@ class MpvPlayerModule : Module() {
                 view.pause()
             }
 
-            // Stop playback and release the MediaCodec decoder + demuxer.
-            // Does not synchronously tear down the native mpv handle (see
-            // MPVLib / MpvPlayerView.destroy docs). Call before navigating
-            // away from the player screen to avoid OOM during screen
-            // transitions on low-RAM devices.
-            AsyncFunction("destroy") { view: MpvPlayerView ->
-                view.destroy()
-            }
-
             // Async function to seek to position
             AsyncFunction("seekTo") { view: MpvPlayerView, position: Double ->
                 view.seekTo(position)

modules/mpv-player/android/src/main/java/expo/modules/mpvplayer/MpvPlayerView.kt

@@ -2,12 +2,14 @@ package expo.modules.mpvplayer
 
 import android.content.Context
 import android.graphics.Color
+import android.graphics.Rect
+import android.graphics.SurfaceTexture
 import android.os.Handler
 import android.os.Looper
 import android.util.Log
 import android.view.Surface
-import android.view.SurfaceHolder
-import android.view.SurfaceView
+import android.view.TextureView
+import android.view.View
 import android.view.ViewGroup
 import expo.modules.kotlin.AppContext
 import expo.modules.kotlin.viewevent.EventDispatcher
@@ -24,30 +26,15 @@ data class VideoLoadConfig(
     val autoplay: Boolean = true,
     val initialSubtitleId: Int? = null,
     val initialAudioId: Int? = null,
-    val voDriver: String? = null,
-    val cacheEnabled: String? = null,
-    val cacheSeconds: Int? = null,
-    val demuxerMaxBytes: Int? = null,
-    val demuxerMaxBackBytes: Int? = null,
+    val voDriver: String? = null
 )
 
 /**
  * MpvPlayerView - ExpoView that hosts the MPV player.
- *
- * Uses SurfaceView (not TextureView) so the surface routes directly to
- * SurfaceFlinger (the OS compositor) rather than compositing into the
- * app's window surface. This matches mpv-android's architecture and
- * gives mpv a standalone surface.
- *
- * PiP black-screen mitigation: SurfaceView's surface is destroyed and
- * recreated on PiP entry/exit, and the new surface's initial dimensions
- * can be stale until the next layout pass. We push dimension updates to
- * mpv via both SurfaceHolder.Callback.surfaceChanged AND an
- * OnLayoutChangeListener, so the PiP transition (which fires layout
- * passes on the view itself) reaches mpv promptly.
+ * Uses TextureView for reliable Picture-in-Picture support.
  */
 class MpvPlayerView(context: Context, appContext: AppContext) : ExpoView(context, appContext),
-    MPVLayerRenderer.Delegate, SurfaceHolder.Callback {
+    MPVLayerRenderer.Delegate, TextureView.SurfaceTextureListener {
 
     companion object {
         private const val TAG = "MpvPlayerView"
@@ -61,7 +48,7 @@ class MpvPlayerView(context: Context, appContext: AppContext) : ExpoView(context
     val onTracksReady by EventDispatcher()
     val onPictureInPictureChange by EventDispatcher()
 
-    private var surfaceView: SurfaceView
+    private var textureView: TextureView
     private var renderer: MPVLayerRenderer? = null
     private var pipController: PiPController? = null
 
@@ -72,45 +59,30 @@ class MpvPlayerView(context: Context, appContext: AppContext) : ExpoView(context
     private var surfaceReady: Boolean = false
     private var pendingConfig: VideoLoadConfig? = null
     private var rendererStarted: Boolean = false
-    private var activeSurface: Surface? = null
+    private var pendingSurface: Surface? = null
+    private var surfaceTexture: SurfaceTexture? = null
 
     // PiP state tracking
+    private var isWaitingForPiPTransition: Boolean = false
+    private var isPiPSurfaceForced: Boolean = false
     private val pipHandler = Handler(Looper.getMainLooper())
 
     init {
         setBackgroundColor(Color.BLACK)
 
-        // SurfaceView for video rendering. Routes the surface directly to
-        // SurfaceFlinger (the OS compositor), giving mpv a standalone
-        // surface. TextureView composites into the app's window surface
-        // which is less efficient and breaks PiP transitions.
-        surfaceView = SurfaceView(context).apply {
+        // Create TextureView for video rendering (composites into app window for PiP support)
+        textureView = TextureView(context).apply {
             layoutParams = ViewGroup.LayoutParams(
                 ViewGroup.LayoutParams.MATCH_PARENT,
                 ViewGroup.LayoutParams.MATCH_PARENT
             )
+            surfaceTextureListener = this@MpvPlayerView
         }
-        surfaceView.holder.addCallback(this@MpvPlayerView)
-        addView(surfaceView)
-
-        // Push dimension updates to mpv on every view bounds change. This
-        // is the primary PiP black-screen fix: entering PiP fires a layout
-        // pass on the SurfaceView itself, and we proactively tell mpv the
-        // new size so it resizes its EGL swapchain before rendering.
-        surfaceView.addOnLayoutChangeListener { _, left, top, right, bottom,
-                                                  oldLeft, oldTop, oldRight, oldBottom ->
-            val w = right - left
-            val h = bottom - top
-            val oldW = oldRight - oldLeft
-            val oldH = oldBottom - oldTop
-            if (w > 0 && h > 0 && (w != oldW || h != oldH)) {
-                renderer?.updateSurfaceSize(w, h)
-            }
-        }
+        addView(textureView)
 
         // Initialize PiP controller with Expo's AppContext for proper activity access
         pipController = PiPController(context, appContext)
-        pipController?.setPlayerView(surfaceView)
+        pipController?.setPlayerView(textureView)
         pipController?.delegate = object : PiPController.Delegate {
             override fun onPlay() {
                 play()
@@ -126,17 +98,17 @@ class MpvPlayerView(context: Context, appContext: AppContext) : ExpoView(context
 
             override fun onPictureInPictureModeChanged(isInPiP: Boolean) {
                 if (isInPiP) {
-                    // Post size syncs after the PiP layout settles. Two passes
-                    // catch both the immediate surface re-attach and the
-                    // post-animation layout pass. Replaces the old TextureView
-                    // measure/layout polling hack (forcePiPBufferSize).
-                    pipHandler.removeCallbacksAndMessages(null)
-                    pipHandler.postDelayed({ syncSurfaceSizeToView() }, 100)
-                    pipHandler.postDelayed({ syncSurfaceSizeToView() }, 500)
+                    if (!isWaitingForPiPTransition) {
+                        isWaitingForPiPTransition = true
+                        pipHandler.removeCallbacksAndMessages(null)
+                        for (delay in longArrayOf(500, 1000, 1500, 2000)) {
+                            pipHandler.postDelayed({ forcePiPBufferSize() }, delay)
+                        }
+                    }
                 } else {
-                    // Restore from PiP: surface resized back to fullscreen.
+                    isWaitingForPiPTransition = false
                     pipHandler.removeCallbacksAndMessages(null)
-                    pipHandler.postDelayed({ syncSurfaceSizeToView() }, 100)
+                    restoreFromPiP()
                 }
                 onPictureInPictureChange(mapOf("isActive" to isInPiP))
             }
@@ -149,7 +121,7 @@ class MpvPlayerView(context: Context, appContext: AppContext) : ExpoView(context
 
     /**
      * Start the renderer with the given VO driver.
-     * Called lazily on first loadVideo so user settings are available.
+     * Called lazily on first loadVideo so the voDriver setting is available.
      */
     private fun ensureRendererStarted(voDriver: String?) {
         if (rendererStarted) return
@@ -158,14 +130,9 @@ class MpvPlayerView(context: Context, appContext: AppContext) : ExpoView(context
             renderer?.start(voDriver ?: "gpu-next")
             rendererStarted = true
 
-            // If the surface is already alive (surfaceCreated fired before
-            // loadVideo), attach it now. With SurfaceView the surface is
-            // owned by the holder, so we read it from there directly rather
-            // than stashing it on the side.
-            surfaceView.holder.surface?.takeIf { it.isValid }?.let { surface ->
-                activeSurface = surface
+            pendingSurface?.let { surface ->
                 renderer?.attachSurface(surface)
-                syncSurfaceSizeToView()
+                pendingSurface = null
             }
         } catch (e: Exception) {
             Log.e(TAG, "Failed to start renderer: ${e.message}")
@@ -173,20 +140,18 @@ class MpvPlayerView(context: Context, appContext: AppContext) : ExpoView(context
         }
     }
 
-    // MARK: - SurfaceHolder.Callback
+    // MARK: - TextureView.SurfaceTextureListener
 
-    override fun surfaceCreated(holder: SurfaceHolder) {
-        val surface = holder.surface
+    override fun onSurfaceTextureAvailable(surfaceTexture: SurfaceTexture, width: Int, height: Int) {
+        this.surfaceTexture = surfaceTexture
+        val surface = Surface(surfaceTexture)
+        surfaceTexture.setDefaultBufferSize(width, height)
         surfaceReady = true
 
         if (rendererStarted) {
-            // The previous Surface reference is holder-owned; do NOT release
-            // it (SurfaceView manages its lifecycle). Just track the new one.
-            activeSurface = surface
             renderer?.attachSurface(surface)
-            // Push the actual view dimensions immediately so mpv doesn't
-            // render against stale full-screen geometry during PiP transitions.
-            syncSurfaceSizeToView()
+        } else {
+            pendingSurface = surface
         }
 
         // If we have a pending load, execute it now
@@ -197,36 +162,20 @@ class MpvPlayerView(context: Context, appContext: AppContext) : ExpoView(context
         }
     }
 
-    override fun surfaceChanged(holder: SurfaceHolder, format: Int, width: Int, height: Int) {
-        if (width > 0 && height > 0) {
-            renderer?.updateSurfaceSize(width, height)
-        }
+    override fun onSurfaceTextureSizeChanged(surfaceTexture: SurfaceTexture, width: Int, height: Int) {
+        surfaceTexture.setDefaultBufferSize(width, height)
+        renderer?.updateSurfaceSize(width, height)
     }
 
-    override fun surfaceDestroyed(holder: SurfaceHolder) {
+    override fun onSurfaceTextureDestroyed(surfaceTexture: SurfaceTexture): Boolean {
+        this.surfaceTexture = null
         surfaceReady = false
         renderer?.detachSurface()
-        // Do NOT issue mpv "stop" here. Playback continues against the
-        // demuxer; when surfaceCreated fires again (PiP entry/exit, app
-        // background/foreground), we re-attach and frames resume. This
-        // matches the keep-open=always setting in MPVLayerRenderer.
-        //
-        // Do NOT release activeSurface — SurfaceView owns it via the holder.
-        activeSurface = null
+        return false // mpv manages the SurfaceTexture
     }
 
-    /**
-     * Read the actual SurfaceView width/height and push them to mpv.
-     * The PiP transition can fire surfaceCreated before the view's layout
-     * has settled to PiP dimensions, so we re-sync after layout passes.
-     */
-    private fun syncSurfaceSizeToView() {
-        if (!surfaceReady) return
-        val w = surfaceView.width
-        val h = surfaceView.height
-        if (w > 0 && h > 0) {
-            renderer?.updateSurfaceSize(w, h)
-        }
+    override fun onSurfaceTextureUpdated(surfaceTexture: SurfaceTexture) {
+        // Called every frame — no action needed, mpv drives rendering directly
     }
 
     // MARK: - Video Loading
@@ -258,11 +207,7 @@ class MpvPlayerView(context: Context, appContext: AppContext) : ExpoView(context
             startPosition = config.startPosition,
             externalSubtitles = config.externalSubtitles,
             initialSubtitleId = config.initialSubtitleId,
-            initialAudioId = config.initialAudioId,
-            cacheEnabled = config.cacheEnabled,
-            cacheSeconds = config.cacheSeconds,
-            demuxerMaxBytes = config.demuxerMaxBytes,
-            demuxerMaxBackBytes = config.demuxerMaxBackBytes
+            initialAudioId = config.initialAudioId
         )
 
         if (config.autoplay) {
@@ -291,50 +236,6 @@ class MpvPlayerView(context: Context, appContext: AppContext) : ExpoView(context
         pipController?.setPlaybackRate(0.0)
     }
 
-    /**
-     * Stop playback and release decoder resources.
-     *
-     * Delegates to [MPVLayerRenderer.stop], which issues mpv's "stop" command
-     * on a background thread (flushing the demuxer and releasing the
-     * MediaCodec hardware decoder) and drops the per-instance mpv handle.
-     *
-     * NOTE: this does NOT call `LibMPV.destroy()`. libmpv 1.0's
-     * nativeDestroy has an internal use-after-free on the JNI global ref
-     * path, so the native mpv handle is intentionally left for the JVM GC
-     * / native finalizer rather than torn down synchronously. See
-     * [MPVLib] class doc for the full rationale.
-     *
-     * Call this BEFORE navigating away from the player screen so the
-     * decoder is reclaimed before the next screen (or the next episode's
-     * player) mounts. Otherwise Expo Router renders the new screen first
-     * and you briefly have two mpv instances + two 4K decoders alive —
-     * instant OOM on a 2 GB device.
-     */
-    fun destroy() {
-        renderer?.stop()
-
-        // Reset view-level state so a subsequent loadVideo() on the SAME view
-        // instance re-creates the mpv handle and re-attaches the still-live
-        // SurfaceView surface. Without this, rendererStarted stays true and
-        // ensureRendererStarted() early-returns, so renderer.start() is never
-        // called again — but stop() already nulled the renderer's mpv handle.
-        // The next loadVideo() then runs loadVideoInternal() -> renderer.load()
-        // against mpv == null, where every mpv?.command() (including the
-        // "stop" and load commands) silently no-ops, leaving a black frame.
-        //
-        // This path is hit by direct-player.tsx's goToNextItem()/stop(),
-        // which call destroy() immediately before router.replace() to the
-        // same route — Expo Router reuses the same MpvPlayerView instance,
-        // so the next source load happens on this view without a remount.
-        //
-        // SurfaceView note: the surface is owned by the holder and survives
-        // across destroy()/loadVideo() on the same view instance. The next
-        // ensureRendererStarted() reads it from surfaceView.holder.surface.
-        rendererStarted = false
-        currentUrl = null
-        activeSurface = null
-    }
-
     fun seekTo(position: Double) {
         renderer?.seekTo(position)
     }
@@ -366,10 +267,59 @@ class MpvPlayerView(context: Context, appContext: AppContext) : ExpoView(context
     // MARK: - Picture in Picture
 
     fun startPictureInPicture() {
+        isWaitingForPiPTransition = true
         pipController?.startPictureInPicture()
+
+        // Resize buffer to match PiP window after animation settles
+        pipHandler.removeCallbacksAndMessages(null)
+        for (delay in longArrayOf(500, 1000, 1500, 2000)) {
+            pipHandler.postDelayed({ forcePiPBufferSize() }, delay)
+        }
+    }
+
+    /**
+     * Resize the SurfaceTexture buffer AND TextureView layout to match the PiP
+     * visible rect so mpv renders at the PiP window's actual dimensions.
+     */
+    private fun forcePiPBufferSize() {
+        if (!isWaitingForPiPTransition || !surfaceReady) return
+
+        val rect = Rect()
+        textureView.getGlobalVisibleRect(rect)
+        val visW = rect.width()
+        val visH = rect.height()
+        val vw = textureView.width
+        val vh = textureView.height
+
+        if (visW <= 0 || visH <= 0 || (vw == visW && vh == visH)) return
+
+        surfaceTexture?.setDefaultBufferSize(visW, visH)
+        renderer?.updateSurfaceSize(visW, visH)
+
+        // Force TextureView layout to match PiP visible area.
+        // layoutParams alone doesn't work during PiP because the parent
+        // never re-lays out its children.
+        textureView.measure(
+            View.MeasureSpec.makeMeasureSpec(visW, View.MeasureSpec.EXACTLY),
+            View.MeasureSpec.makeMeasureSpec(visH, View.MeasureSpec.EXACTLY)
+        )
+        textureView.layout(0, 0, visW, visH)
+        isPiPSurfaceForced = true
+    }
+
+    private fun restoreFromPiP() {
+        if (!isPiPSurfaceForced) return
+        isPiPSurfaceForced = false
+
+        val lp = textureView.layoutParams
+        lp.width = ViewGroup.LayoutParams.MATCH_PARENT
+        lp.height = ViewGroup.LayoutParams.MATCH_PARENT
+        textureView.layoutParams = lp
+        textureView.requestLayout()
     }
 
     fun stopPictureInPicture() {
+        isWaitingForPiPTransition = false
         pipHandler.removeCallbacksAndMessages(null)
         pipController?.stopPictureInPicture()
     }
@@ -529,24 +479,13 @@ class MpvPlayerView(context: Context, appContext: AppContext) : ExpoView(context
 
     // MARK: - Cleanup
 
-    /**
-     * Proactively tear down the player. Called from onDetachedFromWindow so
-     * the app releases mpv + decoder buffers when the View detaches from the
-     * window. The JS-facing destroy() is intentionally thinner (just
-     * renderer.stop()) — see this thread for why the full teardown was kept
-     * off the JS path.
-     */
     fun cleanup() {
+        isWaitingForPiPTransition = false
         pipHandler.removeCallbacksAndMessages(null)
         pipController?.stopPictureInPicture()
         renderer?.stop()
-        renderer?.delegate = null
-
-        // SurfaceView owns the Surface via its holder — do NOT release it.
-        activeSurface = null
+        surfaceTexture = null
         surfaceReady = false
-        currentUrl = null
-        rendererStarted = false
     }
 
     override fun onDetachedFromWindow() {

modules/mpv-player/android/src/main/java/expo/modules/mpvplayer/PiPController.kt

@@ -44,11 +44,6 @@ class PiPController(private val context: Context, private val appContext: AppCon
     private var currentPosition: Double = 0.0
     private var currentDuration: Double = 0.0
     private var playbackRate: Double = 1.0
-    // Independently tracks whether the system should auto-enter PiP on home
-    // press. Decoupled from playbackRate so that disabling auto-enter
-    // (e.g. when the player unmounts) doesn't corrupt the play/pause icon
-    // state that buildPiPActions() derives from playbackRate.
-    private var autoEnterEnabled: Boolean = false
 
     private var videoWidth: Int = 0
     private var videoHeight: Int = 0
@@ -111,37 +106,15 @@ class PiPController(private val context: Context, private val appContext: AppCon
     }
 
     fun stopPictureInPicture() {
-        // Disable auto-enter eligibility without touching playbackRate.
-        // playbackRate drives the play/pause icon in buildPiPActions();
-        // mutating it here would cause a stale icon if PiP is re-entered
-        // before the next playback state callback corrects it.
-        autoEnterEnabled = false
         isInPiPMode = false
         pipEntryNotified = false
         unregisterLifecycleCallbacks()
-
-        val activity = getActivity() ?: return
-
-        // Push minimal params with just auto-enter disabled. Do NOT call
-        // buildPiPParams() — it calls ensurePiPReceiverRegistered() and
-        // setActions(), which would re-register the broadcast receiver
-        // (just unregistered above) and attach play/pause/skip actions to
-        // params being torn down. That leaves a live receiver + stale
-        // actions after the player has unmounted.
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-            try {
-                activity.setPictureInPictureParams(
-                    PictureInPictureParams.Builder()
-                        .setAutoEnterEnabled(false)
-                        .build()
-                )
-            } catch (e: Exception) {
-                Log.e(TAG, "Failed to clear PiP auto-enter params: ${e.message}")
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            val activity = getActivity()
+            if (activity?.isInPictureInPictureMode == true) {
+                activity.moveTaskToBack(false)
             }
         }
-        if (activity.isInPictureInPictureMode) {
-            activity.moveTaskToBack(false)
-        }
     }
 
     fun isCurrentlyInPiP(): Boolean = isInPiPMode
@@ -153,7 +126,6 @@ class PiPController(private val context: Context, private val appContext: AppCon
 
     fun setPlaybackRate(rate: Double) {
         playbackRate = rate
-        autoEnterEnabled = rate > 0
 
         if (rate > 0) {
             registerLifecycleCallbacks()
@@ -236,7 +208,7 @@ class PiPController(private val context: Context, private val appContext: AppCon
         builder.setActions(buildPiPActions())
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-            builder.setAutoEnterEnabled(forEntering || autoEnterEnabled)
+            builder.setAutoEnterEnabled(forEntering || playbackRate > 0)
         }
 
         return builder.build()

modules/mpv-player/ios/MPVLayerRenderer.swift

@@ -770,32 +770,12 @@ final class MPVLayerRenderer {
             if let lang = getStringProperty(handle: handle, name: "track-list/\(i)/lang") {
                 track["lang"] = lang
             }
-
-            if let codec = getStringProperty(handle: handle, name: "track-list/\(i)/codec") {
-                track["codec"] = codec
-            }
-
-            // Identity fields used to map a Jellyfin subtitle to the real track
-            // (instead of fragile positional counting). `external` + `external-filename`
-            // uniquely identify a sub-added sidecar; `ff-index` aids embedded matching.
-            var external: Int32 = 0
-            getProperty(handle: handle, name: "track-list/\(i)/external", format: MPV_FORMAT_FLAG, value: &external)
-            track["external"] = external != 0
-
-            if let extFilename = getStringProperty(handle: handle, name: "track-list/\(i)/external-filename") {
-                track["externalFilename"] = extFilename
-            }
-
-            var ffIndex: Int64 = 0
-            if getProperty(handle: handle, name: "track-list/\(i)/ff-index", format: MPV_FORMAT_INT64, value: &ffIndex) >= 0 {
-                track["ffIndex"] = Int(ffIndex)
-            }
-
+            
             var selected: Int32 = 0
             getProperty(handle: handle, name: "track-list/\(i)/selected", format: MPV_FORMAT_FLAG, value: &selected)
             track["selected"] = selected != 0
-
-            Logger.shared.log("getSubtitleTracks: found sub track id=\(trackId), title=\(track["title"] ?? "none"), lang=\(track["lang"] ?? "none"), external=\(external != 0)", type: "Info")
+            
+            Logger.shared.log("getSubtitleTracks: found sub track id=\(trackId), title=\(track["title"] ?? "none"), lang=\(track["lang"] ?? "none")", type: "Info")
             tracks.append(track)
         }
         
@@ -1040,44 +1020,12 @@ final class MPVLayerRenderer {
             info["cacheSeconds"] = cacheSeconds
         }
 
-        // Configured cache limits — read back from mpv to confirm user
-        // settings actually took effect. mpv stores byte sizes as int64
-        // (bytes); convert to MiB for display.
-        var demuxerMaxBytes: Int64 = 0
-        if getProperty(handle: handle, name: "demuxer-max-bytes", format: MPV_FORMAT_INT64, value: &demuxerMaxBytes) >= 0 {
-            info["demuxerMaxBytes"] = Int(demuxerMaxBytes / (1024 * 1024))
-        }
-        var demuxerMaxBackBytes: Int64 = 0
-        if getProperty(handle: handle, name: "demuxer-max-back-bytes", format: MPV_FORMAT_INT64, value: &demuxerMaxBackBytes) >= 0 {
-            info["demuxerMaxBackBytes"] = Int(demuxerMaxBackBytes / (1024 * 1024))
-        }
-        var cacheSecsLimit: Double = 0
-        if getProperty(handle: handle, name: "cache-secs", format: MPV_FORMAT_DOUBLE, value: &cacheSecsLimit) >= 0 {
-            info["cacheSecsLimit"] = cacheSecsLimit
-        }
-
         // Dropped frames
         var droppedFrames: Int64 = 0
         if getProperty(handle: handle, name: "frame-drop-count", format: MPV_FORMAT_INT64, value: &droppedFrames) >= 0 {
             info["droppedFrames"] = Int(droppedFrames)
         }
 
-        // Active video output driver
-        if let voDriver = getStringProperty(handle: handle, name: "vo") {
-            info["voDriver"] = voDriver
-        }
-
-        // Active hardware decoder
-        if let hwdec = getStringProperty(handle: handle, name: "hwdec-current") {
-            info["hwdec"] = hwdec
-        }
-
-        // Estimated video output fps (post-filter)
-        var estimatedVfFps: Double = 0
-        if getProperty(handle: handle, name: "estimated-vf-fps", format: MPV_FORMAT_DOUBLE, value: &estimatedVfFps) >= 0 && estimatedVfFps > 0 {
-            info["estimatedVfFps"] = estimatedVfFps
-        }
-
         return info
     }
 }

modules/mpv-player/ios/MpvPlayerModule.swift

@@ -74,13 +74,7 @@ public class MpvPlayerModule: Module {
       AsyncFunction("pause") { (view: MpvPlayerView) in
         view.pause()
       }
-
-      // Synchronously destroy mpv instance + decoder before navigating
-      // away from the player screen (cross-platform; matches Android).
-      AsyncFunction("destroy") { (view: MpvPlayerView) in
-        view.destroy()
-      }
-
+      
       // Async function to seek to position
       AsyncFunction("seekTo") { (view: MpvPlayerView, position: Double) in
         view.seekTo(position: position)

modules/mpv-player/ios/MpvPlayerView.swift

@@ -289,49 +289,6 @@ class MpvPlayerView: ExpoView {
 		pipController?.updatePlaybackState()
 	}
 
-	/**
-	 * Synchronously stop and destroy the mpv instance + decoder so memory is
-	 * freed before the next screen mounts. Safe to call multiple times — the
-	 * underlying renderer.stop() guards against re-entry.
-	 *
-	 * Cross-platform counterpart of MpvPlayerView.destroy() on Android.
-	 */
-	func destroy() {
-		renderer?.stop()
-
-		// Reset view state and re-create the mpv handle so a subsequent
-		// loadVideo() on the SAME view instance can actually load.
-		// Without this, stop() leaves renderer.mpv == nil, and the next
-		// loadVideo(config:) calls renderer.load() which early-returns
-		// at `guard let handle = self.mpv else { return }` — but only
-		// after flipping isLoading = true and dispatching the loading
-		// delegate callback, so the JS layer is stuck in a perpetual
-		// "loading" state with no actual playback.
-		//
-		// This path is hit by direct-player.tsx's goToNextItem()/stop(),
-		// which call destroy() immediately before router.replace() to
-		// the same route — Expo Router reuses the same MpvPlayerView
-		// instance, so the next `source` prop update arrives on this
-		// view without a remount. setupView() is otherwise the only
-		// place start() is called, so without re-starting here the
-		// renderer stays dead until the whole view is unmounted and
-		// recreated.
-		//
-		// start() is idempotent (`guard !isRunning else { return }`)
-		// and stop() has already nulled mpv synchronously before
-		// dispatching the async mpv_terminate_destroy, so creating a
-		// fresh handle here is safe even while the old handle's
-		// teardown is still in flight on a background queue (libmpv
-		// handles are independent).
-		currentURL = nil
-		intendedPlayState = false
-		do {
-			try renderer?.start()
-		} catch {
-			onError(["error": "Failed to restart renderer after destroy: \(error.localizedDescription)"])
-		}
-	}
-
 	func seekTo(position: Double) {
 		// Update cached position and Now Playing immediately for smooth Control Center feedback
 		cachedPosition = position

modules/mpv-player/src/MpvPlayer.types.ts

@@ -89,14 +89,6 @@ export type MpvPlayerViewProps = {
 export interface MpvPlayerViewRef {
   play: () => Promise<void>;
   pause: () => Promise<void>;
-  /**
-   * Synchronously destroy the mpv instance + decoder + surface buffers.
-   * Call before navigating away from the player screen so memory is
-   * freed before the next screen mounts. Safe to call multiple times.
-   */
-  destroy: () => Promise<void>;
-  // Pre-libmpv-1.0 alias (kept for source-history reference):
-  // stop: () => Promise<void>;
   seekTo: (position: number) => Promise<void>;
   seekBy: (offset: number) => Promise<void>;
   setSpeed: (speed: number) => Promise<void>;
@@ -141,14 +133,6 @@ export type SubtitleTrack = {
   id: number;
   title?: string;
   lang?: string;
-  /** Subtitle codec (mpv `codec`), e.g. "subrip", "ass", "hdmv_pgs_subtitle". */
-  codec?: string;
-  /** True if loaded from a separate file via `sub-add` (mpv `external`). */
-  external?: boolean;
-  /** For external tracks: the exact URL/path it was loaded from (mpv `external-filename`). */
-  externalFilename?: string;
-  /** FFmpeg stream index (mpv `ff-index`); not guaranteed for non-lavf demuxers. */
-  ffIndex?: number;
   selected?: boolean;
 };
 
@@ -170,17 +154,9 @@ export type TechnicalInfo = {
   videoBitrate?: number;
   audioBitrate?: number;
   cacheSeconds?: number;
-  /** Configured demuxer forward cache cap (MiB), read back from mpv */
-  demuxerMaxBytes?: number;
-  /** Configured demuxer backward cache cap (MiB), read back from mpv */
-  demuxerMaxBackBytes?: number;
-  /** Configured cache-secs floor, read back from mpv */
-  cacheSecsLimit?: number;
   droppedFrames?: number;
   /** Active video output driver (read from MPV at runtime) */
   voDriver?: string;
   /** Active hardware decoder (read from MPV at runtime) */
   hwdec?: string;
-  /** Estimated video output fps (mpv "estimated-vf-fps") */
-  estimatedVfFps?: number;
 };

modules/mpv-player/src/MpvPlayerView.tsx

@@ -20,9 +20,6 @@ export default React.forwardRef<MpvPlayerViewRef, MpvPlayerViewProps>(
       pause: async () => {
         await nativeRef.current?.pause();
       },
-      destroy: async () => {
-        await nativeRef.current?.destroy();
-      },
       seekTo: async (position: number) => {
         await nativeRef.current?.seekTo(position);
       },

modules/wifi-ssid/index.ts

@@ -15,6 +15,7 @@ const WifiSsidModule =
  */
 export async function getSSID(): Promise<string | null> {
   if (!WifiSsidModule) {
+    console.log("[WifiSsid] Module not available on this platform");
     return null;
   }
 

package.json

@@ -17,63 +17,63 @@
     "ios:unsigned-build": "cross-env EXPO_TV=0 bun scripts/ios/build-ios.ts --production",
     "ios:unsigned-build:tv": "cross-env EXPO_TV=1 bun scripts/ios/build-ios.ts --production",
     "prepare": "husky",
-    "typecheck": "bun scripts/typecheck.ts",
+    "typecheck": "node scripts/typecheck.js",
     "check": "biome check . --max-diagnostics 1000",
     "lint": "biome check --write --unsafe --max-diagnostics 1000",
     "format": "biome format --write .",
     "doctor": "expo-doctor",
-    "i18n:check": "bun scripts/check-i18n-keys.ts",
-    "i18n:fix-unused": "bun scripts/check-i18n-keys.ts --fix-unused",
+    "i18n:check": "bun scripts/check-i18n-keys.mjs",
+    "i18n:fix-unused": "bun scripts/check-i18n-keys.mjs --fix-unused",
     "test": "bun run typecheck && bun run lint && bun run format && bun run i18n:check && bun run doctor",
     "postinstall": "patch-package"
   },
   "dependencies": {
     "@bottom-tabs/react-navigation": "1.2.0",
     "@douglowder/expo-av-route-picker-view": "^0.0.5",
-    "@expo/metro-runtime": "~56.0.15",
+    "@expo/metro-runtime": "~56.0.13",
     "@expo/react-native-action-sheet": "^4.1.1",
-    "@expo/ui": "~56.0.17",
+    "@expo/ui": "~56.0.14",
     "@expo/vector-icons": "^15.0.3",
     "@gorhom/bottom-sheet": "5.2.14",
     "@jellyfin/sdk": "^0.13.0",
     "@react-native-community/netinfo": "^12.0.0",
     "@react-navigation/material-top-tabs": "7.4.28",
     "@react-navigation/native": "^7.2.5",
-    "@shopify/flash-list": "2.0.3",
+    "@shopify/flash-list": "2.0.2",
     "@tanstack/query-sync-storage-persister": "^5.100.14",
     "@tanstack/react-pacer": "^0.19.1",
     "@tanstack/react-query": "5.100.14",
     "@tanstack/react-query-persist-client": "^5.100.14",
     "axios": "^1.7.9",
-    "expo": "~56.0.11",
+    "expo": "~56.0.6",
     "expo-application": "~56.0.3",
-    "expo-asset": "~56.0.17",
-    "expo-audio": "~56.0.12",
-    "expo-background-task": "~56.0.18",
+    "expo-asset": "~56.0.15",
+    "expo-audio": "~56.0.11",
+    "expo-background-task": "~56.0.15",
     "expo-blur": "~56.0.3",
     "expo-brightness": "~56.0.5",
-    "expo-build-properties": "~56.0.18",
-    "expo-camera": "~56.0.8",
-    "expo-constants": "~56.0.18",
+    "expo-build-properties": "~56.0.15",
+    "expo-camera": "~56.0.7",
+    "expo-constants": "~56.0.16",
     "expo-crypto": "~56.0.4",
-    "expo-dev-client": "~56.0.20",
+    "expo-dev-client": "~56.0.16",
     "expo-device": "~56.0.4",
-    "expo-font": "~56.0.6",
+    "expo-font": "~56.0.5",
     "expo-haptics": "~56.0.3",
-    "expo-image": "~56.0.11",
+    "expo-image": "~56.0.9",
     "expo-linear-gradient": "~56.0.4",
-    "expo-linking": "~56.0.14",
+    "expo-linking": "~56.0.12",
     "expo-localization": "~56.0.6",
-    "expo-location": "~56.0.17",
-    "expo-notifications": "~56.0.17",
-    "expo-router": "~56.2.10",
+    "expo-location": "~56.0.14",
+    "expo-notifications": "~56.0.14",
+    "expo-router": "~56.2.7",
     "expo-screen-orientation": "~56.0.5",
     "expo-secure-store": "~56.0.4",
-    "expo-sharing": "~56.0.17",
+    "expo-sharing": "~56.0.14",
     "expo-splash-screen": "~56.0.10",
     "expo-status-bar": "~56.0.4",
     "expo-system-ui": "~56.0.5",
-    "expo-task-manager": "~56.0.18",
+    "expo-task-manager": "~56.0.15",
     "expo-web-browser": "~56.0.5",
     "i18next": "^26.3.0",
     "jotai": "2.20.0",
@@ -128,16 +128,14 @@
     "@react-native-tvos/config-tv": "0.1.6",
     "@types/jest": "29.5.14",
     "@types/lodash": "4.17.24",
-    "@types/node": "^18.19.130",
     "@types/react": "~19.2.10",
     "@types/react-test-renderer": "19.1.0",
     "cross-env": "10.1.0",
     "expo-doctor": "1.19.9",
     "husky": "9.1.7",
-    "lint-staged": "17.0.8",
+    "lint-staged": "17.0.5",
     "react-test-renderer": "19.2.3",
-    "tsx": "^4.22.4",
-    "typescript": "6.0.3"
+    "typescript": "5.9.3"
   },
   "expo": {
     "doctor": {
@@ -145,7 +143,6 @@
         "exclude": [
           "react-native-google-cast",
           "react-native-udp",
-          "react-native-track-player",
           "@jellyfin/sdk"
         ],
         "listUnknownPackages": false

plugins/with-runtime-framework-headers.js

@@ -1,4 +1,4 @@
-import { type ConfigPlugin, withPodfile } from "expo/config-plugins";
+const { withPodfile } = require("expo/config-plugins");
 
 const PATCH_START = "## >>> runtime-framework headers";
 const PATCH_END = "## <<< runtime-framework headers";
@@ -13,7 +13,7 @@ const EXTRA_HDRS = [
   `\${PODS_CONFIGURATION_BUILD_DIR}/React-rendererconsistency/React_rendererconsistency.framework/Headers`,
 ];
 
-function buildPatch(): string {
+function buildPatch() {
   return [
     PATCH_START,
     "  extra_hdrs = [",
@@ -91,7 +91,7 @@ function buildPatch(): string {
   ].join("\n");
 }
 
-const withRuntimeFrameworkHeaders: ConfigPlugin = (config) => {
+module.exports = function withRuntimeFrameworkHeaders(config) {
   return withPodfile(config, (config) => {
     let podfile = config.modResults.contents;
 
@@ -125,5 +125,3 @@ end
     return config;
   });
 };
-
-export default withRuntimeFrameworkHeaders;

plugins/withAndroidAlertColors.js

@@ -1,20 +1,10 @@
-import {
-  type ConfigPlugin,
+const {
   withAndroidColors,
   withAndroidColorsNight,
-} from "expo/config-plugins";
+} = require("expo/config-plugins");
 
-interface ColorResourceItem {
-  $: { name: string };
-  _: string;
-}
-
-const withAndroidAlertColors: ConfigPlugin = (config) => {
-  const setColor = (
-    colorsList: ColorResourceItem[],
-    name: string,
-    value: string,
-  ) => {
+const withAndroidAlertColors = (config) => {
+  const setColor = (colorsList, name, value) => {
     const existingColor = colorsList.find(
       (item) => item.$ && item.$.name === name,
     );
@@ -30,7 +20,7 @@ const withAndroidAlertColors: ConfigPlugin = (config) => {
 
   config = withAndroidColors(config, (config) => {
     const colors = config.modResults;
-    const colorsList = (colors.resources.color ?? []) as ColorResourceItem[];
+    const colorsList = colors.resources.color || [];
     setColor(colorsList, "colorPrimary", "#000000");
     colors.resources.color = colorsList;
     return config;
@@ -38,7 +28,7 @@ const withAndroidAlertColors: ConfigPlugin = (config) => {
 
   config = withAndroidColorsNight(config, (config) => {
     const colors = config.modResults;
-    const colorsList = (colors.resources.color ?? []) as ColorResourceItem[];
+    const colorsList = colors.resources.color || [];
     setColor(colorsList, "colorPrimary", "#FFFFFF");
     colors.resources.color = colorsList;
     return config;
@@ -47,4 +37,4 @@ const withAndroidAlertColors: ConfigPlugin = (config) => {
   return config;
 };
 
-export default withAndroidAlertColors;
+module.exports = withAndroidAlertColors;

plugins/withAndroidManifest.js

@@ -1,12 +1,8 @@
-import { type ConfigPlugin, withAndroidManifest } from "expo/config-plugins";
+const { withAndroidManifest } = require("expo/config-plugins");
 
-const withGoogleCastAndroidManifest: ConfigPlugin = (config) =>
+const _withGoogleCastAndroidManifest = (config) =>
   withAndroidManifest(config, async (mod) => {
-    const mainApplication = mod.modResults.manifest.application?.[0];
-
-    if (!mainApplication) {
-      return mod;
-    }
+    const mainApplication = mod.modResults.manifest.application[0];
 
     // Initialize activity array if it doesn't exist
     if (!mainApplication.activity) {
@@ -43,4 +39,4 @@ const withGoogleCastAndroidManifest: ConfigPlugin = (config) =>
     return mod;
   });
 
-export default withGoogleCastAndroidManifest;
+module.exports = _withGoogleCastAndroidManifest;

plugins/withChangeNativeAndroidTextToWhite.js

@@ -1,8 +1,8 @@
-import { readFileSync, writeFileSync } from "node:fs";
-import { join } from "node:path";
-import { type ConfigPlugin, withDangerousMod } from "expo/config-plugins";
+const { readFileSync, writeFileSync } = require("node:fs");
+const { join } = require("node:path");
+const { withDangerousMod } = require("expo/config-plugins");
 
-const withChangeNativeAndroidTextToWhite: ConfigPlugin = (expoConfig) =>
+const withChangeNativeAndroidTextToWhite = (expoConfig) =>
   withDangerousMod(expoConfig, [
     "android",
     (modConfig) => {
@@ -30,4 +30,4 @@ const withChangeNativeAndroidTextToWhite: ConfigPlugin = (expoConfig) =>
     },
   ]);
 
-export default withChangeNativeAndroidTextToWhite;
+module.exports = withChangeNativeAndroidTextToWhite;

plugins/withExcludeMedia3Dash.js

@@ -1,6 +1,6 @@
-import { type ConfigPlugin, withAppBuildGradle } from "expo/config-plugins";
+const { withAppBuildGradle } = require("expo/config-plugins");
 
-const withExcludeMedia3Dash: ConfigPlugin = (config) => {
+module.exports = function withExcludeMedia3Dash(config) {
   return withAppBuildGradle(config, (config) => {
     const contents = config.modResults.contents;
 
@@ -32,5 +32,3 @@ configurations.all {
     return config;
   });
 };
-
-export default withExcludeMedia3Dash;

plugins/withGitPod.js

@@ -1,14 +1,6 @@
-import { type ConfigPlugin, withPodfile } from "expo/config-plugins";
+const { withPodfile } = require("@expo/config-plugins");
 
-interface GitPodOptions {
-  podName: string;
-  podspecUrl: string;
-}
-
-const withGitPod: ConfigPlugin<GitPodOptions> = (
-  config,
-  { podName, podspecUrl },
-) => {
+const withGitPod = (config, { podName, podspecUrl }) => {
   return withPodfile(config, (config) => {
     const podfile = config.modResults.contents;
 
@@ -29,4 +21,4 @@ const withGitPod: ConfigPlugin<GitPodOptions> = (
   });
 };
 
-export default withGitPod;
+module.exports = withGitPod;

plugins/withGradleProperties.js

@@ -1,21 +1,12 @@
-import type { ExpoConfig } from "expo/config";
-import {
-  AndroidConfig,
-  type ConfigPlugin,
-  withGradleProperties,
-} from "expo/config-plugins";
+const { withGradleProperties } = require("expo/config-plugins");
 
-function setGradlePropertiesValue(
-  config: ExpoConfig,
-  key: string,
-  value: string,
-): ExpoConfig {
+function setGradlePropertiesValue(config, key, value) {
   return withGradleProperties(config, (exportedConfig) => {
     const props = exportedConfig.modResults;
     const keyIdx = props.findIndex(
       (item) => item.type === "property" && item.key === key,
     );
-    const property: AndroidConfig.Properties.PropertiesItem = {
+    const property = {
       type: "property",
       key,
       value,
@@ -31,14 +22,11 @@ function setGradlePropertiesValue(
   });
 }
 
-const withCustomGradleProperties: ConfigPlugin = (config) => {
+module.exports = function withCustomPlugin(config) {
   // Expo 52 is not setting this
   // https://github.com/expo/expo/issues/32558
   config = setGradlePropertiesValue(config, "android.enableJetifier", "true");
 
-  // NDK version required by libmpv 1.0.0
-  config = setGradlePropertiesValue(config, "ndkVersion", "29.0.14206865");
-
   // Increase memory
   config = setGradlePropertiesValue(
     config,
@@ -47,5 +35,3 @@ const withCustomGradleProperties: ConfigPlugin = (config) => {
   );
   return config;
 };
-
-export default withCustomGradleProperties;

plugins/withTVOSAppIcon.js

@@ -1,6 +1,6 @@
-import { type ConfigPlugin, withXcodeProject } from "expo/config-plugins";
+const { withXcodeProject } = require("@expo/config-plugins");
 
-const withTVOSAppIcon: ConfigPlugin = (config) => {
+const withTVOSAppIcon = (config) => {
   // Only apply for TV builds
   if (process.env.EXPO_TV !== "1") {
     return config;
@@ -28,4 +28,4 @@ const withTVOSAppIcon: ConfigPlugin = (config) => {
   });
 };
 
-export default withTVOSAppIcon;
+module.exports = withTVOSAppIcon;

plugins/withTVOSTopShelf.js

@@ -1,10 +1,8 @@
-import type { ExpoConfig } from "expo/config";
-import {
-  type ConfigPlugin,
+const {
   withEntitlementsPlist,
   withInfoPlist,
   withXcodeProject,
-} from "expo/config-plugins";
+} = require("@expo/config-plugins");
 
 const EXTENSION_TARGET_NAME = "StreamyfinTopShelf";
 const TARGET_SOURCE_DIR = "../targets/StreamyfinTopShelf";
@@ -12,29 +10,19 @@ const APP_GROUP_INFO_PLIST_KEY = "StreamyfinAppGroupIdentifier";
 const KEYCHAIN_ACCESS_GROUP_INFO_PLIST_KEY =
   "StreamyfinKeychainAccessGroupIdentifier";
 
-interface AppExtensionConfig {
-  targetName: string;
-  bundleIdentifier: string;
-  entitlements: {
-    "com.apple.security.application-groups": string[];
-    "keychain-access-groups": string[];
-  };
-}
-
-function getBundleIdentifier(config: ExpoConfig): string {
+function getBundleIdentifier(config) {
   return config.ios?.bundleIdentifier || "com.fredrikburmester.streamyfin";
 }
 
-function getAppGroupIdentifier(config: ExpoConfig): string {
+function getAppGroupIdentifier(config) {
   return `group.${getBundleIdentifier(config)}.tvtopshelf`;
 }
 
-function getKeychainAccessGroupIdentifier(config: ExpoConfig): string {
+function getKeychainAccessGroupIdentifier(config) {
   return `$(AppIdentifierPrefix)${getBundleIdentifier(config)}`;
 }
 
-// The xcode project object has no usable typings — keep `any` here.
-function getBuildConfigurations(project: any, configurationListId: string) {
+function getBuildConfigurations(project, configurationListId) {
   const configurationList =
     project.hash.project.objects.XCConfigurationList[configurationListId];
 
@@ -42,21 +30,18 @@ function getBuildConfigurations(project: any, configurationListId: string) {
 
   const buildConfigurations = project.pbxXCBuildConfigurationSection();
   return configurationList.buildConfigurations
-    .map((config: { value: string }) => buildConfigurations[config.value])
+    .map((config) => buildConfigurations[config.value])
     .filter(Boolean);
 }
 
-function ensureAppGroup(value: unknown, appGroupIdentifier: string): string[] {
+function ensureAppGroup(value, appGroupIdentifier) {
   const groups = Array.isArray(value) ? value : [];
   return groups.includes(appGroupIdentifier)
     ? groups
     : [...groups, appGroupIdentifier];
 }
 
-function ensureKeychainAccessGroup(
-  value: unknown,
-  keychainAccessGroupIdentifier: string,
-): string[] {
+function ensureKeychainAccessGroup(value, keychainAccessGroupIdentifier) {
   const groups = Array.isArray(value) ? value : [];
   return groups.includes(keychainAccessGroupIdentifier)
     ? groups
@@ -64,13 +49,13 @@ function ensureKeychainAccessGroup(
 }
 
 function ensureAppExtension(
-  appExtensions: unknown,
-  targetName: string,
-  bundleIdentifier: string,
-  appGroupIdentifier: string,
-  keychainAccessGroupIdentifier: string,
-): AppExtensionConfig[] {
-  const extensionConfig: AppExtensionConfig = {
+  appExtensions,
+  targetName,
+  bundleIdentifier,
+  appGroupIdentifier,
+  keychainAccessGroupIdentifier,
+) {
+  const extensionConfig = {
     targetName,
     bundleIdentifier,
     entitlements: {
@@ -78,9 +63,7 @@ function ensureAppExtension(
       "keychain-access-groups": [keychainAccessGroupIdentifier],
     },
   };
-  const extensions: AppExtensionConfig[] = Array.isArray(appExtensions)
-    ? appExtensions
-    : [];
+  const extensions = Array.isArray(appExtensions) ? appExtensions : [];
   // Keep plugin runs idempotent and preserve unrelated app extension entries.
   const existingIndex = extensions.findIndex(
     (appExtension) => appExtension?.targetName === targetName,
@@ -95,7 +78,7 @@ function ensureAppExtension(
   );
 }
 
-const withTVOSTopShelf: ConfigPlugin = (config) => {
+const withTVOSTopShelf = (config) => {
   const appGroupIdentifier = getAppGroupIdentifier(config);
   const keychainAccessGroupIdentifier =
     getKeychainAccessGroupIdentifier(config);
@@ -210,4 +193,4 @@ const withTVOSTopShelf: ConfigPlugin = (config) => {
   });
 };
 
-export default withTVOSTopShelf;
+module.exports = withTVOSTopShelf;

plugins/withTVUserManagement.js

@@ -1,9 +1,9 @@
-import { type ConfigPlugin, withEntitlementsPlist } from "expo/config-plugins";
+const { withEntitlementsPlist } = require("expo/config-plugins");
 
 /**
  * Expo config plugin to add User Management entitlement for tvOS profile linking
  */
-const withTVUserManagement: ConfigPlugin = (config) => {
+const withTVUserManagement = (config) => {
   // Only add for tvOS builds. The entitlement is restricted by Apple and must
   // be present in the provisioning profile, so injecting it into mobile builds
   // breaks signing ("Entitlement ... not found and could not be included in
@@ -24,4 +24,4 @@ const withTVUserManagement: ConfigPlugin = (config) => {
   });
 };
 
-export default withTVUserManagement;
+module.exports = withTVUserManagement;

plugins/withTVXcodeEnv.js

@@ -1,7 +1,7 @@
-import { execSync } from "node:child_process";
-import fs from "node:fs";
-import path from "node:path";
-import { type ConfigPlugin, withDangerousMod } from "expo/config-plugins";
+const { withDangerousMod } = require("@expo/config-plugins");
+const { execSync } = require("node:child_process");
+const fs = require("node:fs");
+const path = require("node:path");
 
 /**
  * Expo config plugin that adds EXPO_TV=1 and NODE_BINARY to .xcode.env.local for TV builds.
@@ -12,7 +12,7 @@ import { type ConfigPlugin, withDangerousMod } from "expo/config-plugins";
  *
  * It also sets NODE_BINARY for nvm users since Xcode can't resolve shell functions.
  */
-const withTVXcodeEnv: ConfigPlugin = (config) => {
+const withTVXcodeEnv = (config) => {
   // Only apply for TV builds
   if (process.env.EXPO_TV !== "1") {
     return config;
@@ -70,7 +70,7 @@ const withTVXcodeEnv: ConfigPlugin = (config) => {
 /**
  * Get the actual node binary path, handling nvm installations.
  */
-function getNodeBinaryPath(): string | null {
+function getNodeBinaryPath() {
   try {
     // First try to get node path directly (works for non-nvm installs)
     const directPath = execSync("which node 2>/dev/null", {
@@ -114,4 +114,4 @@ function getNodeBinaryPath(): string | null {
   return null;
 }
 
-export default withTVXcodeEnv;
+module.exports = withTVXcodeEnv;

plugins/withTrustLocalCerts.js

@@ -1,29 +1,18 @@
-import fs from "node:fs";
-import path from "node:path";
-import {
-  AndroidConfig,
-  type ConfigPlugin,
-  type ExportedConfigWithProps,
-  withAndroidManifest,
-} from "expo/config-plugins";
-
+const { AndroidConfig, withAndroidManifest } = require("expo/config-plugins");
+const path = require("node:path");
+const fs = require("node:fs");
 const fsPromises = fs.promises;
 
 const { getMainApplicationOrThrow } = AndroidConfig.Manifest;
 
-type AndroidManifest = AndroidConfig.Manifest.AndroidManifest;
-
-const withTrustLocalCerts: ConfigPlugin = (config) => {
+const withTrustLocalCerts = (config) => {
   return withAndroidManifest(config, async (mod) => {
     mod.modResults = await setCustomConfigAsync(mod, mod.modResults);
     return mod;
   });
 };
 
-async function setCustomConfigAsync(
-  config: ExportedConfigWithProps<AndroidManifest>,
-  androidManifest: AndroidManifest,
-): Promise<AndroidManifest> {
+async function setCustomConfigAsync(config, androidManifest) {
   const src_file_path = path.join(__dirname, "network_security_config.xml");
   const res_file_path = path.join(
     await AndroidConfig.Paths.getResourceFolderAsync(
@@ -56,4 +45,4 @@ async function setCustomConfigAsync(
   return androidManifest;
 }
 
-export default withTrustLocalCerts;
+module.exports = withTrustLocalCerts;

providers/Downloads/hooks/useDownloadEventHandlers.ts

@@ -142,12 +142,31 @@ export function useDownloadEventHandlers({
         } else {
           // Transcoding - estimate from bitrate
           const process = processes.find((p) => p.id === processId);
-          if (process?.maxBitrate.value && process.item.RunTimeTicks) {
-            const { estimateDownloadSize } = require("@/utils/download");
-            estimatedTotalBytes = estimateDownloadSize(
-              process.maxBitrate.value,
-              process.item.RunTimeTicks,
-            );
+          console.log(
+            `[DPL] Transcoding detected, looking for process ${processId}, found:`,
+            process ? "yes" : "no",
+          );
+          if (process) {
+            console.log(`[DPL] Process bitrate:`, {
+              key: process.maxBitrate.key,
+              value: process.maxBitrate.value,
+              runTimeTicks: process.item.RunTimeTicks,
+            });
+            if (process.maxBitrate.value && process.item.RunTimeTicks) {
+              const { estimateDownloadSize } = require("@/utils/download");
+              estimatedTotalBytes = estimateDownloadSize(
+                process.maxBitrate.value,
+                process.item.RunTimeTicks,
+              );
+              console.log(
+                `[DPL] Calculated estimatedTotalBytes:`,
+                estimatedTotalBytes,
+              );
+            } else {
+              console.log(
+                `[DPL] Cannot estimate size - bitrate.value or RunTimeTicks missing`,
+              );
+            }
           }
         }
 

providers/WebSocketProvider.tsx

@@ -1,5 +1,4 @@
 import { getSessionApi } from "@jellyfin/sdk/lib/utils/api";
-import { router } from "expo-router";
 import { useAtomValue } from "jotai";
 import {
   createContext,
@@ -12,6 +11,7 @@ import {
   useState,
 } from "react";
 import { AppState, type AppStateStatus } from "react-native";
+import useRouter from "@/hooks/useAppRouter";
 import { useNetworkAwareQueryClient } from "@/hooks/useNetworkAwareQueryClient";
 import { apiAtom, getOrSetDeviceId } from "@/providers/JellyfinProvider";
 import { useNetworkStatus } from "@/providers/NetworkStatusProvider";
@@ -28,20 +28,6 @@ const LIBRARY_CHANGE_QUERY_KEYS = [
   ["episodes"],
 ] as const;
 
-// Query keys that depend on per-user playback state (resume position, played
-// status, favorites) and should be refreshed when the server reports a
-// `UserDataChanged`. Scoped to the progression-based sections so finishing an
-// episode does not pointlessly refetch "recently added" or suggestions.
-const USER_DATA_CHANGE_QUERY_KEYS = [
-  ["home", "continueAndNextUp"],
-  ["home", "resumeItems"],
-  ["home", "nextUp-all"],
-  ["home", "heroItems"],
-  ["resumeItems"],
-  ["nextUp-all"],
-  ["nextUp"],
-] as const;
-
 interface WebSocketMessage {
   MessageType: string;
   Data: any;
@@ -52,30 +38,10 @@ interface WebSocketProviderProps {
   children: ReactNode;
 }
 
-/**
- * Handler invoked for every message of a given `MessageType`. Receives the
- * message `Data` payload and the full message.
- */
-type WebSocketMessageHandler = (data: any, message: WebSocketMessage) => void;
-
 interface WebSocketContextType {
   ws: WebSocket | null;
   isConnected: boolean;
-  /**
-   * @deprecated Prefer `subscribe`. `lastMessage` only keeps the most recent
-   * message, so bursts arriving in the same tick are coalesced and lost. Kept
-   * for `useWebsockets` (GeneralCommand handling) until it is migrated.
-   */
   lastMessage: WebSocketMessage | null;
-  /**
-   * Subscribe to a given message type. The handler is called synchronously for
-   * every matching message (no coalescing, unlike `lastMessage`). Returns an
-   * unsubscribe function to call on cleanup.
-   */
-  subscribe: (
-    messageType: string,
-    handler: WebSocketMessageHandler,
-  ) => () => void;
   sendMessage: (message: any) => void;
   clearLastMessage: () => void;
 }
@@ -88,6 +54,7 @@ export const WebSocketProvider = ({ children }: WebSocketProviderProps) => {
   const [ws, setWs] = useState<WebSocket | null>(null);
   const [isConnected, setIsConnected] = useState(false);
   const [lastMessage, setLastMessage] = useState<WebSocketMessage | null>(null);
+  const router = useRouter();
   const queryClient = useNetworkAwareQueryClient();
   const deviceId = useMemo(() => {
     return getOrSetDeviceId();
@@ -96,76 +63,8 @@ export const WebSocketProvider = ({ children }: WebSocketProviderProps) => {
   const libraryChangeDebounceRef = useRef<ReturnType<typeof setTimeout> | null>(
     null,
   );
-  const userDataChangeDebounceRef = useRef<ReturnType<
-    typeof setTimeout
-  > | null>(null);
-  // Handle for the onerror backoff timer. Tracked so a reconnect triggered by
-  // another path (foreground, network reconnect, effect re-run) can cancel a
-  // pending one — an untracked timer would later open a second socket.
-  const reconnectTimeoutRef = useRef<ReturnType<typeof setTimeout> | null>(
-    null,
-  );
-
-  // Pub/sub registry: messageType -> set of handlers. Stored in a ref so
-  // subscribing/dispatching never triggers a re-render.
-  const listenersRef = useRef<Map<string, Set<WebSocketMessageHandler>>>(
-    new Map(),
-  );
-
-  const subscribe = useCallback(
-    (messageType: string, handler: WebSocketMessageHandler) => {
-      const listeners = listenersRef.current;
-      let handlers = listeners.get(messageType);
-      if (!handlers) {
-        handlers = new Set();
-        listeners.set(messageType, handlers);
-      }
-      handlers.add(handler);
-      return () => {
-        handlers?.delete(handler);
-        // Only drop the map entry if it still points at THIS set. After an
-        // unsubscribe + re-subscribe for the same type, a stale second call to
-        // this cleanup would otherwise delete the new subscribers' set and
-        // silently stop delivering their messages.
-        if (
-          handlers &&
-          handlers.size === 0 &&
-          listeners.get(messageType) === handlers
-        ) {
-          listeners.delete(messageType);
-        }
-      };
-    },
-    [],
-  );
-
-  const dispatchMessage = useCallback((message: WebSocketMessage) => {
-    const handlers = listenersRef.current.get(message.MessageType);
-    if (!handlers || handlers.size === 0) return;
-    // Copy to tolerate handlers that unsubscribe during dispatch.
-    for (const handler of [...handlers]) {
-      // Isolate each handler so one throwing subscriber can't abort the rest
-      // (and isn't misreported as a parse failure by the outer onmessage catch).
-      try {
-        handler(message.Data, message);
-      } catch (error) {
-        console.error(
-          `Error handling WebSocket message type "${message.MessageType}":`,
-          error,
-        );
-      }
-    }
-  }, []);
 
   const connectWebSocket = useCallback(() => {
-    // Cancel any reconnect queued by a previous onerror before opening a new
-    // socket, so we never end up with two live sockets — each would double the
-    // message fan-out and double-invalidate queries.
-    if (reconnectTimeoutRef.current) {
-      clearTimeout(reconnectTimeoutRef.current);
-      reconnectTimeoutRef.current = null;
-    }
-
     if (!deviceId || !api?.accessToken || !isNetworkConnected) {
       return;
     }
@@ -186,10 +85,6 @@ export const WebSocketProvider = ({ children }: WebSocketProviderProps) => {
     newWebSocket.onopen = () => {
       setIsConnected(true);
       reconnectAttemptsRef.current = 0;
-      if (reconnectTimeoutRef.current) {
-        clearTimeout(reconnectTimeoutRef.current);
-        reconnectTimeoutRef.current = null;
-      }
       keepAliveInterval = setInterval(() => {
         if (newWebSocket.readyState === WebSocket.OPEN) {
           newWebSocket.send(JSON.stringify({ MessageType: "KeepAlive" }));
@@ -201,15 +96,9 @@ export const WebSocketProvider = ({ children }: WebSocketProviderProps) => {
       // Don't log errors - this is expected when offline or server unreachable
       setIsConnected(false);
 
-      // Replace any still-pending reconnect so only one is ever queued; the
-      // previously untracked handle could leak and open a second socket.
-      if (reconnectTimeoutRef.current) {
-        clearTimeout(reconnectTimeoutRef.current);
-      }
       if (reconnectAttemptsRef.current < maxReconnectAttempts) {
         reconnectAttemptsRef.current++;
-        reconnectTimeoutRef.current = setTimeout(() => {
-          reconnectTimeoutRef.current = null;
+        setTimeout(() => {
           connectWebSocket();
         }, reconnectDelay);
       }
@@ -224,10 +113,7 @@ export const WebSocketProvider = ({ children }: WebSocketProviderProps) => {
     newWebSocket.onmessage = (e) => {
       try {
         const message = JSON.parse(e.data);
-        // Legacy single-slot state, still consumed by useWebsockets.
-        setLastMessage(message);
-        // Pub/sub: deliver to every subscriber without coalescing.
-        dispatchMessage(message);
+        setLastMessage(message); // Store the last message in context
       } catch (error) {
         console.error("Error parsing WebSocket message:", error);
       }
@@ -238,13 +124,9 @@ export const WebSocketProvider = ({ children }: WebSocketProviderProps) => {
       if (keepAliveInterval) {
         clearInterval(keepAliveInterval);
       }
-      if (reconnectTimeoutRef.current) {
-        clearTimeout(reconnectTimeoutRef.current);
-        reconnectTimeoutRef.current = null;
-      }
       newWebSocket.close();
     };
-  }, [api, deviceId, isNetworkConnected, dispatchMessage]);
+  }, [api, deviceId, isNetworkConnected]);
 
   const handleLibraryChanged = useCallback(
     (data: any) => {
@@ -275,80 +157,47 @@ export const WebSocketProvider = ({ children }: WebSocketProviderProps) => {
     [queryClient],
   );
 
-  const handleUserDataChanged = useCallback(
-    (data: any) => {
-      // Jellyfin sends UserDataChanged when playback position, played status
-      // or favorites change (e.g. finishing an episode). Only the
-      // progression-based home sections care about it.
-      if (!((data?.UserDataList?.length ?? 0) > 0)) {
-        return;
-      }
-
-      // Finishing an item can emit several UserDataChanged messages, so
-      // debounce to invalidate the affected sections only once.
-      if (userDataChangeDebounceRef.current) {
-        clearTimeout(userDataChangeDebounceRef.current);
-      }
-      userDataChangeDebounceRef.current = setTimeout(() => {
-        for (const queryKey of USER_DATA_CHANGE_QUERY_KEYS) {
-          queryClient.invalidateQueries({ queryKey: [...queryKey] });
-        }
-      }, 800);
-    },
-    [queryClient],
-  );
-
-  // Refresh library-dependent queries when the server reports a change.
-  useEffect(
-    () => subscribe("LibraryChanged", handleLibraryChanged),
-    [subscribe, handleLibraryChanged],
-  );
-
-  // Refresh "Continue Watching" / "Next Up" when playback state changes.
-  useEffect(
-    () => subscribe("UserDataChanged", handleUserDataChanged),
-    [subscribe, handleUserDataChanged],
-  );
+  useEffect(() => {
+    if (!lastMessage) {
+      return;
+    }
+    if (lastMessage.MessageType === "Play") {
+      handlePlayCommand(lastMessage.Data);
+    } else if (lastMessage.MessageType === "LibraryChanged") {
+      handleLibraryChanged(lastMessage.Data);
+    }
+  }, [lastMessage, router, handleLibraryChanged]);
 
   useEffect(() => {
     return () => {
       if (libraryChangeDebounceRef.current) {
         clearTimeout(libraryChangeDebounceRef.current);
       }
-      if (userDataChangeDebounceRef.current) {
-        clearTimeout(userDataChangeDebounceRef.current);
-      }
-      if (reconnectTimeoutRef.current) {
-        clearTimeout(reconnectTimeoutRef.current);
-      }
     };
   }, []);
 
-  const handlePlayCommand = useCallback((data: any) => {
-    if (!data?.ItemIds?.length) {
-      return;
-    }
+  const handlePlayCommand = useCallback(
+    (data: any) => {
+      if (!data?.ItemIds?.length) {
+        return;
+      }
 
-    const itemId = data.ItemIds[0];
+      const itemId = data.ItemIds[0];
 
-    router.push({
-      pathname: "/(auth)/player/direct-player",
-      params: {
-        itemId: itemId,
-        playCommand: data.PlayCommand || "PlayNow",
-        audioIndex: data.AudioStreamIndex?.toString(),
-        subtitleIndex: data.SubtitleStreamIndex?.toString(),
-        mediaSourceId: data.MediaSourceId || "",
-        bitrateValue: "",
-        offline: "false",
-      },
-    });
-  }, []);
-
-  // Server-initiated "Play me this item" remote command.
-  useEffect(
-    () => subscribe("Play", handlePlayCommand),
-    [subscribe, handlePlayCommand],
+      router.push({
+        pathname: "/(auth)/player/direct-player",
+        params: {
+          itemId: itemId,
+          playCommand: data.PlayCommand || "PlayNow",
+          audioIndex: data.AudioStreamIndex?.toString(),
+          subtitleIndex: data.SubtitleStreamIndex?.toString(),
+          mediaSourceId: data.MediaSourceId || "",
+          bitrateValue: "",
+          offline: "false",
+        },
+      });
+    },
+    [router],
   );
 
   useEffect(() => {
@@ -418,14 +267,7 @@ export const WebSocketProvider = ({ children }: WebSocketProviderProps) => {
   }, []);
   return (
     <WebSocketContext.Provider
-      value={{
-        ws,
-        isConnected,
-        lastMessage,
-        subscribe,
-        sendMessage,
-        clearLastMessage,
-      }}
+      value={{ ws, isConnected, lastMessage, sendMessage, clearLastMessage }}
     >
       {children}
     </WebSocketContext.Provider>