Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (589 of 589 strings)

Translation: Jellyfin Android/Jellyfin Android TV
Translate-URL: https://translate.jellyfin.org/projects/jellyfin-android/jellyfin-androidtv/pt_BR/

.editorconfig

@@ -2,6 +2,7 @@ root = true
 
 [*]
 insert_final_newline = true
+max_line_length = 140
 trim_trailing_whitespace = true
 
 [{*.kts,*.kt}]
@@ -11,7 +12,7 @@ tab_width = 4
 # Disable wildcard imports in IntelliJ/Android Studio
 ij_kotlin_name_count_to_use_star_import = 1000
 ij_kotlin_name_count_to_use_star_import_for_members = 1000
-ij_kotlin_packages_to_use_import_on_demand =
+ij_kotlin_packages_to_use_import_on_demand = unset
 
 [*.md]
 trim_trailing_whitespace = false

.gitattributes

@@ -5,3 +5,5 @@
 
 CONTRIBUTORS.md merge=union
 app/src/main/res/values*/strings.xml merge=union
+
+design/src/main/kotlin/token/* linguist-generated

.github/ISSUE_TEMPLATE/bug-report-playback.yaml

@@ -4,6 +4,24 @@ labels:
   - bug
   - playback
 body:
+  - type: checkboxes
+    id: before-posting
+    attributes:
+      label: "This issue respects the following points:"
+      description: All conditions are **required**.
+      options:
+        - label: I have discussed this issue in the [Jellyfin forum](https://forum.jellyfin.org/) and/or [troubleshooting chat](https://jellyfin.org/contact) before opening this issue.
+          required: true
+        - label: This issue is **not** already reported on [GitHub](https://github.com/jellyfin/jellyfin-androidtv/issues?q=is%3Aopen+is%3Aissue) _(I've searched it)_.
+          required: true
+        - label: I agree to follow Jellyfin's [Code of Conduct](https://jellyfin.org/docs/general/community-standards.html#code-of-conduct).
+          required: true
+        - label: This report addresses only a single issue; If you encounter multiple issues, kindly create separate reports for each one.
+          required: true
+  - type: markdown
+    attributes:
+      value: |
+        ## Bug information  
   - type: textarea
     id: description
     attributes:
@@ -20,24 +38,6 @@ body:
         Instead, I expect …
     validations:
       required: true
-  - type: textarea
-    id: logs
-    attributes:
-      label: Logs
-      description: |
-        Please paste your client logs (logcat) here, *NOT* server logs (in most cases).
-        Learn how to capture those logcats [here](https://wiki.lineageos.org/logcat.html).
-        Make sure that they don't contain any sensitive information like server URL, auth tokens or passwords.
-      placeholder: Paste logs…
-      render: shell
-  - type: textarea
-    id: logs-ffmpeg
-    attributes:
-      label: FFmpeg logs
-      description: |
-        Please paste your FFmpeg logs here. You can find these by going to the dashboard of your Jellyfin server.
-      placeholder: Paste logs…
-      render: shell
   - type: textarea
     id: mediainfo
     attributes:
@@ -45,24 +45,72 @@ body:
       description: |
         Please share the media information for the file causing issues. You can use a variety of tools to retrieve this information.
         - Use ffprobe (`ffprobe ./file.mp4`)
-        - Use the Media Info tool (set to text format, download here: https://mediaarea.net/en/MediaInfo)
         - Copy the media info from the web interface
       placeholder: Paste media info…
       render: shell
+  - type: textarea
+    id: mediacapabilitiesreport
+    attributes:
+      label: Media capabilities report
+      description: |
+        Please share the media capability report generated from within the app. To do some follow these steps:
+        1. Open the Jellyfin for Android TV app
+        2. Connect to a server **that you have admin access to**
+        3. Go to Preferences -> Playback -> Advanced playback preferences
+        4. On the bottom, press the "Report playback capabilities to server" button
+        5. Go to the logs in your Jellyfin dashboard (in your browser)
+        6. Open the newest log file, it should be named similar to `upload_Jellyfin Android TV[...].log`
+        7. Press the "Download" button and paste the file contents
+      placeholder: Paste capability report contents…
+  - type: markdown
+    attributes:
+      value: |
+        ## Logs
+  - type: textarea
+    id: logs
+    attributes:
+      label: Client logs
+      description: |
+        Please paste your crash logs here if applicable. You can find these in your servers dashboard under "logs".
+        The file name should start with "upload_org.jellyfin.androidtv".
+        Make sure that they don't contain any sensitive information like server URL, auth tokens or passwords.
+      placeholder: Paste logs…
+  - type: textarea
+    id: logs-ffmpeg
+    attributes:
+      label: FFmpeg logs
+      description: |
+        Please paste your FFmpeg logs here. You can find these in your servers dashboard under "logs".
+      placeholder: Paste logs…
+      render: shell
+  - type: markdown
+    attributes:
+      value: |
+        ## Environment
   - type: input
     id: app-version
     attributes:
       label: Application version
       description: The version of the installed Jellyfin Android TV app.
-      placeholder: 0.12.0
+      placeholder: 0.18.2
     validations:
       required: true
+  - type: dropdown
+    id: installation-source
+    attributes:
+      label: Where did you install the app from?
+      description: Choose the appropriate app store or installation method.
+      options:
+        - Google Play Store
+        - Amazon Appstore
+        - F-Droid
+        - Sideloaded APK
   - type: input
     id: device-info
     attributes:
       label: Device information
       description: Manufacturer and model
-      placeholder: Nvidia Shield Pro (2017), Amazon Fire TV Stick v1 (2014)
+      placeholder: Nvidia Shield TV Pro (2019), Fire TV Stick HD (2020)
     validations:
       required: true
   - type: input
@@ -70,7 +118,7 @@ body:
     attributes:
       label: Android version
       description: Version of the OS and other information (e.g. custom ROM / OEM skin)
-      placeholder: Android 9, Fire OS 7 
+      placeholder: Android 13, Fire OS 7
     validations:
       required: true
   - type: input
@@ -78,6 +126,18 @@ body:
     attributes:
       label: Jellyfin server version
       description: If on unstable, please specify the commit hash.
-      placeholder: 10.7.7
+      placeholder: 10.10.2
     validations:
       required: true
+  - type: markdown
+    attributes:
+      value: |
+        ## Additional
+  - type: input
+    id: other-sources
+    attributes:
+      label: Other sources
+      description: Please link the related forum topics or chat messages that prompted you open this issue.
+      placeholder: https://forum.jellyfin.org/…
+    validations:
+      required: false

.github/ISSUE_TEMPLATE/bug-report.yaml

@@ -3,6 +3,24 @@ description: Create a bug report
 labels:
   - bug
 body:
+  - type: checkboxes
+    id: before-posting
+    attributes:
+      label: "This issue respects the following points:"
+      description: All conditions are **required**.
+      options:
+        - label: I have discussed this issue in the [Jellyfin forum](https://forum.jellyfin.org/) and/or [troubleshooting chat](https://jellyfin.org/contact) before opening this issue.
+          required: true
+        - label: This issue is **not** already reported on [GitHub](https://github.com/jellyfin/jellyfin-androidtv/issues?q=is%3Aopen+is%3Aissue) _(I've searched it)_.
+          required: true
+        - label: I agree to follow Jellyfin's [Code of Conduct](https://jellyfin.org/docs/general/community-standards.html#code-of-conduct).
+          required: true
+        - label: This report addresses only a single issue; If you encounter multiple issues, kindly create separate reports for each one.
+          required: true
+  - type: markdown
+    attributes:
+      value: |
+        ## Bug information  
   - type: textarea
     id: description
     attributes:
@@ -24,17 +42,20 @@ body:
     attributes:
       label: Logs
       description: |
-        Please paste your client logs (logcat) here, *NOT* server logs (in most cases).
-        Learn how to capture those logcats [here](https://wiki.lineageos.org/logcat.html).
+        Please paste your crash logs here if applicable. You can find these in your servers dashboard under "logs".
+        The file name should start with "upload_org.jellyfin.androidtv".
         Make sure that they don't contain any sensitive information like server URL, auth tokens or passwords.
       placeholder: Paste logs…
-      render: shell
+  - type: markdown
+    attributes:
+      value: |
+        ## Environment
   - type: input
     id: app-version
     attributes:
       label: Application version
       description: The version of the installed Jellyfin Android TV app.
-      placeholder: 0.12.0
+      placeholder: 0.18.2
     validations:
       required: true
   - type: dropdown
@@ -43,15 +64,16 @@ body:
       label: Where did you install the app from?
       description: Choose the appropriate app store or installation method.
       options:
-        - Google Play
+        - Google Play Store
         - Amazon Appstore
+        - F-Droid
         - Sideloaded APK
   - type: input
     id: device-info
     attributes:
       label: Device information
       description: Manufacturer and model
-      placeholder: Nvidia Shield Pro (2017), Amazon Fire TV Stick v1 (2014)
+      placeholder: Nvidia Shield TV Pro (2019), Fire TV Stick HD (2020)
     validations:
       required: true
   - type: input
@@ -59,7 +81,7 @@ body:
     attributes:
       label: Android version
       description: Version of the OS and other information (e.g. custom ROM / OEM skin)
-      placeholder: Android 9, Fire OS 7
+      placeholder: Android 13, Fire OS 7
     validations:
       required: true
   - type: input
@@ -67,6 +89,18 @@ body:
     attributes:
       label: Jellyfin server version
       description: If on unstable, please specify the commit hash.
-      placeholder: 10.7.7
+      placeholder: 10.10.2
     validations:
       required: true
+  - type: markdown
+    attributes:
+      value: |
+        ## Additional
+  - type: input
+    id: other-sources
+    attributes:
+      label: Other sources
+      description: Please link the related forum topics or chat messages that prompted you open this issue.
+      placeholder: https://forum.jellyfin.org/…
+    validations:
+      required: false

.github/ISSUE_TEMPLATE/feature-request.yaml

@@ -3,12 +3,54 @@ description: Request a new feature
 labels:
   - enhancement
 body:
-  - type: textarea
-    id: description
+  - type: checkboxes
+    id: before-posting
     attributes:
-      label: Describe the feature you'd like
-      description: |
-        A clear and concise description of what you want to request.
-        You can also attach screenshots or screen recordings to help explain your request.
+      label: "This request respects the following points:"
+      description: All conditions are **required**.
+      options:
+        - label: This request is **not** already on [GitHub](https://github.com/jellyfin/jellyfin-androidtv/labels/enhancement) _(I've searched it)_.
+          required: true
+        - label: I agree to follow Jellyfin's [Code of Conduct](https://jellyfin.org/docs/general/community-standards.html#code-of-conduct).
+          required: true
+  - type: textarea
+    attributes:
+      label: Problem description
+      description: Describe the issue you are experiencing or the gap you are trying to address.
+      placeholder: |
+        The Android TV app does not support displaying lyrics, while the Jellyfin web interface does.
+        This creates an inconsistent user experience across platforms.
     validations:
       required: true
+  - type: textarea
+    attributes:
+      label: Proposed solution
+      description: Provide a detailed description of what you would like to see implemented or changed.
+      placeholder: |
+        The app could display lyrics in the screensaver. Additionally, a lyrics section could be integrated into the page that opens when music is played.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Alternatives considered
+      description: Outline any other approaches you have thought about or explored to solve the problem.
+      placeholder: |
+        An alternative approach could involve adding a dedicated "Lyrics" button in the app, similar to the Jellyfin web interface.
+        Users could press this button to open a full-screen lyrics view.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Additional information
+      description: Include any relevant details, resources, or screenshots that might help in understanding or implementing the request.
+      placeholder: Add any additional context here.
+    validations:
+      required: false
+  - type: input
+    id: other-sources
+    attributes:
+      label: Other sources
+      description: If this topic has been discussed outside of GitHub, please link it.
+      placeholder: https://forum.jellyfin.org/…
+    validations:
+      required: false

.github/dependabot.yml

@@ -1,10 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: github-actions
-    directory: /
-    schedule:
-      interval: weekly
-    labels:
-      - ci
-      - github-actions
-      - dependencies

.github/pull_request_template.md

@@ -1,11 +1,15 @@
 <!--
 Ensure your title is short, descriptive, and in the imperative mood (Fix X, Change Y, instead of Fixed X, Changed Y).
-For a good inspiration of what to write in commit messages and PRs please review https://chris.beams.io/posts/git-commit/ and our https://docs.jellyfin.org/general/contributing/issues.html page.
+For a good inspiration of what to write in commit messages and PRs please review https://chris.beams.io/posts/git-commit/ and our https://jellyfin.org/docs/general/contributing/issues/ page.
 -->
 
 **Changes**
 <!-- Describe your changes here in 1-5 sentences. -->
 
+**Code assistance**
+<!-- If code assistance was used, describe how it contributed
+e.g., code generated by LLM, explanation of code base, debugging guidance. -->
+
 **Issues**
 <!-- Tag any issues that this PR solves here.
 ex. Fixes # -->

.github/workflows/app-build.yaml

@@ -1,29 +1,37 @@
-name: App Build
+name: App / Build
 
 on:
   push:
     branches:
       - master
+      - release-*
   pull_request:
 
+permissions:
+  contents: read
+
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    name: Build
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
       - name: Setup Java
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
         with:
-          distribution: adopt
-          java-version: 11
-          cache: gradle
+          distribution: temurin
+          java-version-file: .tools-versions
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2
       - name: Assemble debug APKs
-        run: ./gradlew --build-cache --no-daemon --info assembleDebug
+        run: ./gradlew assembleDebug
+      - name: Create publish bundle
+        run: mkdir -p build/gh-app-publish/; find app/build/ -iname "*.apk" -exec mv "{}" build/gh-app-publish/ \;
       - name: Upload artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
           name: build-artifacts
           retention-days: 14
           if-no-files-found: error
-          path: app/build/outputs/apk/debug/*.apk
+          path: build/gh-app-publish/

.github/workflows/app-lint.yaml

@@ -1,4 +1,4 @@
-name: App Lint
+name: App / Lint
 
 on:
   push:
@@ -7,22 +7,28 @@ on:
       - release-*
   pull_request:
 
+permissions:
+  contents: read
+  security-events: write
+
 jobs:
   lint:
-    runs-on: ubuntu-20.04
+    name: Lint
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
       - name: Setup Java
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
         with:
-          distribution: adopt
-          java-version: 11
-          cache: gradle
-      - name: Run detekt and lint task
-        run: ./gradlew --build-cache --no-daemon --info detekt lint
+          distribution: temurin
+          java-version-file: .tools-versions
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2
+      - name: Run detekt and lint tasks
+        run: ./gradlew detekt lint
       - name: Upload SARIF files
-        uses: github/codeql-action/upload-sarif@v1
+        uses: github/codeql-action/upload-sarif@c10b8064de6f491fea524254123dbe5e09572f13 # v4.35.1
         if: ${{ always() }}
         with:
           sarif_file: .

.github/workflows/app-publish.yaml

@@ -1,4 +1,4 @@
-name: App Publish
+name: App / Publish
 
 on:
   push:
@@ -6,33 +6,40 @@ on:
       - v*
 
 jobs:
-  build:
-    runs-on: ubuntu-20.04
-    if: ${{ github.repository == 'jellyfin/jellyfin-androidtv' }}
+  publish:
+    name: Publish
+    runs-on: ubuntu-24.04
+    if: ${{ contains(github.repository_owner, 'jellyfin') }}
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
       - name: Setup Java
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
         with:
-          distribution: adopt
-          java-version: 11
+          distribution: temurin
+          java-version-file: .tools-versions
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2
       - name: Set JELLYFIN_VERSION
         run: echo "JELLYFIN_VERSION=$(echo ${GITHUB_REF#refs/tags/v} | tr / -)" >> $GITHUB_ENV
       - name: Assemble release files
-        run: ./gradlew --no-daemon --info assemble bundleRelease versionTxt
+        run: ./gradlew assemble bundleRelease versionTxt
       - name: Sign APK
         id: signApk
-        uses: r0adkll/sign-android-release@v1
+        uses: r0adkll/sign-android-release@349ebdef58775b1e0d8099458af0816dc79b6407 # tag=v1
+        env:
+          BUILD_TOOLS_VERSION: "34.0.0"
         with:
           releaseDirectory: app/build/outputs/apk/release
           signingKeyBase64: ${{ secrets.KEYSTORE }}
           keyStorePassword: ${{ secrets.KEYSTORE_PASSWORD }}
           alias: ${{ secrets.KEY_ALIAS }}
           keyPassword: ${{ secrets.KEY_PASSWORD }}
-      - name: Sign AAB
+      - name: Sign app bundle
         id: signAab
-        uses: r0adkll/sign-android-release@v1
+        uses: r0adkll/sign-android-release@349ebdef58775b1e0d8099458af0816dc79b6407 # tag=v1
+        env:
+          BUILD_TOOLS_VERSION: "34.0.0"
         with:
           releaseDirectory: app/build/outputs/bundle/release
           signingKeyBase64: ${{ secrets.KEYSTORE }}
@@ -48,30 +55,34 @@ jobs:
           mv ${{ steps.signAab.outputs.signedReleaseFile }} build/jellyfin-publish/jellyfin-androidtv-v${{ env.JELLYFIN_VERSION }}-release.aab
           mv app/build/version.txt build/jellyfin-publish/
       - name: Upload release archive to GitHub release
-        uses: alexellis/upload-assets@0.3.0
+        uses: alexellis/upload-assets@13926a61cdb2cb35f5fdef1c06b8b591523236d3 # 0.4.1
         env:
-          GITHUB_TOKEN: ${{ github.token }}
+          GITHUB_TOKEN: ${{ secrets.JF_BOT_TOKEN }}
         with:
           asset_paths: '["build/jellyfin-publish/*"]'
       - name: Upload release archive to repo.jellyfin.org
-        uses: burnett01/rsync-deployments@5.2
+        uses: burnett01/rsync-deployments@0dc935cdecc5f5e571865e60d2a6cdc673704823 # tag=5.2
         with:
           switches: -vrptz
           path: build/jellyfin-publish/
-          remote_path: /srv/repository/releases/client/androidtv/versions/v${{ env.JELLYFIN_VERSION }}
-          remote_host: ${{ secrets.DEPLOY_HOST }}
-          remote_user: ${{ secrets.DEPLOY_USER }}
-          remote_key: ${{ secrets.DEPLOY_KEY }}
+          remote_path: /srv/incoming/androidtv/v${{ env.JELLYFIN_VERSION }}/
+          remote_host: ${{ secrets.REPO_HOST }}
+          remote_user: ${{ secrets.REPO_USER }}
+          remote_key: ${{ secrets.REPO_KEY }}
       - name: Update repo.jellyfin.org symlinks
-        uses: appleboy/ssh-action@v0.1.4
+        uses: appleboy/ssh-action@0ff4204d59e8e51228ff73bce53f80d53301dee2 # v1.2.5
         with:
-          host: ${{ secrets.DEPLOY_HOST }}
-          username: ${{ secrets.DEPLOY_USER }}
-          key: ${{ secrets.DEPLOY_KEY }}
+          host: ${{ secrets.REPO_HOST }}
+          username: ${{ secrets.REPO_USER }}
+          key: ${{ secrets.REPO_KEY }}
           envs: JELLYFIN_VERSION
           script_stop: true
           script: |
-            cd /srv/repository/releases/client/androidtv;
-            rm -rf *.apk version.txt;
-            ln -s versions/v${JELLYFIN_VERSION}/jellyfin-androidtv-v${JELLYFIN_VERSION}-*.apk .;
-            ln -s versions/v${JELLYFIN_VERSION}/version.txt .;
+            if [ -d "/srv/repository/main/client/androidtv/versions/v${{ env.JELLYFIN_VERSION }}" ] && [ -n "${{ env.JELLYFIN_VERSION }}" ]; then
+                sudo rm -r /srv/repository/main/client/androidtv/versions/v${{ env.JELLYFIN_VERSION }}
+            fi
+            sudo mv /srv/incoming/androidtv/v${{ env.JELLYFIN_VERSION }} /srv/repository/main/client/androidtv/versions/v${{ env.JELLYFIN_VERSION }}
+            cd /srv/repository/main/client/androidtv;
+            sudo rm -rf *.apk version.txt;
+            sudo ln -s versions/v${JELLYFIN_VERSION}/jellyfin-androidtv-v${JELLYFIN_VERSION}-*.apk .;
+            sudo ln -s versions/v${JELLYFIN_VERSION}/version.txt .;

.github/workflows/app-test.yaml

@@ -1,4 +1,4 @@
-name: App Test
+name: App / Test
 
 on:
   push:
@@ -7,17 +7,22 @@ on:
       - release-*
   pull_request:
 
+permissions:
+  contents: read
+
 jobs:
   test:
-    runs-on: ubuntu-20.04
+    name: Test
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
       - name: Setup Java
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
         with:
-          distribution: adopt
-          java-version: 11
-          cache: gradle
+          distribution: temurin
+          java-version-file: .tools-versions
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2
       - name: Run test task
-        run: ./gradlew --build-cache --no-daemon --info test
+        run: ./gradlew test

.github/workflows/gradlew-update.yaml

@@ -1,17 +0,0 @@
-name: Gradle update
-
-on:
-  schedule:
-    - cron: '0 4 * * *'
-
-jobs:
-  update:
-    runs-on: ubuntu-20.04
-    if: github.repository == 'jellyfin/jellyfin-androidtv'
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-      - name: Update Gradle Wrapper
-        uses: gradle-update/update-gradle-wrapper-action@v1
-        with:
-          repo-token: ${{ secrets.JF_BOT_TOKEN }}

.github/workflows/gradlew-validate.yaml

@@ -1,4 +1,4 @@
-name: Gradle validate
+name: Gradle / Validate wrapper
 
 on:
   push:
@@ -8,11 +8,15 @@ on:
     paths:
       - '**/gradlе-wrapper.jar'
 
+permissions:
+  contents: read
+
 jobs:
   validate:
-    runs-on: ubuntu-20.04
+    name: Validate
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
       - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v1
+        uses: gradle/actions/wrapper-validation@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2

.github/workflows/merge-conflict-labeler.yaml

@@ -1,17 +0,0 @@
-name: Merge conflict labeler
-
-on:
-  push:
-  pull_request_target:
-    types:
-      - synchronize
-
-jobs:
-  triage:
-    runs-on: ubuntu-20.04
-    if: github.repository == 'jellyfin/jellyfin-androidtv'
-    steps:
-      - uses: eps1lon/actions-label-merge-conflict@v2.0.1
-        with:
-          dirtyLabel: merge conflict
-          repoToken: ${{ secrets.JF_BOT_TOKEN }}

.github/workflows/repo-merge-conflict.yaml

@@ -0,0 +1,18 @@
+name: Repo / Label merge conflict
+
+on:
+  push:
+  pull_request_target:
+    types:
+      - synchronize
+
+jobs:
+  triage:
+    name: Triage
+    runs-on: ubuntu-24.04
+    if: ${{ contains(github.repository_owner, 'jellyfin') }}
+    steps:
+      - uses: eps1lon/actions-label-merge-conflict@1df065ebe6e3310545d4f4c4e862e43bdca146f0 # v3.0.3
+        with:
+          dirtyLabel: merge conflict
+          repoToken: ${{ secrets.JF_BOT_TOKEN }}

.github/workflows/repo-stale.yaml

@@ -1,4 +1,4 @@
-name: Issue stale check
+name: Repo / Reply stale issue
 
 on:
   schedule:
@@ -10,11 +10,12 @@ permissions:
   pull-requests: write
 
 jobs:
-  stale:
-    runs-on: ubuntu-20.04
-    if: github.repository == 'jellyfin/jellyfin-androidtv'
+  triage:
+    name: Triage
+    runs-on: ubuntu-24.04
+    if: ${{ contains(github.repository_owner, 'jellyfin') }}
     steps:
-      - uses: actions/stale@v5
+      - uses: actions/stale@b5d41d4e1d5dceea10e7104786b73624c18a190f # v10.2.0
         with:
           repo-token: ${{ secrets.JF_BOT_TOKEN }}
           days-before-stale: 120

.gitignore

@@ -4,5 +4,6 @@ local.properties
 
 /.idea
 .gradle
+.kotlin/
 build/
 captures/

.tools-versions

@@ -0,0 +1 @@
+java 21

CONTRIBUTORS.md

@@ -10,6 +10,12 @@
  - [joern-h](https://github.com/joern-h)
  - [Niels van Velzen](https://github.com/nielsvanvelzen)
  - [GodTamIt](https://github.com/GodTamIt)
+ - [sparky3387](https://github.com/sparky3387)
+ - [mohd-akram](https://github.com/mohd-akram)
+ - [3l0w](https://github.com/3l0w)
+ - [MajMongoose](https://github.com/majmongoose)
+ - [Olaren15](https://github.com/Olaren15)
+ - [dtrexler](https://github.com/dtrexler)
 
 # Emby Contributors
 

README.md

@@ -25,9 +25,6 @@
 <a href="https://matrix.to/#/+jellyfin:matrix.org">
 <img alt="Chat on Matrix" src="https://img.shields.io/matrix/jellyfin:matrix.org.svg?logo=matrix"/>
 </a>
-<a href="https://www.reddit.com/r/jellyfin">
-<img alt="Join our Subreddit" src="https://img.shields.io/badge/reddit-r%2Fjellyfin-%23FF5700.svg"/>
-</a>
 <br/>
 <a href="https://play.google.com/store/apps/details?id=org.jellyfin.androidtv">
 <img width="153" alt="Jellyfin on Google Play" src="https://jellyfin.org/images/store-icons/google-play.png"/>
@@ -35,52 +32,46 @@
 <a href="https://www.amazon.com/gp/aw/d/B07TX7Z725">
 <img width="153" alt="Jellyfin on Amazon Appstore" src="https://jellyfin.org/images/store-icons/amazon.png"/>
 </a>
+<a href="https://f-droid.org/en/packages/org.jellyfin.androidtv/">
+<img width="153" alt="Jellyfin on F-Droid" src="https://jellyfin.org/images/store-icons/fdroid.png"/>
+</a>
 <br/>
 <a href="https://repo.jellyfin.org/releases/client/androidtv/">Download archive</a>
 </p>
 
-Jellyfin Android TV is a Jellyfin client for Android TV, Nvidia Shield, and Amazon Fire TV devices.
-We welcome all contributions and pull requests! If you have a larger feature in mind please open an
-issue so we can discuss the implementation before you start. 
+Jellyfin Android TV is a Jellyfin client for Android TV, Nvidia Shield, and Amazon Fire TV devices. We welcome all contributions and pull
+requests! If you have a larger feature in mind please open an issue so we can discuss the implementation before you start. 
 
-## Translating
+## Building
 
-Translations can be improved very easily from our
-[Weblate](https://translate.jellyfin.org/projects/jellyfin-android/jellyfin-androidtv) instance.
-Look through the following graphic to see if your native language could use some work!
+The app uses Gradle and requires the Android SDK. We recommend using Android Studio, which includes all required dependencies, for
+development and building. For manual building without Android Studio make sure a compatible JDK and Android SDK are installed and in your
+PATH, then use the Gradle wrapper (`./gradlew`) to build the project with the `assembleDebug` Gradle task to generate an apk file:
 
-<a href="https://translate.jellyfin.org/engage/jellyfin-android/">
-<img alt="Detailed Translation Status" src="https://translate.jellyfin.org/widgets/jellyfin-android/-/jellyfin-androidtv/multi-auto.svg"/>
-</a>
-
-## Build Process
-
-### Dependencies
-
-- Android Studio
-
-### Build
-
-1. Clone or download this repository
-
-   ```sh
-   git clone https://github.com/jellyfin/jellyfin-androidtv.git
-   cd jellyfin-androidtv
-   ```
-
-2. Open the project in Android Studio and run it from there or build an APK directly through Gradle:
-
-   ```sh
+```shell
 ./gradlew assembleDebug
 ```
 
-   Add the Android SDK to you PATH environment variable or create the ANDROID_SDK_ROOT variable for
-   this to work.
+The task will create an APK file in the `/app/build/outputs/apk/debug` directory. This APK file uses a different app-id from our stable
+builds and can be manually installed to your device.
 
-### Deploy to device/emulator
+## Branching
 
-   ```sh
-   ./gradlew installDebug
-   ```
+The `master` branch is the primary development branch and the target for all pull requests. It is **unstable** and may contain breaking
+changes or unresolved bugs. For production deployments and forks, always use the latest `release-x.y.z` branch. Do not base production work
+or long-lived forks on `master`.
 
-*You can also replace the "Debug" with "Release" to get an optimized release binary.*
+Release branches are created at the start of a beta cycle and are kept up to date with each published release. Maintainers will cherry-pick
+selected changes into release branches as needed for backports. These branches are reused for subsequent patch releases.
+
+## Translating
+
+Translations can be improved very easily from our [Weblate](https://translate.jellyfin.org/projects/jellyfin-android/jellyfin-androidtv)
+instance. Look through the following graphic to see if your native language could use some work! We cannot accept changes to translation
+files via pull requests.
+
+<p align="center">
+<a href="https://translate.jellyfin.org/engage/jellyfin-android/">
+<img alt="Detailed Translation Status" src="https://translate.jellyfin.org/widgets/jellyfin-android/-/jellyfin-androidtv/multi-auto.svg"/>
+</a>
+</p>

android-lint.xml

@@ -18,4 +18,8 @@
     <issue id="Typos" severity="ignore" />
     <issue id="UnknownNullness" severity="informational" />
     <issue id="UnusedIds" severity="ignore" />
+    <issue id="UnusedAttribute">
+        <ignore regexp="usesCleartextTraffic" />
+        <ignore regexp="networkSecurityConfig" />
+    </issue>
 </lint>

app/build.gradle.kts

@@ -1,31 +1,29 @@
 plugins {
-	id("com.android.application")
-	kotlin("android")
-	kotlin("kapt")
-	alias(libs.plugins.kotlin.serialization)
 	alias(libs.plugins.aboutlibraries)
+	alias(libs.plugins.android.application)
+	alias(libs.plugins.kotlin.compose)
+	alias(libs.plugins.kotlin.serialization)
 }
 
 android {
 	namespace = "org.jellyfin.androidtv"
-	compileSdk = 31
+	compileSdk = libs.versions.android.compileSdk.get().toInt()
 
 	defaultConfig {
-		minSdk = 21
-		targetSdk = 31
+		minSdk = libs.versions.android.minSdk.get().toInt()
+		targetSdk = libs.versions.android.targetSdk.get().toInt()
 
 		// Release version
 		applicationId = namespace
 		versionName = project.getVersionName()
 		versionCode = getVersionCode(versionName!!)
-		setProperty("archivesBaseName", "jellyfin-androidtv-v$versionName")
 	}
 
-	sourceSets["main"].java.srcDirs("src/main/kotlin")
-	sourceSets["test"].java.srcDirs("src/test/kotlin")
-
 	buildFeatures {
+		buildConfig = true
 		viewBinding = true
+		compose = true
+		resValues = true
 	}
 
 	compileOptions {
@@ -33,8 +31,8 @@ android {
 	}
 
 	buildTypes {
-		val release by getting {
-			isMinifyEnabled = false
+		release {
+			proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
 
 			// Set package names used in various XML files
 			resValue("string", "app_id", namespace!!)
@@ -47,7 +45,7 @@ android {
 			buildConfigField("boolean", "DEVELOPMENT", "false")
 		}
 
-		val debug by getting {
+		debug {
 			// Use different application id to run release and debug at the same time
 			applicationIdSuffix = ".debug"
 
@@ -75,8 +73,10 @@ android {
 	}
 }
 
-val versionTxt by tasks.registering {
-	val path = buildDir.resolve("version.txt")
+base.archivesName.set("jellyfin-androidtv-v${project.getVersionName()}")
+
+tasks.register("versionTxt") {
+	val path = layout.buildDirectory.asFile.get().resolve("version.txt")
 
 	doLast {
 		val versionString = "v${android.defaultConfig.versionName}=${android.defaultConfig.versionCode}"
@@ -87,8 +87,12 @@ val versionTxt by tasks.registering {
 
 dependencies {
 	// Jellyfin
-	implementation(projects.playback)
-	implementation(libs.jellyfin.apiclient)
+	implementation(projects.design)
+	implementation(projects.playback.core)
+	implementation(projects.playback.jellyfin)
+	implementation(projects.playback.media3.exoplayer)
+	implementation(projects.playback.media3.session)
+	implementation(projects.preference)
 	implementation(libs.jellyfin.sdk) {
 		// Change version if desired
 		val sdkVersion = findProperty("sdk.version")?.toString()
@@ -106,9 +110,12 @@ dependencies {
 	// Android(x)
 	implementation(libs.androidx.core)
 	implementation(libs.androidx.activity)
+	implementation(libs.androidx.activity.compose)
 	implementation(libs.androidx.fragment)
+	implementation(libs.androidx.fragment.compose)
 	implementation(libs.androidx.leanback.core)
 	implementation(libs.androidx.leanback.preference)
+	implementation(libs.androidx.navigation3.ui)
 	implementation(libs.androidx.preference)
 	implementation(libs.androidx.appcompat)
 	implementation(libs.androidx.tvprovider)
@@ -119,22 +126,25 @@ dependencies {
 	implementation(libs.androidx.window)
 	implementation(libs.androidx.cardview)
 	implementation(libs.androidx.startup)
+	implementation(libs.bundles.androidx.compose)
+	implementation(libs.accompanist.permissions)
 
 	// Dependency Injection
 	implementation(libs.bundles.koin)
 
-	// GSON
-	implementation(libs.gson)
-
 	// Media players
-	implementation(libs.exoplayer)
-	implementation(libs.jellyfin.exoplayer.ffmpegextension)
-	implementation(libs.libvlc)
+	implementation(libs.androidx.media3.exoplayer)
+	implementation(libs.androidx.media3.datasource.okhttp)
+	implementation(libs.androidx.media3.exoplayer.hls)
+	implementation(libs.androidx.media3.ui)
+	implementation(libs.jellyfin.androidx.media3.ffmpeg.decoder)
+	implementation(libs.libass.media3)
+
+	// Markdown
+	implementation(libs.bundles.markwon)
 
 	// Image utility
-	implementation(libs.glide.core)
-	kapt(libs.glide.compiler)
-	implementation(libs.kenburnsview)
+	implementation(libs.bundles.coil)
 
 	// Crash Reporting
 	implementation(libs.bundles.acra)
@@ -146,10 +156,6 @@ dependencies {
 	implementation(libs.timber)
 	implementation(libs.slf4j.timber)
 
-	// Debugging
-	if (getProperty("leakcanary.enable")?.toBoolean() == true)
-		debugImplementation(libs.leakcanary)
-
 	// Compatibility (desugaring)
 	coreLibraryDesugaring(libs.android.desugar)
 

app/proguard-rules.pro

@@ -0,0 +1 @@
+-dontwarn org.commonmark.ext.gfm.strikethrough.Strikethrough

app/src/main/AndroidManifest.xml

@@ -1,33 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="org.jellyfin.androidtv">
+    android:installLocation="auto">
 
     <!-- Android TV Integration -->
     <uses-permission android:name="com.android.providers.tv.permission.WRITE_EPG_DATA" />
 
-    <!-- AccountManager permissions -->
-    <uses-permission
-        android:name="android.permission.AUTHENTICATE_ACCOUNTS"
-        android:maxSdkVersion="22" />
-    <uses-permission
-        android:name="android.permission.GET_ACCOUNTS"
-        android:maxSdkVersion="22" />
-    <uses-permission
-        android:name="android.permission.MANAGE_ACCOUNTS"
-        android:maxSdkVersion="22" />
-
     <!-- Generic permissions -->
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission
+        android:name="android.permission.ACCESS_WIFI_STATE"
+        tools:ignore="LeanbackUsesWifi" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+
+    <!-- Search permissions (voice to text) -->
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
 
     <!-- Device feature requirements -->
     <uses-feature
         android:name="android.software.leanback"
         android:required="false" />
-
     <uses-feature
         android:name="android.hardware.touchscreen"
         android:required="false" />
@@ -35,30 +28,36 @@
         android:name="android.hardware.microphone"
         android:required="false" />
 
+    <queries>
+        <intent>
+            <action android:name="android.intent.action.VIEW" />
+            <data
+                android:host="youtube.com"
+                android:scheme="https" />
+        </intent>
+
+        <intent>
+            <action android:name="android.intent.action.VIEW" />
+            <data android:mimeType="video/*" />
+        </intent>
+    </queries>
+
     <application
         android:name=".JellyfinApplication"
         android:allowBackup="true"
-        android:banner="@drawable/app_banner"
+        android:appCategory="video"
+        android:banner="@mipmap/app_banner"
+        android:dataExtractionRules="@xml/backup_rules"
         android:fullBackupContent="@xml/backup_content"
-        android:icon="@drawable/app_icon"
+        android:icon="@mipmap/app_icon"
         android:label="@string/app_name"
         android:largeHeap="true"
-        android:roundIcon="@drawable/app_icon_round"
+        android:networkSecurityConfig="@xml/network_security_config"
+        android:supportsRtl="true"
         android:theme="@style/Theme.Jellyfin"
-        android:usesCleartextTraffic="true"
-        tools:ignore="GoogleAppIndexingWarning">
-
-        <service
-            android:name=".auth.AuthenticatorService"
-            android:exported="false">
-            <intent-filter>
-                <action android:name="android.accounts.AccountAuthenticator" />
-            </intent-filter>
-            <meta-data
-                android:name="android.accounts.AccountAuthenticator"
-                android:resource="@xml/authenticator" />
-        </service>
+        android:usesCleartextTraffic="true">
 
+        <!-- Screensaver -->
         <service
             android:name=".integration.dream.LibraryDreamService"
             android:exported="true"
@@ -93,19 +92,23 @@
             android:exported="true"
             android:initOrder="10" />
 
-        <activity
-            android:name=".ui.browsing.MainActivity"
-            android:screenOrientation="landscape" />
+        <provider
+            android:name=".integration.provider.ImageProvider"
+            android:authorities="${applicationId}.integration.provider.ImageProvider"
+            android:exported="true"
+            android:initOrder="10" />
 
+        <!-- Authentication -->
         <activity
             android:name=".ui.startup.StartupActivity"
             android:exported="true"
+            android:launchMode="singleTask"
             android:noHistory="true"
-            android:screenOrientation="landscape"
-            android:windowSoftInputMode="adjustResize">
+            android:windowSoftInputMode="adjustNothing">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.intent.action.SEARCH" />
+                <action android:name="android.intent.action.VIEW" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
                 <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
@@ -115,83 +118,16 @@
                 android:name="android.app.searchable"
                 android:resource="@xml/searchable" />
         </activity>
-
         <activity-alias
             android:name=".startup.StartupActivity"
             android:targetActivity=".ui.startup.StartupActivity" />
 
+        <!-- Main application -->
         <activity
-            android:name=".ui.playback.PlaybackOverlayActivity"
-            android:screenOrientation="landscape" />
-
-        <activity
-            android:name=".ui.browsing.GenericFolderActivity"
-            android:screenOrientation="landscape" />
-
-        <activity
-            android:name=".ui.browsing.UserViewActivity"
-            android:screenOrientation="landscape" />
-
-        <activity
-            android:name=".ui.browsing.CollectionActivity"
-            android:screenOrientation="landscape" />
-
-        <activity
-            android:name=".ui.browsing.GroupedItemsActivity"
-            android:screenOrientation="landscape" />
-
-        <activity
-            android:name=".ui.preference.PreferencesActivity"
-            android:theme="@style/Theme.Jellyfin.Preferences" />
-
-        <activity
-            android:name=".ui.browsing.SuggestedMoviesActivity"
-            android:screenOrientation="landscape" />
-
-        <activity
-            android:name=".ui.search.SearchActivity"
-            android:screenOrientation="landscape" />
-
-        <activity
-            android:name=".ui.itemdetail.FullDetailsActivity"
-            android:screenOrientation="landscape" />
-
-        <activity
-            android:name=".ui.livetv.LiveTvGuideActivity"
-            android:screenOrientation="landscape" />
-
-        <activity
-            android:name=".ui.browsing.GenericGridActivity"
-            android:screenOrientation="landscape" />
-
-        <activity
-            android:name=".ui.browsing.BrowseRecordingsActivity"
-            android:screenOrientation="landscape" />
-
-        <activity
-            android:name=".ui.browsing.BrowseScheduleActivity"
-            android:screenOrientation="landscape" />
-
-        <activity
-            android:name=".ui.itemdetail.PhotoPlayerActivity"
-            android:screenOrientation="landscape" />
-
-        <activity
-            android:name=".ui.itemdetail.ItemListActivity"
-            android:screenOrientation="landscape" />
-
-        <activity
-            android:name=".ui.playback.AudioNowPlayingActivity"
-            android:screenOrientation="landscape" />
+            android:name=".ui.browsing.MainActivity"
+            android:launchMode="singleTask"
+            android:windowSoftInputMode="adjustNothing" />
 
         <activity android:name=".ui.playback.ExternalPlayerActivity" />
-
-        <activity
-            android:name=".ui.playback.nextup.NextUpActivity"
-            android:noHistory="true"
-            android:screenOrientation="landscape" />
-
-        <!-- Playback Rewrite - Temporary -->
-        <activity android:name=".ui.playback.rewrite.PlaybackForwardingActivity" />
     </application>
 </manifest>

app/src/main/java/org/jellyfin/androidtv/JellyfinApplication.kt

@@ -1,102 +1,64 @@
 package org.jellyfin.androidtv
 
+import android.app.Application
 import android.content.Context
-import androidx.lifecycle.DefaultLifecycleObserver
-import androidx.lifecycle.LifecycleOwner
-import androidx.lifecycle.ProcessLifecycleOwner
 import androidx.work.BackoffPolicy
 import androidx.work.ExistingPeriodicWorkPolicy
 import androidx.work.PeriodicWorkRequestBuilder
 import androidx.work.WorkManager
 import androidx.work.await
-import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
-import org.acra.config.dialog
-import org.acra.config.httpSender
-import org.acra.config.limiter
-import org.acra.data.StringFormat
-import org.acra.ktx.initAcra
-import org.acra.sender.HttpSender
-import org.jellyfin.androidtv.auth.SessionRepository
+import kotlinx.coroutines.withContext
+import org.acra.ACRA
+import org.jellyfin.androidtv.data.eventhandling.SocketHandler
+import org.jellyfin.androidtv.data.repository.NotificationsRepository
 import org.jellyfin.androidtv.integration.LeanbackChannelWorker
-import org.jellyfin.androidtv.util.AutoBitrate
-import org.koin.android.ext.android.get
-import org.koin.android.ext.android.getKoin
+import org.jellyfin.androidtv.telemetry.TelemetryService
 import org.koin.android.ext.android.inject
-import timber.log.Timber
 import java.util.concurrent.TimeUnit
 
 @Suppress("unused")
-class JellyfinApplication : TvApp() {
+class JellyfinApplication : Application() {
 	override fun onCreate() {
 		super.onCreate()
 
-		// Register application lifecycle events
-		ProcessLifecycleOwner.get().lifecycle.addObserver(object : DefaultLifecycleObserver {
-			/**
-			 * Called by the Process Lifecycle when the app is created. It is called after [onCreate].
-			 */
-			override fun onCreate(owner: LifecycleOwner) {
-				// Register activity lifecycle callbacks
-				getKoin().getAll<ActivityLifecycleCallbacks>().forEach(::registerActivityLifecycleCallbacks)
-			}
+		// Don't run in ACRA service
+		if (ACRA.isACRASenderServiceProcess()) return
 
-			/**
-			 * Called by the Process Lifecycle when the app is activated in the foreground (activity opened).
-			 */
-			override fun onStart(owner: LifecycleOwner) {
-				Timber.i("Process lifecycle started")
-
-				get<SessionRepository>().restoreDefaultSession()
-			}
-		})
+		val notificationsRepository by inject<NotificationsRepository>()
+		notificationsRepository.addDefaultNotifications()
 	}
 
 	/**
 	 * Called from the StartupActivity when the user session is started.
 	 */
-	@DelicateCoroutinesApi
-	suspend fun onSessionStart() {
+	suspend fun onSessionStart() = withContext(Dispatchers.IO) {
 		val workManager by inject<WorkManager>()
-		val autoBitrate by inject<AutoBitrate>()
+		val socketListener by inject<SocketHandler>()
 
+		// Update background worker
+		launch {
 			// Cancel all current workers
 			workManager.cancelAllWork().await()
 
 			// Recreate periodic workers
 			workManager.enqueueUniquePeriodicWork(
 				LeanbackChannelWorker.PERIODIC_UPDATE_REQUEST_NAME,
-			ExistingPeriodicWorkPolicy.REPLACE,
+				ExistingPeriodicWorkPolicy.UPDATE,
 				PeriodicWorkRequestBuilder<LeanbackChannelWorker>(1, TimeUnit.HOURS)
 					.setBackoffCriteria(BackoffPolicy.LINEAR, 10, TimeUnit.MINUTES)
 					.build()
 			).await()
+		}
 
-		// Detect auto bitrate
-		GlobalScope.launch(Dispatchers.IO) { autoBitrate.detect() }
+		// Update WebSockets
+		launch { socketListener.updateSession() }
 	}
 
 	override fun attachBaseContext(base: Context?) {
 		super.attachBaseContext(base)
 
-		initAcra {
-			buildConfigClass = BuildConfig::class.java
-			reportFormat = StringFormat.JSON
-
-			httpSender {
-				uri = "https://collector.tracepot.com/a2eda9d9"
-				httpMethod = HttpSender.Method.POST
-			}
-
-			dialog {
-				withResTitle(R.string.acra_dialog_title)
-				withResText(R.string.acra_dialog_text)
-				withResTheme(R.style.Theme_Jellyfin)
-			}
-
-			limiter {}
-		}
+		TelemetryService.init(this)
 	}
 }

app/src/main/java/org/jellyfin/androidtv/JellyfinGlideModule.kt

@@ -1,22 +0,0 @@
-package org.jellyfin.androidtv
-
-import android.content.Context
-import android.util.Log
-import com.bumptech.glide.GlideBuilder
-import com.bumptech.glide.annotation.GlideModule
-import com.bumptech.glide.load.engine.DiskCacheStrategy
-import com.bumptech.glide.module.AppGlideModule
-import com.bumptech.glide.request.RequestOptions
-
-@GlideModule
-class JellyfinGlideModule : AppGlideModule() {
-	override fun applyOptions(context: Context, builder: GlideBuilder): Unit = with(builder) {
-		setDefaultRequestOptions(
-			// Set default disk cache strategy
-			RequestOptions().diskCacheStrategy(DiskCacheStrategy.RESOURCE)
-		)
-
-		// Silence image load errors
-		setLogLevel(Log.ERROR)
-	}
-}

app/src/main/java/org/jellyfin/androidtv/SessionInitializer.kt

@@ -1,9 +1,13 @@
 package org.jellyfin.androidtv
 
 import android.content.Context
+import androidx.lifecycle.ProcessLifecycleOwner
+import androidx.lifecycle.lifecycleScope
 import androidx.startup.AppInitializer
 import androidx.startup.Initializer
-import org.jellyfin.androidtv.auth.SessionRepository
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import org.jellyfin.androidtv.auth.repository.SessionRepository
 import org.jellyfin.androidtv.di.KoinInitializer
 
 @Suppress("unused")
@@ -14,7 +18,9 @@ class SessionInitializer : Initializer<Unit> {
 			.koin
 
 		// Restore system session
-		koin.get<SessionRepository>().restoreDefaultSystemSession()
+		ProcessLifecycleOwner.get().lifecycleScope.launch(Dispatchers.IO) {
+			koin.get<SessionRepository>().restoreSession(destroyOnly = false)
+		}
 	}
 
 	override fun dependencies() = listOf(KoinInitializer::class.java)

app/src/main/java/org/jellyfin/androidtv/TvApp.java

@@ -1,93 +0,0 @@
-package org.jellyfin.androidtv;
-
-import android.app.Activity;
-import android.app.Application;
-
-import androidx.annotation.Nullable;
-import androidx.lifecycle.LiveData;
-import androidx.lifecycle.MediatorLiveData;
-
-import org.jellyfin.androidtv.ui.livetv.TvManager;
-import org.jellyfin.androidtv.ui.playback.PlaybackController;
-import org.jellyfin.apiclient.model.dto.BaseItemDto;
-import org.jellyfin.apiclient.model.dto.UserDto;
-
-public class TvApp extends Application {
-    public static final int LIVE_TV_GUIDE_OPTION_ID = 1000;
-    public static final int LIVE_TV_RECORDINGS_OPTION_ID = 2000;
-    public static final int VIDEO_QUEUE_OPTION_ID = 3000;
-    public static final int LIVE_TV_SCHEDULE_OPTION_ID = 4000;
-    public static final int LIVE_TV_SERIES_OPTION_ID = 5000;
-
-    private static TvApp app;
-    private MediatorLiveData<UserDto> currentUser = new MediatorLiveData<UserDto>();
-    private BaseItemDto lastPlayedItem;
-    private PlaybackController playbackController;
-
-    private Activity currentActivity;
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-
-        app = this;
-    }
-
-    @Nullable
-    public static TvApp getApplication() {
-        return app;
-    }
-
-    @Deprecated
-    @Nullable
-    public UserDto getCurrentUser() {
-        return currentUser.getValue();
-    }
-
-    @Deprecated
-    public LiveData<UserDto> getCurrentUserLiveData() {
-        return currentUser;
-    }
-
-    @Deprecated
-    public void setCurrentUser(UserDto currentUser) {
-        this.currentUser.postValue(currentUser);
-        TvManager.clearCache();
-    }
-
-    /**
-     * @deprecated This function is causing a **lot** of issues because not all activities will set their self as "currentactivity". Try to receive a Context instance instead.
-     */
-    @Deprecated
-    @Nullable
-    public Activity getCurrentActivity() {
-        return currentActivity;
-    }
-
-    public void setCurrentActivity(Activity activity) {
-        currentActivity = activity;
-    }
-
-    @Nullable
-    public PlaybackController getPlaybackController() {
-        return playbackController;
-    }
-
-    public void setPlaybackController(PlaybackController playbackController) {
-        this.playbackController = playbackController;
-    }
-
-    public boolean canManageRecordings() {
-        UserDto currentUser = getCurrentUser();
-        return currentUser != null && currentUser.getPolicy().getEnableLiveTvManagement();
-    }
-
-    @Nullable
-    public BaseItemDto getLastPlayedItem() {
-        return lastPlayedItem;
-    }
-
-    public void setLastPlayedItem(BaseItemDto lastPlayedItem) {
-        this.lastPlayedItem = lastPlayedItem;
-    }
-}

app/src/main/java/org/jellyfin/androidtv/auth/AccountManagerHelper.kt

@@ -1,81 +0,0 @@
-package org.jellyfin.androidtv.auth
-
-import android.accounts.Account
-import android.accounts.AccountManager
-import android.os.Bundle
-import org.jellyfin.androidtv.BuildConfig
-import org.jellyfin.androidtv.auth.model.AccountManagerAccount
-import org.jellyfin.sdk.model.serializer.toUUID
-import org.jellyfin.sdk.model.serializer.toUUIDOrNull
-import java.util.UUID
-import kotlin.coroutines.resume
-import kotlin.coroutines.suspendCoroutine
-
-class AccountManagerHelper(
-	private val accountManager: AccountManager
-) {
-	companion object {
-		const val ACCOUNT_TYPE = BuildConfig.APPLICATION_ID
-		const val ACCOUNT_DATA_ID = "$ACCOUNT_TYPE.id"
-		const val ACCOUNT_DATA_SERVER = "$ACCOUNT_TYPE.server"
-		const val ACCOUNT_DATA_NAME = "$ACCOUNT_TYPE.name"
-		const val ACCOUNT_ACCESS_TOKEN_TYPE = "$ACCOUNT_TYPE.access_token"
-	}
-
-	private fun getAccountData(account: Account): AccountManagerAccount = AccountManagerAccount(
-		id = accountManager.getUserData(account, ACCOUNT_DATA_ID).toUUID(),
-		server = accountManager.getUserData(account, ACCOUNT_DATA_SERVER).toUUID(),
-		name = accountManager.getUserData(account, ACCOUNT_DATA_NAME),
-		accessToken = accountManager.peekAuthToken(account, ACCOUNT_ACCESS_TOKEN_TYPE)
-	)
-
-	suspend fun putAccount(accountManagerAccount: AccountManagerAccount) {
-		var androidAccount = accountManager.getAccountsByType(ACCOUNT_TYPE)
-			.firstOrNull { accountManager.getUserData(it, ACCOUNT_DATA_ID)?.toUUIDOrNull() == accountManagerAccount.id }
-
-		// Update credentials
-		if (androidAccount == null) {
-			androidAccount = Account(accountManagerAccount.name, ACCOUNT_TYPE)
-
-			accountManager.addAccountExplicitly(
-				androidAccount,
-				"", // Leave password empty
-				Bundle()
-			)
-			accountManager.setUserData(androidAccount, ACCOUNT_DATA_ID, accountManagerAccount.id.toString())
-		}
-
-		// Update name
-		if (androidAccount.name != accountManagerAccount.name) {
-			androidAccount = suspendCoroutine { continuation ->
-				accountManager.renameAccount(androidAccount, accountManagerAccount.name, { continuation.resume(it.result) }, null)
-			}
-		}
-
-		accountManager.setUserData(androidAccount, ACCOUNT_DATA_NAME, accountManagerAccount.name)
-		accountManager.setUserData(androidAccount, ACCOUNT_DATA_SERVER, accountManagerAccount.server.toString())
-		accountManager.setAuthToken(androidAccount, ACCOUNT_ACCESS_TOKEN_TYPE, accountManagerAccount.accessToken)
-	}
-
-	fun removeAccount(accountManagerAccount: AccountManagerAccount) {
-		val androidAccount = accountManager.getAccountsByType(ACCOUNT_TYPE)
-			.first { accountManager.getUserData(it, ACCOUNT_DATA_ID)?.toUUIDOrNull() == accountManagerAccount.id }
-
-		// Remove current account info
-		@Suppress("DEPRECATION")
-		if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.LOLLIPOP_MR1)
-			accountManager.removeAccountExplicitly(androidAccount)
-		else
-			accountManager.removeAccount(androidAccount, null, null)
-	}
-
-	fun getAccounts() = accountManager.getAccountsByType(ACCOUNT_TYPE).map(::getAccountData)
-
-	fun getAccountsByServer(server: UUID) = accountManager.getAccountsByType(ACCOUNT_TYPE).filter { account ->
-		accountManager.getUserData(account, ACCOUNT_DATA_SERVER)?.toUUIDOrNull() == server
-	}.map(::getAccountData)
-
-	fun getAccount(id: UUID) = accountManager.getAccountsByType(ACCOUNT_TYPE).firstOrNull { account ->
-		accountManager.getUserData(account, ACCOUNT_DATA_ID)?.toUUIDOrNull() == id
-	}?.let(::getAccountData)
-}

app/src/main/java/org/jellyfin/androidtv/auth/ApiBinder.kt

@@ -1,81 +0,0 @@
-package org.jellyfin.androidtv.auth
-
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.launch
-import org.jellyfin.androidtv.JellyfinApplication
-import org.jellyfin.androidtv.util.apiclient.callApi
-import org.jellyfin.androidtv.util.apiclient.callApiEmpty
-import org.jellyfin.androidtv.util.sdk.legacy
-import org.jellyfin.apiclient.interaction.ApiClient
-import org.jellyfin.apiclient.model.apiclient.ServerInfo
-import org.jellyfin.apiclient.model.dto.UserDto
-import org.jellyfin.apiclient.model.entities.MediaType
-import org.jellyfin.apiclient.model.session.ClientCapabilities
-import org.jellyfin.apiclient.model.session.GeneralCommandType
-import org.jellyfin.sdk.model.DeviceInfo
-import timber.log.Timber
-
-class ApiBinder(
-	private val application: JellyfinApplication,
-	private val api: ApiClient,
-	private val authenticationStore: AuthenticationStore,
-) {
-	fun updateSession(session: Session?, deviceInfo: DeviceInfo, resultCallback: ((Boolean) -> Unit)? = null) {
-		GlobalScope.launch(Dispatchers.IO) {
-			@Suppress("TooGenericExceptionCaught")
-			val success = try {
-				updateSessionInternal(session, deviceInfo)
-			} catch (throwable: Throwable) {
-				Timber.e(throwable, "Unable to update legacy API session.")
-				false
-			}
-
-			resultCallback?.invoke(success)
-		}
-	}
-
-	private suspend fun updateSessionInternal(session: Session?, deviceInfo: DeviceInfo): Boolean {
-		if (session == null) {
-			application.currentUser = null
-			return true
-		}
-
-		val server = authenticationStore.getServer(session.serverId)
-		if (server == null) {
-			Timber.e("Could not bind API because server ${session.serverId} was not found in the store.")
-			return false
-		}
-
-		api.device = deviceInfo.legacy()
-		api.SetAuthenticationInfo(session.accessToken, session.userId.toString())
-		api.EnableAutomaticNetworking(ServerInfo().apply {
-			id = session.serverId.toString()
-			name = server.name
-			address = server.address.removeSuffix("/")
-			userId = session.userId.toString()
-			accessToken = session.accessToken
-		})
-
-		// Update currentUser DTO
-		val user = callApi<UserDto> { callback -> api.GetUserAsync(session.userId.toString(), callback) }
-		application.currentUser = user
-
-		callApiEmpty { callback ->
-			api.ReportCapabilities(ClientCapabilities().apply {
-				playableMediaTypes = arrayListOf(MediaType.Video, MediaType.Audio)
-				supportsMediaControl = true
-				supportedCommands = arrayListOf(
-					GeneralCommandType.DisplayContent.toString(),
-					GeneralCommandType.DisplayMessage.toString(),
-				)
-			}, callback)
-		}
-
-		// Connect to WebSocket AFTER HTTP connection confirmed working
-		// to catch exceptions not catchable with the legacy websocket client
-		api.ensureWebSocket()
-
-		return true
-	}
-}

app/src/main/java/org/jellyfin/androidtv/auth/AuthenticationRepository.kt

@@ -1,276 +0,0 @@
-package org.jellyfin.androidtv.auth
-
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.emitAll
-import kotlinx.coroutines.flow.flow
-import org.jellyfin.androidtv.auth.model.AccountManagerAccount
-import org.jellyfin.androidtv.auth.model.AuthenticatedState
-import org.jellyfin.androidtv.auth.model.AuthenticatingState
-import org.jellyfin.androidtv.auth.model.AuthenticationStoreServer
-import org.jellyfin.androidtv.auth.model.AuthenticationStoreUser
-import org.jellyfin.androidtv.auth.model.LoginState
-import org.jellyfin.androidtv.auth.model.PrivateUser
-import org.jellyfin.androidtv.auth.model.RequireSignInState
-import org.jellyfin.androidtv.auth.model.Server
-import org.jellyfin.androidtv.auth.model.ServerVersionNotSupported
-import org.jellyfin.androidtv.auth.model.User
-import org.jellyfin.androidtv.preference.AuthenticationPreferences
-import org.jellyfin.androidtv.util.ImageUtils
-import org.jellyfin.androidtv.util.sdk.forUser
-import org.jellyfin.sdk.Jellyfin
-import org.jellyfin.sdk.api.client.ApiClient
-import org.jellyfin.sdk.api.client.exception.ApiClientException
-import org.jellyfin.sdk.api.client.extensions.authenticateUserByName
-import org.jellyfin.sdk.api.client.extensions.imageApi
-import org.jellyfin.sdk.api.client.extensions.userApi
-import org.jellyfin.sdk.model.DeviceInfo
-import org.jellyfin.sdk.model.api.ImageType
-import timber.log.Timber
-import java.util.Date
-import java.util.UUID
-
-interface AuthenticationRepository {
-	fun getServers(): List<Server>
-	fun getServer(id: UUID): Server?
-	fun getUsers(server: UUID): List<PrivateUser>?
-	fun getUser(server: UUID, user: UUID): PrivateUser?
-	fun saveServer(id: UUID, name: String, address: String, version: String?, loginDisclaimer: String?)
-	fun authenticateUser(user: User): Flow<LoginState>
-	fun authenticateUser(user: User, server: Server): Flow<LoginState>
-	fun login(server: Server, username: String, password: String = ""): Flow<LoginState>
-	fun logout(user: User)
-	fun removeUser(user: User)
-	fun getUserImageUrl(server: Server, user: User): String?
-}
-
-class AuthenticationRepositoryImpl(
-	private val jellyfin: Jellyfin,
-	private val sessionRepository: SessionRepository,
-	private val accountManagerHelper: AccountManagerHelper,
-	private val authenticationStore: AuthenticationStore,
-	private val userApiClient: ApiClient,
-	private val authenticationPreferences: AuthenticationPreferences,
-	private val defaultDeviceInfo: DeviceInfo,
-) : AuthenticationRepository {
-	private val serverComparator = compareByDescending<Server> { it.dateLastAccessed }.thenBy { it.name }
-	private val userComparator = compareByDescending<PrivateUser> { it.lastUsed }.thenBy { it.name }
-
-	private fun AuthenticationStoreServer.asServer(id: UUID) = Server(
-			id = id,
-			name = name,
-			address = address,
-			version = version,
-			loginDisclaimer = loginDisclaimer,
-			dateLastAccessed = Date(lastUsed),
-	)
-
-	override fun getServers() = authenticationStore.getServers()
-			.map { (id, entry) -> entry.asServer(id) }
-			.sortedWith(serverComparator)
-
-	override fun getServer(id: UUID) = authenticationStore.getServer(id)?.asServer(id)
-
-	private fun mapUser(
-		serverId: UUID,
-		userId: UUID,
-		userInfo: AuthenticationStoreUser,
-		authInfo: AccountManagerAccount?,
-	) = PrivateUser(
-		id = authInfo?.id ?: userId,
-		serverId = authInfo?.server ?: serverId,
-		name = userInfo.name,
-		accessToken = authInfo?.accessToken,
-		requirePassword = userInfo.requirePassword,
-		imageTag = userInfo.imageTag,
-		lastUsed = userInfo.lastUsed,
-	)
-
-	override fun getUsers(server: UUID): List<PrivateUser>? =
-		authenticationStore.getUsers(server)?.mapNotNull { (userId, userInfo) ->
-			accountManagerHelper.getAccount(userId).let { authInfo ->
-				mapUser(server, userId, userInfo, authInfo)
-			}
-		}?.sortedWith(userComparator)
-
-	override fun getUser(server: UUID, user: UUID): PrivateUser? {
-		val userInfo = authenticationStore.getUser(server, user) ?: return null
-		val authInfo = accountManagerHelper.getAccount(user) ?: return null
-
-		return mapUser(server, user, userInfo, authInfo)
-	}
-
-	override fun saveServer(id: UUID, name: String, address: String, version: String?, loginDisclaimer: String?) {
-		val current = authenticationStore.getServer(id)
-		val server = if (current != null) current.copy(name = name, address = address, version = version, loginDisclaimer = loginDisclaimer, lastUsed = Date().time)
-		else AuthenticationStoreServer(name, address, version, loginDisclaimer)
-
-		authenticationStore.putServer(id, server)
-	}
-
-	/**
-	 * Set the active session to the information in [user] and [server].
-	 * Connects to the server and requests the info of the currently authenticated user.
-	 *
-	 * @return Whether the user information can be retrieved.
-	 */
-	private suspend fun setActiveSession(user: User, server: Server): Boolean {
-		val authenticated = sessionRepository.switchCurrentSession(user.id)
-
-		if (authenticated) {
-			// Update last use in store
-			authenticationStore.getServer(server.id)?.let { storedServer ->
-				authenticationStore.putServer(server.id, storedServer.copy(lastUsed = Date().time))
-			}
-
-			authenticationStore.getUser(server.id, user.id)?.let { storedUser ->
-				authenticationStore.putUser(server.id, user.id, storedUser.copy(lastUsed = Date().time))
-			}
-		}
-
-		return authenticated
-	}
-
-	override fun authenticateUser(user: User): Flow<LoginState> = flow {
-		Timber.d("Authenticating serverless user %s", user)
-		emit(AuthenticatingState)
-
-		val server = authenticationStore.getServer(user.serverId)?.let {
-			Server(
-				id = user.serverId,
-				name = it.name,
-				address = it.address,
-				version = it.version,
-				loginDisclaimer = it.loginDisclaimer,
-				dateLastAccessed = Date(it.lastUsed),
-			)
-		}
-
-		if (server == null) emit(RequireSignInState)
-		else if (!server.versionSupported) emit(ServerVersionNotSupported(server))
-		else emitAll(authenticateUser(user, server))
-	}
-
-	override fun authenticateUser(user: User, server: Server): Flow<LoginState> = flow {
-		Timber.d("Authenticating user %s", user)
-		emit(AuthenticatingState)
-
-		val account = accountManagerHelper.getAccount(user.id)
-		when {
-			!server.versionSupported -> emit(ServerVersionNotSupported(server))
-			// Access token found, proceed with sign in
-			!authenticationPreferences[AuthenticationPreferences.alwaysAuthenticate] && account?.accessToken != null -> when {
-				// Update session
-				setActiveSession(user, server) -> {
-					// Update stored user
-					try {
-						val userInfo by userApiClient.userApi.getCurrentUser()
-						val currentUser = authenticationStore.getUser(server.id, user.id)
-
-						val updatedUser = currentUser?.copy(
-							name = userInfo.name!!,
-							requirePassword = userInfo.hasPassword,
-							imageTag = userInfo.primaryImageTag
-						) ?: AuthenticationStoreUser(
-							name = userInfo.name!!,
-							requirePassword = userInfo.hasPassword,
-							imageTag = userInfo.primaryImageTag
-						)
-						authenticationStore.putUser(server.id, user.id, updatedUser)
-						accountManagerHelper.putAccount(AccountManagerAccount(user.id, server.id, updatedUser.name, account.accessToken))
-
-						emit(AuthenticatedState)
-					} catch (err: ApiClientException) {
-						Timber.e(err, "Unable to get current user data")
-						emit(RequireSignInState)
-					}
-				}
-				// Login failed
-				else -> when {
-					// No password required - try login
-					!user.requirePassword -> emitAll(login(server, user.name))
-					// Require new sign in
-					else -> emit(RequireSignInState)
-				}
-			}
-			// User is known to not require a password, try a sign in
-			!user.requirePassword -> emitAll(login(server, user.name))
-			// Account found without access token, require sign in
-			else -> emit(RequireSignInState)
-		}
-	}
-
-	override fun login(server: Server, username: String, password: String) = flow {
-		if (!server.versionSupported) {
-			emit(ServerVersionNotSupported(server))
-			return@flow
-		}
-
-		val api = jellyfin.createApi(server.address, deviceInfo = defaultDeviceInfo.forUser(username))
-		val result = try {
-			val response = api.userApi.authenticateUserByName(username, password)
-			response.content
-		} catch (err: ApiClientException) {
-			Timber.e(err, "Unable to sign in as $username")
-			emit(RequireSignInState)
-			return@flow
-		}
-
-		val userInfo = result.user ?: return@flow emit(RequireSignInState)
-
-		val userId = userInfo.id
-		val currentUser = authenticationStore.getUser(server.id, userId)
-		val updatedUser = currentUser?.copy(
-			name = userInfo.name!!,
-			lastUsed = Date().time,
-			requirePassword = userInfo.hasPassword,
-			imageTag = userInfo.primaryImageTag
-		) ?: AuthenticationStoreUser(
-			name = userInfo.name!!,
-			requirePassword = userInfo.hasPassword,
-			imageTag = userInfo.primaryImageTag
-		)
-
-		authenticationStore.putUser(server.id, userId, updatedUser)
-		val accountManagerAccount = AccountManagerAccount(userId, server.id, updatedUser.name, result.accessToken)
-		accountManagerHelper.putAccount(accountManagerAccount)
-
-		val user = PrivateUser(
-			id = userId,
-			serverId = server.id,
-			name = updatedUser.name,
-			accessToken = result.accessToken,
-			requirePassword = userInfo.hasPassword,
-			imageTag = userInfo.primaryImageTag,
-			lastUsed = Date().time,
-		)
-
-		// We just added the account so it should activate properly although in rare cases it doesn't.
-		// this is often caused by issues in the platforms account manager
-		if (setActiveSession(user, server)) emit(AuthenticatedState)
-		else {
-			// Try to remove the account and ask for sign in
-			accountManagerHelper.removeAccount(accountManagerAccount)
-			emit(RequireSignInState)
-		}
-	}
-
-	override fun logout(user: User) {
-		accountManagerHelper.getAccount(user.id)?.let(accountManagerHelper::removeAccount)
-	}
-
-	override fun removeUser(user: User) {
-		authenticationStore.removeUser(user.serverId, user.id)
-		logout(user)
-	}
-
-	override fun getUserImageUrl(server: Server, user: User): String? {
-		return user.imageTag?.let { imageTag ->
-			jellyfin.createApi(baseUrl = server.address).imageApi.getUserImageUrl(
-				userId = user.id,
-				tag = imageTag,
-				imageType = ImageType.PRIMARY,
-				maxHeight = ImageUtils.MAX_PRIMARY_IMAGE_HEIGHT
-			)
-		}
-	}
-}

app/src/main/java/org/jellyfin/androidtv/auth/AuthenticationSortBy.kt

@@ -1,11 +0,0 @@
-package org.jellyfin.androidtv.auth
-
-import org.jellyfin.androidtv.R
-import org.jellyfin.androidtv.ui.preference.dsl.EnumDisplayOptions
-
-enum class AuthenticationSortBy {
-	@EnumDisplayOptions(name = R.string.last_use)
-	LAST_USE,
-	@EnumDisplayOptions(name = R.string.alphabetical)
-	ALPHABETICAL
-}

app/src/main/java/org/jellyfin/androidtv/auth/AuthenticatorService.kt

@@ -1,49 +0,0 @@
-package org.jellyfin.androidtv.auth
-
-import android.accounts.AbstractAccountAuthenticator
-import android.accounts.Account
-import android.accounts.AccountAuthenticatorResponse
-import android.accounts.AccountManager
-import android.app.Service
-import android.content.Intent
-import android.os.Bundle
-import android.os.IBinder
-import androidx.core.os.bundleOf
-import org.jellyfin.androidtv.ui.preference.PreferencesActivity
-
-class AuthenticatorService : Service() {
-	private val authenticator by lazy {
-		Authenticator(this)
-	}
-
-	override fun onBind(intent: Intent): IBinder? = authenticator.iBinder
-
-	private inner class Authenticator(
-		private val service: AuthenticatorService
-	) : AbstractAccountAuthenticator(service) {
-		private val unsupportedOperationBundle = bundleOf(
-			AccountManager.KEY_ERROR_CODE to 1,
-			AccountManager.KEY_ERROR_MESSAGE to "Unsupported operation"
-		)
-
-		override fun addAccount(response: AccountAuthenticatorResponse, accountType: String, authTokenType: String?, requiredFeatures: Array<String>?, options: Bundle): Bundle = unsupportedOperationBundle
-
-		override fun confirmCredentials(response: AccountAuthenticatorResponse, account: Account, options: Bundle?): Bundle = unsupportedOperationBundle
-
-		override fun editProperties(response: AccountAuthenticatorResponse, accountType: String): Bundle = bundleOf(
-			AccountManager.KEY_INTENT to Intent(service, PreferencesActivity::class.java)
-		)
-
-		override fun getAccountRemovalAllowed(response: AccountAuthenticatorResponse, account: Account): Bundle = bundleOf(
-			AccountManager.KEY_BOOLEAN_RESULT to true
-		)
-
-		override fun getAuthToken(response: AccountAuthenticatorResponse, account: Account, authTokenType: String, options: Bundle): Bundle = unsupportedOperationBundle
-
-		override fun getAuthTokenLabel(authTokenType: String): String? = null
-
-		override fun hasFeatures(response: AccountAuthenticatorResponse, account: Account, features: Array<String>): Bundle = unsupportedOperationBundle
-
-		override fun updateCredentials(response: AccountAuthenticatorResponse, account: Account, authTokenType: String?, options: Bundle?): Bundle = unsupportedOperationBundle
-	}
-}

app/src/main/java/org/jellyfin/androidtv/auth/LegacyAccountMigration.kt

@@ -1,98 +0,0 @@
-package org.jellyfin.androidtv.auth
-
-import android.content.Context
-import kotlinx.serialization.json.Json
-import kotlinx.serialization.json.booleanOrNull
-import kotlinx.serialization.json.jsonObject
-import kotlinx.serialization.json.jsonPrimitive
-import kotlinx.serialization.modules.SerializersModule
-import kotlinx.serialization.modules.contextual
-import org.jellyfin.androidtv.auth.model.AccountManagerAccount
-import org.jellyfin.androidtv.auth.model.AuthenticationStoreServer
-import org.jellyfin.androidtv.auth.model.AuthenticationStoreUser
-import org.jellyfin.androidtv.preference.SystemPreferences
-import org.jellyfin.sdk.model.serializer.UUIDSerializer
-import org.jellyfin.sdk.model.serializer.toUUIDOrNull
-import timber.log.Timber
-
-class LegacyAccountMigration(
-	private val context: Context,
-	private val authenticationStore: AuthenticationStore,
-	private val accountManagerHelper: AccountManagerHelper,
-	private val systemPreferences: SystemPreferences,
-) {
-	companion object {
-		const val LEGACY_CREDENTIAL_FILE = "org.jellyfin.androidtv.login.json"
-	}
-
-	suspend fun migrate() {
-		val path = context.filesDir.resolve(LEGACY_CREDENTIAL_FILE)
-
-		if (path.exists() && !systemPreferences[SystemPreferences.legacyCredentialsMigrated]) {
-			Timber.d("Starting migration of legacy credentials from $path")
-			val json = Json {
-				serializersModule = SerializersModule {
-					contextual(UUIDSerializer())
-				}
-				ignoreUnknownKeys = true
-			}
-			val root = json.parseToJsonElement(path.readText()).jsonObject
-			val server = root["serverInfo"]?.jsonObject
-			val user = root["userDto"]?.jsonObject
-
-			val serverId = server?.get("Id")?.jsonPrimitive?.content?.toUUIDOrNull()
-			if (serverId != null) {
-				val serverName = server["Name"]?.jsonPrimitive?.content
-				val serverAddress = server["Address"]?.jsonPrimitive?.content
-				val serverVersion = server["Version"]?.jsonPrimitive?.content
-
-				if (!authenticationStore.containsServer(serverId)) {
-					Timber.i("Migrating server $serverId")
-					authenticationStore.putServer(
-						id = serverId,
-						server = AuthenticationStoreServer(
-							name = serverName ?: "",
-							address = serverAddress ?: "",
-							loginDisclaimer = null,
-							version = serverVersion,
-							lastRefreshed = 0,
-						)
-					)
-				}
-
-				val userId = user?.get("Id")?.jsonPrimitive?.content?.toUUIDOrNull()
-				if (userId != null && !authenticationStore.containsUser(serverId, userId)) {
-					Timber.i("Migrating user $userId")
-					val name = user["Name"]?.jsonPrimitive?.content ?: userId.toString()
-					val requirePassword = user["HasPassword"]?.jsonPrimitive?.booleanOrNull ?: true
-					val imageTag = user["PrimaryImageTag"]?.jsonPrimitive?.content
-					val accessToken = user["AccessToken"]?.jsonPrimitive?.content ?: server["AccessToken"]?.jsonPrimitive?.content
-
-					authenticationStore.putUser(
-						server = serverId,
-						userId = userId,
-						userInfo = AuthenticationStoreUser(
-							name = name,
-							requirePassword = requirePassword,
-							imageTag = imageTag
-						)
-					)
-					accountManagerHelper.putAccount(AccountManagerAccount(
-						id = userId,
-						server = serverId,
-						name = name,
-						accessToken = accessToken?.let {
-							// Convert empty string to null
-							if (it.isBlank()) null
-							else it
-						}
-					))
-				}
-			}
-
-			systemPreferences[SystemPreferences.legacyCredentialsMigrated] = true
-		} else {
-			Timber.d("Skipping migration of legacy credentials from $path (file does not exist)")
-		}
-	}
-}

app/src/main/java/org/jellyfin/androidtv/auth/ServerRepository.kt

@@ -1,200 +0,0 @@
-package org.jellyfin.androidtv.auth
-
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.liveData
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.emitAll
-import kotlinx.coroutines.flow.firstOrNull
-import kotlinx.coroutines.flow.flow
-import kotlinx.coroutines.flow.flowOn
-import kotlinx.coroutines.flow.mapNotNull
-import org.jellyfin.androidtv.auth.model.ConnectedState
-import org.jellyfin.androidtv.auth.model.ConnectingState
-import org.jellyfin.androidtv.auth.model.PrivateUser
-import org.jellyfin.androidtv.auth.model.PublicUser
-import org.jellyfin.androidtv.auth.model.Server
-import org.jellyfin.androidtv.auth.model.ServerAdditionState
-import org.jellyfin.androidtv.auth.model.UnableToConnectState
-import org.jellyfin.androidtv.auth.model.User
-import org.jellyfin.androidtv.util.sdk.toPublicUser
-import org.jellyfin.androidtv.util.sdk.toServer
-import org.jellyfin.sdk.Jellyfin
-import org.jellyfin.sdk.api.client.exception.ApiClientException
-import org.jellyfin.sdk.api.client.extensions.brandingApi
-import org.jellyfin.sdk.api.client.extensions.systemApi
-import org.jellyfin.sdk.api.client.extensions.userApi
-import org.jellyfin.sdk.discovery.RecommendedServerInfo
-import org.jellyfin.sdk.discovery.RecommendedServerInfoScore
-import org.jellyfin.sdk.model.api.ServerDiscoveryInfo
-import org.jellyfin.sdk.model.api.UserDto
-import org.jellyfin.sdk.model.serializer.toUUID
-import timber.log.Timber
-import java.util.Date
-import java.util.UUID
-
-interface ServerRepository {
-	fun getStoredServers(): List<Server>
-	fun getDiscoveryServers(): Flow<Server>
-	suspend fun migrateLegacyCredentials()
-
-	fun getServerUsers(server: Server): LiveData<List<User>>
-	fun removeServer(serverId: UUID): Boolean
-	fun addServer(address: String): Flow<ServerAdditionState>
-	suspend fun refreshServerInfo(server: Server): Boolean
-
-	companion object {
-		val minimumServerVersion = Jellyfin.minimumVersion.copy(build = null)
-	}
-}
-
-class ServerRepositoryImpl(
-	private val jellyfin: Jellyfin,
-	private val authenticationRepository: AuthenticationRepository,
-	private val authenticationStore: AuthenticationStore,
-	private val legacyAccountMigration: LegacyAccountMigration,
-) : ServerRepository {
-	override fun getStoredServers() = authenticationRepository.getServers()
-
-	override fun getDiscoveryServers() = flow {
-		val servers = jellyfin.discovery.discoverLocalServers().mapNotNull(ServerDiscoveryInfo::toServer)
-		emitAll(servers)
-	}.flowOn(Dispatchers.IO)
-
-	private suspend fun getServerPublicUsers(server: Server): List<PublicUser> {
-		val api = jellyfin.createApi(server.address)
-
-		return try {
-			val users by api.userApi.getPublicUsers()
-			users.mapNotNull(UserDto::toPublicUser)
-		} catch (err: ApiClientException) {
-			Timber.e(err, "Unable to retrieve public users")
-
-			emptyList()
-		}
-	}
-
-	public override suspend fun refreshServerInfo(server: Server): Boolean {
-		// Only update existing servers
-		val serverInfo = authenticationStore.getServer(server.id) ?: return false
-		val now = Date().time
-
-		// Only update every 10 minutes
-		if (now - serverInfo.lastRefreshed < 600000 && serverInfo.version != null) return false
-
-		return try {
-			val api = jellyfin.createApi(server.address)
-			// Get login disclaimer
-			val branding by api.brandingApi.getBrandingOptions()
-			val systemInfo by api.systemApi.getPublicSystemInfo()
-
-			authenticationStore.putServer(server.id, serverInfo.copy(
-				name = systemInfo.serverName ?: serverInfo.name,
-				version = systemInfo.version ?: serverInfo.version,
-				loginDisclaimer = branding.loginDisclaimer ?: serverInfo.loginDisclaimer,
-				lastRefreshed = now
-			))
-		} catch (err: ApiClientException) {
-			Timber.e(err, "Unable to update server")
-
-			false
-		}
-	}
-
-	private fun getServerStoredUsers(server: Server): List<PrivateUser> = authenticationRepository
-		.getUsers(server.id)
-		.orEmpty()
-
-	override fun getServerUsers(server: Server): LiveData<List<User>> = liveData {
-		val users = mutableListOf<User>()
-
-		users.addAll(getServerStoredUsers(server))
-		emit(users.toList())
-
-		getServerPublicUsers(server)
-			.sortedBy { it.name }
-			.forEach { user ->
-				val index = users.indexOfFirst { it.id == user.id }
-				if (index == -1) users.add(user)
-				else {
-					users[index] = when (val currentUser = users[index]) {
-						is PublicUser -> user
-						is PrivateUser -> currentUser.copy(
-							name = user.name,
-							requirePassword = user.requirePassword,
-							imageTag = user.imageTag
-						)
-					}
-				}
-			}
-
-		emit(users.toList())
-	}
-
-	override suspend fun migrateLegacyCredentials() = legacyAccountMigration.migrate()
-
-	override fun removeServer(serverId: UUID) = authenticationStore.removeServer(serverId)
-
-	override fun addServer(address: String): Flow<ServerAdditionState> = flow {
-		Timber.d("Adding server %s", address)
-
-		emit(ConnectingState(address))
-
-		val addressCandidates = jellyfin.discovery.getAddressCandidates(address)
-		Timber.d("Found ${addressCandidates.size} candidates")
-
-		val goodRecommendations = mutableListOf<RecommendedServerInfo>()
-		val badRecommendations = mutableListOf<RecommendedServerInfo>()
-		val greatRecommendaton = jellyfin.discovery.getRecommendedServers(addressCandidates).firstOrNull { recommendedServer ->
-			when (recommendedServer.score) {
-				RecommendedServerInfoScore.GREAT -> true
-				RecommendedServerInfoScore.GOOD -> {
-					goodRecommendations += recommendedServer
-					false
-				}
-				else -> {
-					badRecommendations += recommendedServer
-					false
-				}
-			}
-		}
-
-		Timber.d(buildString {
-			append("Recommendations: ")
-			if (greatRecommendaton == null) append(0)
-			else append(1)
-			append(" great, ")
-			append(goodRecommendations.size)
-			append(" good, ")
-			append(badRecommendations.size)
-			append(" bad")
-		})
-
-		val chosenRecommendation = greatRecommendaton ?: goodRecommendations.firstOrNull()
-		if (chosenRecommendation != null && chosenRecommendation.systemInfo.isSuccess) {
-			// Get system info
-			val systemInfo = chosenRecommendation.systemInfo.getOrThrow()
-
-			// Get branding info
-			val api = jellyfin.createApi(chosenRecommendation.address).brandingApi
-			val branding by api.getBrandingOptions()
-
-			val id = systemInfo.id!!.toUUID()
-			authenticationRepository.saveServer(
-				id = id,
-				name = systemInfo.serverName ?: "Jellyfin Server",
-				address = chosenRecommendation.address,
-				version = systemInfo.version,
-				loginDisclaimer = branding.loginDisclaimer,
-			)
-
-			emit(ConnectedState(id, systemInfo))
-		} else {
-			// No great or good recommendations, only add bad recommendations
-			val addressCandidatesWithIssues = (badRecommendations + goodRecommendations)
-				.groupBy { it.address }
-				.mapValues { (_, entry) -> entry.flatMap { server -> server.issues } }
-			emit(UnableToConnectState(addressCandidatesWithIssues))
-		}
-	}
-}

app/src/main/java/org/jellyfin/androidtv/auth/SessionRepository.kt

@@ -1,179 +0,0 @@
-package org.jellyfin.androidtv.auth
-
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
-import kotlinx.coroutines.runBlocking
-import org.jellyfin.androidtv.preference.AuthenticationPreferences
-import org.jellyfin.androidtv.preference.PreferencesRepository
-import org.jellyfin.androidtv.preference.constant.UserSelectBehavior.DISABLED
-import org.jellyfin.androidtv.preference.constant.UserSelectBehavior.LAST_USER
-import org.jellyfin.androidtv.preference.constant.UserSelectBehavior.SPECIFIC_USER
-import org.jellyfin.androidtv.util.sdk.forUser
-import org.jellyfin.sdk.api.client.ApiClient
-import org.jellyfin.sdk.model.DeviceInfo
-import org.jellyfin.sdk.model.serializer.toUUIDOrNull
-import timber.log.Timber
-import java.util.UUID
-import kotlin.coroutines.resume
-import kotlin.coroutines.suspendCoroutine
-
-data class Session(
-	val userId: UUID,
-	val serverId: UUID,
-	val accessToken: String,
-)
-
-interface SessionRepository {
-	val currentSession: LiveData<Session?>
-	val currentSystemSession: LiveData<Session?>
-
-	fun restoreDefaultSession()
-	fun restoreDefaultSystemSession()
-
-	suspend fun switchCurrentSession(userId: UUID): Boolean
-	fun destroyCurrentSession()
-}
-
-class SessionRepositoryImpl(
-	private val authenticationPreferences: AuthenticationPreferences,
-	private val accountManagerHelper: AccountManagerHelper,
-	private val apiBinder: ApiBinder,
-	private val authenticationStore: AuthenticationStore,
-	private val userApiClient: ApiClient,
-	private val systemApiClient: ApiClient,
-	private val preferencesRepository: PreferencesRepository,
-	private val defaultDeviceInfo: DeviceInfo,
-) : SessionRepository {
-	private val _currentSession = MutableLiveData<Session?>()
-	override val currentSession: LiveData<Session?> get() = _currentSession
-
-	private val _currentSystemSession = MutableLiveData<Session?>()
-	override val currentSystemSession: LiveData<Session?> get() = _currentSystemSession
-
-	override fun restoreDefaultSession() {
-		Timber.d("Restoring default session")
-
-		if (authenticationPreferences[AuthenticationPreferences.alwaysAuthenticate]) return destroyCurrentSession()
-
-		val behavior = authenticationPreferences[AuthenticationPreferences.autoLoginUserBehavior]
-		val userId = authenticationPreferences[AuthenticationPreferences.autoLoginUserId].toUUIDOrNull()
-
-		when (behavior) {
-			DISABLED -> destroyCurrentSession()
-			LAST_USER -> setCurrentSession(createLastUserSession(), false)
-			SPECIFIC_USER -> setCurrentSession(createUserSession(userId), false)
-		}
-	}
-
-	override fun restoreDefaultSystemSession() {
-		Timber.d("Restoring default system session")
-
-		if (authenticationPreferences[AuthenticationPreferences.alwaysAuthenticate]) return setCurrentSession(null, false)
-
-		val behavior = authenticationPreferences[AuthenticationPreferences.systemUserBehavior]
-		val userId = authenticationPreferences[AuthenticationPreferences.systemUserId].toUUIDOrNull()
-
-		when (behavior) {
-			DISABLED -> setCurrentSystemSession(null)
-			LAST_USER -> setCurrentSystemSession(createLastUserSession())
-			SPECIFIC_USER -> setCurrentSystemSession(createUserSession(userId))
-		}
-	}
-
-	override suspend fun switchCurrentSession(userId: UUID): Boolean {
-		// No change in user - don't switch
-		if (currentSession.value?.userId == userId) return false
-
-		Timber.d("Switching current session to user $userId")
-
-		val session = createUserSession(userId)
-		if (session == null) {
-			Timber.d("Could not switch to non-existing session for user $userId")
-			return false
-		}
-
-		return suspendCoroutine { continuation ->
-			setCurrentSession(session, true) { success ->
-				continuation.resume(success)
-			}
-		}
-	}
-
-	override fun destroyCurrentSession() {
-		Timber.d("Destroying current session")
-
-		_currentSession.value = null
-		userApiClient.applySession(null)
-		apiBinder.updateSession(null, userApiClient.deviceInfo)
-	}
-
-	private fun setCurrentSession(session: Session?, includeSystemUser: Boolean, callback: ((Boolean) -> Unit)? = null) {
-		// No change in session - don't switch
-		if (session != null && currentSession.value?.userId == session.userId) return
-
-		if (session != null) authenticationPreferences[AuthenticationPreferences.lastUserId] = session.userId.toString()
-
-		val systemUserBehavior = authenticationPreferences[AuthenticationPreferences.systemUserBehavior]
-		if (includeSystemUser && systemUserBehavior == LAST_USER) setCurrentSystemSession(session)
-
-		// Update session after binding the apiclient settings
-		val deviceInfo = session?.let { defaultDeviceInfo.forUser(it.userId) } ?: defaultDeviceInfo
-		apiBinder.updateSession(session, deviceInfo) { success ->
-			Timber.d("Updating current session. userId=${session?.userId} apiBindingSuccess=${success}")
-
-			if (success) {
-				userApiClient.applySession(session, deviceInfo)
-				runBlocking { preferencesRepository.onSessionChanged() }
-				_currentSession.postValue(session)
-			} else {
-				userApiClient.applySession(null, deviceInfo)
-				_currentSession.postValue(null)
-			}
-
-			callback?.invoke(success)
-		}
-	}
-
-	private fun setCurrentSystemSession(session: Session?) {
-		// No change in session - don't switch
-		if (session != null && currentSession.value?.userId == session.userId) return
-
-		_currentSystemSession.postValue(session)
-
-		systemApiClient.applySession(session)
-	}
-
-	private fun createLastUserSession(): Session? {
-		val lastUserId = authenticationPreferences[AuthenticationPreferences.lastUserId].toUUIDOrNull()
-		return createUserSession(lastUserId)
-	}
-
-	private fun createUserSession(userId: UUID?): Session? {
-		if (userId == null) return null
-
-		val account = accountManagerHelper.getAccount(userId)
-		if (account?.accessToken == null) return null
-
-		return Session(
-			userId = account.id,
-			serverId = account.server,
-			accessToken = account.accessToken
-		)
-	}
-
-	private fun ApiClient.applySession(session: Session?, newDeviceInfo: DeviceInfo = defaultDeviceInfo) {
-		deviceInfo = newDeviceInfo
-
-		if (session == null) {
-			baseUrl = null
-			accessToken = null
-			userId = null
-		} else {
-			val server = authenticationStore.getServer(session.serverId)
-				?: return applySession(null)
-			baseUrl = server.address
-			accessToken = session.accessToken
-			userId = session.userId
-		}
-	}
-}

app/src/main/java/org/jellyfin/androidtv/auth/model/AccountManagerAccount.kt

@@ -1,10 +0,0 @@
-package org.jellyfin.androidtv.auth.model
-
-import java.util.UUID
-
-data class AccountManagerAccount(
-	val id: UUID,
-	val server: UUID,
-	val name: String,
-	val accessToken: String? = null,
-)

app/src/main/java/org/jellyfin/androidtv/auth/model/AuthenticateMethod.kt

@@ -0,0 +1,6 @@
+package org.jellyfin.androidtv.auth.model
+
+sealed class AuthenticateMethod
+data class AutomaticAuthenticateMethod(val user: User) : AuthenticateMethod()
+data class CredentialAuthenticateMethod(val username: String, val password: String = "") : AuthenticateMethod()
+data class QuickConnectAuthenticateMethod(val secret: String) : AuthenticateMethod()

app/src/main/java/org/jellyfin/androidtv/auth/model/AuthenticationSortBy.kt

@@ -0,0 +1,11 @@
+package org.jellyfin.androidtv.auth.model
+
+import org.jellyfin.androidtv.R
+import org.jellyfin.preference.PreferenceEnum
+
+enum class AuthenticationSortBy(
+	override val nameRes: Int
+) : PreferenceEnum {
+	LAST_USE(R.string.last_use),
+	ALPHABETICAL(R.string.alphabetical);
+}

app/src/main/java/org/jellyfin/androidtv/auth/model/AuthenticationStoreServer.kt

@@ -6,7 +6,7 @@ import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.UseSerializers
 import org.jellyfin.sdk.model.serializer.UUIDSerializer
-import java.util.Date
+import java.time.Instant
 import java.util.UUID
 
 /**
@@ -18,7 +18,9 @@ data class AuthenticationStoreServer(
 	val address: String,
 	val version: String? = null,
 	@SerialName("login_disclaimer")  val loginDisclaimer: String? = null,
-	@SerialName("last_used") val lastUsed: Long = Date().time,
-	@SerialName("last_refreshed") val lastRefreshed: Long = Date().time,
+	@SerialName("splashscreen_enabled")  val splashscreenEnabled: Boolean = false,
+	@SerialName("setup_completed")  val setupCompleted: Boolean = true,
+	@SerialName("last_used") val lastUsed: Long = Instant.now().toEpochMilli(),
+	@SerialName("last_refreshed") val lastRefreshed: Long = Instant.now().toEpochMilli(),
 	val users: Map<UUID, AuthenticationStoreUser> = emptyMap(),
 )

app/src/main/java/org/jellyfin/androidtv/auth/model/AuthenticationStoreUser.kt

@@ -2,7 +2,7 @@ package org.jellyfin.androidtv.auth.model
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
-import java.util.Date
+import java.time.Instant
 
 /**
  * Locally stored user information. New properties require default values or deserialization will fail.
@@ -10,7 +10,7 @@ import java.util.Date
 @Serializable
 data class AuthenticationStoreUser(
 	val name: String,
-	@SerialName("last_used") val lastUsed: Long = Date().time,
-	@SerialName("require_password") val requirePassword: Boolean = true,
-	@SerialName("image_tag") val imageTag: String? = null
+	@SerialName("last_used") val lastUsed: Long = Instant.now().toEpochMilli(),
+	@SerialName("image_tag") val imageTag: String? = null,
+	@SerialName("access_token") val accessToken: String? = null,
 )

app/src/main/java/org/jellyfin/androidtv/auth/model/LoginState.kt

@@ -1,8 +1,11 @@
 package org.jellyfin.androidtv.auth.model
 
+import org.jellyfin.sdk.api.client.exception.ApiClientException
+
 sealed class LoginState
-object AuthenticatingState : LoginState()
-object RequireSignInState : LoginState()
-object ServerUnavailableState : LoginState()
+data object AuthenticatingState : LoginState()
+data object RequireSignInState : LoginState()
+data object ServerUnavailableState : LoginState()
 data class ServerVersionNotSupported(val server: Server) : LoginState()
-object AuthenticatedState : LoginState()
+data class ApiClientErrorLoginState(val error: ApiClientException) : LoginState()
+data object AuthenticatedState : LoginState()

app/src/main/java/org/jellyfin/androidtv/auth/model/QuickConnectState.kt

@@ -0,0 +1,23 @@
+package org.jellyfin.androidtv.auth.model
+
+sealed class QuickConnectState
+
+/**
+ * State unknown until first poll completed.
+ */
+data object UnknownQuickConnectState : QuickConnectState()
+
+/**
+ * Server does not have QuickConnect enabled.
+ */
+data object UnavailableQuickConnectState : QuickConnectState()
+
+/**
+ * Connection is pending.
+ */
+data class PendingQuickConnectState(val code: String) : QuickConnectState()
+
+/**
+ * User connected.
+ */
+data object ConnectedQuickConnectState : QuickConnectState()

app/src/main/java/org/jellyfin/androidtv/auth/model/Server.kt

@@ -1,8 +1,8 @@
 package org.jellyfin.androidtv.auth.model
 
-import org.jellyfin.androidtv.auth.ServerRepository
+import org.jellyfin.androidtv.auth.repository.ServerRepository
 import org.jellyfin.sdk.model.ServerVersion
-import java.util.Date
+import java.time.Instant
 import java.util.UUID
 
 /**
@@ -14,9 +14,11 @@ data class Server(
 	var address: String,
 	val version: String? = null,
 	val loginDisclaimer: String? = null,
-	var dateLastAccessed: Date = Date(0),
+	val splashscreenEnabled: Boolean = false,
+	val setupCompleted: Boolean = true,
+	var dateLastAccessed: Instant = Instant.MIN,
 ) {
-	private val serverVersion = version?.let(ServerVersion::fromString)
+	val serverVersion = version?.let(ServerVersion::fromString)
 	val versionSupported = serverVersion != null && serverVersion >= ServerRepository.minimumServerVersion
 
 	operator fun compareTo(other: ServerVersion): Int = serverVersion?.compareTo(other) ?: -1

app/src/main/java/org/jellyfin/androidtv/auth/model/User.kt

@@ -10,9 +10,10 @@ sealed class User {
 	abstract val serverId: UUID
 	abstract val name: String
 	abstract val accessToken: String?
-	abstract val requirePassword: Boolean
 	abstract val imageTag: String?
 
+	abstract fun withToken(accessToken: String): User
+
 	override fun equals(other: Any?) = other is User
 		&& serverId == other.serverId
 		&& id == other.id
@@ -32,10 +33,11 @@ data class PrivateUser(
 	override val serverId: UUID,
 	override val name: String,
 	override val accessToken: String?,
-	override val requirePassword: Boolean,
 	override val imageTag: String?,
 	val lastUsed: Long,
-) : User()
+) : User() {
+	override fun withToken(accessToken: String) = copy(accessToken = accessToken)
+}
 
 /**
  * Represents a user stored server side. Found using the Public User endpoint.
@@ -45,6 +47,7 @@ data class PublicUser(
 	override val serverId: UUID,
 	override val name: String,
 	override val accessToken: String?,
-	override val requirePassword: Boolean,
 	override val imageTag: String?,
-) : User()
+) : User() {
+	override fun withToken(accessToken: String) = copy(accessToken = accessToken)
+}

app/src/main/java/org/jellyfin/androidtv/auth/repository/AuthenticationRepository.kt

@@ -0,0 +1,217 @@
+package org.jellyfin.androidtv.auth.repository
+
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.emitAll
+import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.flow.flowOf
+import kotlinx.coroutines.flow.flowOn
+import org.jellyfin.androidtv.auth.model.ApiClientErrorLoginState
+import org.jellyfin.androidtv.auth.model.AuthenticateMethod
+import org.jellyfin.androidtv.auth.model.AuthenticatedState
+import org.jellyfin.androidtv.auth.model.AuthenticatingState
+import org.jellyfin.androidtv.auth.model.AuthenticationStoreUser
+import org.jellyfin.androidtv.auth.model.AutomaticAuthenticateMethod
+import org.jellyfin.androidtv.auth.model.CredentialAuthenticateMethod
+import org.jellyfin.androidtv.auth.model.LoginState
+import org.jellyfin.androidtv.auth.model.PrivateUser
+import org.jellyfin.androidtv.auth.model.QuickConnectAuthenticateMethod
+import org.jellyfin.androidtv.auth.model.RequireSignInState
+import org.jellyfin.androidtv.auth.model.Server
+import org.jellyfin.androidtv.auth.model.ServerUnavailableState
+import org.jellyfin.androidtv.auth.model.ServerVersionNotSupported
+import org.jellyfin.androidtv.auth.model.User
+import org.jellyfin.androidtv.auth.store.AuthenticationPreferences
+import org.jellyfin.androidtv.auth.store.AuthenticationStore
+import org.jellyfin.androidtv.util.apiclient.JellyfinImage
+import org.jellyfin.androidtv.util.apiclient.JellyfinImageSource
+import org.jellyfin.androidtv.util.apiclient.getUrl
+import org.jellyfin.androidtv.util.apiclient.primaryImage
+import org.jellyfin.androidtv.util.sdk.forUser
+import org.jellyfin.sdk.Jellyfin
+import org.jellyfin.sdk.api.client.ApiClient
+import org.jellyfin.sdk.api.client.exception.ApiClientException
+import org.jellyfin.sdk.api.client.exception.TimeoutException
+import org.jellyfin.sdk.api.client.extensions.authenticateUserByName
+import org.jellyfin.sdk.api.client.extensions.authenticateWithQuickConnect
+import org.jellyfin.sdk.api.client.extensions.userApi
+import org.jellyfin.sdk.model.DeviceInfo
+import org.jellyfin.sdk.model.api.AuthenticationResult
+import org.jellyfin.sdk.model.api.ImageType
+import org.jellyfin.sdk.model.api.UserDto
+import timber.log.Timber
+import java.time.Instant
+
+/**
+ * Repository to manage authentication of the user in the app.
+ */
+interface AuthenticationRepository {
+	fun authenticate(server: Server, method: AuthenticateMethod): Flow<LoginState>
+	fun logout(user: User): Boolean
+	fun getUserImageUrl(server: Server, user: User): String?
+}
+
+class AuthenticationRepositoryImpl(
+	private val jellyfin: Jellyfin,
+	private val sessionRepository: SessionRepository,
+	private val authenticationStore: AuthenticationStore,
+	private val userApiClient: ApiClient,
+	private val authenticationPreferences: AuthenticationPreferences,
+	private val defaultDeviceInfo: DeviceInfo,
+) : AuthenticationRepository {
+	override fun authenticate(server: Server, method: AuthenticateMethod): Flow<LoginState> {
+		return when (method) {
+			is AutomaticAuthenticateMethod -> authenticateAutomatic(server, method.user)
+			is CredentialAuthenticateMethod -> authenticateCredential(server, method.username, method.password)
+			is QuickConnectAuthenticateMethod -> authenticateQuickConnect(server, method.secret)
+		}
+	}
+
+	private fun authenticateAutomatic(server: Server, user: User): Flow<LoginState> {
+		Timber.i("Authenticating user ${user.id}")
+
+		// Automatic logic is disabled when the always authenticate preference is enabled
+		if (authenticationPreferences[AuthenticationPreferences.alwaysAuthenticate]) return flowOf(RequireSignInState)
+
+		val authStoreUser = authenticationStore.getUser(server.id, user.id)
+		// Try login with access token
+		return if (authStoreUser?.accessToken != null) authenticateToken(server, user.withToken(authStoreUser.accessToken))
+		// Require login
+		else flowOf(RequireSignInState)
+	}
+
+	private fun authenticateCredential(server: Server, username: String, password: String) = flow {
+		val api = jellyfin.createApi(server.address, deviceInfo = defaultDeviceInfo.forUser(username))
+		val result = try {
+			val response = api.userApi.authenticateUserByName(username, password)
+			response.content
+		} catch (err: TimeoutException) {
+			Timber.e(err, "Failed to connect to server trying to sign in $username")
+			emit(ServerUnavailableState)
+			return@flow
+		} catch (err: ApiClientException) {
+			Timber.e(err, "Unable to sign in as $username")
+			emit(ApiClientErrorLoginState(err))
+			return@flow
+		}
+
+		emitAll(authenticateAuthenticationResult(server, result))
+	}.flowOn(Dispatchers.IO)
+
+	private fun authenticateQuickConnect(server: Server, secret: String) = flow {
+		val api = jellyfin.createApi(server.address, deviceInfo = defaultDeviceInfo)
+		val result = try {
+			val response = api.userApi.authenticateWithQuickConnect(secret)
+			response.content
+		} catch (err: TimeoutException) {
+			Timber.e(err, "Failed to connect to server")
+			emit(ServerUnavailableState)
+			return@flow
+		} catch (err: ApiClientException) {
+			Timber.e(err, "Unable to sign in with Quick Connect secret")
+			emit(ApiClientErrorLoginState(err))
+			return@flow
+		}
+
+		emitAll(authenticateAuthenticationResult(server, result))
+	}.flowOn(Dispatchers.IO)
+
+	private fun authenticateAuthenticationResult(server: Server, result: AuthenticationResult) = flow {
+		val accessToken = result.accessToken ?: return@flow emit(RequireSignInState)
+		val userInfo = result.user ?: return@flow emit(RequireSignInState)
+		val user = PrivateUser(
+			id = userInfo.id,
+			serverId = server.id,
+			name = userInfo.name!!,
+			accessToken = result.accessToken,
+			imageTag = userInfo.primaryImage?.tag,
+			lastUsed = Instant.now().toEpochMilli(),
+		)
+
+		authenticateFinish(server, userInfo, accessToken)
+		val success = setActiveSession(user, server)
+		if (success) {
+			emit(AuthenticatedState)
+		} else {
+			Timber.w("Failed to set active session after authenticating")
+			if (!server.versionSupported) emit(ServerVersionNotSupported(server))
+			else emit(RequireSignInState)
+		}
+	}.flowOn(Dispatchers.IO)
+
+	private fun authenticateToken(server: Server, user: User) = flow {
+		emit(AuthenticatingState)
+
+		val success = setActiveSession(user, server)
+		if (!success) {
+			if (!server.versionSupported) emit(ServerVersionNotSupported(server))
+			else emit(RequireSignInState)
+		} else try {
+			// Update user info
+			val userInfo by userApiClient.userApi.getCurrentUser()
+			authenticateFinish(server, userInfo, user.accessToken.orEmpty())
+			emit(AuthenticatedState)
+		} catch (err: TimeoutException) {
+			Timber.e(err, "Failed to connect to server")
+			emit(ServerUnavailableState)
+			return@flow
+		} catch (err: ApiClientException) {
+			Timber.e(err, "Unable to get current user data")
+			emit(ApiClientErrorLoginState(err))
+		}
+	}.flowOn(Dispatchers.IO)
+
+	private suspend fun authenticateFinish(server: Server, userInfo: UserDto, accessToken: String) {
+		val currentUser = authenticationStore.getUser(server.id, userInfo.id)
+
+		val updatedUser = currentUser?.copy(
+			name = userInfo.name!!,
+			lastUsed = Instant.now().toEpochMilli(),
+			imageTag = userInfo.primaryImage?.tag,
+			accessToken = accessToken,
+		) ?: AuthenticationStoreUser(
+			name = userInfo.name!!,
+			imageTag = userInfo.primaryImage?.tag,
+			accessToken = accessToken,
+		)
+		authenticationStore.putUser(server.id, userInfo.id, updatedUser)
+	}
+
+	private suspend fun setActiveSession(user: User, server: Server): Boolean {
+		val authenticated = sessionRepository.switchCurrentSession(server.id, user.id)
+
+		if (authenticated) {
+			// Update last use in store
+			authenticationStore.getServer(server.id)?.let { storedServer ->
+				authenticationStore.putServer(server.id, storedServer.copy(lastUsed = Instant.now().toEpochMilli()))
+			}
+
+			authenticationStore.getUser(server.id, user.id)?.let { storedUser ->
+				authenticationStore.putUser(server.id, user.id, storedUser.copy(lastUsed = Instant.now().toEpochMilli()))
+			}
+		}
+
+		return authenticated
+	}
+
+	override fun logout(user: User): Boolean {
+		val authStoreUser = authenticationStore
+			.getUser(user.serverId, user.id)
+			?.copy(accessToken = null)
+
+		return if (authStoreUser != null) authenticationStore.putUser(user.serverId, user.id, authStoreUser)
+		else false
+	}
+
+	override fun getUserImageUrl(server: Server, user: User): String? = user.imageTag?.let { primaryImageTag ->
+		JellyfinImage(
+			item = user.id,
+			source = JellyfinImageSource.USER,
+			type = ImageType.PRIMARY,
+			tag = primaryImageTag,
+			blurHash = null,
+			aspectRatio = null,
+			index = null
+		)
+	}?.getUrl(jellyfin.createApi(server.address))
+}

app/src/main/java/org/jellyfin/androidtv/auth/repository/ServerRepository.kt

@@ -0,0 +1,271 @@
+package org.jellyfin.androidtv.auth.repository
+
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.withContext
+import org.jellyfin.androidtv.auth.model.AuthenticationStoreServer
+import org.jellyfin.androidtv.auth.model.ConnectedState
+import org.jellyfin.androidtv.auth.model.ConnectingState
+import org.jellyfin.androidtv.auth.model.Server
+import org.jellyfin.androidtv.auth.model.ServerAdditionState
+import org.jellyfin.androidtv.auth.model.UnableToConnectState
+import org.jellyfin.androidtv.auth.store.AuthenticationStore
+import org.jellyfin.androidtv.util.sdk.toServer
+import org.jellyfin.sdk.Jellyfin
+import org.jellyfin.sdk.api.client.ApiClient
+import org.jellyfin.sdk.api.client.exception.ApiClientException
+import org.jellyfin.sdk.api.client.exception.InvalidContentException
+import org.jellyfin.sdk.api.client.extensions.brandingApi
+import org.jellyfin.sdk.api.client.extensions.systemApi
+import org.jellyfin.sdk.discovery.RecommendedServerInfo
+import org.jellyfin.sdk.discovery.RecommendedServerInfoScore
+import org.jellyfin.sdk.model.ServerVersion
+import org.jellyfin.sdk.model.api.BrandingOptionsDto
+import org.jellyfin.sdk.model.api.ServerDiscoveryInfo
+import org.jellyfin.sdk.model.serializer.toUUID
+import timber.log.Timber
+import java.time.Instant
+import java.util.UUID
+
+/**
+ * Repository to maintain servers.
+ */
+interface ServerRepository {
+	val storedServers: StateFlow<List<Server>>
+	val discoveredServers: StateFlow<List<Server>>
+	val currentServer: StateFlow<Server?>
+
+	suspend fun loadStoredServers()
+	suspend fun loadDiscoveryServers()
+
+	fun setCurrentServer(server: Server?)
+
+	fun addServer(address: String): Flow<ServerAdditionState>
+	suspend fun getServer(id: UUID, eagerUpdate: Boolean = false): Server?
+	suspend fun updateServer(server: Server, force: Boolean = false): Boolean
+	suspend fun deleteServer(server: UUID): Boolean
+
+	companion object {
+		val minimumServerVersion = Jellyfin.minimumVersion.copy(build = null)
+		val recommendedServerVersion = Jellyfin.apiVersion.copy(build = null)
+
+		val upcomingMinimumServerVersion = ServerVersion(10, 11, 0)
+	}
+}
+
+class ServerRepositoryImpl(
+	private val jellyfin: Jellyfin,
+	private val authenticationStore: AuthenticationStore,
+) : ServerRepository {
+	// State
+	private val _storedServers = MutableStateFlow(emptyList<Server>())
+	override val storedServers = _storedServers.asStateFlow()
+
+	private val _discoveredServers = MutableStateFlow(emptyList<Server>())
+	override val discoveredServers = _discoveredServers.asStateFlow()
+
+	private val _currentServer = MutableStateFlow<Server?>(null)
+	override val currentServer = _currentServer.asStateFlow()
+
+	// Loading data
+	override suspend fun loadStoredServers() {
+		authenticationStore.getServers()
+			.map { (id, entry) -> entry.asServer(id) }
+			.sortedWith(compareByDescending<Server> { it.dateLastAccessed }.thenBy { it.name })
+			.let { _storedServers.emit(it) }
+	}
+
+	override suspend fun loadDiscoveryServers() {
+		val servers = mutableListOf<Server>()
+
+		jellyfin.discovery
+			.discoverLocalServers()
+			.map(ServerDiscoveryInfo::toServer)
+			.collect { server ->
+				servers += server
+				_discoveredServers.emit(servers.toList())
+			}
+	}
+
+	override fun setCurrentServer(server: Server?) {
+		_currentServer.value = server
+	}
+
+	// Mutating data
+	override fun addServer(address: String): Flow<ServerAdditionState> = flow {
+		Timber.i("Adding server %s", address)
+
+		emit(ConnectingState(address))
+
+		val addressCandidates = jellyfin.discovery.getAddressCandidates(address)
+		Timber.i("Found ${addressCandidates.size} candidates")
+
+		val goodRecommendations = mutableListOf<RecommendedServerInfo>()
+		val badRecommendations = mutableListOf<RecommendedServerInfo>()
+		val greatRecommendation = jellyfin.discovery.getRecommendedServers(addressCandidates).firstOrNull { recommendedServer ->
+			when (recommendedServer.score) {
+				RecommendedServerInfoScore.GREAT -> true
+				RecommendedServerInfoScore.GOOD -> {
+					goodRecommendations += recommendedServer
+					false
+				}
+
+				else -> {
+					badRecommendations += recommendedServer
+					false
+				}
+			}
+		}
+
+		Timber.i(buildString {
+			append("Recommendations: ")
+			if (greatRecommendation == null) append(0)
+			else append(1)
+			append(" great, ")
+			append(goodRecommendations.size)
+			append(" good, ")
+			append(badRecommendations.size)
+			append(" bad")
+		})
+
+		val chosenRecommendation = greatRecommendation ?: goodRecommendations.firstOrNull()
+		if (chosenRecommendation != null && chosenRecommendation.systemInfo.isSuccess) {
+			// Get system info
+			val systemInfo = chosenRecommendation.systemInfo.getOrThrow()
+
+			// Get branding info
+			val api = jellyfin.createApi(chosenRecommendation.address)
+			val branding = api.getBrandingOptionsOrDefault()
+
+			val id = systemInfo.id!!.toUUID()
+
+			val server = authenticationStore.getServer(id)?.copy(
+				name = systemInfo.serverName ?: "Jellyfin Server",
+				address = chosenRecommendation.address,
+				version = systemInfo.version,
+				loginDisclaimer = branding.loginDisclaimer,
+				splashscreenEnabled = branding.splashscreenEnabled,
+				setupCompleted = systemInfo.startupWizardCompleted ?: true,
+				lastUsed = Instant.now().toEpochMilli()
+			) ?: AuthenticationStoreServer(
+				name = systemInfo.serverName ?: "Jellyfin Server",
+				address = chosenRecommendation.address,
+				version = systemInfo.version,
+				loginDisclaimer = branding.loginDisclaimer,
+				splashscreenEnabled = branding.splashscreenEnabled,
+				setupCompleted = systemInfo.startupWizardCompleted ?: true,
+			)
+
+			authenticationStore.putServer(id, server)
+			loadStoredServers()
+
+			emit(ConnectedState(id, systemInfo))
+		} else {
+			// No great or good recommendations, only add bad recommendations
+			val addressCandidatesWithIssues = (badRecommendations + goodRecommendations)
+				.groupBy { it.address }
+				.mapValues { (_, entry) -> entry.flatMap { server -> server.issues } }
+			emit(UnableToConnectState(addressCandidatesWithIssues))
+		}
+	}.flowOn(Dispatchers.IO)
+
+	override suspend fun getServer(id: UUID, eagerUpdate: Boolean): Server? {
+		val server = authenticationStore.getServer(id) ?: return null
+
+		val updatedServer = try {
+			val forceUpdate = eagerUpdate && server.version
+				?.let(ServerVersion::fromString)
+				?.let { version -> version < ServerRepository.minimumServerVersion } == true
+
+			updateServerInternal(id, server, forceUpdate)
+		} catch (err: ApiClientException) {
+			Timber.e(err, "Unable to update server")
+			null
+		}
+
+		return (updatedServer ?: server).asServer(id)
+	}
+
+	override suspend fun updateServer(server: Server, force: Boolean): Boolean {
+		// Only update existing servers
+		val serverInfo = authenticationStore.getServer(server.id) ?: return false
+
+		return try {
+			updateServerInternal(server.id, serverInfo, force) != null
+		} catch (err: ApiClientException) {
+			Timber.e(err, "Unable to update server")
+
+			false
+		}
+	}
+
+	private suspend fun updateServerInternal(
+		id: UUID,
+		server: AuthenticationStoreServer,
+		forceUpdate: Boolean
+	): AuthenticationStoreServer? {
+		val now = Instant.now().toEpochMilli()
+
+		// Only update every 10 minutes
+		if (now - server.lastRefreshed < 600000 && server.version != null && !forceUpdate) return null
+
+		val newServer = withContext(Dispatchers.IO) {
+			val api = jellyfin.createApi(server.address)
+
+			// Get login disclaimer
+			val branding = api.getBrandingOptionsOrDefault()
+			val systemInfo by api.systemApi.getPublicSystemInfo()
+
+			server.copy(
+				name = systemInfo.serverName ?: server.name,
+				version = systemInfo.version ?: server.version,
+				loginDisclaimer = branding.loginDisclaimer ?: server.loginDisclaimer,
+				splashscreenEnabled = branding.splashscreenEnabled,
+				setupCompleted = systemInfo.startupWizardCompleted ?: server.setupCompleted,
+				lastRefreshed = now
+			)
+		}
+		authenticationStore.putServer(id, newServer)
+
+		return newServer
+	}
+
+	override suspend fun deleteServer(server: UUID): Boolean {
+		val success = authenticationStore.removeServer(server)
+		if (success) loadStoredServers()
+		return success
+	}
+
+	// Helper functions
+	private fun AuthenticationStoreServer.asServer(id: UUID) = Server(
+		id = id,
+		name = name,
+		address = address,
+		version = version,
+		loginDisclaimer = loginDisclaimer,
+		splashscreenEnabled = splashscreenEnabled,
+		setupCompleted = setupCompleted,
+		dateLastAccessed = Instant.ofEpochMilli(lastUsed),
+	)
+
+	/**
+	 * Try to retrieve the branding options. If the response JSON is invalid it will return a default value.
+	 * This makes sure we can still work with older Jellyfin versions.
+	 */
+	private suspend fun ApiClient.getBrandingOptionsOrDefault() = try {
+		brandingApi.getBrandingOptions().content
+	} catch (exception: InvalidContentException) {
+		Timber.w(exception, "Invalid branding options response, using default value")
+		BrandingOptionsDto(
+			loginDisclaimer = null,
+			customCss = null,
+			splashscreenEnabled = false,
+		)
+	}
+}

app/src/main/java/org/jellyfin/androidtv/auth/repository/ServerUserRepository.kt

@@ -0,0 +1,67 @@
+package org.jellyfin.androidtv.auth.repository
+
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import org.jellyfin.androidtv.auth.model.PrivateUser
+import org.jellyfin.androidtv.auth.model.PublicUser
+import org.jellyfin.androidtv.auth.model.Server
+import org.jellyfin.androidtv.auth.store.AuthenticationStore
+import org.jellyfin.androidtv.util.sdk.toPublicUser
+import org.jellyfin.sdk.Jellyfin
+import org.jellyfin.sdk.api.client.exception.ApiClientException
+import org.jellyfin.sdk.api.client.extensions.userApi
+import org.jellyfin.sdk.model.api.UserDto
+import timber.log.Timber
+
+/**
+ * Repository to maintain users for servers.
+ * Authentication is done using the [AuthenticationRepository].
+ */
+interface ServerUserRepository {
+	//server
+	fun getStoredServerUsers(server: Server): List<PrivateUser>
+	suspend fun getPublicServerUsers(server: Server): List<PublicUser>
+
+	fun deleteStoredUser(user: PrivateUser)
+}
+
+class ServerUserRepositoryImpl(
+	private val jellyfin: Jellyfin,
+	private val authenticationStore: AuthenticationStore,
+) : ServerUserRepository {
+	override fun getStoredServerUsers(server: Server) = authenticationStore.getUsers(server.id)
+		?.mapNotNull { (userId, userInfo) ->
+			val authInfo = authenticationStore.getUser(server.id, userId)
+			PrivateUser(
+				id = userId,
+				serverId = server.id,
+				name = userInfo.name,
+				accessToken = authInfo?.accessToken,
+				imageTag = userInfo.imageTag,
+				lastUsed = userInfo.lastUsed,
+			)
+		}
+		?.sortedWith(compareByDescending<PrivateUser> { it.lastUsed }.thenBy { it.name })
+		.orEmpty()
+
+	override suspend fun getPublicServerUsers(server: Server): List<PublicUser> {
+		// Create a fresh API because the shared one might be authenticated for a different server
+		val api = jellyfin.createApi(server.address)
+
+		return try {
+			val users = withContext(Dispatchers.IO) {
+				api.userApi.getPublicUsers().content
+			}
+			users.mapNotNull(UserDto::toPublicUser)
+		} catch (err: ApiClientException) {
+			Timber.e(err, "Unable to retrieve public users")
+
+			emptyList()
+		}
+	}
+
+	override fun deleteStoredUser(user: PrivateUser) {
+		// Remove user info from store
+		authenticationStore.removeUser(user.serverId, user.id)
+	}
+}

app/src/main/java/org/jellyfin/androidtv/auth/repository/SessionRepository.kt

@@ -0,0 +1,208 @@
+package org.jellyfin.androidtv.auth.repository
+
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.NonCancellable
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
+import kotlinx.coroutines.withContext
+import org.jellyfin.androidtv.auth.model.Server
+import org.jellyfin.androidtv.auth.store.AuthenticationPreferences
+import org.jellyfin.androidtv.auth.store.AuthenticationStore
+import org.jellyfin.androidtv.preference.PreferencesRepository
+import org.jellyfin.androidtv.preference.TelemetryPreferences
+import org.jellyfin.androidtv.preference.constant.UserSelectBehavior.DISABLED
+import org.jellyfin.androidtv.preference.constant.UserSelectBehavior.LAST_USER
+import org.jellyfin.androidtv.preference.constant.UserSelectBehavior.SPECIFIC_USER
+import org.jellyfin.androidtv.util.sdk.forUser
+import org.jellyfin.sdk.api.client.ApiClient
+import org.jellyfin.sdk.api.client.exception.ApiClientException
+import org.jellyfin.sdk.api.client.extensions.clientLogApi
+import org.jellyfin.sdk.api.client.extensions.userApi
+import org.jellyfin.sdk.model.DeviceInfo
+import org.jellyfin.sdk.model.serializer.toUUIDOrNull
+import timber.log.Timber
+import java.util.UUID
+
+data class Session(
+	val userId: UUID,
+	val serverId: UUID,
+	val accessToken: String,
+)
+
+enum class SessionRepositoryState {
+	READY,
+	RESTORING_SESSION,
+	SWITCHING_SESSION,
+}
+
+interface SessionRepository {
+	val currentSession: StateFlow<Session?>
+	val state: StateFlow<SessionRepositoryState>
+
+	suspend fun restoreSession(destroyOnly: Boolean)
+	suspend fun switchCurrentSession(serverId: UUID, userId: UUID): Boolean
+	fun destroyCurrentSession()
+}
+
+class SessionRepositoryImpl(
+	private val authenticationPreferences: AuthenticationPreferences,
+	private val authenticationStore: AuthenticationStore,
+	private val userApiClient: ApiClient,
+	private val preferencesRepository: PreferencesRepository,
+	private val defaultDeviceInfo: DeviceInfo,
+	private val userRepository: UserRepository,
+	private val serverRepository: ServerRepository,
+	private val telemetryPreferences: TelemetryPreferences,
+) : SessionRepository {
+	private val currentSessionMutex = Mutex()
+	private val _currentSession = MutableStateFlow<Session?>(null)
+	override val currentSession = _currentSession.asStateFlow()
+	private val _state = MutableStateFlow(SessionRepositoryState.READY)
+	override val state = _state.asStateFlow()
+
+	override suspend fun restoreSession(destroyOnly: Boolean): Unit = withContext(NonCancellable) {
+		currentSessionMutex.withLock {
+			Timber.i("Restoring session")
+
+			_state.value = SessionRepositoryState.RESTORING_SESSION
+
+			val alwaysAuthenticate = authenticationPreferences[AuthenticationPreferences.alwaysAuthenticate]
+			val autoLoginBehavior = authenticationPreferences[AuthenticationPreferences.autoLoginUserBehavior]
+
+			when {
+				alwaysAuthenticate -> destroyCurrentSession()
+				autoLoginBehavior == DISABLED -> destroyCurrentSession()
+				autoLoginBehavior == LAST_USER && !destroyOnly -> setCurrentSession(createLastUserSession())
+				autoLoginBehavior == SPECIFIC_USER && !destroyOnly -> {
+					val serverId = authenticationPreferences[AuthenticationPreferences.autoLoginServerId].toUUIDOrNull()
+					val userId = authenticationPreferences[AuthenticationPreferences.autoLoginUserId].toUUIDOrNull()
+					if (serverId != null && userId != null) setCurrentSession(createUserSession(serverId, userId))
+				}
+			}
+
+			_state.value = SessionRepositoryState.READY
+		}
+	}
+
+	override suspend fun switchCurrentSession(serverId: UUID, userId: UUID): Boolean {
+		// No change in user - don't switch
+		if (currentSession.value?.userId == userId) {
+			Timber.d("Current session user is the same as the requested user")
+			return false
+		}
+
+		_state.value = SessionRepositoryState.SWITCHING_SESSION
+		Timber.i("Switching current session to user $userId")
+
+		val session = createUserSession(serverId, userId)
+		if (session == null) {
+			Timber.w("Could not switch to non-existing session for user $userId")
+			_state.value = SessionRepositoryState.READY
+			return false
+		}
+
+		val switched = setCurrentSession(session)
+		_state.value = SessionRepositoryState.READY
+		return switched
+	}
+
+	override fun destroyCurrentSession() {
+		Timber.i("Destroying current session")
+
+		userRepository.setCurrentUser(null)
+		serverRepository.setCurrentServer(null)
+		_currentSession.value = null
+		_state.value = SessionRepositoryState.READY
+	}
+
+	private suspend fun setCurrentSession(session: Session?): Boolean {
+		var server: Server? = null
+
+		if (session != null) {
+			// No change in session - don't switch
+			if (currentSession.value?.userId == session.userId) return true
+
+			// Update last active user
+			authenticationPreferences[AuthenticationPreferences.lastServerId] = session.serverId.toString()
+			authenticationPreferences[AuthenticationPreferences.lastUserId] = session.userId.toString()
+
+			// Check if server version is supported
+			server = serverRepository.getServer(session.serverId, true)
+			if (server == null || !server.versionSupported) return false
+		}
+
+		// Update session after binding the apiclient settings
+		val deviceInfo = session?.let { defaultDeviceInfo.forUser(it.userId) } ?: defaultDeviceInfo
+		Timber.i("Updating current session. userId=${session?.userId} server=${server?.serverVersion}")
+
+		val applied = userApiClient.applySession(session, deviceInfo)
+		if (applied && session != null) {
+			try {
+				val user = withContext(Dispatchers.IO) {
+					userApiClient.userApi.getCurrentUser().content
+				}
+				userRepository.setCurrentUser(user)
+				serverRepository.setCurrentServer(server)
+			} catch (err: ApiClientException) {
+				Timber.e(err, "Unable to authenticate: bad response when getting user info")
+				destroyCurrentSession()
+				return false
+			}
+
+			// Update crash reporting URL
+			val crashReportUrl = userApiClient.clientLogApi.logFileUrl()
+			telemetryPreferences[TelemetryPreferences.crashReportUrl] = crashReportUrl
+			telemetryPreferences[TelemetryPreferences.crashReportToken] = session.accessToken
+		} else {
+			userRepository.setCurrentUser(null)
+			serverRepository.setCurrentServer(null)
+		}
+		preferencesRepository.onSessionChanged()
+		_currentSession.value = session
+
+		return true
+	}
+
+	private fun createLastUserSession(): Session? {
+		val lastUserId = authenticationPreferences[AuthenticationPreferences.lastUserId].toUUIDOrNull()
+		val lastServerId = authenticationPreferences[AuthenticationPreferences.lastServerId].toUUIDOrNull()
+
+		return if (lastUserId != null && lastServerId != null) createUserSession(lastServerId, lastUserId)
+		else null
+	}
+
+	private fun createUserSession(serverId: UUID, userId: UUID): Session? {
+		val account = authenticationStore.getUser(serverId, userId)
+		if (account?.accessToken == null) return null
+
+		return Session(
+			userId = userId,
+			serverId = serverId,
+			accessToken = account.accessToken
+		)
+	}
+
+	private fun ApiClient.applySession(session: Session?, newDeviceInfo: DeviceInfo = defaultDeviceInfo): Boolean {
+		if (session == null) {
+			update(
+				baseUrl = null,
+				accessToken = null,
+				deviceInfo = newDeviceInfo,
+			)
+		} else {
+			val server = authenticationStore.getServer(session.serverId)
+				?: return false
+
+			update(
+				baseUrl = server.address,
+				accessToken = session.accessToken,
+				deviceInfo = newDeviceInfo,
+			)
+		}
+
+		return true
+	}
+}

app/src/main/java/org/jellyfin/androidtv/auth/repository/UserRepository.kt

@@ -0,0 +1,22 @@
+package org.jellyfin.androidtv.auth.repository
+
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import org.jellyfin.sdk.model.api.UserDto
+
+/**
+ * Repository to get the current authenticated user.
+ */
+interface UserRepository {
+	val currentUser: StateFlow<UserDto?>
+
+	fun setCurrentUser(user: UserDto?)
+}
+
+class UserRepositoryImpl : UserRepository {
+	override val currentUser = MutableStateFlow<UserDto?>(null)
+
+	override fun setCurrentUser(user: UserDto?) {
+		currentUser.value = user
+	}
+}

app/src/main/java/org/jellyfin/androidtv/auth/store/AuthenticationPreferences.kt

@@ -0,0 +1,43 @@
+package org.jellyfin.androidtv.auth.store
+
+import android.content.Context
+import org.jellyfin.androidtv.auth.model.AuthenticationSortBy
+import org.jellyfin.androidtv.preference.constant.UserSelectBehavior
+import org.jellyfin.preference.booleanPreference
+import org.jellyfin.preference.enumPreference
+import org.jellyfin.preference.store.SharedPreferenceStore
+import org.jellyfin.preference.stringPreference
+
+class AuthenticationPreferences(context: Context) : SharedPreferenceStore(
+	sharedPreferences = context.getSharedPreferences("authentication", Context.MODE_PRIVATE)
+) {
+	companion object {
+		// Preferences
+		val autoLoginUserBehavior = enumPreference("auto_login_user_behavior", UserSelectBehavior.LAST_USER)
+		val autoLoginServerId = stringPreference("auto_login_server_id", "")
+		val autoLoginUserId = stringPreference("auto_login_user_id", "")
+
+		val sortBy = enumPreference("sort_by", AuthenticationSortBy.LAST_USE)
+		val alwaysAuthenticate = booleanPreference("always_authenticate", false)
+
+		// Persistent state
+		val lastServerId = stringPreference("last_server_id", "")
+		val lastUserId = stringPreference("last_user_id", "")
+	}
+
+	init {
+		runMigrations {
+			// v0.15.4 to v0.15.5
+			migration(toVersion = 2) {
+				// Unfortunately we cannot migrate the "specific user" login option
+				// so we'll reset the preference to disabled if it was used
+				if (it.getString("auto_login_user_behavior", null) === UserSelectBehavior.SPECIFIC_USER.name) {
+					putString("auto_login_user_id", "")
+					putString("auto_login_user_behavior", UserSelectBehavior.DISABLED.name)
+				}
+
+				putString("last_user_id", "")
+			}
+		}
+	}
+}

app/src/main/java/org/jellyfin/androidtv/auth/store/AuthenticationStore.kt

@@ -1,7 +1,7 @@
-package org.jellyfin.androidtv.auth
+package org.jellyfin.androidtv.auth.store
 
 import android.content.Context
-import kotlinx.serialization.encodeToString
+import kotlinx.serialization.SerializationException
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.JsonPrimitive
@@ -19,14 +19,13 @@ import timber.log.Timber
 import java.util.UUID
 
 /**
- * Storage for authentication related entities. Stores servers with users inside. Should be used in
- * combination with the [AccountManagerHelper] to store access tokens and integrate with the
- * operating system.
+ * Storage for authentication related entities. Stores servers with users inside, including
+ * access tokens.
  *
  * The data is stored in a JSON file located in the applications data directory.
  */
 class AuthenticationStore(
-	private val context: Context
+	private val context: Context,
 ) {
 	private val storePath
 		get() = context.filesDir.resolve("authentication_store.json")
@@ -47,14 +46,30 @@ class AuthenticationStore(
 		// No store found
 		if (!storePath.exists()) return emptyMap()
 
+		// Parse JSON document
+		val root = try {
+			json.parseToJsonElement(storePath.readText()).jsonObject
+		} catch (e: SerializationException) {
+			Timber.e(e, "Unable to read JSON")
+			JsonObject(emptyMap())
+		}
+
 		// Check for version
-		val root = json.parseToJsonElement(storePath.readText()).jsonObject
 		return when (root["version"]?.jsonPrimitive?.intOrNull) {
-			1 -> json.decodeFromJsonElement<Map<UUID, AuthenticationStoreServer>>(root["servers"]!!)
+			// Migration was removed, clear stored servers
+			1 -> {
+				Timber.e("Migrating from version 1 is no longer possible")
+				emptyMap()
+			}
+
+			// Current version, return as-is
+			2 -> json.decodeFromJsonElement<Map<UUID, AuthenticationStoreServer>>(root["servers"]!!)
+
 			null -> {
 				Timber.e("Authentication Store is corrupt!")
 				emptyMap()
 			}
+
 			else -> {
 				Timber.e("Authentication Store is using an unknown version!")
 				emptyMap()
@@ -62,10 +77,10 @@ class AuthenticationStore(
 		}
 	}
 
-	private fun save(): Boolean {
+	private fun write(servers: Map<UUID, AuthenticationStoreServer>): Boolean {
 		val root = JsonObject(mapOf(
-			"version" to JsonPrimitive(1),
-			"servers" to json.encodeToJsonElement(store)
+			"version" to JsonPrimitive(2),
+			"servers" to json.encodeToJsonElement(servers)
 		))
 
 		storePath.writeText(json.encodeToString(root))
@@ -73,6 +88,10 @@ class AuthenticationStore(
 		return true
 	}
 
+	private fun save(): Boolean {
+		return write(store)
+	}
+
 	fun getServers(): Map<UUID, AuthenticationStoreServer> = store
 
 	fun getUsers(server: UUID): Map<UUID, AuthenticationStoreUser>? = getServer(server)?.users
@@ -94,10 +113,6 @@ class AuthenticationStore(
 		return save()
 	}
 
-	fun containsServer(server: UUID): Boolean = server in store
-
-	fun containsUser(server: UUID, user: UUID): Boolean = server in store && user in store[server]!!.users
-
 	/**
 	 * Removes the server and stored users from the credential store.
 	 */

app/src/main/java/org/jellyfin/androidtv/constant/ChangeTriggerType.java

@@ -1,12 +0,0 @@
-package org.jellyfin.androidtv.constant;
-
-public enum ChangeTriggerType {
-    LibraryUpdated,
-    MoviePlayback,
-    TvPlayback,
-    GuideNeedsLoad,
-    MusicPlayback,
-    Always,
-    VideoQueueChange,
-    FavoriteUpdate
-}

app/src/main/java/org/jellyfin/androidtv/constant/ChangeTriggerType.kt

@@ -0,0 +1,9 @@
+package org.jellyfin.androidtv.constant
+
+enum class ChangeTriggerType {
+	LibraryUpdated,
+	MoviePlayback,
+	TvPlayback,
+	MusicPlayback,
+	FavoriteUpdate,
+}

app/src/main/java/org/jellyfin/androidtv/constant/Codec.kt

@@ -0,0 +1,89 @@
+package org.jellyfin.androidtv.constant
+
+object Codec {
+	object Container {
+		@Suppress("ObjectPropertyName", "ObjectPropertyNaming")
+		const val `3GP` = "3gp"
+		const val ASF = "asf"
+		const val AVI = "avi"
+		const val DVR_MS = "dvr-ms"
+		const val HLS = "hls"
+		const val M2V = "m2v"
+		const val M4V = "m4v"
+		const val MKV = "mkv"
+		const val MOV = "mov"
+		const val MP3 = "mp3"
+		const val MP4 = "mp4"
+		const val MPEG = "mpeg"
+		const val MPEGTS = "mpegts"
+		const val MPG = "mpg"
+		const val OGM = "ogm"
+		const val OGV = "ogv"
+		const val TS = "ts"
+		const val VOB = "vob"
+		const val WEBM = "webm"
+		const val WMV = "wmv"
+		const val WTV = "wtv"
+		const val XVID = "xvid"
+	}
+
+	object Audio {
+		const val AAC = "aac"
+		const val AAC_LATM = "aac_latm"
+		const val AC3 = "ac3"
+		const val ALAC = "alac"
+		const val APE = "ape"
+		const val DCA = "dca"
+		const val DTS = "dts"
+		const val EAC3 = "eac3"
+		const val FLAC = "flac"
+		const val MLP = "mlp"
+		const val MP2 = "mp2"
+		const val MP3 = "mp3"
+		const val MPA = "mpa"
+		const val OGA = "oga"
+		const val OGG = "ogg"
+		const val OPUS = "opus"
+		const val PCM = "pcm"
+		const val PCM_ALAW = "pcm_alaw"
+		const val PCM_MULAW = "pcm_mulaw"
+		const val PCM_S16LE = "pcm_s16le"
+		const val PCM_S20LE = "pcm_s20le"
+		const val PCM_S24LE = "pcm_s24le"
+		const val TRUEHD = "truehd"
+		const val VORBIS = "vorbis"
+		const val WAV = "wav"
+		const val WEBMA = "webma"
+		const val WMA = "wma"
+		const val WMAV2 = "wmav2"
+	}
+
+	object Video {
+		const val H264 = "h264"
+		const val HEVC = "hevc"
+		const val MPEG = "mpeg"
+		const val MPEG2VIDEO = "mpeg2video"
+		const val VP8 = "vp8"
+		const val VP9 = "vp9"
+		const val AV1 = "av1"
+		const val VC1 = "vc1"
+	}
+
+	object Subtitle {
+		const val ASS = "ass"
+		const val DVBSUB = "dvbsub"
+		const val DVDSUB = "dvdsub"
+		const val IDX = "idx"
+		const val PGS = "pgs"
+		const val PGSSUB = "pgssub"
+		const val SMI = "smi"
+		const val SRT = "srt"
+		const val SSA = "ssa"
+		const val SUB = "sub"
+		const val SUBRIP = "subrip"
+		const val VTT = "vtt"
+		const val SMIL = "smil"
+		const val TTML = "ttml"
+		const val WEBVTT = "webvtt"
+	}
+}

app/src/main/java/org/jellyfin/androidtv/constant/CodecTypes.java

@@ -1,40 +0,0 @@
-package org.jellyfin.androidtv.constant;
-
-public class CodecTypes {
-    /* Audio Codec Types */
-    public static final String AAC = "aac";
-    public static final String AAC_LATM = "aac_latm";
-    public static final String AC3 = "ac3";
-    public static final String ALAC = "alac";
-    public static final String APE = "ape";
-    public static final String DCA = "dca";
-    public static final String DTS = "dts";
-    public static final String EAC3 = "eac3";
-    public static final String FLAC = "flac";
-    public static final String MLP = "mlp";
-    public static final String MP2 = "mp2";
-    public static final String MP3 = "mp3";
-    public static final String MPA = "mpa";
-    public static final String OPUS = "opus";
-    public static final String PCM = "pcm";
-    public static final String PCM_ALAW = "pcm_alaw";
-    public static final String PCM_MULAW = "pcm_mulaw";
-    public static final String PCM_S16LE = "pcm_s16le";
-    public static final String PCM_S24LE = "pcm_s24le";
-    public static final String TRUEHD = "truehd";
-    public static final String VORBIS = "vorbis";
-    public static final String WAV = "wav";
-    public static final String WMA = "wma";
-    public static final String WMAV2 = "wmav2";
-
-    /* Video Codec Types */
-    public static final String AVC = "avc";
-    public static final String H264 = "h264";
-    public static final String H265 = "h265";
-    public static final String HEVC = "hevc";
-    public static final String MPEG2 = "mpeg2";
-    public static final String MPEG2VIDEO = "mpeg2video";
-    public static final String MPEG4 = "mpeg4";
-    public static final String VP8 = "vp8";
-    public static final String VP9 = "vp9";
-}

app/src/main/java/org/jellyfin/androidtv/constant/ContainerTypes.java

@@ -1,29 +0,0 @@
-package org.jellyfin.androidtv.constant;
-
-public class ContainerTypes {
-    public static final String _3GP = "3gp";
-    public static final String _3GPP = "3gpp";
-    public static final String ASF = "asf";
-    public static final String AVI = "avi";
-    public static final String DVR_MS = "dvr-ms";
-    public static final String M2TS = "m2ts";
-    public static final String M2V = "m2v";
-    public static final String M4V = "m4v";
-    public static final String MKV = "mkv";
-    public static final String MOV = "mov";
-    public static final String MP4 = "mp4";
-    public static final String MPEG = "mpeg";
-    public static final String MPEGTS = "mpegts";
-    public static final String MPG = "mpg";
-    public static final String OGA = "oga";
-    public static final String OGG = "ogg";
-    public static final String OGM = "ogm";
-    public static final String OGV = "ogv";
-    public static final String TS = "ts";
-    public static final String VOB = "vob";
-    public static final String WEBM = "webm";
-    public static final String WEBMA = "webma";
-    public static final String WMV = "wmv";
-    public static final String WTV = "wtv";
-    public static final String XVID = "xvid";
-}

app/src/main/java/org/jellyfin/androidtv/constant/CustomMessage.java

@@ -1,6 +0,0 @@
-package org.jellyfin.androidtv.constant;
-
-public enum CustomMessage {
-    RefreshCurrentItem,
-    ActionComplete,
-}

app/src/main/java/org/jellyfin/androidtv/constant/CustomMessage.kt

@@ -0,0 +1,6 @@
+package org.jellyfin.androidtv.constant
+
+sealed interface CustomMessage {
+	data object RefreshCurrentItem : CustomMessage
+	data object ActionComplete : CustomMessage
+}

app/src/main/java/org/jellyfin/androidtv/constant/Extras.kt

@@ -2,5 +2,6 @@ package org.jellyfin.androidtv.constant
 
 object Extras {
 	const val Folder = "folder"
+	const val IsLiveTvSeriesRecordings = "is_livetv_series_recordings"
 	const val IncludeType = "type_include"
 }

app/src/main/java/org/jellyfin/androidtv/constant/GridDirection.kt

@@ -1,18 +1,18 @@
 package org.jellyfin.androidtv.constant
 
 import org.jellyfin.androidtv.R
-import org.jellyfin.androidtv.ui.preference.dsl.EnumDisplayOptions
+import org.jellyfin.preference.PreferenceEnum
 
-enum class GridDirection {
+enum class GridDirection(
+	override val nameRes: Int,
+) : PreferenceEnum {
 	/**
 	 * Horizontal.
 	 */
-	@EnumDisplayOptions(R.string.grid_direction_horizontal)
-	HORIZONTAL,
+	HORIZONTAL(R.string.grid_direction_horizontal),
 
 	/**
 	 * Vertical.
 	 */
-	@EnumDisplayOptions(R.string.grid_direction_vertical)
-	VERTICAL,
+	VERTICAL(R.string.grid_direction_vertical),
 }

app/src/main/java/org/jellyfin/androidtv/constant/HomeSectionType.kt

@@ -1,8 +1,7 @@
 package org.jellyfin.androidtv.constant
 
 import org.jellyfin.androidtv.R
-import org.jellyfin.androidtv.preference.PreferenceEnum
-import org.jellyfin.androidtv.ui.preference.dsl.EnumDisplayOptions
+import org.jellyfin.preference.PreferenceEnum
 
 /**
  * All possible homesections, "synced" with jellyfin-web.
@@ -10,35 +9,17 @@ import org.jellyfin.androidtv.ui.preference.dsl.EnumDisplayOptions
  * https://github.com/jellyfin/jellyfin-web/blob/master/src/components/homesections/homesections.js
  */
 enum class HomeSectionType(
-	override val serializedName: String
+	override val serializedName: String,
+	override val nameRes: Int,
 ) : PreferenceEnum {
-	@EnumDisplayOptions(R.string.home_section_latest_media)
-	LATEST_MEDIA("latestmedia"),
-
-	@EnumDisplayOptions(R.string.home_section_library)
-	LIBRARY_TILES_SMALL("smalllibrarytiles"),
-
-	@EnumDisplayOptions(R.string.home_section_library_small)
-	LIBRARY_BUTTONS("librarybuttons"),
-
-	@EnumDisplayOptions(R.string.home_section_resume)
-	RESUME("resume"),
-
-	@EnumDisplayOptions(R.string.home_section_resume_audio)
-	RESUME_AUDIO("resumeaudio"),
-
-	@EnumDisplayOptions(R.string.home_section_resume_book)
-	RESUME_BOOK("resumebook"),
-
-	@EnumDisplayOptions(R.string.home_section_active_recordings)
-	ACTIVE_RECORDINGS("activerecordings"),
-
-	@EnumDisplayOptions(R.string.home_section_next_up)
-	NEXT_UP("nextup"),
-
-	@EnumDisplayOptions(R.string.home_section_livetv)
-	LIVE_TV("livetv"),
-
-	@EnumDisplayOptions(R.string.home_section_none)
-	NONE("none"),
+	LATEST_MEDIA("latestmedia", R.string.home_section_latest_media),
+	LIBRARY_TILES_SMALL("smalllibrarytiles", R.string.home_section_library),
+	LIBRARY_BUTTONS("librarybuttons", R.string.home_section_library_small),
+	RESUME("resume", R.string.home_section_resume),
+	RESUME_AUDIO("resumeaudio", R.string.home_section_resume_audio),
+	RESUME_BOOK("resumebook", R.string.home_section_resume_book),
+	ACTIVE_RECORDINGS("activerecordings", R.string.home_section_active_recordings),
+	NEXT_UP("nextup", R.string.home_section_next_up),
+	LIVE_TV("livetv", R.string.home_section_livetv),
+	NONE("none", R.string.home_section_none),
 }

app/src/main/java/org/jellyfin/androidtv/constant/ImageType.kt

@@ -1,24 +1,23 @@
 package org.jellyfin.androidtv.constant
 
 import org.jellyfin.androidtv.R
-import org.jellyfin.androidtv.ui.preference.dsl.EnumDisplayOptions
+import org.jellyfin.preference.PreferenceEnum
 
-enum class ImageType {
+enum class ImageType(
+	override val nameRes: Int,
+) : PreferenceEnum {
 	/**
-	 * Default.
+	 * Poster.
 	 */
-	@EnumDisplayOptions(R.string.image_type_default)
-	DEFAULT,
+	POSTER(R.string.image_type_poster),
 
 	/**
 	 * Thumbnail.
 	 */
-	@EnumDisplayOptions(R.string.image_type_thumbnail)
-	THUMB,
+	THUMB(R.string.image_type_thumbnail),
 
 	/**
 	 * Banner.
 	 */
-	@EnumDisplayOptions(R.string.image_type_banner)
-	BANNER
+	BANNER(R.string.image_type_banner),
 }

app/src/main/java/org/jellyfin/androidtv/constant/LiveTvOption.kt

@@ -0,0 +1,8 @@
+package org.jellyfin.androidtv.constant
+
+object LiveTvOption {
+	const val LIVE_TV_GUIDE_OPTION_ID = 1000
+	const val LIVE_TV_RECORDINGS_OPTION_ID = 2000
+	const val LIVE_TV_SCHEDULE_OPTION_ID = 4000
+	const val LIVE_TV_SERIES_OPTION_ID = 5000
+}

app/src/main/java/org/jellyfin/androidtv/constant/MediaTypes.java

@@ -1,5 +0,0 @@
-package org.jellyfin.androidtv.constant;
-
-public class MediaTypes {
-    public static final String HLS = "hls";
-}

app/src/main/java/org/jellyfin/androidtv/constant/PosterSize.kt

@@ -1,30 +1,32 @@
 package org.jellyfin.androidtv.constant
 
 import org.jellyfin.androidtv.R
-import org.jellyfin.androidtv.ui.preference.dsl.EnumDisplayOptions
+import org.jellyfin.preference.PreferenceEnum
 
-enum class PosterSize {
+enum class PosterSize(
+	override val nameRes: Int,
+) : PreferenceEnum {
 	/**
-	 * Automatic.
+	 * Smallest.
 	 */
-	@EnumDisplayOptions(R.string.image_size_auto)
-	AUTO,
-
+	SMALLEST(R.string.image_size_smallest),
 	/**
 	 * Small.
 	 */
-	@EnumDisplayOptions(R.string.image_size_small)
-	SMALL,
+	SMALL(R.string.image_size_small),
 
 	/**
 	 * Medium.
 	 */
-	@EnumDisplayOptions(R.string.image_size_medium)
-	MED,
+	MED(R.string.image_size_medium),
 
 	/**
 	 * Large.
 	 */
-	@EnumDisplayOptions(R.string.image_size_large)
-	LARGE
+	LARGE(R.string.image_size_large),
+
+	/**
+	 * Extra Large.
+	 */
+	X_LARGE(R.string.image_size_xlarge),
 }

app/src/main/java/org/jellyfin/androidtv/constant/QualityProfiles.kt

@@ -0,0 +1,25 @@
+package org.jellyfin.androidtv.constant
+
+import android.content.Context
+import org.jellyfin.androidtv.R
+
+@Suppress("MagicNumber")
+private val qualityOptions = setOf(
+	200.0, 180.0, 140.0, 120.0, 110.0, 100.0, // 100 >=
+	90.0, 80.0, 70.0, 60.0, 50.0, 40.0, 30.0, 20.0, 15.0, 10.0, // 10 >=
+	5.0, 3.0, 2.0, 1.0, // 1 >=
+	0.72, 0.42 // 0 >=
+)
+
+@Suppress("MagicNumber")
+fun getQualityProfiles(
+	context: Context
+): Map<String, String> = qualityOptions.associate {
+	val value = when {
+		it >= 1.0 -> context.getString(R.string.bitrate_mbit, it)
+		else -> context.getString(R.string.bitrate_kbit, it * 1000.0)
+	}
+
+	it.toString().removeSuffix(".0") to value
+}
+

app/src/main/java/org/jellyfin/androidtv/constant/QueryType.java

@@ -1,28 +0,0 @@
-package org.jellyfin.androidtv.constant;
-
-public enum QueryType {
-    Items,
-    NextUp,
-    Views,
-    Season,
-    Upcoming,
-    SimilarSeries,
-    SimilarMovies,
-    StaticPeople,
-    StaticChapters,
-    Search,
-    Specials,
-    Trailers,
-    LiveTvChannel,
-    LiveTvProgram,
-    LiveTvRecording,
-    LiveTvRecordingGroup,
-    StaticItems,
-    Persons,
-    StaticAudioQueueItems,
-    AlbumArtists,
-    AudioPlaylists,
-    LatestItems,
-    SeriesTimer,
-    Premieres
-}

app/src/main/java/org/jellyfin/androidtv/constant/QueryType.kt

@@ -0,0 +1,28 @@
+package org.jellyfin.androidtv.constant
+
+enum class QueryType {
+	Items,
+	NextUp,
+	Views,
+	Season,
+	Upcoming,
+	SimilarSeries,
+	SimilarMovies,
+	StaticPeople,
+	StaticChapters,
+	Search,
+	Specials,
+	AdditionalParts,
+	Trailers,
+	LiveTvChannel,
+	LiveTvProgram,
+	LiveTvRecording,
+	StaticItems,
+	Artists,
+	AlbumArtists,
+	AudioPlaylists,
+	LatestItems,
+	SeriesTimer,
+	Premieres,
+	Resume,
+}

app/src/main/java/org/jellyfin/androidtv/data/compat/AudioOptions.java

@@ -1,127 +0,0 @@
-package org.jellyfin.androidtv.data.compat;
-
-import org.jellyfin.apiclient.model.dlna.DeviceProfile;
-import org.jellyfin.apiclient.model.dlna.EncodingContext;
-import org.jellyfin.apiclient.model.dto.MediaSourceInfo;
-
-import java.util.ArrayList;
-
-/**
- * Class AudioOptions.
- *
- * @deprecated
- */
-@Deprecated
-public class AudioOptions {
-    public AudioOptions() {
-        setContext(EncodingContext.Streaming);
-
-        setEnableDirectPlay(true);
-        setEnableDirectStream(true);
-    }
-
-    private boolean EnableDirectPlay;
-
-    public final boolean getEnableDirectPlay() {
-        return EnableDirectPlay;
-    }
-
-    public final void setEnableDirectPlay(boolean value) {
-        EnableDirectPlay = value;
-    }
-
-    private boolean EnableDirectStream;
-
-    public final boolean getEnableDirectStream() {
-        return EnableDirectStream;
-    }
-
-    public final void setEnableDirectStream(boolean value) {
-        EnableDirectStream = value;
-    }
-
-    private String ItemId;
-
-    public final String getItemId() {
-        return ItemId;
-    }
-
-    public final void setItemId(String value) {
-        ItemId = value;
-    }
-
-    private ArrayList<MediaSourceInfo> MediaSources;
-
-    public final ArrayList<MediaSourceInfo> getMediaSources() {
-        return MediaSources;
-    }
-
-    public final void setMediaSources(ArrayList<MediaSourceInfo> value) {
-        MediaSources = value;
-    }
-
-    private DeviceProfile Profile;
-
-    public final DeviceProfile getProfile() {
-        return Profile;
-    }
-
-    public final void setProfile(DeviceProfile value) {
-        Profile = value;
-    }
-
-    /**
-     * Optional. Only needed if a specific AudioStreamIndex or SubtitleStreamIndex are requested.
-     */
-    private String MediaSourceId;
-
-    public final String getMediaSourceId() {
-        return MediaSourceId;
-    }
-
-    public final void setMediaSourceId(String value) {
-        MediaSourceId = value;
-    }
-
-    /**
-     * Allows an override of supported number of audio channels
-     * Example: DeviceProfile supports five channel, but user only has stereo speakers
-     */
-    private Integer MaxAudioChannels = null;
-
-    public final Integer getMaxAudioChannels() {
-        return MaxAudioChannels;
-    }
-
-    public final void setMaxAudioChannels(Integer value) {
-        MaxAudioChannels = value;
-    }
-
-    /**
-     * The application's configured quality setting
-     */
-    private Integer MaxBitrate = null;
-
-    public final Integer getMaxBitrate() {
-        return MaxBitrate;
-    }
-
-    public final void setMaxBitrate(Integer value) {
-        MaxBitrate = value;
-    }
-
-    /**
-     * Gets or sets the context.
-     *
-     * <value>The context.</value>
-     */
-    private EncodingContext Context = EncodingContext.values()[0];
-
-    public final EncodingContext getContext() {
-        return Context;
-    }
-
-    public final void setContext(EncodingContext value) {
-        Context = value;
-    }
-}

app/src/main/java/org/jellyfin/androidtv/data/compat/AudioOptions.kt

@@ -0,0 +1,24 @@
+package org.jellyfin.androidtv.data.compat
+
+import org.jellyfin.sdk.model.api.DeviceProfile
+import org.jellyfin.sdk.model.api.MediaSourceInfo
+import java.util.UUID
+
+open class AudioOptions {
+	var enableDirectPlay = true
+	var enableDirectStream = true
+	var itemId: UUID? = null
+	var mediaSources: List<MediaSourceInfo>? = null
+	var profile: DeviceProfile? = null
+
+	/**
+	 * Optional. Only needed if a specific AudioStreamIndex or SubtitleStreamIndex are requested.
+	 */
+	var mediaSourceId: String? = null
+
+	/**
+	 * Allows an override of supported number of audio channels
+	 * Example: DeviceProfile supports five channel, but user only has stereo speakers
+	 */
+	var maxAudioChannels: Int? = null
+}

app/src/main/java/org/jellyfin/androidtv/data/compat/PlaybackException.java

@@ -1,16 +0,0 @@
-package org.jellyfin.androidtv.data.compat;
-
-import org.jellyfin.apiclient.model.dlna.PlaybackErrorCode;
-
-@Deprecated
-public class PlaybackException extends RuntimeException {
-    private PlaybackErrorCode ErrorCode = PlaybackErrorCode.values()[0];
-
-    public final PlaybackErrorCode getErrorCode() {
-        return ErrorCode;
-    }
-
-    public final void setErrorCode(PlaybackErrorCode value) {
-        ErrorCode = value;
-    }
-}

app/src/main/java/org/jellyfin/androidtv/data/compat/PlaybackException.kt

@@ -0,0 +1,7 @@
+package org.jellyfin.androidtv.data.compat
+
+import org.jellyfin.sdk.model.api.PlaybackErrorCode
+
+class PlaybackException : RuntimeException() {
+	var errorCode = PlaybackErrorCode.NOT_ALLOWED
+}

app/src/main/java/org/jellyfin/androidtv/data/compat/StreamBuilder.java

@@ -1,87 +0,0 @@
-package org.jellyfin.androidtv.data.compat;
-
-import org.jellyfin.androidtv.util.Utils;
-import org.jellyfin.apiclient.model.dlna.SubtitleDeliveryMethod;
-import org.jellyfin.apiclient.model.dlna.SubtitleProfile;
-import org.jellyfin.apiclient.model.entities.MediaStream;
-import org.jellyfin.apiclient.model.session.PlayMethod;
-
-@Deprecated
-public class StreamBuilder
-{
-    public static SubtitleProfile GetSubtitleProfile(MediaStream subtitleStream, SubtitleProfile[] subtitleProfiles, PlayMethod playMethod)
-    {
-        if (playMethod != PlayMethod.Transcode && !subtitleStream.getIsExternal())
-        {
-            // Look for supported embedded subs
-            for (SubtitleProfile profile : subtitleProfiles)
-            {
-                if (!profile.SupportsLanguage(subtitleStream.getLanguage()))
-                {
-                    continue;
-                }
-
-                if (profile.getMethod() != SubtitleDeliveryMethod.Embed)
-                {
-                    continue;
-                }
-
-                if (subtitleStream.getIsTextSubtitleStream() == MediaStream.IsTextFormat(profile.getFormat()) && Utils.equalsIgnoreCase(profile.getFormat(), subtitleStream.getCodec()))
-                {
-                    return profile;
-                }
-            }
-        }
-
-        // Look for an external or hls profile that matches the stream type (text/graphical) and doesn't require conversion
-        SubtitleProfile tempVar = new SubtitleProfile();
-        tempVar.setMethod(SubtitleDeliveryMethod.Encode);
-        tempVar.setFormat(subtitleStream.getCodec());
-        SubtitleProfile tempVar2 = GetExternalSubtitleProfile(subtitleStream, subtitleProfiles, playMethod, false);
-        SubtitleProfile tempVar3 = GetExternalSubtitleProfile(subtitleStream, subtitleProfiles, playMethod, true);
-        return (tempVar2 != null) ? tempVar2 : (tempVar3 != null) ? tempVar3 : tempVar;
-    }
-
-    private static SubtitleProfile GetExternalSubtitleProfile(MediaStream subtitleStream, SubtitleProfile[] subtitleProfiles, PlayMethod playMethod, boolean allowConversion)
-    {
-        for (SubtitleProfile profile : subtitleProfiles)
-        {
-            if (profile.getMethod() != SubtitleDeliveryMethod.External && profile.getMethod() != SubtitleDeliveryMethod.Hls)
-            {
-                continue;
-            }
-
-            if (profile.getMethod() == SubtitleDeliveryMethod.Hls && playMethod != PlayMethod.Transcode)
-            {
-                continue;
-            }
-
-            if (!profile.SupportsLanguage(subtitleStream.getLanguage()))
-            {
-                continue;
-            }
-
-            if ((profile.getMethod() == SubtitleDeliveryMethod.External && subtitleStream.getIsTextSubtitleStream() == MediaStream.IsTextFormat(profile.getFormat())) || (profile.getMethod() == SubtitleDeliveryMethod.Hls && subtitleStream.getIsTextSubtitleStream()))
-            {
-                boolean requiresConversion = !Utils.equalsIgnoreCase(subtitleStream.getCodec(), profile.getFormat());
-
-                if (!requiresConversion)
-                {
-                    return profile;
-                }
-
-                if (!allowConversion)
-                {
-                    continue;
-                }
-
-                if (subtitleStream.getIsTextSubtitleStream() && subtitleStream.getSupportsExternalStream() && subtitleStream.SupportsSubtitleConversionTo(profile.getFormat()))
-                {
-                    return profile;
-                }
-            }
-        }
-
-        return null;
-    }
-}

app/src/main/java/org/jellyfin/androidtv/data/compat/StreamInfo.java

@@ -1,43 +1,22 @@
 package org.jellyfin.androidtv.data.compat;
 
-import org.jellyfin.androidtv.util.Utils;
-import org.jellyfin.apiclient.model.dlna.DeviceProfile;
-import org.jellyfin.apiclient.model.dlna.DlnaProfileType;
-import org.jellyfin.apiclient.model.dlna.EncodingContext;
-import org.jellyfin.apiclient.model.dlna.SubtitleDeliveryMethod;
-import org.jellyfin.apiclient.model.dlna.SubtitleProfile;
-import org.jellyfin.apiclient.model.dlna.TranscodeSeekInfo;
-import org.jellyfin.apiclient.model.dto.MediaSourceInfo;
-import org.jellyfin.apiclient.model.dto.NameValuePair;
-import org.jellyfin.apiclient.model.entities.MediaStream;
-import org.jellyfin.apiclient.model.entities.MediaStreamType;
-import org.jellyfin.apiclient.model.mediainfo.MediaProtocol;
-import org.jellyfin.apiclient.model.session.PlayMethod;
+import org.jellyfin.sdk.model.api.MediaSourceInfo;
+import org.jellyfin.sdk.model.api.MediaStream;
+import org.jellyfin.sdk.model.api.MediaStreamType;
+import org.jellyfin.sdk.model.api.PlayMethod;
+import org.jellyfin.sdk.model.api.SubtitleDeliveryMethod;
 
 import java.util.ArrayList;
+import java.util.UUID;
 
-/**
- * Class StreamInfo.
- *
- * @deprecated
- */
-@Deprecated
 public class StreamInfo {
-    private static final String START_TIME_TICKS = "StartTimeTicks";
-    private static final String SUBTITLE_STREAM_INDEX = "SubtitleStreamIndex";
-    private static final String STATIC = "Static";
+    private UUID ItemId;
 
-    public StreamInfo() {
-        setAudioCodecs(new String[]{});
-    }
-
-    private String ItemId;
-
-    public final String getItemId() {
+    public final UUID getItemId() {
         return ItemId;
     }
 
-    public final void setItemId(String value) {
+    public final void setItemId(UUID value) {
         ItemId = value;
     }
 
@@ -51,34 +30,14 @@ public class StreamInfo {
         MediaUrl = value;
     }
 
-    private PlayMethod PlayMethod = getPlayMethod().values()[0];
+    private PlayMethod playMethod = PlayMethod.DIRECT_PLAY;
 
     public final PlayMethod getPlayMethod() {
-        return PlayMethod;
+        return playMethod;
     }
 
     public final void setPlayMethod(PlayMethod value) {
-        PlayMethod = value;
-    }
-
-    private EncodingContext Context = EncodingContext.values()[0];
-
-    public final EncodingContext getContext() {
-        return Context;
-    }
-
-    public final void setContext(EncodingContext value) {
-        Context = value;
-    }
-
-    private DlnaProfileType MediaType = DlnaProfileType.values()[0];
-
-    public final DlnaProfileType getMediaType() {
-        return MediaType;
-    }
-
-    public final void setMediaType(DlnaProfileType value) {
-        MediaType = value;
+        playMethod = value;
     }
 
     private String Container;
@@ -91,46 +50,6 @@ public class StreamInfo {
         Container = value;
     }
 
-    private long StartPositionTicks;
-
-    public final long getStartPositionTicks() {
-        return StartPositionTicks;
-    }
-
-    public final void setStartPositionTicks(long value) {
-        StartPositionTicks = value;
-    }
-
-    private String[] AudioCodecs;
-
-    public final String[] getAudioCodecs() {
-        return AudioCodecs;
-    }
-
-    public final void setAudioCodecs(String[] value) {
-        AudioCodecs = value;
-    }
-
-    private DeviceProfile DeviceProfile;
-
-    public final DeviceProfile getDeviceProfile() {
-        return DeviceProfile;
-    }
-
-    public final void setDeviceProfile(DeviceProfile value) {
-        DeviceProfile = value;
-    }
-
-    private String DeviceId;
-
-    public final String getDeviceId() {
-        return DeviceId;
-    }
-
-    public final void setDeviceId(String value) {
-        DeviceId = value;
-    }
-
     private Long RunTimeTicks = null;
 
     public final Long getRunTimeTicks() {
@@ -141,12 +60,6 @@ public class StreamInfo {
         RunTimeTicks = value;
     }
 
-    private TranscodeSeekInfo TranscodeSeekInfo = getTranscodeSeekInfo().values()[0];
-
-    public final TranscodeSeekInfo getTranscodeSeekInfo() {
-        return TranscodeSeekInfo;
-    }
-
     private MediaSourceInfo MediaSource;
 
     public final MediaSourceInfo getMediaSource() {
@@ -157,10 +70,10 @@ public class StreamInfo {
         MediaSource = value;
     }
 
-    private SubtitleDeliveryMethod SubtitleDeliveryMethod = getSubtitleDeliveryMethod().values()[0];
-
-    public final SubtitleDeliveryMethod getSubtitleDeliveryMethod() {
-        return SubtitleDeliveryMethod;
+    public final org.jellyfin.sdk.model.api.SubtitleDeliveryMethod getSubtitleDeliveryMethod() {
+        Integer subtitleStreamIndex = MediaSource.getDefaultSubtitleStreamIndex();
+        if (subtitleStreamIndex == null || subtitleStreamIndex == -1) return SubtitleDeliveryMethod.DROP;
+        return MediaSource.getMediaStreams().get(subtitleStreamIndex).getDeliveryMethod();
     }
 
     private String PlaySessionId;
@@ -177,191 +90,14 @@ public class StreamInfo {
         return getMediaSource() == null ? null : getMediaSource().getId();
     }
 
-    public final boolean getIsDirectStream() {
-        return getPlayMethod() == PlayMethod.DirectStream || getPlayMethod() == PlayMethod.DirectPlay;
+    public final ArrayList<MediaStream> getSelectableAudioStreams() {
+        return getSelectableStreams(MediaStreamType.AUDIO);
     }
 
-    public final String ToUrl(String baseUrl, String accessToken) {
-        if (!Utils.isEmpty(getMediaUrl())) {
-            return getMediaUrl();
-        }
+    public final ArrayList<org.jellyfin.sdk.model.api.MediaStream> getSelectableStreams(MediaStreamType type) {
+        ArrayList<org.jellyfin.sdk.model.api.MediaStream> list = new ArrayList<org.jellyfin.sdk.model.api.MediaStream>();
 
-        if (getPlayMethod() == PlayMethod.DirectPlay) {
-            return getMediaSource().getPath();
-        }
-
-        if (Utils.isEmpty(baseUrl)) {
-            throw new IllegalArgumentException(baseUrl);
-        }
-
-        ArrayList<String> list = new ArrayList<String>();
-        for (NameValuePair pair : BuildParams(this, accessToken, false)) {
-            if (Utils.isEmpty(pair.getValue())) {
-                continue;
-            }
-
-            // Try to keep the url clean by omitting defaults
-            if (START_TIME_TICKS.equalsIgnoreCase(pair.getName()) && "0".equalsIgnoreCase(pair.getValue())) {
-                continue;
-            }
-            if (SUBTITLE_STREAM_INDEX.equalsIgnoreCase(pair.getName()) && "-1".equalsIgnoreCase(pair.getValue())) {
-                continue;
-            }
-            if (STATIC.equalsIgnoreCase(pair.getName()) && "false".equalsIgnoreCase(pair.getValue())) {
-                continue;
-            }
-
-            list.add(String.format("%1$s=%2$s", pair.getName(), pair.getValue()));
-        }
-
-        String queryString = Utils.join("&", list);
-
-        return GetUrl(baseUrl, queryString);
-    }
-
-    private String GetUrl(String baseUrl, String queryString) {
-        if (Utils.isEmpty(baseUrl)) {
-            throw new IllegalArgumentException(baseUrl);
-        }
-
-        String extension = Utils.isEmpty(getContainer()) ? "" : "." + getContainer();
-
-        // remove trailing slashes
-        baseUrl = baseUrl.replaceAll("[/]+$", "");
-
-        if (getMediaType() == DlnaProfileType.Audio) {
-            return String.format("%1$s/audio/%2$s/stream%3$s?%4$s", baseUrl, getItemId(), extension, queryString);
-        }
-
-        return String.format("%1$s/videos/%2$s/stream%3$s?%4$s", baseUrl, getItemId(), extension, queryString);
-    }
-
-    private static ArrayList<NameValuePair> BuildParams(StreamInfo item, String accessToken, boolean isDlna) {
-        ArrayList<NameValuePair> list = new ArrayList<NameValuePair>();
-
-        String audioCodecs = item.getAudioCodecs().length == 0 ? "" : Utils.join(",", item.getAudioCodecs());
-
-        list.add(new NameValuePair("DeviceProfileId", ""));
-        String tempVar2 = item.getDeviceId();
-        list.add(new NameValuePair("DeviceId", (tempVar2 != null) ? tempVar2 : ""));
-        String tempVar3 = item.getMediaSourceId();
-        list.add(new NameValuePair("MediaSourceId", (tempVar3 != null) ? tempVar3 : ""));
-        list.add(new NameValuePair(STATIC, Boolean.valueOf(item.getIsDirectStream()).toString().toLowerCase()));
-        list.add(new NameValuePair("VideoCodec", ""));
-        list.add(new NameValuePair("AudioCodec", audioCodecs));
-        list.add(new NameValuePair("AudioStreamIndex", ""));
-        list.add(new NameValuePair("SubtitleStreamIndex", ""));
-        list.add(new NameValuePair("VideoBitrate", ""));
-        list.add(new NameValuePair("AudioBitrate", ""));
-        list.add(new NameValuePair("MaxAudioChannels", ""));
-        list.add(new NameValuePair("MaxFramerate", ""));
-        list.add(new NameValuePair("MaxWidth", ""));
-        list.add(new NameValuePair("MaxHeight", ""));
-
-        list.add(new NameValuePair(START_TIME_TICKS, String.valueOf(item.getStartPositionTicks())));
-
-        list.add(new NameValuePair("Level", ""));
-
-        list.add(new NameValuePair("MaxRefFrames", ""));
-        list.add(new NameValuePair("MaxVideoBitDepth", ""));
-        list.add(new NameValuePair("Profile", ""));
-
-        // no longer used
-        list.add(new NameValuePair("Cabac", ""));
-
-        String tempVar6 = item.getPlaySessionId();
-        list.add(new NameValuePair("PlaySessionId", (tempVar6 != null) ? tempVar6 : ""));
-        list.add(new NameValuePair("api_key", (accessToken != null) ? accessToken : ""));
-
-        String liveStreamId = item.getMediaSource() == null ? null : item.getMediaSource().getLiveStreamId();
-        list.add(new NameValuePair("LiveStreamId", (liveStreamId != null) ? liveStreamId : ""));
-
-        if (isDlna) {
-            list.add(new NameValuePair("ItemId", item.getItemId()));
-        }
-
-        list.add(new NameValuePair("CopyTimestamps", "false"));
-        list.add(new NameValuePair("ForceLiveStream", "false"));
-        list.add(new NameValuePair("SubtitleMethod", ""));
-
-        list.add(new NameValuePair("TranscodingMaxAudioChannels", ""));
-        list.add(new NameValuePair("EnableSubtitlesInManifest", "false"));
-
-        String tempVar7 = item.getMediaSource().getETag();
-        list.add(new NameValuePair("Tag", (tempVar7 != null) ? tempVar7 : ""));
-
-        return list;
-    }
-
-    public final ArrayList<SubtitleStreamInfo> GetSubtitleProfiles(boolean includeSelectedTrackOnly, String baseUrl, String accessToken) {
-        return GetSubtitleProfiles(includeSelectedTrackOnly, false, baseUrl, accessToken);
-    }
-
-    public final ArrayList<SubtitleStreamInfo> GetSubtitleProfiles(boolean includeSelectedTrackOnly, boolean enableAllProfiles, String baseUrl, String accessToken) {
-        ArrayList<SubtitleStreamInfo> list = new ArrayList<SubtitleStreamInfo>();
-
-        // HLS will preserve timestamps so we can just grab the full subtitle stream
-        long startPositionTicks = getPlayMethod() == PlayMethod.Transcode ? getStartPositionTicks() : 0;
-
-        if (!includeSelectedTrackOnly) {
-            for (MediaStream stream : getMediaSource().getMediaStreams()) {
-                if (stream.getType() == MediaStreamType.Subtitle) {
-                    AddSubtitleProfiles(list, stream, enableAllProfiles, baseUrl, accessToken, startPositionTicks);
-                }
-            }
-        }
-
-        return list;
-    }
-
-    private void AddSubtitleProfiles(ArrayList<SubtitleStreamInfo> list, MediaStream stream, boolean enableAllProfiles, String baseUrl, String accessToken, long startPositionTicks) {
-        if (enableAllProfiles) {
-            for (SubtitleProfile profile : getDeviceProfile().getSubtitleProfiles()) {
-                SubtitleStreamInfo info = GetSubtitleStreamInfo(stream, baseUrl, accessToken, startPositionTicks, new SubtitleProfile[]{profile});
-
-                list.add(info);
-            }
-        } else {
-            SubtitleStreamInfo info = GetSubtitleStreamInfo(stream, baseUrl, accessToken, startPositionTicks, getDeviceProfile().getSubtitleProfiles());
-
-            list.add(info);
-        }
-    }
-
-    private SubtitleStreamInfo GetSubtitleStreamInfo(MediaStream stream, String baseUrl, String accessToken, long startPositionTicks, SubtitleProfile[] subtitleProfiles) {
-        SubtitleProfile subtitleProfile = StreamBuilder.GetSubtitleProfile(stream, subtitleProfiles, getPlayMethod());
-        SubtitleStreamInfo tempVar = new SubtitleStreamInfo();
-        String tempVar2 = stream.getLanguage();
-        tempVar.setName((tempVar2 != null) ? tempVar2 : "Unknown");
-        tempVar.setFormat(subtitleProfile.getFormat());
-        tempVar.setIndex(stream.getIndex());
-        tempVar.setDeliveryMethod(subtitleProfile.getMethod());
-        tempVar.setDisplayTitle(stream.getDisplayTitle());
-        SubtitleStreamInfo info = tempVar;
-
-        if (info.getDeliveryMethod() == SubtitleDeliveryMethod.External) {
-            if (getMediaSource().getProtocol() == MediaProtocol.File || !stream.getCodec().equalsIgnoreCase(subtitleProfile.getFormat())) {
-                info.setUrl(String.format("%1$s/Videos/%2$s/%3$s/Subtitles/%4$s/%5$s/Stream.%6$s", baseUrl, getItemId(), getMediaSourceId(), String.valueOf(stream.getIndex()), String.valueOf(startPositionTicks), subtitleProfile.getFormat()));
-
-                if (!Utils.isEmpty(accessToken)) {
-                    info.setUrl(info.getUrl() + "?api_key=" + accessToken);
-                }
-            } else {
-                info.setUrl(stream.getPath());
-            }
-        }
-
-        return info;
-    }
-
-    public final ArrayList<MediaStream> GetSelectableAudioStreams() {
-        return GetSelectableStreams(MediaStreamType.Audio);
-    }
-
-    public final ArrayList<MediaStream> GetSelectableStreams(MediaStreamType type) {
-        ArrayList<MediaStream> list = new ArrayList<MediaStream>();
-
-        for (MediaStream stream : getMediaSource().getMediaStreams()) {
+        for (org.jellyfin.sdk.model.api.MediaStream stream : getMediaSource().getMediaStreams()) {
             if (type == stream.getType()) {
                 list.add(stream);
             }

app/src/main/java/org/jellyfin/androidtv/data/compat/SubtitleStreamInfo.java

@@ -1,66 +0,0 @@
-package org.jellyfin.androidtv.data.compat;
-
-import org.jellyfin.apiclient.model.dlna.SubtitleDeliveryMethod;
-
-@Deprecated
-public class SubtitleStreamInfo {
-    private String Url;
-
-    public final String getUrl() {
-        return Url;
-    }
-
-    public final void setUrl(String value) {
-        Url = value;
-    }
-
-    private String Name;
-
-    public final String getName() {
-        return Name;
-    }
-
-    public final void setName(String value) {
-        Name = value;
-    }
-
-    private String Format;
-
-    public final String getFormat() {
-        return Format;
-    }
-
-    public final void setFormat(String value) {
-        Format = value;
-    }
-
-    private String DisplayTitle;
-
-    public final String getDisplayTitle() {
-        return DisplayTitle;
-    }
-
-    public final void setDisplayTitle(String value) {
-        DisplayTitle = value;
-    }
-
-    private int Index;
-
-    public final int getIndex() {
-        return Index;
-    }
-
-    public final void setIndex(int value) {
-        Index = value;
-    }
-
-    private SubtitleDeliveryMethod DeliveryMethod = SubtitleDeliveryMethod.values()[0];
-
-    public final SubtitleDeliveryMethod getDeliveryMethod() {
-        return DeliveryMethod;
-    }
-
-    public final void setDeliveryMethod(SubtitleDeliveryMethod value) {
-        DeliveryMethod = value;
-    }
-}

app/src/main/java/org/jellyfin/androidtv/data/compat/VideoOptions.java

@@ -1,28 +0,0 @@
-package org.jellyfin.androidtv.data.compat;
-
-/**
- * Class VideoOptions.
- *
- * @deprecated
- */
-@Deprecated
-public class VideoOptions extends AudioOptions {
-    private Integer AudioStreamIndex;
-    private Integer SubtitleStreamIndex;
-
-    public final Integer getAudioStreamIndex() {
-        return AudioStreamIndex;
-    }
-
-    public final void setAudioStreamIndex(Integer value) {
-        AudioStreamIndex = value;
-    }
-
-    public final Integer getSubtitleStreamIndex() {
-        return SubtitleStreamIndex;
-    }
-
-    public final void setSubtitleStreamIndex(Integer value) {
-        SubtitleStreamIndex = value;
-    }
-}

app/src/main/java/org/jellyfin/androidtv/data/compat/VideoOptions.kt

@@ -0,0 +1,6 @@
+package org.jellyfin.androidtv.data.compat
+
+class VideoOptions : AudioOptions() {
+	var audioStreamIndex: Int? = null
+	var subtitleStreamIndex: Int? = null
+}

app/src/main/java/org/jellyfin/androidtv/data/eventhandling/SocketHandler.kt

@@ -0,0 +1,254 @@
+package org.jellyfin.androidtv.data.eventhandling
+
+import android.content.Context
+import android.media.AudioManager
+import android.widget.Toast
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.coroutineScope
+import androidx.lifecycle.repeatOnLifecycle
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.withContext
+import org.jellyfin.androidtv.data.model.DataRefreshService
+import org.jellyfin.androidtv.ui.itemhandling.ItemLauncher
+import org.jellyfin.androidtv.ui.navigation.Destinations
+import org.jellyfin.androidtv.ui.navigation.NavigationRepository
+import org.jellyfin.androidtv.ui.playback.MediaManager
+import org.jellyfin.androidtv.ui.playback.PlaybackControllerContainer
+import org.jellyfin.androidtv.ui.playback.setSubtitleIndex
+import org.jellyfin.androidtv.util.PlaybackHelper
+import org.jellyfin.sdk.api.client.ApiClient
+import org.jellyfin.sdk.api.client.exception.ApiClientException
+import org.jellyfin.sdk.api.client.extensions.sessionApi
+import org.jellyfin.sdk.api.client.extensions.userLibraryApi
+import org.jellyfin.sdk.api.sockets.subscribe
+import org.jellyfin.sdk.api.sockets.subscribeGeneralCommand
+import org.jellyfin.sdk.api.sockets.subscribeGeneralCommands
+import org.jellyfin.sdk.model.api.BaseItemKind
+import org.jellyfin.sdk.model.api.GeneralCommandType
+import org.jellyfin.sdk.model.api.LibraryChangedMessage
+import org.jellyfin.sdk.model.api.LibraryUpdateInfo
+import org.jellyfin.sdk.model.api.MediaType
+import org.jellyfin.sdk.model.api.PlayMessage
+import org.jellyfin.sdk.model.api.PlaystateCommand
+import org.jellyfin.sdk.model.api.PlaystateMessage
+import org.jellyfin.sdk.model.extensions.get
+import org.jellyfin.sdk.model.extensions.getValue
+import org.jellyfin.sdk.model.serializer.toUUIDOrNull
+import timber.log.Timber
+import java.time.Instant
+import java.util.UUID
+
+class SocketHandler(
+	private val context: Context,
+	private val api: ApiClient,
+	private val dataRefreshService: DataRefreshService,
+	private val mediaManager: MediaManager,
+	private val playbackControllerContainer: PlaybackControllerContainer,
+	private val navigationRepository: NavigationRepository,
+	private val audioManager: AudioManager,
+	private val itemLauncher: ItemLauncher,
+	private val playbackHelper: PlaybackHelper,
+	private val lifecycle: Lifecycle,
+) {
+	init {
+		lifecycle.coroutineScope.launch(Dispatchers.IO) {
+			lifecycle.repeatOnLifecycle(Lifecycle.State.RESUMED) {
+				subscribe(this)
+			}
+		}
+	}
+
+	suspend fun updateSession() {
+		try {
+			withContext(Dispatchers.IO) {
+				api.sessionApi.postCapabilities(
+					playableMediaTypes = listOf(MediaType.VIDEO, MediaType.AUDIO),
+					supportsMediaControl = true,
+					supportedCommands = buildList {
+						add(GeneralCommandType.DISPLAY_CONTENT)
+						add(GeneralCommandType.SET_SUBTITLE_STREAM_INDEX)
+						add(GeneralCommandType.SET_AUDIO_STREAM_INDEX)
+
+						add(GeneralCommandType.DISPLAY_MESSAGE)
+						add(GeneralCommandType.SEND_STRING)
+
+						// Note: These are used in the PlaySessionSocketService
+						if (!audioManager.isVolumeFixed) {
+							add(GeneralCommandType.VOLUME_UP)
+							add(GeneralCommandType.VOLUME_DOWN)
+							add(GeneralCommandType.SET_VOLUME)
+
+							add(GeneralCommandType.MUTE)
+							add(GeneralCommandType.UNMUTE)
+							add(GeneralCommandType.TOGGLE_MUTE)
+						}
+					},
+				)
+			}
+		} catch (err: ApiClientException) {
+			Timber.e(err, "Unable to update capabilities")
+		}
+	}
+
+	private fun subscribe(coroutineScope: CoroutineScope) = api.webSocket.apply {
+		// Library
+		subscribe<LibraryChangedMessage>()
+			.onEach { message -> message.data?.let(::onLibraryChanged) }
+			.launchIn(coroutineScope)
+
+		// Media playback
+		subscribe<PlayMessage>()
+			.onEach { message -> onPlayMessage(message) }
+			.launchIn(coroutineScope)
+
+		subscribe<PlaystateMessage>()
+			.onEach { message -> onPlayStateMessage(message) }
+			.launchIn(coroutineScope)
+
+		subscribeGeneralCommand(GeneralCommandType.SET_SUBTITLE_STREAM_INDEX)
+			.onEach { message ->
+				val index = message["index"]?.toIntOrNull() ?: return@onEach
+
+				withContext(Dispatchers.Main) {
+					playbackControllerContainer.playbackController?.setSubtitleIndex(index)
+				}
+			}
+			.launchIn(coroutineScope)
+
+		subscribeGeneralCommand(GeneralCommandType.SET_AUDIO_STREAM_INDEX)
+			.onEach { message ->
+				val index = message["index"]?.toIntOrNull() ?: return@onEach
+
+				withContext(Dispatchers.Main) {
+					playbackControllerContainer.playbackController?.switchAudioStream(index)
+				}
+			}
+			.launchIn(coroutineScope)
+
+		// General commands
+		subscribeGeneralCommand(GeneralCommandType.DISPLAY_CONTENT)
+			.onEach { message ->
+				val itemId by message
+				val itemType by message
+
+				val itemUuid = itemId?.toUUIDOrNull()
+				val itemKind = itemType?.let { type ->
+					BaseItemKind.entries.find { value ->
+						value.serialName.equals(type, true)
+					}
+				}
+
+				if (itemUuid != null && itemKind != null) onDisplayContent(itemUuid, itemKind)
+			}
+			.launchIn(coroutineScope)
+
+		subscribeGeneralCommands(setOf(GeneralCommandType.DISPLAY_MESSAGE, GeneralCommandType.SEND_STRING))
+			.onEach { message ->
+				val header by message
+				val text by message
+				val string by message
+
+				onDisplayMessage(header, text ?: string)
+			}
+			.launchIn(coroutineScope)
+	}
+
+	private fun onLibraryChanged(info: LibraryUpdateInfo) {
+		Timber.d(buildString {
+			appendLine("Library changed.")
+			appendLine("Added ${info.itemsAdded.size} items")
+			appendLine("Removed ${info.itemsRemoved.size} items")
+			appendLine("Updated ${info.itemsUpdated.size} items")
+		})
+
+		if (info.itemsAdded.any() || info.itemsRemoved.any())
+			dataRefreshService.lastLibraryChange = Instant.now()
+	}
+
+	private fun onPlayMessage(message: PlayMessage) {
+		val itemIds = message.data?.itemIds ?: return
+
+		runCatching {
+			playbackHelper.retrieveAndPlay(
+				itemIds,
+				false,
+				message.data?.startPositionTicks,
+				message.data?.startIndex,
+				context
+			)
+		}.onFailure { Timber.w(it, "Failed to start playback") }
+	}
+
+	@Suppress("ComplexMethod")
+	private suspend fun onPlayStateMessage(message: PlaystateMessage) = withContext(Dispatchers.Main) {
+		Timber.i("Received PlayStateMessage with command ${message.data?.command}")
+
+		// Audio playback uses (Rewrite)MediaManager, (legacy) video playback uses playbackController
+		when {
+			mediaManager.hasAudioQueueItems() -> {
+				Timber.i("Ignoring PlayStateMessage: should be handled by PlaySessionSocketService")
+				return@withContext
+			}
+
+			// PlaybackController
+			else -> {
+				val playbackController = playbackControllerContainer.playbackController
+				when (message.data?.command) {
+					PlaystateCommand.STOP -> playbackController?.endPlayback(true)
+					PlaystateCommand.PAUSE, PlaystateCommand.UNPAUSE, PlaystateCommand.PLAY_PAUSE -> playbackController?.playPause()
+					PlaystateCommand.NEXT_TRACK -> playbackController?.next()
+					PlaystateCommand.PREVIOUS_TRACK -> playbackController?.prev()
+					PlaystateCommand.SEEK -> playbackController?.seek(
+						(message.data?.seekPositionTicks ?: 0) / TICKS_TO_MS
+					)
+
+					PlaystateCommand.REWIND -> playbackController?.rewind()
+					PlaystateCommand.FAST_FORWARD -> playbackController?.fastForward()
+
+					null -> Unit
+				}
+			}
+		}
+	}
+
+	private suspend fun onDisplayContent(itemId: UUID, itemKind: BaseItemKind) = withContext(Dispatchers.Main) {
+		val playbackController = playbackControllerContainer.playbackController
+
+		if (playbackController?.isPlaying == true || playbackController?.isPaused == true) {
+			Timber.i("Not launching $itemId: playback in progress")
+			return@withContext
+		}
+
+		Timber.i("Launching $itemId")
+
+		when (itemKind) {
+			BaseItemKind.USER_VIEW,
+			BaseItemKind.COLLECTION_FOLDER -> {
+				val item by api.userLibraryApi.getItem(itemId = itemId)
+				itemLauncher.launchUserView(item)
+			}
+
+			else -> navigationRepository.navigate(Destinations.itemDetails(itemId))
+		}
+	}
+
+	private fun onDisplayMessage(header: String?, text: String?) {
+		val toastMessage = buildString {
+			if (!header.isNullOrBlank()) append(header, ": ")
+			append(text)
+		}
+
+		runBlocking(Dispatchers.Main) {
+			Toast.makeText(context, toastMessage, Toast.LENGTH_LONG).show()
+		}
+	}
+
+	companion object {
+		const val TICKS_TO_MS = 10000L
+	}
+}

app/src/main/java/org/jellyfin/androidtv/data/eventhandling/TvApiEventListener.java

@@ -1,218 +0,0 @@
-package org.jellyfin.androidtv.data.eventhandling;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Handler;
-import android.os.Looper;
-import android.widget.Toast;
-
-import org.jellyfin.androidtv.R;
-import org.jellyfin.androidtv.TvApp;
-import org.jellyfin.androidtv.data.model.DataRefreshService;
-import org.jellyfin.androidtv.data.querying.StdItemQuery;
-import org.jellyfin.androidtv.ui.itemhandling.BaseRowItem;
-import org.jellyfin.androidtv.ui.itemhandling.ItemLauncher;
-import org.jellyfin.androidtv.ui.playback.MediaManager;
-import org.jellyfin.androidtv.ui.playback.PlaybackController;
-import org.jellyfin.androidtv.ui.playback.PlaybackLauncher;
-import org.jellyfin.androidtv.ui.playback.PlaybackOverlayActivity;
-import org.jellyfin.androidtv.util.Utils;
-import org.jellyfin.androidtv.util.apiclient.PlaybackHelper;
-import org.jellyfin.apiclient.interaction.ApiClient;
-import org.jellyfin.apiclient.interaction.ApiEventListener;
-import org.jellyfin.apiclient.interaction.Response;
-import org.jellyfin.apiclient.model.dto.BaseItemDto;
-import org.jellyfin.apiclient.model.entities.LibraryUpdateInfo;
-import org.jellyfin.apiclient.model.querying.ItemFields;
-import org.jellyfin.apiclient.model.querying.ItemsResult;
-import org.jellyfin.apiclient.model.session.BrowseRequest;
-import org.jellyfin.apiclient.model.session.MessageCommand;
-import org.jellyfin.apiclient.model.session.PlayRequest;
-import org.jellyfin.apiclient.model.session.PlaystateRequest;
-import org.jellyfin.apiclient.model.session.SessionInfoDto;
-import org.koin.java.KoinJavaComponent;
-
-import java.util.Arrays;
-
-import timber.log.Timber;
-
-public class TvApiEventListener extends ApiEventListener {
-    private final DataRefreshService dataRefreshService;
-    private final MediaManager mediaManager;
-    private final Handler mainThreadHandler;
-
-    public TvApiEventListener(DataRefreshService dataRefreshService, MediaManager mediaManager) {
-        this.dataRefreshService = dataRefreshService;
-        this.mediaManager = mediaManager;
-
-        //handler to interact with the players (exoplayer doesn't allow access from another thread)
-        mainThreadHandler = new Handler(Looper.getMainLooper());
-    }
-
-    @Override
-    public void onPlaybackStopped(ApiClient client, SessionInfoDto info) {
-        TvApp app = TvApp.getApplication();
-        Timber.d("Got Playback stopped message from server");
-        if (info.getUserId().equals(app.getCurrentUser().getId())) {
-            dataRefreshService.setLastPlayback(System.currentTimeMillis());
-            if (info.getNowPlayingItem() == null) return;
-            switch (info.getNowPlayingItem().getType()) {
-                case "Movie":
-                    dataRefreshService.setLastMoviePlayback(System.currentTimeMillis());
-                    break;
-                case "Episode":
-                    dataRefreshService.setLastTvPlayback(System.currentTimeMillis());
-                    break;
-
-            }
-        }
-    }
-
-    @Override
-    public void onLibraryChanged(ApiClient client, LibraryUpdateInfo info) {
-        Timber.d("Library Changed. Added %o items. Removed %o items. Changed %o items.", info.getItemsAdded().size(), info.getItemsRemoved().size(), info.getItemsUpdated().size());
-        if (info.getItemsAdded().size() > 0 || info.getItemsRemoved().size() > 0)
-            dataRefreshService.setLastLibraryChange(System.currentTimeMillis());
-    }
-
-    @Override
-    public void onPlaystateCommand(ApiClient client, PlaystateRequest command) {
-        PlaybackController playbackController = TvApp.getApplication().getPlaybackController();
-        Timber.d("caught playstate command: %s", command.getCommand());
-
-        switch (command.getCommand()) {
-            case Stop:
-                if (mediaManager.getIsAudioPlayerInitialized())
-                    mainThreadHandler.post(() -> mediaManager.stopAudio(true));
-                else {
-                    Activity currentActivity = TvApp.getApplication().getCurrentActivity();
-                    if(playbackController != null && mediaManager.hasVideoQueueItems() && playbackController.hasInitializedVideoManager())
-                        mainThreadHandler.post(() -> playbackController.endPlayback());
-                    if(currentActivity instanceof PlaybackOverlayActivity)
-                        currentActivity.finish();
-                }
-                break;
-            case Pause:
-            case Unpause:
-            case PlayPause:
-                if (mediaManager.getIsAudioPlayerInitialized())
-                    mainThreadHandler.post(() -> mediaManager.playPauseAudio());
-                else if(playbackController != null && mediaManager.hasVideoQueueItems() && playbackController.hasInitializedVideoManager())
-                    mainThreadHandler.post(() -> playbackController.playPause());
-                break;
-            case NextTrack:
-                if (mediaManager.getIsAudioPlayerInitialized() && mediaManager.hasAudioQueueItems())
-                    mainThreadHandler.post(() -> mediaManager.nextAudioItem());
-                else if(playbackController != null && mediaManager.hasVideoQueueItems() && playbackController.hasInitializedVideoManager())
-                    mainThreadHandler.post(() -> playbackController.next());
-                break;
-            case PreviousTrack:
-                if (mediaManager.getIsAudioPlayerInitialized() && mediaManager.hasAudioQueueItems())
-                    mainThreadHandler.post(() -> mediaManager.prevAudioItem());
-                else if(playbackController != null && mediaManager.hasVideoQueueItems() && playbackController.hasInitializedVideoManager())
-                    mainThreadHandler.post(() -> playbackController.prev());
-                break;
-            case Seek:
-                if(playbackController != null && mediaManager.hasVideoQueueItems() && playbackController.hasInitializedVideoManager()) {
-                    long pos = command.getSeekPositionTicks() / 10000;
-                    mainThreadHandler.post(() -> playbackController.seek(pos));
-                }
-                break;
-            case Rewind:
-                if (playbackController != null && mediaManager.hasVideoQueueItems() && playbackController.hasInitializedVideoManager())
-                    mainThreadHandler.post(() -> playbackController.skip(-11000));
-                break;
-            case FastForward:
-                if (playbackController != null && mediaManager.hasVideoQueueItems() && playbackController.hasInitializedVideoManager())
-                    mainThreadHandler.post(() -> playbackController.skip(30000));
-                break;
-        }
-    }
-
-    @Override
-    public void onBrowseCommand(ApiClient client, BrowseRequest command) {
-        Timber.d("Browse command received");
-        if (Utils.isEmpty(command.getItemId())) return;
-
-        mainThreadHandler.post(() -> {
-            if (TvApp.getApplication().getCurrentActivity() == null ||
-                    (TvApp.getApplication().getPlaybackController() != null && (TvApp.getApplication().getPlaybackController().isPlaying() || TvApp.getApplication().getPlaybackController().isPaused()))) {
-                Timber.i("Command ignored due to no activity or playback in progress");
-                return;
-            }
-            client.GetItemAsync(command.getItemId(), TvApp.getApplication().getCurrentUser().getId(), new Response<BaseItemDto>() {
-                @Override
-                public void onResponse(BaseItemDto response) {
-                    //Create a rowItem and pass to our handler
-                    ItemLauncher.launch(new BaseRowItem(0, response), null, -1, TvApp.getApplication().getCurrentActivity(), true);
-                }
-            });
-        });
-    }
-
-    @Override
-    public void onPlayCommand(ApiClient client, PlayRequest command) {
-        mainThreadHandler.post(() -> {
-            if (TvApp.getApplication().getPlaybackController() != null && (TvApp.getApplication().getPlaybackController().isPlaying() || TvApp.getApplication().getPlaybackController().isPaused())) {
-                TvApp.getApplication().getCurrentActivity().runOnUiThread(new Runnable() {
-                    @Override
-                    public void run() {
-                        Utils.showToast(TvApp.getApplication().getCurrentActivity(), TvApp.getApplication().getString(R.string.msg_remote_already_playing));
-                    }
-                });
-                return;
-            }
-            if (command.getItemIds().length > 1) {
-                Timber.i("Playing multiple items by remote request");
-                if (TvApp.getApplication().getCurrentActivity() == null) {
-                    Timber.e("No current activity.  Cannot play");
-                    return;
-                }
-                int startIndex = command.getStartIndex() == null ? 0 : command.getStartIndex().intValue();
-                int startPosition = command.getStartPositionTicks() == null || command.getStartPositionTicks().longValue() == 0 ? 0 : Long.valueOf(command.getStartPositionTicks() / 10000L).intValue();
-                Timber.d("got queue start index: %s position %s", startIndex, startPosition);
-                StdItemQuery query = new StdItemQuery(new ItemFields[]{
-                        ItemFields.MediaSources,
-                        ItemFields.ChildCount
-                });
-                query.setIds(command.getItemIds());
-                KoinJavaComponent.<ApiClient>get(ApiClient.class).GetItemsAsync(query, new Response<ItemsResult>() {
-                    @Override
-                    public void onResponse(ItemsResult response) {
-                        if (response.getItems() != null && response.getItems().length > 0) {
-                            PlaybackLauncher playbackLauncher = KoinJavaComponent.<PlaybackLauncher>get(PlaybackLauncher.class);
-                            if (playbackLauncher.interceptPlayRequest(TvApp.getApplication(), response.getItems()[0])) return;
-
-                            //peek at first item to see what type it is
-                            switch (response.getItems()[0].getMediaType()) {
-                                case "Video":
-                                    Class activity = KoinJavaComponent.<PlaybackLauncher>get(PlaybackLauncher.class).getPlaybackActivityClass(response.getItems()[0].getBaseItemType());
-                                    mediaManager.setCurrentVideoQueue(Arrays.asList(response.getItems()));
-                                    Intent intent = new Intent(TvApp.getApplication().getCurrentActivity(), activity);
-                                    intent.putExtra("Position", startPosition);
-                                    TvApp.getApplication().getCurrentActivity().startActivity(intent);
-                                    break;
-                                case "Audio":
-                                    mediaManager.playNow(TvApp.getApplication().getCurrentActivity(), Arrays.asList(response.getItems()), startIndex, false);
-                                    break;
-                            }
-                        }
-                    }
-                });
-
-            } else {
-                if (command.getItemIds().length > 0) {
-                    Timber.i("Playing single item by remote request");
-                    Context context = TvApp.getApplication().getCurrentActivity() != null ? TvApp.getApplication().getCurrentActivity() : TvApp.getApplication();
-                    PlaybackHelper.retrieveAndPlay(command.getItemIds()[0], false, command.getStartPositionTicks(), context);
-                }
-            }
-        });
-    }
-
-    @Override
-    public void onMessageCommand(ApiClient client, MessageCommand command) {
-        new Handler(TvApp.getApplication().getMainLooper()).post(() -> Toast.makeText(TvApp.getApplication(), command.getText(), Toast.LENGTH_LONG).show());
-    }
-}

app/src/main/java/org/jellyfin/androidtv/data/model/AppNotification.kt

@@ -0,0 +1,7 @@
+package org.jellyfin.androidtv.data.model
+
+data class AppNotification(
+	val message: String,
+	val dismiss: () -> Unit,
+	val public: Boolean,
+)

app/src/main/java/org/jellyfin/androidtv/data/model/ChapterItemInfo.java

@@ -1,15 +0,0 @@
-package org.jellyfin.androidtv.data.model;
-
-import org.jellyfin.apiclient.model.entities.ChapterInfo;
-
-public class ChapterItemInfo extends ChapterInfo {
-    private String itemId;
-
-    public String getItemId() {
-        return itemId;
-    }
-
-    public void setItemId(String itemId) {
-        this.itemId = itemId;
-    }
-}

app/src/main/java/org/jellyfin/androidtv/data/model/ChapterItemInfo.kt

@@ -0,0 +1,11 @@
+package org.jellyfin.androidtv.data.model
+
+import org.jellyfin.androidtv.util.apiclient.JellyfinImage
+import java.util.UUID
+
+data class ChapterItemInfo(
+	val itemId: UUID,
+	val name: String?,
+	val startPositionTicks: Long,
+	val image: JellyfinImage?,
+)

app/src/main/java/org/jellyfin/androidtv/data/model/DataRefreshService.kt

@@ -1,12 +1,15 @@
 package org.jellyfin.androidtv.data.model
 
+import org.jellyfin.sdk.model.api.BaseItemDto
+import java.time.Instant
+import java.util.UUID
+
 class DataRefreshService {
-	var lastDeletedItemId: String? = null
-	var lastPlayback: Long = 0
-	var lastMoviePlayback: Long = 0
-	var lastTvPlayback: Long = 0
-	var lastMusicPlayback: Long = 0
-	var lastLibraryChange: Long = 0
-	var lastVideoQueueChange: Long = 0
-	var lastFavoriteUpdate: Long = 0
+	var lastDeletedItemId: UUID? = null
+	var lastPlayback: Instant? = null
+	var lastMoviePlayback: Instant? = null
+	var lastTvPlayback: Instant? = null
+	var lastLibraryChange: Instant? = null
+	var lastFavoriteUpdate: Instant? = null
+	var lastPlayedItem: BaseItemDto? = null
 }

app/src/main/java/org/jellyfin/androidtv/data/model/DetailItemLoadResponse.java

@@ -1,25 +0,0 @@
-package org.jellyfin.androidtv.data.model;
-
-import org.jellyfin.androidtv.ui.itemdetail.FullDetailsActivity;
-import org.jellyfin.apiclient.interaction.Response;
-import org.jellyfin.apiclient.model.dto.BaseItemDto;
-
-import timber.log.Timber;
-
-public class DetailItemLoadResponse extends Response<BaseItemDto> {
-    private FullDetailsActivity activity;
-
-    public DetailItemLoadResponse(FullDetailsActivity activity) {
-        this.activity = activity;
-    }
-
-    @Override
-    public void onResponse(BaseItemDto response) {
-        activity.setBaseItem(response);
-    }
-
-    @Override
-    public void onError(Exception exception) {
-        Timber.e(exception, "Error retrieving full object");
-    }
-}

app/src/main/java/org/jellyfin/androidtv/data/model/FilterOptions.java

@@ -1,37 +0,0 @@
-package org.jellyfin.androidtv.data.model;
-
-import org.jellyfin.apiclient.model.querying.ItemFilter;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class FilterOptions {
-    private boolean favoriteOnly;
-    private boolean unwatchedOnly;
-
-    public void setFavoriteOnly(boolean value) {
-        favoriteOnly = value;
-    }
-
-    public void setUnwatchedOnly(boolean value) {
-        unwatchedOnly = value;
-    }
-
-    public boolean isUnwatchedOnly() {
-        return unwatchedOnly;
-    }
-
-    public boolean isFavoriteOnly() {
-        return favoriteOnly;
-    }
-
-    public ItemFilter[] getFilters() {
-        if (!unwatchedOnly && !favoriteOnly) return null;
-
-        List<ItemFilter> filters = new ArrayList<>();
-        if (favoriteOnly) filters.add(ItemFilter.IsFavorite);
-        if (unwatchedOnly) filters.add(ItemFilter.IsUnplayed);
-
-        return filters.toArray(new ItemFilter[0]);
-    }
-}

app/src/main/java/org/jellyfin/androidtv/data/model/FilterOptions.kt

@@ -0,0 +1,15 @@
+package org.jellyfin.androidtv.data.model
+
+import org.jellyfin.sdk.model.api.ItemFilter
+
+
+class FilterOptions {
+	var isFavoriteOnly = false
+	var isUnwatchedOnly = false
+
+	val filters: Set<ItemFilter>
+		get() = buildSet {
+			if (isFavoriteOnly) add(ItemFilter.IS_FAVORITE)
+			if (isUnwatchedOnly) add(ItemFilter.IS_UNPLAYED)
+		}
+}

app/src/main/java/org/jellyfin/androidtv/data/model/GotFocusEvent.java

@@ -1,7 +0,0 @@
-package org.jellyfin.androidtv.data.model;
-
-import android.view.View;
-
-public class GotFocusEvent {
-    public void gotFocus(View v) {}
-}

app/src/main/java/org/jellyfin/androidtv/data/model/InfoItem.java

@@ -1,23 +0,0 @@
-package org.jellyfin.androidtv.data.model;
-
-public class InfoItem {
-    private String label;
-    private String value;
-
-    public InfoItem() {
-        this("", "");
-    }
-
-    public InfoItem(String label, String value) {
-        this.label = label;
-        this.value = value;
-    }
-
-    public String getLabel() {
-        return label;
-    }
-
-    public String getValue() {
-        return value;
-    }
-}

app/src/main/java/org/jellyfin/androidtv/data/model/InfoItem.kt

@@ -0,0 +1,6 @@
+package org.jellyfin.androidtv.data.model
+
+data class InfoItem @JvmOverloads constructor(
+	val label: String = "",
+	val value: String = "",
+)

app/src/main/java/org/jellyfin/androidtv/data/querying/GetAdditionalPartsRequest.kt

@@ -0,0 +1,7 @@
+package org.jellyfin.androidtv.data.querying;
+
+import java.util.UUID
+
+data class GetAdditionalPartsRequest(
+	val itemId: UUID,
+)

app/src/main/java/org/jellyfin/androidtv/data/querying/GetSeriesTimersRequest.kt

@@ -0,0 +1,3 @@
+package org.jellyfin.androidtv.data.querying
+
+data object GetSeriesTimersRequest

app/src/main/java/org/jellyfin/androidtv/data/querying/GetSpecialsRequest.kt

@@ -0,0 +1,7 @@
+package org.jellyfin.androidtv.data.querying
+
+import java.util.UUID
+
+data class GetSpecialsRequest(
+	val itemId: UUID,
+)

app/src/main/java/org/jellyfin/androidtv/data/querying/GetTrailersRequest.kt

@@ -0,0 +1,7 @@
+package org.jellyfin.androidtv.data.querying
+
+import java.util.UUID
+
+data class GetTrailersRequest(
+	val itemId: UUID,
+)

app/src/main/java/org/jellyfin/androidtv/data/querying/GetUserViewsRequest.kt

@@ -0,0 +1,3 @@
+package org.jellyfin.androidtv.data.querying
+
+data object GetUserViewsRequest

app/src/main/java/org/jellyfin/androidtv/data/querying/SpecialsQuery.java

@@ -1,13 +0,0 @@
-package org.jellyfin.androidtv.data.querying;
-
-public class SpecialsQuery {
-    private String ItemId;
-
-    public SpecialsQuery(String itemId) {
-        ItemId = itemId;
-    }
-
-    public String getItemId() {
-        return ItemId;
-    }
-}

app/src/main/java/org/jellyfin/androidtv/data/querying/StdItemQuery.java

@@ -1,25 +0,0 @@
-package org.jellyfin.androidtv.data.querying;
-
-import org.jellyfin.androidtv.TvApp;
-import org.jellyfin.apiclient.model.querying.ItemFields;
-import org.jellyfin.apiclient.model.querying.ItemQuery;
-
-public class StdItemQuery extends ItemQuery {
-    public StdItemQuery(ItemFields[] fields) {
-        if (fields == null) {
-            fields = new ItemFields[]{
-                    ItemFields.PrimaryImageAspectRatio,
-                    ItemFields.Overview,
-                    ItemFields.ItemCounts,
-                    ItemFields.DisplayPreferencesId,
-                    ItemFields.ChildCount
-            };
-        }
-        setUserId(TvApp.getApplication().getCurrentUser().getId());
-        setFields(fields);
-    }
-
-    public StdItemQuery() {
-        this(null);
-    }
-}

app/src/main/java/org/jellyfin/androidtv/data/querying/TrailersQuery.java

@@ -1,13 +0,0 @@
-package org.jellyfin.androidtv.data.querying;
-
-public class TrailersQuery {
-    private String ItemId;
-
-    public TrailersQuery(String itemId) {
-        ItemId = itemId;
-    }
-
-    public String getItemId() {
-        return ItemId;
-    }
-}

app/src/main/java/org/jellyfin/androidtv/data/querying/ViewQuery.java

@@ -1,5 +0,0 @@
-package org.jellyfin.androidtv.data.querying;
-
-public class ViewQuery {
-    //Dummy indicator class
-}

app/src/main/java/org/jellyfin/androidtv/data/repository/CustomMessageRepository.kt

@@ -0,0 +1,23 @@
+package org.jellyfin.androidtv.data.repository
+
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import org.jellyfin.androidtv.constant.CustomMessage
+
+interface CustomMessageRepository {
+	val message: StateFlow<CustomMessage?>
+	fun pushMessage(message: CustomMessage)
+}
+
+class CustomMessageRepositoryImpl : CustomMessageRepository {
+	private val _message = MutableStateFlow<CustomMessage?>(null)
+	override val message get() = _message.asStateFlow()
+
+	override fun pushMessage(message: CustomMessage) {
+		// Make sure to re-emit the same message if requested
+		if (_message.value == message) _message.value = null
+
+		_message.value = message
+	}
+}