Fix skipBackwardLength instead of skipBackLength (#1182)

(cherry picked from commit 379e3e7c2c)

.ci/azure-pipelines.yml

@@ -1,16 +0,0 @@
-trigger:
-- master
-- release
-
-pool:
-  vmImage: 'ubuntu-latest'
-
-steps:
-- task: Gradle@2
-  inputs:
-    gradleWrapperFile: 'gradlew'
-    tasks: 'build'
-    publishJUnitResults: true
-    testResultsFiles: '**/TEST-*.xml'
-    javaHomeOption: 'JDKVersion'
-    sonarQubeRunAnalysis: false

.dockerignore

@@ -1,7 +0,0 @@
-.git*
-.dockerignore
-Dockerfile
-build
-new-file-header.txt
-CONTRIBUTORS.md
-README.md

.editorconfig

@@ -1,5 +1,6 @@
+root = true
+
 [*]
-end_of_line = lf
 insert_final_newline = true
 
 [{*.kts, *.kt}]

.gitattributes

@@ -1 +1,7 @@
+*.kt text eol=lf
+*.kts text eol=lf
+*.java text eol=lf
+*.xml text eol=lf
+
 CONTRIBUTORS.md merge=union
+app/src/main/res/values*/strings.xml merge=union

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,36 @@
+---
+name: Bug report
+about: Create a bug report
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+**Describe the bug**
+<!-- A clear and concise description of what the bug is. -->
+
+**To Reproduce**
+<!-- Steps to reproduce the behavior: -->
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+<!-- A clear and concise description of what you expected to happen. -->
+
+**Logs**
+<!-- Please paste any log errors. -->
+
+**Screenshots**
+<!-- If applicable, add screenshots to help explain your problem. -->
+
+**System (please complete the following information):**
+ - Android TV or Fire TV version: [e.g. Android 9 or Fire OS 7]
+ - Device manufacturer: [e.g. Amazon, Nvidia, Sony]
+ - Device model: [e.g. Fire TV Stick (2nd Gen) or Shield TV]
+ - Jellyfin server version: [e.g. 10.5.4]
+
+**Additional context**
+<!-- Add any other context about the problem here. -->

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,8 @@
+blank_issues_enabled: true
+contact_links:
+  - name: Jellyfin documentation
+    url:  https://jellyfin.org/docs/general/getting-help.html
+    about: Our documentation contains lots of help for common issues
+  - name: Jellyfin contact
+    url: https://jellyfin.org/contact/
+    about: Our community is ready to help you get started with Jellyfin

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,14 @@
+---
+name: Feature Request
+about: Request a new feature
+title: ''	
+labels: enhancement	
+assignees: ''	
+
+---
+
+**Describe the feature you'd like**	
+<!-- A clear and concise description of what you want to happen. -->	
+
+**Additional context**	
+<!-- Add any other context or screenshots about the feature request here. -->

.github/ISSUE_TEMPLATE/media_playback.md

@@ -0,0 +1,29 @@
+---
+name: Media playback issue
+about: Create a media playback issue report
+title: ''
+labels: playback
+assignees: ''
+
+---
+
+**Checks**
+- [ ] Issue does not happen in the browser (jellyfin-web)
+
+**Media Info of the file**
+<!-- Use the Media Info tool (set to text format, download here: https://mediaarea.net/en/MediaInfo) or copy the info from the web ui for the file with the playback issue. -->
+
+**Logs**
+<!-- Please paste any log messages from during the playback issue. -->
+
+**FFmpeg Logs**
+<!-- Please paste any FFmpeg logs if remuxing or transcoding appears to be part of the issue. -->
+
+**System (please complete the following information):**
+ - Android TV or Fire TV version: [e.g. Android 9 or Fire OS 7]
+ - Device manufacturer: [e.g. Amazon, Nvidia, Sony]
+ - Device model: [e.g. Fire TV Stick (2nd Gen) or Shield TV]
+ - Jellyfin server version: [e.g. 10.5.4]
+
+**Additional context**
+<!-- Add any other context about the problem here. -->

.github/dependabot.yml

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

.github/pull_request_template.md

@@ -0,0 +1,11 @@
+<!--
+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.
+-->
+
+**Changes**
+<!-- Describe your changes here in 1-5 sentences. -->
+
+**Issues**
+<!-- Tag any issues that this PR solves here.
+ex. Fixes # -->

.github/stale.yml

@@ -0,0 +1,19 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 120
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 21
+# Issues with these labels will never be considered stale
+exemptLabels:
+  - enhancement
+  - confirmed
+# Label to use when marking an issue as stale
+staleLabel: stale
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  This issue has gone 120 days without comment. To avoid abandoned issues, it will be closed in 21 days if there are no new comments.
+
+  If you're the original submitter of this issue, please comment confirming if this issue still affects you in the latest release or master branch, or close the issue if it has been fixed. If you're another user also affected by this bug, please comment confirming so. Either action will remove the stale label.
+
+  This bot exists to prevent issues from becoming stale and forgotten. Jellyfin is always moving forward, and bugs are often fixed as side effects of other changes. We therefore ask that bug report authors remain vigilant about their issues to ensure they are closed if fixed, or re-confirmed - perhaps with fresh logs or reproduction examples - regularly. If you have any questions you can reach us on [Matrix or Social Media](https://docs.jellyfin.org/general/getting-help.html).
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: false

.github/workflows/app-build.yaml

@@ -0,0 +1,29 @@
+name: App Build
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+
+jobs:
+  build:
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+      - name: Setup Java
+        uses: actions/setup-java@v2
+        with:
+          distribution: adopt
+          java-version: 11
+          cache: gradle
+      - name: Assemble debug APKs
+        run: ./gradlew --build-cache --no-daemon --info assembleDebug
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: build-artifacts
+          retention-days: 14
+          if-no-files-found: error
+          path: app/build/outputs/apk/debug/*.apk

.github/workflows/app-lint.yaml

@@ -0,0 +1,28 @@
+name: App Lint
+
+on:
+  push:
+    branches:
+      - master
+      - release-*
+  pull_request:
+
+jobs:
+  lint:
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+      - name: Setup Java
+        uses: actions/setup-java@v2
+        with:
+          distribution: adopt
+          java-version: 11
+          cache: gradle
+      - name: Run detekt and lint task
+        run: ./gradlew --build-cache --no-daemon --info detekt lint
+      - name: Upload SARIF files
+        uses: github/codeql-action/upload-sarif@v1
+        if: ${{ always() }}
+        with:
+          sarif_file: .

.github/workflows/app-publish.yaml

@@ -0,0 +1,67 @@
+name: App Publish
+
+on:
+  push:
+    tags:
+      - v*
+
+jobs:
+  build:
+    runs-on: ubuntu-20.04
+    if: ${{ github.repository == 'jellyfin/jellyfin-androidtv' }}
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+      - name: Setup Java
+        uses: actions/setup-java@v2
+        with:
+          distribution: adopt
+          java-version: 11
+      - 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 versionTxt
+      - name: Sign proprietary APK
+        id: sign
+        uses: r0adkll/sign-android-release@v1
+        with:
+          releaseDirectory: app/build/outputs/apk/release
+          signingKeyBase64: ${{ secrets.KEYSTORE }}
+          keyStorePassword: ${{ secrets.KEYSTORE_PASSWORD }}
+          alias: ${{ secrets.KEY_ALIAS }}
+          keyPassword: ${{ secrets.KEY_PASSWORD }}
+      - name: Prepare release archive
+        run: |
+          mkdir -p build/jellyfin-publish
+          mv app/build/outputs/apk/*/jellyfin-androidtv-*-debug.apk build/jellyfin-publish/
+          mv app/build/outputs/apk/*/jellyfin-androidtv-*-release-unsigned.apk build/jellyfin-publish/
+          mv ${{ steps.sign.outputs.signedReleaseFile }} build/jellyfin-publish/jellyfin-androidtv-v${{ env.JELLYFIN_VERSION }}-release.apk
+          mv app/build/version.txt build/jellyfin-publish/
+      - name: Upload release archive to GitHub release
+        uses: alexellis/upload-assets@0.3.0
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+        with:
+          asset_paths: '["build/jellyfin-publish/*"]'
+      - name: Upload release archive to repo.jellyfin.org
+        uses: burnett01/rsync-deployments@5.1
+        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 }}
+      - name: Update repo.jellyfin.org symlinks
+        uses: appleboy/ssh-action@v0.1.4
+        with:
+          host: ${{ secrets.DEPLOY_HOST }}
+          username: ${{ secrets.DEPLOY_USER }}
+          key: ${{ secrets.DEPLOY_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 .;

.github/workflows/app-test.yaml

@@ -0,0 +1,23 @@
+name: App Test
+
+on:
+  push:
+    branches:
+      - master
+      - release-*
+  pull_request:
+
+jobs:
+  test:
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+      - name: Setup Java
+        uses: actions/setup-java@v2
+        with:
+          distribution: adopt
+          java-version: 11
+          cache: gradle
+      - name: Run test task
+        run: ./gradlew --build-cache --no-daemon --info test

.github/workflows/gradlew-update.yaml

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

.github/workflows/gradlew-validate.yaml

@@ -0,0 +1,18 @@
+name: Gradle validate
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    paths:
+      - '**/gradlе-wrapper.jar'
+
+jobs:
+  validate:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+      - name: Validate Gradle Wrapper
+        uses: gradle/wrapper-validation-action@v1

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

@@ -0,0 +1,17 @@
+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 }}

.gitignore

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

CODEOWNERS

@@ -0,0 +1,15 @@
+# Build files
+/.github/workflows/ @nielsvanvelzen
+/.github/dependabot.yml @nielsvanvelzen
+/gradle/ @nielsvanvelzen
+/buildSrc/ @nielsvanvelzen
+settings.gradle.ts @nielsvanvelzen
+build.gradle.kts @nielsvanvelzen
+gradle.properties @nielsvanvelzen
+
+# Linting
+android-lint.xml @nielsvanvelzen
+detekt.yaml @nielsvanvelzen
+
+# Playback code
+/playback/ @nielsvanvelzen

CONTRIBUTORS.md

@@ -9,6 +9,7 @@
  - [AndreasGB](https://github.com/andreasgb)
  - [joern-h](https://github.com/joern-h)
  - [Niels van Velzen](https://github.com/nielsvanvelzen)
+ - [GodTamIt](https://github.com/GodTamIt)
 
 # Emby Contributors
 

Dockerfile

@@ -1,38 +0,0 @@
-FROM debian:9
-# Docker build arguments
-ARG SOURCE_DIR=/repo
-ARG ARTIFACT_DIR=/dist
-ARG ANDROID_DIR=/usr/lib/android-sdk
-# Docker run environment
-ENV SOURCE_DIR=/repo
-ENV ARTIFACT_DIR=/dist
-ENV ANDROID_DIR=/usr/lib/android-sdk
-
-# Prepare Debian build environment
-RUN echo "deb http://deb.debian.org/debian stretch-backports main" >> /etc/apt/sources.list.d/backports.list \
- && apt-get update \
- && apt-get install -y mmv wget unzip git \
- && apt-get install -t stretch-backports -y android-sdk openjdk-8-jdk
-
-# Install Android repository tools
-RUN rm -rf ${ANDROID_DIR}/tools \
- && wget http://dl-ssl.google.com/android/repository/tools_r25.2.3-linux.zip -O tools.zip \
- && unzip tools.zip -d ${ANDROID_DIR}/ \
- && rm -f tools.zip
-
-# Install SDK tools
-# `yes` is required to accept licenses:
-# https://stackoverflow.com/questions/38096225/automatically-accept-all-sdk-licences/42125740#42125740
-# There will be no output to the screen while this runs - expect a delay of up to several minutes on the license
-RUN yes | ${ANDROID_DIR}/tools/bin/sdkmanager "platform-tools" "platforms;android-27" "build-tools;27.0.3" "extras;android;m2repository" "extras;google;m2repository"
-
-RUN ln -sf ${SOURCE_DIR}/docker-build.sh /docker-build.sh
-
-# Prepare artifact volume
-VOLUME ${ARTIFACT_DIR}/
-
-# Copy repository
-COPY . ${SOURCE_DIR}/
-
-# Set docker-build entrypoint
-ENTRYPOINT ["/docker-build.sh"]

LICENSE

@@ -1,7 +1,7 @@
-GNU GENERAL PUBLIC LICENSE
+                    GNU GENERAL PUBLIC LICENSE
                        Version 2, June 1991
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc., <http://fsf.org/>
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
@@ -290,8 +290,8 @@ to attach them to the start of each source file to most effectively
 convey the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
-    {description}
-    Copyright (C) {year}  {fullname}
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -329,7 +329,7 @@ necessary.  Here is a sample; alter the names:
   Yoyodyne, Inc., hereby disclaims all copyright interest in the program
   `Gnomovision' (which makes passes at compilers) written by James Hacker.
 
-  {signature of Ty Coon}, 1 April 1989
+  <signature of Ty Coon>, 1 April 1989
   Ty Coon, President of Vice
 
 This General Public License does not permit incorporating your program into
@@ -337,4 +337,3 @@ proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
 library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.
-

README.md

@@ -1,5 +1,5 @@
 <h1 align="center">Jellyfin Android TV</h1>
-<h3 align="center">Part of the <a href="https://jellyfin.media">Jellyfin Project</a></h3>
+<h3 align="center">Part of the <a href="https://jellyfin.org">Jellyfin Project</a></h3>
 
 ---
 
@@ -12,8 +12,8 @@
 <a href="https://github.com/jellyfin/jellyfin-androidtv/releases">
 <img alt="Current Release" src="https://img.shields.io/github/release/jellyfin/jellyfin-androidtv.svg"/>
 </a>
-<a href="https://translate.jellyfin.org/projects/jellyfin/jellyfin-androidtv/?utm_source=widget">
-<img src="https://translate.jellyfin.org/widgets/jellyfin/-/jellyfin-androidtv/svg-badge.svg" alt="Translation status" />
+<a href="https://translate.jellyfin.org/projects/jellyfin-android/jellyfin-androidtv/">
+<img alt="Translation Status" src="https://translate.jellyfin.org/widgets/jellyfin-android/-/jellyfin-androidtv/svg-badge.svg"/>
 </a>
 <br/>
 <a href="https://opencollective.com/jellyfin">
@@ -22,9 +22,6 @@
 <a href="https://features.jellyfin.org">
 <img alt="Feature Requests" src="https://img.shields.io/badge/fider-vote%20on%20features-success.svg"/>
 </a>
-<a href="https://forum.jellyfin.org">
-<img alt="Discuss on our Forum" src="https://img.shields.io/discourse/https/forum.jellyfin.org/users.svg"/>
-</a>
 <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>
@@ -33,18 +30,57 @@
 </a>
 <br/>
 <a href="https://play.google.com/store/apps/details?id=org.jellyfin.androidtv">
-<img width="200" src="https://play.google.com/intl/en_us/badges/static/images/badges/en_badge_web_generic.png" alt="Get it on Google Play"/>
+<img width="153" alt="Jellyfin on Google Play" src="https://jellyfin.org/images/store-icons/google-play.png"/>
 </a>
-<br/>
 <a href="https://www.amazon.com/gp/aw/d/B07TX7Z725">
-<img width="170" src="https://images-na.ssl-images-amazon.com/images/G/01/mobile-apps/devportal2/res/images/amazon-appstore-badge-english-black.png" alt="Available at Amazon Appstore"/>
+<img width="153" alt="Jellyfin on Amazon Appstore" src="https://jellyfin.org/images/store-icons/amazon.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. Translations can be improved very easily from our <a href="https://translate.jellyfin.org/projects/jellyfin/jellyfin-androidtv">Weblate</a> instance. Look through the following graphic to see if your native language could use some work!
+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. 
 
-<a href="https://translate.jellyfin.org/engage/jellyfin/?utm_source=widget">
-<img src="https://translate.jellyfin.org/widgets/jellyfin/-/jellyfin-androidtv/multi-auto.svg" alt="Detailed Translation Status"/>
+## 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!
+
+<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
+   ./gradlew assembleDebug
+   ```
+   
+   Add the Android SDK to you PATH environment variable or create the ANDROID_SDK_ROOT variable for
+   this to work.
+
+### Deploy to device/emulator
+
+   ```sh
+   ./gradlew installDebug
+   ```
+
+*You can also replace the "Debug" with "Release" to get an optimized release binary.*

android-lint.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<lint>
+    <issue id="BinaryOperationInTimber" severity="error" />
+    <issue id="ConvertToWebp" severity="warning" />
+    <issue id="DuplicateStrings" severity="ignore" />
+    <issue id="EasterEgg" severity="fatal" />
+    <issue id="ExtraTranslation" severity="warning" />
+    <issue id="FragmentTagUsage" severity="error" />
+    <issue id="GradleDependency" severity="ignore" />
+    <issue id="KotlinPropertyAccess" severity="warning" />
+    <issue id="LambdaLast" severity="warning" />
+    <issue id="LogNotTimber" severity="error" />
+    <issue id="MangledCRLF" severity="warning" />
+    <issue id="NegativeMargin" severity="warning" />
+    <issue id="NoHardKeywords" severity="warning" />
+    <issue id="Registered" severity="warning" />
+    <issue id="RequiredSize" severity="error" />
+    <issue id="Typos" severity="ignore" />
+    <issue id="UnknownNullness" severity="informational" />
+    <issue id="UnusedIds" severity="ignore" />
+</lint>

app/build.gradle

@@ -1,71 +0,0 @@
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
-def version = "0.11.0"
-
-android {
-    compileSdkVersion 28
-    buildToolsVersion "28.0.3"
-
-    compileOptions {
-        sourceCompatibility 1.8
-        targetCompatibility 1.8
-    }
-
-    defaultConfig {
-        minSdkVersion 21
-        targetSdkVersion 28
-        versionCode 905
-        versionName version
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-        debug {
-            applicationIdSuffix ".debug"
-            debuggable true
-        }
-    }
-}
-
-dependencies {
-    def acraVersion = '5.4.0'
-
-    implementation fileTree(include: ['*.jar'], dir: 'libs')
-
-    // This is split like this because this is a modular gradle project on jitpack
-    // see https://github.com/jitpack/gradle-modular
-    // The split allows dependency substitution to work in the settings.gradle file,
-    // at least for the 'library' part. 'android' part is still broken somehow, but this
-    // is better than nothing.
-    implementation 'com.github.jellyfin.jellyfin-apiclient-java:android:master-SNAPSHOT'
-    implementation 'com.github.jellyfin.jellyfin-apiclient-java:library:master-SNAPSHOT'
-    implementation 'com.amazon.android:exoplayer:2.10.6'
-    implementation 'androidx.recyclerview:recyclerview:1.0.0'
-    implementation 'androidx.leanback:leanback:1.0.0'
-    implementation 'androidx.appcompat:appcompat:1.0.2'
-    implementation 'androidx.palette:palette:1.0.0'
-    implementation 'com.squareup.picasso:picasso:2.3.2'
-    implementation 'com.github.bumptech.glide:glide:3.7.0'
-    implementation 'com.squareup.okhttp:okhttp:2.7.0'
-    implementation 'com.squareup.okhttp:okhttp-urlconnection:2.7.0'
-    implementation 'com.google.guava:guava:18.0'
-    implementation 'com.flaviofaria:kenburnsview:1.0.6'
-    implementation 'org.videolan.android:libvlc-all:3.1.12'
-    implementation "ch.acra:acra-http:$acraVersion"
-    implementation "ch.acra:acra-dialog:$acraVersion"
-    implementation "ch.acra:acra-limiter:$acraVersion"
-    testImplementation 'junit:junit:4.12'
-    implementation "androidx.core:core-ktx:1.1.0"
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    implementation 'androidx.tvprovider:tvprovider:1.0.0'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.2'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.2'
-}
-repositories {
-    mavenCentral()
-}

app/build.gradle.kts

@@ -0,0 +1,143 @@
+plugins {
+	id("com.android.application")
+	kotlin("android")
+	kotlin("plugin.serialization") version Plugins.Versions.kotlin
+	kotlin("kapt")
+}
+
+android {
+	compileSdkVersion(30)
+
+	defaultConfig {
+		// Android version targets
+		minSdkVersion(21)
+		targetSdkVersion(30)
+
+		// Release version
+		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 {
+		viewBinding = true
+	}
+
+	compileOptions {
+		isCoreLibraryDesugaringEnabled = true
+	}
+
+	buildTypes {
+		val release by getting {
+			isMinifyEnabled = false
+
+			// Add applicationId as string for XML resources
+			resValue("string", "app_id", "org.jellyfin.androidtv")
+
+			// Set flavored application name
+			resValue("string", "app_name", "@string/app_name_release")
+
+			buildConfigField("boolean", "DEVELOPMENT", "false")
+		}
+
+		val debug by getting {
+			// Use different application id to run release and debug at the same time
+			applicationIdSuffix = ".debug"
+
+			// Add applicationId as string for XML resources
+			resValue("string", "app_id", "org.jellyfin.androidtv.debug")
+
+			// Set flavored application name
+			resValue("string", "app_name", "@string/app_name_debug")
+
+			buildConfigField("boolean", "DEVELOPMENT", (defaultConfig.versionCode!! < 100).toString())
+		}
+	}
+
+	lintOptions {
+		lintConfig = file("$rootDir/android-lint.xml")
+		isAbortOnError = false
+		sarifReport = true
+	}
+}
+
+val versionTxt by tasks.registering {
+	val path = buildDir.resolve("version.txt")
+
+	doLast {
+		val versionString = "v${android.defaultConfig.versionName}=${android.defaultConfig.versionCode}"
+		logger.info("Writing [$versionString] to $path")
+		path.writeText("$versionString\n")
+	}
+}
+
+dependencies {
+	// Jellyfin
+	implementation(projects.playback)
+	implementation(libs.jellyfin.apiclient)
+	implementation(libs.jellyfin.sdk) {
+		// Change version if desired
+		val sdkVersion = findProperty("sdk.version")?.toString()
+		when (sdkVersion) {
+			"local" -> version { strictly("latest-SNAPSHOT") }
+			"snapshot" -> version { strictly("master-SNAPSHOT") }
+			"unstable-snapshot" -> version { strictly("openapi-unstable-SNAPSHOT") }
+		}
+	}
+
+	// Kotlin
+	implementation(libs.kotlinx.coroutines)
+	implementation(libs.kotlinx.serialization.json)
+
+	// Android(x)
+	implementation(libs.androidx.core)
+	implementation(libs.androidx.activity)
+	implementation(libs.androidx.fragment)
+	implementation(libs.androidx.leanback.core)
+	implementation(libs.androidx.leanback.preference)
+	implementation(libs.androidx.preference)
+	implementation(libs.androidx.appcompat)
+	implementation(libs.androidx.tvprovider)
+	implementation(libs.androidx.constraintlayout)
+	implementation(libs.androidx.recyclerview)
+	implementation(libs.androidx.work.runtime)
+	implementation(libs.bundles.androidx.lifecycle)
+	implementation(libs.androidx.window)
+	implementation(libs.androidx.cardview)
+
+	// Dependency Injection
+	implementation(libs.bundles.koin)
+
+	// GSON
+	implementation(libs.gson)
+
+	// Media players
+	implementation(libs.exoplayer)
+	implementation(libs.libvlc)
+
+	// Image utility
+	implementation(libs.glide.core)
+	kapt(libs.glide.compiler)
+	implementation(libs.kenburnsview)
+
+	// Crash Reporting
+	implementation(libs.bundles.acra)
+
+	// Logging
+	implementation(libs.timber)
+	implementation(libs.slf4j.android)
+
+	// Debugging
+	if (getProperty("leakcanary.enable")?.toBoolean() == true)
+		debugImplementation(libs.leakcanary)
+
+	// Compatibility (desugaring)
+	coreLibraryDesugaring(libs.android.desugar)
+
+	// Testing
+	testImplementation(libs.junit)
+	testImplementation(libs.mockito)
+}

app/proguard-rules.pro

@@ -1,17 +0,0 @@
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in C:\Users\Eric\AppData\Local\Android\android-sdk/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the proguardFiles
-# directive in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}

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

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="logo_gradient_start">#F2364D</color>
+    <color name="logo_gradient_stop">#FDC92F</color>
+    <color name="logo_background">#0A0A0A</color>
+    <color name="logo_text">#FFFFFF</color>
+</resources>

app/src/main/AndroidManifest.xml

@@ -1,19 +1,33 @@
 <?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" >
+    package="org.jellyfin.androidtv">
 
+    <!-- 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.RECORD_AUDIO" />
+
+    <!-- Device feature requirements -->
     <uses-feature
         android:name="android.software.leanback"
         android:required="false" />
 
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.RECORD_AUDIO" />
-
-    <!-- Needed for ChannelManager on older devices (< API 23) -->
-    <uses-permission android:name="com.android.providers.tv.permission.WRITE_EPG_DATA" />
-
     <uses-feature
         android:name="android.hardware.touchscreen"
         android:required="false" />
@@ -22,61 +36,28 @@
         android:required="false" />
 
     <application
-        android:name=".TvApp"
-        android:banner="@drawable/app_logo"
-        android:icon="@drawable/app_icon_large"
+        android:name=".JellyfinApplication"
+        android:allowBackup="true"
+        android:banner="@drawable/app_banner"
+        android:fullBackupContent="@xml/backup_content"
+        android:icon="@drawable/app_icon"
         android:label="@string/app_name"
         android:largeHeap="true"
+        android:roundIcon="@drawable/app_icon_round"
         android:theme="@style/Theme.Jellyfin"
-        android:allowBackup="false"
         android:usesCleartextTraffic="true"
         tools:ignore="GoogleAppIndexingWarning">
-        <activity
-            android:name=".browsing.MainActivity"
-            android:label="@string/app_name"
-            android:logo="@drawable/app_logo"
-            android:screenOrientation="landscape" />
-        <activity
-            android:name=".startup.StartupActivity"
-            android:label="@string/app_name"
-            android:logo="@drawable/app_logo"
-            android:noHistory="true">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
 
-                <category android:name="android.intent.category.LAUNCHER" />
-                <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
+        <service
+            android:name=".auth.AuthenticatorService"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="android.accounts.AccountAuthenticator" />
             </intent-filter>
-        </activity>
-        <activity
-            android:name=".startup.SelectUserActivity"
-            android:label="@string/title_activity_select_user" />
-        <activity
-            android:name=".playback.PlaybackOverlayActivity"
-            android:label="PlaybackOverlayActivity" />
-        <activity android:name=".browsing.GenericFolderActivity" />
-        <activity android:name=".browsing.UserViewActivity" />
-        <activity android:name=".startup.SelectServerActivity" />
-        <activity android:name=".browsing.CollectionActivity" />
-        <activity android:name=".browsing.ByLetterActivity" />
-        <activity android:name=".browsing.ByGenreActivity" />
-        <activity android:name=".settings.SettingsActivity" />
-        <activity android:name=".browsing.SuggestedMoviesActivity" />
-        <activity android:name=".browsing.BrowsePersonsActivity" />
-        <activity android:name=".search.SearchActivity" />
-        <activity android:name=".details.FullDetailsActivity" />
-        <activity android:name=".livetv.LiveTvGuideActivity" />
-        <activity android:name=".browsing.GenericGridActivity" />
-        <activity android:name=".browsing.BrowseRecordingsActivity" />
-        <activity android:name=".browsing.BrowseScheduleActivity" />
-        <activity android:name=".details.PhotoPlayerActivity" />
-        <activity android:name=".details.ItemListActivity" />
-        <activity android:name=".playback.AudioNowPlayingActivity" />
-        <activity android:name=".playback.ExternalPlayerActivity" />
-        <activity
-            android:name=".startup.DpadPwActivity"
-            android:label="@string/title_activity_dpad_pw" >
-        </activity>
+            <meta-data
+                android:name="android.accounts.AccountAuthenticator"
+                android:resource="@xml/authenticator" />
+        </service>
 
         <receiver android:name=".util.RemoteControlReceiver">
             <intent-filter>
@@ -85,8 +66,109 @@
         </receiver>
 
         <activity
-            android:name=".details.ExpandedTextActivity"
-            android:label="@string/title_activity_expanded_text" />
-    </application>
+            android:name=".ui.browsing.MainActivity"
+            android:screenOrientation="landscape" />
+        <activity
+            android:name=".ui.startup.StartupActivity"
+            android:noHistory="true"
+            android:screenOrientation="landscape"
+            android:windowSoftInputMode="adjustResize">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
 
+                <category android:name="android.intent.category.LAUNCHER" />
+                <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
+            </intent-filter>
+        </activity>
+
+        <activity-alias
+            android:name=".startup.StartupActivity"
+            android:targetActivity=".ui.startup.StartupActivity" />
+
+        <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.ByLetterActivity"
+            android:screenOrientation="landscape" />
+
+        <activity
+            android:name=".ui.browsing.ByGenreActivity"
+            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.browsing.BrowsePersonsActivity"
+            android:screenOrientation="landscape" />
+
+        <activity
+            android:name=".ui.search.SearchActivity"
+            android:screenOrientation="landscape">
+            <intent-filter>
+                <action android:name="android.intent.action.SEARCH" />
+            </intent-filter>
+        </activity>
+
+        <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" />
+
+        <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

@@ -0,0 +1,133 @@
+package org.jellyfin.androidtv
+
+import android.content.Context
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleObserver
+import androidx.lifecycle.OnLifecycleEvent
+import androidx.lifecycle.ProcessLifecycleOwner
+import androidx.work.*
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+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 org.jellyfin.androidtv.di.*
+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.koin.android.ext.android.inject
+import org.koin.android.ext.koin.androidContext
+import org.koin.core.KoinExperimentalAPI
+import org.koin.core.context.startKoin
+import timber.log.Timber
+import timber.log.Timber.DebugTree
+import java.util.concurrent.TimeUnit
+
+@Suppress("unused")
+class JellyfinApplication : TvApp(), LifecycleObserver {
+	@OptIn(KoinExperimentalAPI::class)
+	override fun onCreate() {
+		super.onCreate()
+
+		// Enable improved logging for leaking resources
+		// https://wh0.github.io/2020/08/12/closeguard.html
+		if (BuildConfig.DEBUG) {
+			try {
+				Class.forName("dalvik.system.CloseGuard")
+					.getMethod("setEnabled", Boolean::class.javaPrimitiveType)
+					.invoke(null, true)
+			} catch (e: ReflectiveOperationException) {
+				@Suppress("TooGenericExceptionThrown")
+				throw RuntimeException(e)
+			}
+		}
+
+		// Initialize the logging library
+		Timber.plant(DebugTree())
+		Timber.i("Application object created")
+
+		// Dependency Injection
+		startKoin {
+			androidContext(this@JellyfinApplication)
+
+			modules(
+				appModule,
+				authModule,
+				activityLifecycleCallbacksModule,
+				playbackModule,
+				preferenceModule,
+				utilsModule
+			)
+		}
+
+		// Register lifecycle callbacks
+		getKoin().getAll<ActivityLifecycleCallbacks>().forEach(::registerActivityLifecycleCallbacks)
+
+		ProcessLifecycleOwner.get().lifecycle.addObserver(this)
+
+		// Restore system session
+		get<SessionRepository>().restoreDefaultSystemSession()
+	}
+
+	/**
+	 * Called by the Process Lifecycle when the app is activated in the foreground (activity opened).
+	 */
+	@OnLifecycleEvent(Lifecycle.Event.ON_START)
+	fun onActivate() {
+		Timber.i("Process Lifecycle started")
+
+		get<SessionRepository>().restoreDefaultSession()
+	}
+
+	/**
+	 * Called from the StartupActivity when the user session is started.
+	 */
+	suspend fun onSessionStart() {
+		val workManager by inject<WorkManager>()
+		val autoBitrate by inject<AutoBitrate>()
+
+		// Cancel all current workers
+		workManager.cancelAllWork().await()
+
+		// Recreate periodic workers
+		workManager.enqueueUniquePeriodicWork(
+			LeanbackChannelWorker.PERIODIC_UPDATE_REQUEST_NAME,
+			ExistingPeriodicWorkPolicy.REPLACE,
+			PeriodicWorkRequestBuilder<LeanbackChannelWorker>(1, TimeUnit.HOURS)
+				.setBackoffCriteria(BackoffPolicy.LINEAR, 10, TimeUnit.MINUTES)
+				.build()
+		).await()
+
+		// Detect auto bitrate
+		withContext(Dispatchers.IO) {
+			autoBitrate.detect()
+		}
+	}
+
+	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 {}
+		}
+	}
+}

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

@@ -0,0 +1,22 @@
+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/TvApp.java

@@ -1,70 +1,31 @@
 package org.jellyfin.androidtv;
 
+import static org.koin.java.KoinJavaComponent.inject;
+
 import android.app.Activity;
 import android.app.Application;
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.graphics.Bitmap;
-import android.graphics.Typeface;
-import android.graphics.drawable.Drawable;
-import android.graphics.drawable.GradientDrawable;
-import android.media.AudioManager;
-import android.preference.PreferenceManager;
 
-import org.acra.ACRA;
-import org.acra.annotation.AcraCore;
-import org.acra.annotation.AcraDialog;
-import org.acra.annotation.AcraHttpSender;
-import org.acra.annotation.AcraLimiter;
-import org.acra.sender.HttpSender;
-import org.jellyfin.androidtv.base.BaseActivity;
-import org.jellyfin.androidtv.livetv.TvManager;
-import org.jellyfin.androidtv.model.DisplayPriorityType;
-import org.jellyfin.androidtv.model.LogonCredentials;
-import org.jellyfin.androidtv.playback.ExternalPlayerActivity;
-import org.jellyfin.androidtv.playback.MediaManager;
-import org.jellyfin.androidtv.playback.PlaybackController;
-import org.jellyfin.androidtv.playback.PlaybackManager;
-import org.jellyfin.androidtv.playback.PlaybackOverlayActivity;
-import org.jellyfin.androidtv.search.SearchActivity;
-import org.jellyfin.androidtv.util.DeviceUtils;
-import org.jellyfin.androidtv.util.Utils;
+import androidx.annotation.NonNull;
+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.interaction.ApiClient;
 import org.jellyfin.apiclient.interaction.EmptyResponse;
-import org.jellyfin.apiclient.interaction.IConnectionManager;
 import org.jellyfin.apiclient.interaction.Response;
-import org.jellyfin.apiclient.interaction.VolleyHttpClient;
-import org.jellyfin.apiclient.logging.AndroidLogger;
-import org.jellyfin.apiclient.model.configuration.ServerConfiguration;
 import org.jellyfin.apiclient.model.dto.BaseItemDto;
-import org.jellyfin.apiclient.model.dto.BaseItemType;
 import org.jellyfin.apiclient.model.dto.UserDto;
 import org.jellyfin.apiclient.model.entities.DisplayPreferences;
-import org.jellyfin.apiclient.model.logging.ILogger;
-import org.jellyfin.apiclient.model.serialization.GsonJsonSerializer;
 
-import java.util.Calendar;
 import java.util.HashMap;
 
-import androidx.core.content.ContextCompat;
-import androidx.palette.graphics.Palette;
+import kotlin.Lazy;
+import timber.log.Timber;
 
-@AcraCore(buildConfigClass = BuildConfig.class)
-@AcraHttpSender(
-        uri = "https://collector.tracepot.com/a2eda9d9",
-        httpMethod = HttpSender.Method.POST
-)
-@AcraDialog(
-        resTitle = R.string.acra_dialog_title,
-        resText = R.string.acra_dialog_text,
-        resTheme = R.style.Theme_Jellyfin
-)
-@AcraLimiter
 public class TvApp extends Application {
-    // The minimum supported server version. Trying to connect to an older server will display an error.
-    public static final String MINIMUM_SERVER_VERSION = "10.3.0";
-    public static final String CREDENTIALS_PATH = "org.jellyfin.androidtv.login.json";
+    public static final String DISPLAY_PREFS_APP_NAME = "ATV";
 
     public static final int LIVE_TV_GUIDE_OPTION_ID = 1000;
     public static final int LIVE_TV_RECORDINGS_OPTION_ID = 2000;
@@ -72,152 +33,61 @@ public class TvApp extends Application {
     public static final int LIVE_TV_SCHEDULE_OPTION_ID = 4000;
     public static final int LIVE_TV_SERIES_OPTION_ID = 5000;
 
-    private static final String TAG = "Jellyfin-AndroidTV";
-
-    private ILogger logger;
-    private IConnectionManager connectionManager;
-    private PlaybackManager playbackManager;
-    private GsonJsonSerializer serializer;
     private static TvApp app;
-    private UserDto currentUser;
-    private BaseItemDto currentPlayingItem;
+    private MediatorLiveData<UserDto> currentUser = new MediatorLiveData<UserDto>();
     private BaseItemDto lastPlayedItem;
     private PlaybackController playbackController;
-    private ApiClient loginApiClient;
-    private AudioManager audioManager;
-    private VolleyHttpClient httpClient;
-
-    private int autoBitrate;
-    private String directItemId;
-    private Typeface roboto;
 
     private HashMap<String, DisplayPreferences> displayPrefsCache = new HashMap<>();
 
-    private String lastDeletedItemId = "";
+    private Activity currentActivity;
 
-    private ServerConfiguration serverConfiguration;
-
-    private int maxRemoteBitrate = -1;
-
-    private Calendar lastPlayback = Calendar.getInstance();
-    private Calendar lastMoviePlayback = Calendar.getInstance();
-    private Calendar lastTvPlayback = Calendar.getInstance();
-    private Calendar lastLibraryChange = Calendar.getInstance();
-    private long lastVideoQueueChange = System.currentTimeMillis();
-    private long lastFavoriteUpdate = System.currentTimeMillis();
-    private long lastMusicPlayback = System.currentTimeMillis();
-    private long lastUserInteraction = System.currentTimeMillis();
-
-    private GradientDrawable currentBackgroundGradient;
-
-    private boolean audioMuted;
-    private boolean playingIntros;
-    private DisplayPriorityType displayPriority = DisplayPriorityType.Movies;
-
-    private BaseActivity currentActivity;
-
-    private LogonCredentials configuredAutoCredentials;
-
-    @Override
-    protected void attachBaseContext(Context base) {
-        super.attachBaseContext(base);
-
-        ACRA.init(this);
-    }
+    private Lazy<ApiClient> apiClient = inject(ApiClient.class);
 
     @Override
     public void onCreate() {
         super.onCreate();
-        logger = new AndroidLogger(TAG);
-        app = (TvApp) getApplicationContext();
-        audioManager = (AudioManager) getSystemService(Context.AUDIO_SERVICE);
-        roboto = Typeface.createFromAsset(getAssets(), "fonts/Roboto-Light.ttf");
-        setCurrentBackgroundGradient(new int[] {ContextCompat.getColor(this, R.color.lb_default_brand_color_dark), ContextCompat.getColor(this, R.color.lb_default_brand_color)});
 
-        logger.Info("Application object created");
+        app = this;
     }
 
+    @Nullable
     public static TvApp getApplication() {
         return app;
     }
 
-    public ILogger getLogger() {
-        return logger;
-    }
-
-    public void setLogger(ILogger value) {
-        logger = value;
-    }
-
-    public Typeface getDefaultFont() { return roboto; }
-
-    public IConnectionManager getConnectionManager() {
-        return connectionManager;
-    }
-
-    public void setConnectionManager(IConnectionManager connectionManager) {
-        this.connectionManager = connectionManager;
-    }
-
+    @Deprecated
+    @Nullable
     public UserDto getCurrentUser() {
+        return currentUser.getValue();
+    }
+
+    @Deprecated
+    public LiveData<UserDto> getCurrentUserLiveData() {
         return currentUser;
     }
 
+    @Deprecated
     public void setCurrentUser(UserDto currentUser) {
-        this.currentUser = currentUser;
+        this.currentUser.postValue(currentUser);
         TvManager.clearCache();
         this.displayPrefsCache = new HashMap<>();
     }
 
-    public GsonJsonSerializer getSerializer() {
-        return serializer;
-    }
-
-    public void setSerializer(GsonJsonSerializer serializer) {
-        this.serializer = serializer;
-    }
-
-    public ApiClient getApiClient() {
-        return currentUser != null ? connectionManager.GetApiClient(currentUser) : null;
-    }
-
-    public BaseItemDto getCurrentPlayingItem() {
-        return currentPlayingItem;
-    }
-
-    public BaseActivity getCurrentActivity() {
+    /**
+     * @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(BaseActivity activity) {
+    public void setCurrentActivity(Activity activity) {
         currentActivity = activity;
     }
 
-    public void setCurrentPlayingItem(BaseItemDto currentPlayingItem) {
-        this.currentPlayingItem = currentPlayingItem;
-    }
-
-    public ApiClient getLoginApiClient() {
-        return loginApiClient;
-    }
-
-    public void setLoginApiClient(ApiClient loginApiClient) {
-        this.loginApiClient = loginApiClient;
-    }
-
-    public void setAudioMuted(boolean value) {
-        audioMuted = value;
-        getLogger().Info("Setting mute state to: "+audioMuted);
-        if (DeviceUtils.is60()) {
-            audioManager.adjustVolume(audioMuted ? AudioManager.ADJUST_MUTE : AudioManager.ADJUST_UNMUTE, 0);
-
-        } else {
-            audioManager.setStreamMute(AudioManager.STREAM_MUSIC, audioMuted);
-        }
-    }
-
-    public boolean isAudioMuted() { return audioMuted; }
-
+    @Nullable
     public PlaybackController getPlaybackController() {
         return playbackController;
     }
@@ -226,214 +96,21 @@ public class TvApp extends Application {
         this.playbackController = playbackController;
     }
 
-    public void showSearch(final Activity activity, boolean musicOnly) {
-        Intent intent = new Intent(activity, SearchActivity.class);
-        intent.putExtra("MusicOnly", musicOnly);
-
-        activity.startActivity(intent);
-    }
-
-    public void showMessage(String title, String msg) {
-        if (currentActivity != null) {
-            currentActivity.showMessage(title, msg);
-        }
-    }
-
-    public void showMessage(String title, String msg, int timeout, int iconResource) {
-        if (currentActivity != null) {
-            currentActivity.showMessage(title, msg, timeout, iconResource, null);
-        }
-    }
-
-    public LogonCredentials getConfiguredAutoCredentials() {
-        return configuredAutoCredentials;
-    }
-
-    public void setConfiguredAutoCredentials(LogonCredentials configuredAutoCredentials) {
-        this.configuredAutoCredentials = configuredAutoCredentials;
-    }
-
-    public SharedPreferences getPrefs() {
-        return PreferenceManager.getDefaultSharedPreferences(this);
-    }
-
-    public SharedPreferences getSystemPrefs() {
-        return getSharedPreferences("systemprefs", MODE_PRIVATE);
-    }
-
-    public String getConfigVersion() {
-        return getSystemPrefs().getString("sys_pref_config_version", "2");
-    }
-
-    public boolean getIsAutoLoginConfigured() {
-        return getPrefs().getString("pref_login_behavior", "0").equals("1") && getConfiguredAutoCredentials().getServerInfo().getId() != null;
-    }
-
-    public boolean useExternalPlayer(BaseItemType itemType) {
-        switch (itemType) {
-            case Movie:
-            case Episode:
-            case Video:
-            case Series:
-            case Recording:
-                return getPrefs().getString("pref_video_player", "auto").equals("external");
-            case TvChannel:
-            case Program:
-                return getPrefs().getBoolean("pref_live_tv_use_external", false);
-            default:
-                return false;
-        }
-    }
-
-    public Class getPlaybackActivityClass(BaseItemType itemType) {
-        return useExternalPlayer(itemType) ? ExternalPlayerActivity.class : PlaybackOverlayActivity.class;
-    }
-
-    public Calendar getLastMoviePlayback() {
-        return lastMoviePlayback.after(lastPlayback) ? lastMoviePlayback : lastPlayback;
-    }
-
-    public void setLastMoviePlayback(Calendar lastMoviePlayback) {
-        this.lastMoviePlayback = lastMoviePlayback;
-        this.lastPlayback = lastMoviePlayback;
-    }
-
-    public void setLastFavoriteUpdate(long time) { lastFavoriteUpdate = time; }
-    public long getLastFavoriteUpdate() { return lastFavoriteUpdate; }
-
-    public void setLastMusicPlayback(long time) { lastMusicPlayback = time; }
-    public long getLastMusicPlayback() { return lastMusicPlayback; }
-
-    public boolean directStreamLiveTv() { return getPrefs().getBoolean("pref_live_direct", true); }
-
-    public void setDirectStreamLiveTv(boolean value) { getPrefs().edit().putBoolean("pref_live_direct", value).commit(); }
-
-    public boolean useVlcForLiveTv() { return getPrefs().getBoolean("pref_enable_vlc_livetv", false); }
-
-    public int getResumePreroll() {
-        try {
-            return Integer.parseInt(getPrefs().getString("pref_resume_preroll","0")) * 1000;
-        } catch (Exception e) {
-            return 0;
-        }
-    }
-
-    public Calendar getLastTvPlayback() {
-        return lastTvPlayback.after(lastPlayback) ? lastTvPlayback : lastPlayback;
-    }
-
-    public void setLastTvPlayback(Calendar lastTvPlayback) {
-        this.lastTvPlayback = lastTvPlayback;
-        this.lastPlayback = lastTvPlayback;
-    }
-
-    public Calendar getLastLibraryChange() {
-        return lastLibraryChange;
-    }
-
-    public void setLastLibraryChange(Calendar lastLibraryChange) {
-        this.lastLibraryChange = lastLibraryChange;
-    }
-
-    public Calendar getLastPlayback() {
-        return lastPlayback;
-    }
-
-    public void setLastPlayback(Calendar lastPlayback) {
-        this.lastPlayback = lastPlayback;
-    }
-
-    public long getLastUserInteraction() {
-        return lastUserInteraction;
-    }
-
-    public void setLastUserInteraction(long lastUserInteraction) {
-        this.lastUserInteraction = lastUserInteraction;
-    }
-
+    @NonNull
     public boolean canManageRecordings() {
+        UserDto currentUser = getCurrentUser();
         return currentUser != null && currentUser.getPolicy().getEnableLiveTvManagement();
     }
 
-    public PlaybackManager getPlaybackManager() {
-        return playbackManager;
-    }
-
-    public void setPlaybackManager(PlaybackManager playbackManager) {
-        this.playbackManager = playbackManager;
-    }
-
-    public Drawable getDrawableCompat(int id) {
-//        if (Build.VERSION.SDK_INT >= 21) {
-//            return getDrawable(id);
-//        }
-
-        return getResources().getDrawable(id);
-    }
-
-    public boolean isPlayingVideo() {
-        return playbackController != null && currentActivity != null && currentActivity instanceof PlaybackOverlayActivity;
-    }
-
-    public void stopPlayback() {
-        if (isPlayingVideo()) {
-            currentActivity.finish();
-        } else if (MediaManager.isPlayingAudio()) {
-            MediaManager.stopAudio();
-        }
-    }
-
-    public void pausePlayback() {
-        if (MediaManager.isPlayingAudio()) {
-            MediaManager.pauseAudio();
-        } else if (isPlayingVideo()) {
-            playbackController.playPause();
-        }
-    }
-    public void unPausePlayback() {
-        if (isPlayingVideo()) {
-            playbackController.playPause();
-        } else if (MediaManager.hasAudioQueueItems()) {
-            MediaManager.resumeAudio();
-        }
-    }
-
-    public void playbackNext() {
-        if (isPlayingVideo()) {
-            playbackController.next();
-        } else if (MediaManager.hasAudioQueueItems()) {
-            MediaManager.nextAudioItem();
-        }
-    }
-
-    public void playbackPrev() {
-        if (isPlayingVideo()) {
-            playbackController.prev();
-        } else if (MediaManager.hasAudioQueueItems()) {
-            MediaManager.prevAudioItem();
-        }
-    }
-
-    public void playbackSeek(int pos) {
-        if (isPlayingVideo()) {
-            playbackController.seek(pos);
-        }
-    }
-
-    public void playbackJump() {
-        if (isPlayingVideo()) {
-            playbackController.skip(30000);
-        }
-    }
-
-    public void playbackJumpBack() {
-        if (playbackController != null) {
-            playbackController.skip(-11000);
-        }
-    }
-
+    @NonNull
     public DisplayPreferences getCachedDisplayPrefs(String key) {
-        return displayPrefsCache.containsKey(key) ? displayPrefsCache.get(key) : new DisplayPreferences();
+        return getCachedDisplayPrefs(key, DISPLAY_PREFS_APP_NAME);
+    }
+
+    @NonNull
+    public DisplayPreferences getCachedDisplayPrefs(String key, String app) {
+        String cacheKey = String.format("%s.%s", app, key);
+        return displayPrefsCache.containsKey(cacheKey) ? displayPrefsCache.get(cacheKey) : new DisplayPreferences();
     }
 
     public void updateDisplayPrefs(DisplayPreferences preferences) {
@@ -441,34 +118,38 @@ public class TvApp extends Application {
     }
 
     public void updateDisplayPrefs(String app, DisplayPreferences preferences) {
-        displayPrefsCache.put(preferences.getId(), preferences);
-        getApiClient().UpdateDisplayPreferencesAsync(preferences, getCurrentUser().getId(), app, new EmptyResponse());
-        logger.Debug("Display prefs updated for "+preferences.getId()+" isFavorite: "+preferences.getCustomPrefs().get("FavoriteOnly"));
+        displayPrefsCache.put(String.format("%s.%s", app, preferences.getId()), preferences);
+        apiClient.getValue().UpdateDisplayPreferencesAsync(preferences, getCurrentUser().getId(), app, new EmptyResponse());
+        Timber.d("Display prefs updated for %s isFavorite: %s", preferences.getId(), preferences.getCustomPrefs().get("FavoriteOnly"));
     }
 
     public void getDisplayPrefsAsync(String key, Response<DisplayPreferences> response) {
-        getDisplayPrefsAsync(key, "ATV", response);
+        getDisplayPrefsAsync(key, DISPLAY_PREFS_APP_NAME, response);
     }
 
     public void getDisplayPrefsAsync(final String key, String app, final Response<DisplayPreferences> outerResponse) {
-        if (displayPrefsCache.containsKey(key)) {
-            logger.Debug("Display prefs loaded from cache "+key);
-            outerResponse.onResponse(displayPrefsCache.get(key));
+        String cacheKey = String.format("%s.%s", app, key);
+
+        if (displayPrefsCache.containsKey(cacheKey)) {
+            Timber.d("Display prefs loaded from cache %s", cacheKey);
+            outerResponse.onResponse(displayPrefsCache.get(cacheKey));
         } else {
-            getApiClient().GetDisplayPreferencesAsync(key, getCurrentUser().getId(), app, new Response<DisplayPreferences>(){
+            apiClient.getValue().GetDisplayPreferencesAsync(key, getCurrentUser().getId(), app, new Response<DisplayPreferences>() {
                 @Override
                 public void onResponse(DisplayPreferences response) {
                     if (response.getSortBy() == null) response.setSortBy("SortName");
-                    if (response.getCustomPrefs() == null) response.setCustomPrefs(new HashMap<String, String>());
-                    displayPrefsCache.put(key, response);
-                    logger.Debug("Display prefs loaded and saved in cache " + key);
+                    if (response.getCustomPrefs() == null)
+                        response.setCustomPrefs(new HashMap<String, String>());
+
+                    displayPrefsCache.put(cacheKey, response);
+                    Timber.d("Display prefs loaded and saved in cache %s", cacheKey);
                     outerResponse.onResponse(response);
                 }
 
                 @Override
                 public void onError(Exception exception) {
                     //Continue with defaults
-                    logger.ErrorException("Unable to load display prefs ", exception);
+                    Timber.e(exception, "Unable to load display prefs ");
                     DisplayPreferences prefs = new DisplayPreferences();
                     prefs.setId(key);
                     prefs.setSortBy("SortName");
@@ -479,47 +160,7 @@ public class TvApp extends Application {
         }
     }
 
-
-    public int getAutoBitrate() {
-        return autoBitrate;
-    }
-
-    public void determineAutoBitrate() {
-        if (getApiClient() == null) return;
-        getApiClient().detectBitrate(new Response<Long>() {
-            @Override
-            public void onResponse(Long response) {
-                autoBitrate = response.intValue();
-                logger.Info("Auto bitrate set to: "+autoBitrate);
-            }
-        });
-    }
-
-
-    public String getDirectItemId() {
-        return directItemId;
-    }
-
-    public void setDirectItemId(String directItemId) {
-        this.directItemId = directItemId;
-    }
-
-    public String getLastDeletedItemId() {
-        return lastDeletedItemId;
-    }
-
-    public void setLastDeletedItemId(String lastDeletedItemId) {
-        this.lastDeletedItemId = lastDeletedItemId;
-    }
-
-    public VolleyHttpClient getHttpClient() {
-        return httpClient;
-    }
-
-    public void setHttpClient(VolleyHttpClient httpClient) {
-        this.httpClient = httpClient;
-    }
-
+    @Nullable
     public BaseItemDto getLastPlayedItem() {
         return lastPlayedItem;
     }
@@ -527,52 +168,4 @@ public class TvApp extends Application {
     public void setLastPlayedItem(BaseItemDto lastPlayedItem) {
         this.lastPlayedItem = lastPlayedItem;
     }
-
-    public long getLastVideoQueueChange() {
-        return lastVideoQueueChange;
-    }
-
-    public void setLastVideoQueueChange(long lastVideoQueueChange) {
-        this.lastVideoQueueChange = lastVideoQueueChange;
-    }
-
-    public boolean isPlayingIntros() {
-        return playingIntros;
-    }
-
-    public void setPlayingIntros(boolean playingIntros) {
-        this.playingIntros = playingIntros;
-    }
-
-    public ServerConfiguration getServerConfiguration() {
-        return serverConfiguration;
-    }
-
-    public int getServerBitrateLimit() { return maxRemoteBitrate > 0 ? maxRemoteBitrate : 100000000; }
-
-    public DisplayPriorityType getDisplayPriority() {
-        return displayPriority;
-    }
-
-    public void setDisplayPriority(DisplayPriorityType displayPriority) {
-        this.displayPriority = displayPriority;
-    }
-
-    public GradientDrawable getCurrentBackgroundGradient() {
-        return currentBackgroundGradient;
-    }
-
-    public void setCurrentBackground(Bitmap currentBackground) {
-        int[] colors = new int[2];
-        colors[0] = Utils.darker(Palette.from(currentBackground).generate().getMutedColor(ContextCompat.getColor(this, R.color.black_transparent)), .6f);
-        colors[1] = Utils.darker(colors[0], .1f);
-        setCurrentBackgroundGradient(colors);
-    }
-
-    private void setCurrentBackgroundGradient(int[] colors) {
-        currentBackgroundGradient = new GradientDrawable(GradientDrawable.Orientation.RIGHT_LEFT, colors);
-        currentBackgroundGradient.setCornerRadius(0f);
-        currentBackgroundGradient.setGradientCenter(.6f, .5f);
-        currentBackgroundGradient.setAlpha(200);
-    }
 }

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

@@ -0,0 +1,81 @@
+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.*
+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

@@ -0,0 +1,80 @@
+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.apiclient.interaction.ApiClient
+import org.jellyfin.apiclient.interaction.device.IDevice
+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 timber.log.Timber
+
+class ApiBinder(
+	private val application: JellyfinApplication,
+	private val api: ApiClient,
+	private val device: IDevice,
+	private val authenticationStore: AuthenticationStore,
+) {
+	fun updateSession(session: Session?, resultCallback: (Boolean) -> Unit) {
+		GlobalScope.launch(Dispatchers.IO) {
+			@Suppress("TooGenericExceptionCaught")
+			try {
+				val success = updateSessionInternal(session)
+				resultCallback(success)
+			} catch (throwable: Throwable) {
+				Timber.e(throwable, "Unable to update legacy API session.")
+				resultCallback(false)
+			}
+		}
+	}
+
+	private suspend fun updateSessionInternal(session: Session?): 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 = AuthenticationDevice(device, session.userId.toString())
+		api.SetAuthenticationInfo(session.accessToken, session.userId.toString())
+		api.EnableAutomaticNetworking(ServerInfo().apply {
+			id = session.serverId.toString()
+			name = server.name
+			address = server.address
+			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/AuthenticationDevice.kt

@@ -0,0 +1,29 @@
+package org.jellyfin.androidtv.auth
+
+import org.jellyfin.apiclient.interaction.device.IDevice
+import org.jellyfin.sdk.model.DeviceInfo
+import java.security.MessageDigest
+
+/**
+ * Wrapper for [IDevice] that changes the device id to a combination of the original device id
+ * and the username. This is neccasary to prevent the server from trashing other sessions with
+ * the same device id.
+ */
+class AuthenticationDevice(
+	private val parent: IDevice,
+	private val username: String
+) : IDevice {
+	// Hash the deviceId because we can't use special characters as the device id is send
+	// via HTTP headers
+	override val deviceId = MessageDigest.getInstance("SHA-1").run {
+		update("${parent.deviceId}+${username}".toByteArray())
+		digest().joinToString("") { "%02x".format(it) }
+	}
+
+	override val deviceName = parent.deviceName
+
+	fun toDeviceInfo() = DeviceInfo(
+		id = deviceId,
+		name = deviceName
+	)
+}

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

@@ -0,0 +1,259 @@
+package org.jellyfin.androidtv.auth
+
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.emitAll
+import kotlinx.coroutines.flow.flow
+import org.jellyfin.androidtv.auth.model.*
+import org.jellyfin.androidtv.preference.AuthenticationPreferences
+import org.jellyfin.androidtv.util.ImageUtils
+import org.jellyfin.apiclient.interaction.device.IDevice
+import org.jellyfin.sdk.Jellyfin
+import org.jellyfin.sdk.api.client.KtorClient
+import org.jellyfin.sdk.api.client.exception.ApiClientException
+import org.jellyfin.sdk.api.client.extensions.authenticateUserByName
+import org.jellyfin.sdk.api.operations.ImageApi
+import org.jellyfin.sdk.api.operations.UserApi
+import org.jellyfin.sdk.model.api.ImageType
+import timber.log.Timber
+import java.util.*
+
+interface AuthenticationRepository {
+	fun getServers(): List<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 device: IDevice,
+	private val accountManagerHelper: AccountManagerHelper,
+	private val authenticationStore: AuthenticationStore,
+	private val userApiClient: KtorClient,
+	private val authenticationPreferences: AuthenticationPreferences,
+) : AuthenticationRepository {
+	private val serverComparator = compareByDescending<Server> { it.dateLastAccessed }.thenBy { it.name }
+	private val userComparator = compareByDescending<PrivateUser> { it.lastUsed }.thenBy { it.name }
+
+	override fun getServers() = authenticationStore.getServers().map { (id, info) ->
+		Server(
+			id = id,
+			name = info.name,
+			address = info.address,
+			version = info.version,
+			loginDisclaimer = info.loginDisclaimer,
+			dateLastAccessed = Date(info.lastUsed),
+		)
+	}.sortedWith(serverComparator)
+
+	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
+	}
+
+	@OptIn(ExperimentalCoroutinesApi::class)
+	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))
+	}
+
+	@OptIn(ExperimentalCoroutinesApi::class)
+	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 UserApi(userApiClient).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)
+		}
+	}
+
+	@OptIn(ExperimentalCoroutinesApi::class)
+	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 = AuthenticationDevice(device, username).toDeviceInfo())
+		val userApi = UserApi(api)
+		val result = try {
+			val response = 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)
+		accountManagerHelper.putAccount(AccountManagerAccount(userId, server.id, updatedUser.name, result.accessToken))
+
+		val user = PrivateUser(
+			id = userId,
+			serverId = server.id,
+			name = updatedUser.name,
+			accessToken = result.accessToken,
+			requirePassword = userInfo.hasPassword,
+			imageTag = userInfo.primaryImageTag,
+			lastUsed = Date().time,
+		)
+		setActiveSession(user, server)
+		emit(AuthenticatedState)
+	}
+
+	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? {
+		val api = jellyfin.createApi(baseUrl = server.address)
+		val imageApi = ImageApi(api)
+
+		return user.imageTag?.let { imageTag ->
+			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

@@ -0,0 +1,11 @@
+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/AuthenticationStore.kt

@@ -0,0 +1,109 @@
+package org.jellyfin.androidtv.auth
+
+import android.content.Context
+import kotlinx.serialization.encodeToString
+import kotlinx.serialization.json.*
+import kotlinx.serialization.modules.SerializersModule
+import kotlinx.serialization.modules.contextual
+import org.jellyfin.androidtv.auth.model.AuthenticationStoreServer
+import org.jellyfin.androidtv.auth.model.AuthenticationStoreUser
+import org.jellyfin.androidtv.util.serializer.UUIDSerializer
+import timber.log.Timber
+import java.util.*
+
+/**
+ * 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.
+ *
+ * The data is stored in a JSON file located in the applications data directory.
+ */
+class AuthenticationStore(
+	private val context: Context
+) {
+	private val storePath
+		get() = context.filesDir.resolve("authentication_store.json")
+
+	private val json = Json {
+		encodeDefaults = true
+		serializersModule = SerializersModule {
+			contextual(UUIDSerializer)
+		}
+		ignoreUnknownKeys = true
+	}
+
+	private val store by lazy {
+		load().toMutableMap()
+	}
+
+	private fun load(): Map<UUID, AuthenticationStoreServer> {
+		// No store found
+		if (!storePath.exists()) return 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"]!!)
+			null -> {
+				Timber.e("Authentication Store is corrupt!")
+				emptyMap()
+			}
+			else -> {
+				Timber.e("Authentication Store is using an unknown version!")
+				emptyMap()
+			}
+		}
+	}
+
+	private fun save(): Boolean {
+		val root = JsonObject(mapOf(
+			"version" to JsonPrimitive(1),
+			"servers" to json.encodeToJsonElement(store)
+		))
+
+		storePath.writeText(json.encodeToString(root))
+
+		return true
+	}
+
+	fun getServers(): Map<UUID, AuthenticationStoreServer> = store
+
+	fun getUsers(server: UUID): Map<UUID, AuthenticationStoreUser>? = getServer(server)?.users
+
+	fun getServer(serverId: UUID) = store[serverId]
+
+	fun getUser(serverId: UUID, userId: UUID) = getUsers(serverId)?.get(userId)
+
+	fun putServer(id: UUID, server: AuthenticationStoreServer): Boolean {
+		store[id] = server
+		return save()
+	}
+
+	fun putUser(server: UUID, userId: UUID, userInfo: AuthenticationStoreUser): Boolean {
+		val serverInfo = store[server] ?: return false
+
+		store[server] = serverInfo.copy(users = serverInfo.users.toMutableMap().apply { put(userId, userInfo) })
+
+		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.
+	 */
+	fun removeServer(server: UUID): Boolean {
+		store.remove(server)
+		return save()
+	}
+
+	fun removeUser(server: UUID, user: UUID): Boolean {
+		val serverInfo = store[server] ?: return false
+
+		store[server] = serverInfo.copy(users = serverInfo.users.toMutableMap().apply { remove(user) })
+
+		return save()
+	}
+}

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

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

@@ -0,0 +1,97 @@
+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.androidtv.util.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,
+						)
+					)
+				}
+
+				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

@@ -0,0 +1,186 @@
+package org.jellyfin.androidtv.auth
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.liveData
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.*
+import org.jellyfin.androidtv.auth.model.*
+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.operations.BrandingApi
+import org.jellyfin.sdk.api.operations.SystemApi
+import org.jellyfin.sdk.api.operations.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.*
+
+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 client = jellyfin.createApi(server.address)
+		val userApi = UserApi(client)
+
+		return try {
+			val users by 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 client = jellyfin.createApi(server.address)
+			// Get login disclaimer
+			val branding by BrandingApi(client).getBrandingOptions()
+			val systemInfo by SystemApi(client).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) {
+			// Get system info
+			val systemInfo = chosenRecommendation.systemInfo!!
+
+			// Get branding info
+			val api = BrandingApi(jellyfin.createApi(chosenRecommendation.address))
+			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
+			emit(UnableToConnectState(addressCandidates))
+		}
+	}
+}

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

@@ -0,0 +1,167 @@
+package org.jellyfin.androidtv.auth
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import org.jellyfin.androidtv.preference.AuthenticationPreferences
+import org.jellyfin.androidtv.preference.constant.UserSelectBehavior.*
+import org.jellyfin.sdk.api.client.KtorClient
+import org.jellyfin.sdk.model.serializer.toUUIDOrNull
+import timber.log.Timber
+import java.util.*
+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: KtorClient,
+	private val systemApiClient: KtorClient,
+) : 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) { }
+	}
+
+	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
+		apiBinder.updateSession(session) { success ->
+			Timber.d("Updating current session. userId=${session?.userId} apiBindingSuccess=${success}")
+
+			if (success) {
+				userApiClient.applySession(session)
+				_currentSession.postValue(session)
+			} else {
+				userApiClient.applySession(null)
+				_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 KtorClient.applySession(session: Session?) {
+		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

@@ -0,0 +1,10 @@
+package org.jellyfin.androidtv.auth.model
+
+import java.util.*
+
+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/AuthenticationStoreServer.kt

@@ -0,0 +1,23 @@
+@file:UseSerializers(UUIDSerializer::class)
+
+package org.jellyfin.androidtv.auth.model
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.UseSerializers
+import org.jellyfin.androidtv.util.serializer.UUIDSerializer
+import java.util.*
+
+/**
+ * Locally stored server information. New properties require default values or deserialization will fail.
+ */
+@Serializable
+data class AuthenticationStoreServer(
+	val name: String,
+	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,
+	val users: Map<UUID, AuthenticationStoreUser> = emptyMap(),
+)

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

@@ -0,0 +1,16 @@
+package org.jellyfin.androidtv.auth.model
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import java.util.*
+
+/**
+ * Locally stored user information. New properties require default values or deserialization will fail.
+ */
+@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
+)

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

@@ -0,0 +1,23 @@
+package org.jellyfin.androidtv.auth.model
+
+import androidx.annotation.StringRes
+
+data class LoadingState(
+	val status: Status,
+	@StringRes val messageRes: Int? = null
+) {
+	companion object {
+		val PENDING = LoadingState(Status.PENDING)
+		val LOADING = LoadingState(Status.LOADING)
+		val SUCCESS = LoadingState(Status.SUCCESS)
+		val ERROR = LoadingState(Status.ERROR)
+		fun error(@StringRes messageRes: Int? = null) = LoadingState(Status.ERROR, messageRes)
+	}
+
+	enum class Status {
+		PENDING,
+		LOADING,
+		SUCCESS,
+		ERROR
+	}
+}

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

@@ -0,0 +1,8 @@
+package org.jellyfin.androidtv.auth.model
+
+sealed class LoginState
+object AuthenticatingState : LoginState()
+object RequireSignInState : LoginState()
+object ServerUnavailableState : LoginState()
+data class ServerVersionNotSupported(val server: Server) : LoginState()
+object AuthenticatedState : LoginState()

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

@@ -0,0 +1,30 @@
+package org.jellyfin.androidtv.auth.model
+
+import org.jellyfin.androidtv.auth.ServerRepository
+import org.jellyfin.sdk.model.ServerVersion
+import java.util.*
+
+/**
+ * Server model to use locally in place of ServerInfo model in ApiClient.
+ */
+data class Server(
+	var id: UUID,
+	var name: String,
+	var address: String,
+	val version: String? = null,
+	val loginDisclaimer: String? = null,
+	var dateLastAccessed: Date = Date(0),
+) {
+	private val serverVersion = version?.let(ServerVersion::fromString)
+	val versionSupported = serverVersion != null && serverVersion >= ServerRepository.minimumServerVersion
+
+	override fun equals(other: Any?) = other is Server
+		&& id == other.id
+		&& address == other.address
+
+	override fun hashCode(): Int {
+		var result = id.hashCode()
+		result = 31 * result + address.hashCode()
+		return result
+	}
+}

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

@@ -0,0 +1,9 @@
+package org.jellyfin.androidtv.auth.model
+
+import org.jellyfin.sdk.model.api.PublicSystemInfo
+import java.util.*
+
+sealed class ServerAdditionState
+data class ConnectingState(val address: String) : ServerAdditionState()
+data class UnableToConnectState(val addressCandidates: List<String>) : ServerAdditionState()
+data class ConnectedState(val id: UUID, val publicInfo: PublicSystemInfo) : ServerAdditionState()

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

@@ -0,0 +1,50 @@
+package org.jellyfin.androidtv.auth.model
+
+import java.util.*
+
+/**
+ * User model used locally.
+ */
+sealed class User {
+	abstract val id: UUID
+	abstract val serverId: UUID
+	abstract val name: String
+	abstract val accessToken: String?
+	abstract val requirePassword: Boolean
+	abstract val imageTag: String?
+
+	override fun equals(other: Any?) = other is User
+		&& serverId == other.serverId
+		&& id == other.id
+
+	override fun hashCode(): Int {
+		var result = id.hashCode()
+		result = 31 * result + serverId.hashCode()
+		return result
+	}
+}
+
+/**
+ * Represents a user stored client side.
+ */
+data class PrivateUser(
+	override val id: UUID,
+	override val serverId: UUID,
+	override val name: String,
+	override val accessToken: String?,
+	override val requirePassword: Boolean,
+	override val imageTag: String?,
+	val lastUsed: Long,
+) : User()
+
+/**
+ * Represents a user stored server side. Found using the Public User endpoint.
+ */
+data class PublicUser(
+	override val id: UUID,
+	override val serverId: UUID,
+	override val name: String,
+	override val accessToken: String?,
+	override val requirePassword: Boolean,
+	override val imageTag: String?,
+) : User()

app/src/main/java/org/jellyfin/androidtv/base/BaseActivity.java

@@ -1,192 +0,0 @@
-package org.jellyfin.androidtv.base;
-
-import android.graphics.Rect;
-import android.os.Bundle;
-import android.os.Handler;
-import android.preference.PreferenceManager;
-import android.view.Gravity;
-import android.view.KeyEvent;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.FrameLayout;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import org.jellyfin.androidtv.R;
-import org.jellyfin.androidtv.TvApp;
-import org.jellyfin.androidtv.util.Utils;
-
-import androidx.core.app.ActivityCompat;
-import androidx.fragment.app.FragmentActivity;
-
-public abstract class BaseActivity extends FragmentActivity implements ActivityCompat.OnRequestPermissionsResultCallback {
-    private TvApp app = TvApp.getApplication();
-    private long timeoutInterval = 3600000;
-    private Handler handler = new Handler();
-    private Runnable loop;
-    private IKeyListener keyListener;
-    private IMessageListener messageListener;
-
-    private View messageUi;
-    private TextView messageTitle;
-    private TextView messageMessage;
-    private ImageView messageIcon;
-    private int messageTimeout = 6000;
-    private int farRight;
-    private int msgPos;
-
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        timeoutInterval = Long.parseLong(PreferenceManager.getDefaultSharedPreferences(app).getString("pref_auto_logoff_timeout", "3600000"));
-        startAutoLogoffLoop();
-        TvApp.getApplication().setCurrentActivity(this);
-
-        //Add message UI - delay to ensure on top of other views
-        handler.postDelayed(new Runnable() {
-            @Override
-            public void run() {
-                if (!isFinishing() && app.getCurrentActivity() != null) {
-                    FrameLayout root = findViewById(android.R.id.content);
-                    messageUi = View.inflate(app.getCurrentActivity(), R.layout.message, null);
-                    messageTitle = messageUi.findViewById(R.id.msgTitle);
-                    messageMessage = messageUi.findViewById(R.id.message);
-                    messageIcon = messageUi.findViewById(R.id.msgIcon);
-                    messageUi.setAlpha(0);
-                    FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT, Gravity.RIGHT | Gravity.BOTTOM);
-                    params.bottomMargin = Utils.convertDpToPixel(TvApp.getApplication().getCurrentActivity(), 50);
-                    Rect windowSize = new Rect();
-                    getWindow().getDecorView().getWindowVisibleDisplayFrame(windowSize);
-                    farRight = windowSize.right;
-                    msgPos = farRight - Utils.convertDpToPixel(TvApp.getApplication().getCurrentActivity(), 500);
-                    messageUi.setLeft(farRight);
-                    root.addView(messageUi, params);
-                }
-            }
-        }, 500);
-
-    }
-
-    public void showMessage(String title, String msg) {
-        showMessage(title, msg, messageTimeout, null, null);
-    }
-
-    public void showMessage(String title, String msg, int timeout) {
-        showMessage(title, msg, timeout, null, null);
-    }
-
-    public void showMessage(String title, String msg, int timeout, Integer icon, Integer background) {
-        if (messageUi != null && !isFinishing()) {
-            messageTitle.setText(title);
-            messageMessage.setText(msg);
-            if (icon != null) {
-                messageIcon.setImageResource(icon);
-            }
-            if (background != null) {
-                messageUi.setBackgroundResource(background);
-            }
-            messageUi.animate().x(msgPos).alpha(1).setDuration(300);
-            handler.postDelayed(new Runnable() {
-                @Override
-                public void run() {
-                    if (messageUi != null && !isFinishing()) {
-                        messageUi.animate().alpha(0).x(farRight).setDuration(300);
-                    }
-                }
-            }, timeout);
-        }
-
-    }
-
-    //Banish task bars and navigation controls on non-TV devices
-    @Override
-    public void onWindowFocusChanged(boolean hasFocus) {
-        super.onWindowFocusChanged(hasFocus);
-        if (hasFocus && android.os.Build.VERSION.SDK_INT >= 19) {
-            getWindow().getDecorView().setSystemUiVisibility(
-                    View.SYSTEM_UI_FLAG_LAYOUT_STABLE
-                            | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
-                            | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
-                            | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
-                            | View.SYSTEM_UI_FLAG_FULLSCREEN
-                            | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY);}
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        TvApp.getApplication().setCurrentActivity(this);
-    }
-
-    @Override
-    protected void onPause() {
-        super.onPause();
-        TvApp.getApplication().setCurrentActivity(null);
-    }
-
-    @Override
-    protected void onDestroy() {
-        if (handler != null && loop != null) {
-            handler.removeCallbacks(loop);
-        }
-        super.onDestroy();
-    }
-
-    @Override
-    public void onUserInteraction() {
-        super.onUserInteraction();
-        app.setLastUserInteraction(System.currentTimeMillis());
-    }
-
-    private void startAutoLogoffLoop() {
-        if (loop != null) {
-            return;
-        }
-
-        loop = new Runnable() {
-            @Override
-            public void run() {
-                if (app != null && System.currentTimeMillis() > app.getLastUserInteraction() + timeoutInterval) {
-                    app.getLogger().Info("Logging off due to inactivity %d", app.getLastUserInteraction());
-                    Utils.showToast(app, "Jellyfin Logging off due to inactivity...");
-                    if (app.getPlaybackController() != null && app.getPlaybackController().isPaused()) {
-                        app.getLogger().Info("Playback was paused, stopping gracefully...");
-                        app.getPlaybackController().stop();
-                    }
-                    handler.removeCallbacks(this);
-                    finish();
-                } else {
-                    handler.postDelayed(this, 60000);
-                }
-            }
-        };
-
-        handler.postDelayed(loop, 60000);
-    }
-
-    public void registerKeyListener(IKeyListener listener) {
-        keyListener = listener;
-    }
-
-    public void registerMessageListener(IMessageListener listener) {
-        messageListener = listener;
-    }
-
-    public void sendMessage(CustomMessage message) {
-        if (messageListener != null) {
-            messageListener.onMessageReceived(message);
-        }
-    }
-
-    @Override
-    public boolean onKeyUp(int keyCode, KeyEvent event) {
-        return keyListener != null ? keyListener.onKeyUp(keyCode, event) || super.onKeyUp(keyCode, event) : super.onKeyUp(keyCode, event);
-    }
-
-    @Override
-    public boolean onSearchRequested() {
-        TvApp.getApplication().showSearch(this, false);
-        return true;
-    }
-}

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

@@ -1,9 +0,0 @@
-package org.jellyfin.androidtv.base;
-
-/**
- * Created by Eric on 4/20/2015.
- */
-public enum  CustomMessage {
-    RefreshCurrentItem,
-    RemoveCurrentItem, ActionComplete, RefreshRows
-}

app/src/main/java/org/jellyfin/androidtv/browsing/BrowsePersonsActivity.java

@@ -1,15 +0,0 @@
-package org.jellyfin.androidtv.browsing;
-
-import android.os.Bundle;
-
-import org.jellyfin.androidtv.R;
-import org.jellyfin.androidtv.base.BaseActivity;
-
-public class BrowsePersonsActivity extends BaseActivity {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_browse_persons);
-    }
-}

app/src/main/java/org/jellyfin/androidtv/browsing/BrowseRecordingsActivity.java

@@ -1,15 +0,0 @@
-package org.jellyfin.androidtv.browsing;
-
-import android.os.Bundle;
-
-import org.jellyfin.androidtv.R;
-import org.jellyfin.androidtv.base.BaseActivity;
-
-public class BrowseRecordingsActivity extends BaseActivity {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_recordings);
-    }
-}

app/src/main/java/org/jellyfin/androidtv/browsing/BrowseScheduleActivity.java

@@ -1,15 +0,0 @@
-package org.jellyfin.androidtv.browsing;
-
-import android.os.Bundle;
-
-import org.jellyfin.androidtv.R;
-import org.jellyfin.androidtv.base.BaseActivity;
-
-public class BrowseScheduleActivity extends BaseActivity {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_schedule);
-    }
-}

app/src/main/java/org/jellyfin/androidtv/browsing/ByGenreActivity.java

@@ -1,15 +0,0 @@
-package org.jellyfin.androidtv.browsing;
-
-import android.os.Bundle;
-
-import org.jellyfin.androidtv.R;
-import org.jellyfin.androidtv.base.BaseActivity;
-
-public class ByGenreActivity extends BaseActivity {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_by_genre);
-    }
-}

app/src/main/java/org/jellyfin/androidtv/browsing/ByLetterActivity.java

@@ -1,15 +0,0 @@
-package org.jellyfin.androidtv.browsing;
-
-import android.os.Bundle;
-
-import org.jellyfin.androidtv.R;
-import org.jellyfin.androidtv.base.BaseActivity;
-
-public class ByLetterActivity extends BaseActivity {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_by_letter);
-    }
-}

app/src/main/java/org/jellyfin/androidtv/browsing/CollectionActivity.java

@@ -1,15 +0,0 @@
-package org.jellyfin.androidtv.browsing;
-
-import android.os.Bundle;
-
-import org.jellyfin.androidtv.R;
-import org.jellyfin.androidtv.base.BaseActivity;
-
-public class CollectionActivity extends BaseActivity {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_collection);
-    }
-}

app/src/main/java/org/jellyfin/androidtv/browsing/CustomBrowseFragment.java

@@ -1,299 +0,0 @@
-package org.jellyfin.androidtv.browsing;
-
-import androidx.fragment.app.Fragment;
-import android.graphics.Bitmap;
-import android.os.Bundle;
-import android.os.Handler;
-import androidx.leanback.app.BackgroundManager;
-import androidx.leanback.app.RowsSupportFragment;
-import androidx.leanback.widget.ArrayObjectAdapter;
-import androidx.leanback.widget.HeaderItem;
-import androidx.leanback.widget.ListRow;
-import androidx.leanback.widget.OnItemViewClickedListener;
-import androidx.leanback.widget.OnItemViewSelectedListener;
-import androidx.leanback.widget.Presenter;
-import androidx.leanback.widget.Row;
-import androidx.leanback.widget.RowPresenter;
-import android.util.DisplayMetrics;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.request.animation.GlideAnimation;
-import com.bumptech.glide.request.target.SimpleTarget;
-
-import org.jellyfin.androidtv.R;
-import org.jellyfin.androidtv.TvApp;
-import org.jellyfin.androidtv.base.BaseActivity;
-import org.jellyfin.androidtv.itemhandling.BaseRowItem;
-import org.jellyfin.androidtv.itemhandling.ItemLauncher;
-import org.jellyfin.androidtv.itemhandling.ItemRowAdapter;
-import org.jellyfin.androidtv.presentation.CardPresenter;
-import org.jellyfin.androidtv.presentation.PositionableListRowPresenter;
-import org.jellyfin.androidtv.querying.QueryType;
-import org.jellyfin.androidtv.querying.ViewQuery;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Timer;
-import java.util.TimerTask;
-
-public class CustomBrowseFragment extends Fragment implements IRowLoader {
-    private RowsSupportFragment mRowsFragment;
-    private static final int BACKGROUND_UPDATE_DELAY = 100;
-
-    protected String MainTitle;
-    protected boolean ShowBadge = true;
-    protected TvApp mApplication;
-    protected BaseActivity mActivity;
-    protected BaseRowItem mCurrentItem;
-    protected ListRow mCurrentRow;
-    protected CompositeClickedListener mClickedListener = new CompositeClickedListener();
-    protected CompositeSelectedListener mSelectedListener = new CompositeSelectedListener();
-    protected ArrayObjectAdapter mRowsAdapter;
-    private SimpleTarget<Bitmap> mBackgroundTarget;
-    private DisplayMetrics mMetrics;
-    private Timer mBackgroundTimer;
-    private final Handler mHandler = new Handler();
-    private String mBackgroundUrl;
-    protected ArrayList<BrowseRowDef> mRows = new ArrayList<>();
-    CardPresenter mCardPresenter;
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-
-        View root = inflater.inflate(R.layout.fragment_custom_browse, container, false);
-
-        // Inject the RowsSupportFragment in the results container
-        if (getChildFragmentManager().findFragmentById(R.id.rows_area) == null) {
-            mRowsFragment = new RowsSupportFragment();
-            getChildFragmentManager().beginTransaction()
-                    .replace(R.id.rows_area, mRowsFragment).commit();
-        } else {
-            mRowsFragment = (RowsSupportFragment) getChildFragmentManager()
-                    .findFragmentById(R.id.rows_area);
-        }
-
-        mRowsAdapter = new ArrayObjectAdapter(new PositionableListRowPresenter());
-        mRowsFragment.setAdapter(mRowsAdapter);
-
-        return root;
-    }
-
-    @Override
-    public void onActivityCreated(Bundle savedInstanceState) {
-        super.onActivityCreated(savedInstanceState);
-
-        mApplication = TvApp.getApplication();
-        //mActivity = (BaseActivity) getActivity();
-
-        prepareBackgroundManager();
-
-        setupUIElements();
-
-        setupQueries(this);
-
-        setupEventListeners();
-    }
-
-    protected void setupQueries(IRowLoader rowLoader) {
-        rowLoader.loadRows(mRows);
-    }
-
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-        if (null != mBackgroundTimer) {
-            mBackgroundTimer.cancel();
-        }
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-
-        //Re-retrieve anything that needs it but delay slightly so we don't take away gui landing
-        if (mRowsAdapter != null) {
-            new Handler().postDelayed(new Runnable() {
-                @Override
-                public void run() {
-                    for (int i = 0; i < mRowsAdapter.size(); i++) {
-                        if (mRowsAdapter.get(i) instanceof ListRow) {
-                            if (((ListRow) mRowsAdapter.get(i)).getAdapter() instanceof ItemRowAdapter) {
-                                ((ItemRowAdapter) ((ListRow) mRowsAdapter.get(i)).getAdapter()).ReRetrieveIfNeeded();
-                            }
-                        }
-                    }
-                }
-            },1500);
-        }
-    }
-
-    public void loadRows(List<BrowseRowDef> rows) {
-
-        mRowsAdapter = new ArrayObjectAdapter(new PositionableListRowPresenter());
-        mCardPresenter = new CardPresenter();
-
-        for (BrowseRowDef def : rows) {
-            HeaderItem header = new HeaderItem(def.getHeaderText());
-            ItemRowAdapter rowAdapter;
-            switch (def.getQueryType()) {
-                case NextUp:
-                    rowAdapter = new ItemRowAdapter(def.getNextUpQuery(), true, mCardPresenter, mRowsAdapter);
-                    break;
-                case Season:
-                    rowAdapter = new ItemRowAdapter(def.getSeasonQuery(), mCardPresenter, mRowsAdapter);
-                    break;
-                case Upcoming:
-                    rowAdapter = new ItemRowAdapter(def.getUpcomingQuery(), mCardPresenter, mRowsAdapter);
-                    break;
-                case Views:
-                    rowAdapter = new ItemRowAdapter(new ViewQuery(), mCardPresenter, mRowsAdapter);
-                    break;
-                case SimilarSeries:
-                    rowAdapter = new ItemRowAdapter(def.getSimilarQuery(), QueryType.SimilarSeries, mCardPresenter, mRowsAdapter);
-                    break;
-                case SimilarMovies:
-                    rowAdapter = new ItemRowAdapter(def.getSimilarQuery(), QueryType.SimilarMovies, mCardPresenter, mRowsAdapter);
-                    break;
-                case Persons:
-                    rowAdapter = new ItemRowAdapter(def.getPersonsQuery(), def.getChunkSize(), mCardPresenter, mRowsAdapter);
-                    break;
-                case LiveTvChannel:
-                    rowAdapter = new ItemRowAdapter(def.getTvChannelQuery(), 40, mCardPresenter, mRowsAdapter);
-                    break;
-                case LiveTvProgram:
-                    rowAdapter = new ItemRowAdapter(def.getProgramQuery(), mCardPresenter, mRowsAdapter);
-                    break;
-                case LiveTvRecording:
-                    rowAdapter = new ItemRowAdapter(def.getRecordingQuery(), def.getChunkSize(), mCardPresenter, mRowsAdapter);
-                    break;
-                default:
-                    rowAdapter = new ItemRowAdapter(def.getQuery(), def.getChunkSize(), def.getPreferParentThumb(), def.isStaticHeight(), mCardPresenter, mRowsAdapter);
-                    break;
-            }
-
-            rowAdapter.setReRetrieveTriggers(def.getChangeTriggers());
-
-            ListRow row = new ListRow(header, rowAdapter);
-            mRowsAdapter.add(row);
-            rowAdapter.setRow(row);
-            rowAdapter.Retrieve();
-        }
-
-        addAdditionalRows(mRowsAdapter);
-
-        mRowsFragment.setAdapter(mRowsAdapter);
-
-    }
-
-    protected void addAdditionalRows(ArrayObjectAdapter rowAdapter) {
-
-    }
-
-    private void prepareBackgroundManager() {
-
-        final BackgroundManager backgroundManager = BackgroundManager.getInstance(getActivity());
-        backgroundManager.attach(getActivity().getWindow());
-
-        mMetrics = new DisplayMetrics();
-        getActivity().getWindowManager().getDefaultDisplay().getMetrics(mMetrics);
-
-        mBackgroundTarget = new SimpleTarget<Bitmap>(mMetrics.widthPixels, mMetrics.heightPixels) {
-            @Override
-            public void onResourceReady(Bitmap resource, GlideAnimation<? super Bitmap> glideAnimation) {
-                backgroundManager.setBitmap(resource);
-            }
-        };
-
-    }
-
-    protected void setupUIElements() {
-    }
-
-    protected void setupEventListeners() {
-
-        mRowsFragment.setOnItemViewClickedListener(mClickedListener);
-        mClickedListener.registerListener(new ItemViewClickedListener());
-
-        mRowsFragment.setOnItemViewSelectedListener(mSelectedListener);
-        mSelectedListener.registerListener(new ItemViewSelectedListener());
-    }
-
-    private final class ItemViewClickedListener implements OnItemViewClickedListener {
-        @Override
-        public void onItemClicked(final Presenter.ViewHolder itemViewHolder, Object item,
-                                  RowPresenter.ViewHolder rowViewHolder, Row row) {
-
-            if (!(item instanceof BaseRowItem)) return;
-            ItemLauncher.launch((BaseRowItem) item, (ItemRowAdapter) ((ListRow)row).getAdapter(), ((BaseRowItem) item).getIndex(), getActivity());
-        }
-    }
-
-    private final class ItemViewSelectedListener implements OnItemViewSelectedListener {
-        @Override
-        public void onItemSelected(Presenter.ViewHolder itemViewHolder, Object item,
-                                   RowPresenter.ViewHolder rowViewHolder, Row row) {
-            if (!(item instanceof BaseRowItem)) {
-                //fill in default background
-                mBackgroundUrl = null;
-                startBackgroundTimer();
-                return;
-            }
-
-            BaseRowItem rowItem = (BaseRowItem) item;
-            mCurrentItem = rowItem;
-            mCurrentRow = (ListRow) row;
-
-            //mApplication.getLogger().Debug("Selected Item "+rowItem.getIndex() + " type: "+ (rowItem.getItemType().equals(BaseRowItem.ItemType.BaseItem) ? rowItem.getBaseItem().getType() : "other"));
-            ItemRowAdapter adapter = (ItemRowAdapter) ((ListRow)row).getAdapter();
-            adapter.loadMoreItemsIfNeeded(rowItem.getIndex());
-
-            mBackgroundUrl = rowItem.getBackdropImageUrl();
-            startBackgroundTimer();
-
-        }
-    }
-
-    protected void updateBackground(String url) {
-        if (url == null) {
-            clearBackground();
-        } else {
-            Glide.with(getActivity())
-                    .load(url)
-                    .asBitmap()
-                    .override(mMetrics.widthPixels, mMetrics.heightPixels)
-                    .centerCrop()
-                    .into(mBackgroundTarget);
-        }
-    }
-
-    protected void clearBackground() {
-        BackgroundManager.getInstance(getActivity()).setDrawable(null);
-    }
-
-    private void startBackgroundTimer() {
-        if (null != mBackgroundTimer) {
-            mBackgroundTimer.cancel();
-        }
-        mBackgroundTimer = new Timer();
-        mBackgroundTimer.schedule(new UpdateBackgroundTask(), BACKGROUND_UPDATE_DELAY);
-    }
-
-    private class UpdateBackgroundTask extends TimerTask {
-
-        @Override
-        public void run() {
-            mHandler.post(new Runnable() {
-                @Override
-                public void run() {
-                    updateBackground(mBackgroundUrl);
-                }
-            });
-
-        }
-    }
-
-
-}

app/src/main/java/org/jellyfin/androidtv/browsing/CustomViewFragment.java

@@ -1,21 +0,0 @@
-package org.jellyfin.androidtv.browsing;
-
-import android.os.Bundle;
-
-import org.jellyfin.androidtv.TvApp;
-
-/**
- * Created by Eric on 1/18/2015.
- */
-public class CustomViewFragment extends BrowseFolderFragment {
-    protected String includeType;
-
-    @Override
-    public void onActivityCreated(Bundle savedInstanceState) {
-        includeType = getActivity().getIntent().getStringExtra("IncludeType");
-        TvApp.getApplication().getLogger().Debug("Item type: "+includeType);
-        showViews = false;
-
-        super.onActivityCreated(savedInstanceState);
-    }
-}

app/src/main/java/org/jellyfin/androidtv/browsing/GenericFolderActivity.java

@@ -1,15 +0,0 @@
-package org.jellyfin.androidtv.browsing;
-
-import android.os.Bundle;
-
-import org.jellyfin.androidtv.R;
-import org.jellyfin.androidtv.base.BaseActivity;
-
-public class GenericFolderActivity extends BaseActivity {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_generic_folder);
-    }
-}

app/src/main/java/org/jellyfin/androidtv/browsing/GenericGridActivity.java

@@ -1,15 +0,0 @@
-package org.jellyfin.androidtv.browsing;
-
-import android.os.Bundle;
-
-import org.jellyfin.androidtv.R;
-import org.jellyfin.androidtv.base.BaseActivity;
-
-public class GenericGridActivity extends BaseActivity {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_browse_grid);
-    }
-}

app/src/main/java/org/jellyfin/androidtv/browsing/MainActivity.kt

@@ -1,12 +0,0 @@
-package org.jellyfin.androidtv.browsing
-
-import android.os.Bundle
-import org.jellyfin.androidtv.R
-import org.jellyfin.androidtv.base.BaseActivity
-
-class MainActivity : BaseActivity() {
-	override fun onCreate(savedInstanceState: Bundle?) {
-		super.onCreate(savedInstanceState)
-		setContentView(R.layout.activity_home)
-	}
-}

app/src/main/java/org/jellyfin/androidtv/browsing/SuggestedMoviesActivity.java

@@ -1,15 +0,0 @@
-package org.jellyfin.androidtv.browsing;
-
-import android.os.Bundle;
-
-import org.jellyfin.androidtv.R;
-import org.jellyfin.androidtv.base.BaseActivity;
-
-public class SuggestedMoviesActivity extends BaseActivity {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_suggested_movie);
-    }
-}

app/src/main/java/org/jellyfin/androidtv/browsing/UserViewActivity.java

@@ -1,15 +0,0 @@
-package org.jellyfin.androidtv.browsing;
-
-import android.os.Bundle;
-
-import org.jellyfin.androidtv.R;
-import org.jellyfin.androidtv.base.BaseActivity;
-
-public class UserViewActivity extends BaseActivity {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_user_view);
-    }
-}

app/src/main/java/org/jellyfin/androidtv/channels/ChannelManager.kt

@@ -1,126 +0,0 @@
-package org.jellyfin.androidtv.channels
-
-import android.content.Intent
-import android.net.Uri
-import android.os.Build
-import androidx.tvprovider.media.tv.TvContractCompat.WatchNextPrograms
-import androidx.tvprovider.media.tv.WatchNextProgram
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import org.jellyfin.androidtv.TvApp
-import org.jellyfin.androidtv.startup.StartupActivity
-import org.jellyfin.androidtv.util.apiclient.getNextUpEpisodes
-import org.jellyfin.apiclient.model.drawing.ImageFormat
-import org.jellyfin.apiclient.model.dto.BaseItemDto
-import org.jellyfin.apiclient.model.dto.ImageOptions
-import org.jellyfin.apiclient.model.querying.ItemFields
-import org.jellyfin.apiclient.model.querying.NextUpQuery
-
-/**
- * Manages channels on the android tv home screen
- *
- * More info: https://developer.android.com/training/tv/discovery/recommendations-channel
- */
-class ChannelManager {
-	private companion object {
-		/**
-		 * Amount of ticks found in a millisecond, used for calculation
-		 */
-		private const val TICKS_IN_MILLISECOND = 10000
-	}
-
-	private val application = TvApp.getApplication()
-
-	/**
-	 * Check if the app can use Leanback features and is API level 26 or higher
-	 */
-	private val isSupported = Build.VERSION.SDK_INT >= Build.VERSION_CODES.O
-		&& application.packageManager.hasSystemFeature("android.software.leanback")
-
-	/**
-	 * Update all channels for the currently authenticated user
-	 */
-	fun update() {
-		// Don't do anything if not supported
-		if (!isSupported) return
-
-		// Launch in separate coroutine scope
-		GlobalScope.launch {
-			updateWatchNext()
-		}
-	}
-
-	/**
-	 * Updates the "watch next" row with new and unfinished episodes
-	 * does not include movies, music or other types of media
-	 */
-	private suspend fun updateWatchNext() = withContext(Dispatchers.Default) {
-		// Delete current items
-		application.contentResolver.delete(WatchNextPrograms.CONTENT_URI, null, null)
-
-		// Get user or return if no user is found (not authenticated)
-		val user = application.currentUser ?: return@withContext
-
-		// Get new items
-		val response = application.apiClient.getNextUpEpisodes(NextUpQuery().apply {
-			userId = user.id
-			imageTypeLimit = 1
-			limit = 10
-			fields = arrayOf(ItemFields.DateCreated)
-		})
-
-		// Add new items
-		response?.items?.forEach { item ->
-			application.contentResolver.insert(
-				WatchNextPrograms.CONTENT_URI,
-				getBaseItemAsWatchNextProgram(item).toContentValues()
-			)
-		}
-	}
-
-	/**
-	 * Convert [BaseItemDto] to [WatchNextProgram]
-	 *
-	 * Assumes the item type is "episode"
-	 */
-	private fun getBaseItemAsWatchNextProgram(item: BaseItemDto) = WatchNextProgram.Builder().apply {
-		setInternalProviderId(item.id)
-		setType(WatchNextPrograms.TYPE_TV_EPISODE)
-		setTitle("${item.seriesName} - ${item.name}")
-
-		// Poster image
-		setPosterArtAspectRatio(WatchNextPrograms.ASPECT_RATIO_16_9)
-		setPosterArtUri(Uri.parse(application.apiClient.GetImageUrl(item, ImageOptions().apply {
-			format = ImageFormat.Png
-			height = 288
-			width = 512
-		})))
-
-		// Use date created or fallback to current time if unavailable
-		setLastEngagementTimeUtcMillis(item.dateCreated?.time ?: System.currentTimeMillis())
-
-		when {
-			// User has started playing the episode
-			item.canResume -> {
-				setWatchNextType(WatchNextPrograms.WATCH_NEXT_TYPE_CONTINUE)
-				setLastPlaybackPositionMillis((item.resumePositionTicks / TICKS_IN_MILLISECOND).toInt())
-				setDurationMillis((item.runTimeTicks / TICKS_IN_MILLISECOND).toInt())
-			}
-			// First episode of the season
-			item.indexNumber == 0 -> {
-				setWatchNextType(WatchNextPrograms.WATCH_NEXT_TYPE_NEW)
-			}
-			// Default
-			else -> {
-				setWatchNextType(WatchNextPrograms.WATCH_NEXT_TYPE_NEXT)
-			}
-		}
-
-		// Set intent to open the episode
-		setIntent(Intent(application, StartupActivity::class.java).apply {
-			putExtra("ItemId", item.id)
-		})
-	}.build()
-}

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

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

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

@@ -1,4 +1,4 @@
-package org.jellyfin.androidtv.constants;
+package org.jellyfin.androidtv.constant;
 
 public class CodecTypes {
     /* Audio Codec Types */
@@ -33,5 +33,4 @@ public class CodecTypes {
     public static final String MPEG4 = "mpeg4";
     public static final String VP8 = "vp8";
     public static final String VP9 = "vp9";
-    public static final String VPX = "vpx";
 }

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

@@ -1,4 +1,4 @@
-package org.jellyfin.androidtv.constants;
+package org.jellyfin.androidtv.constant;
 
 public class ContainerTypes {
     public static final String _3GP = "3gp";

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

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

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

@@ -0,0 +1,6 @@
+package org.jellyfin.androidtv.constant
+
+object Extras {
+	const val Folder = "Folder"
+	const val IncludeType = "IncludeType"
+}

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

@@ -0,0 +1,22 @@
+package org.jellyfin.androidtv.constant
+
+import org.jellyfin.androidtv.R
+import org.jellyfin.androidtv.ui.preference.dsl.EnumDisplayOptions
+
+enum class GridDirection {
+	/**
+	 * Horizontal.
+	 */
+	@EnumDisplayOptions(R.string.grid_direction_horizontal)
+	HORIZONTAL,
+
+	/**
+	 * Vertical.
+	 */
+	@EnumDisplayOptions(R.string.grid_direction_vertical)
+	VERTICAL;
+
+	companion object {
+		fun getGridDirection(direction: String?) = values().firstOrNull { it.name == direction }
+	}
+}

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

@@ -0,0 +1,22 @@
+package org.jellyfin.androidtv.constant
+
+/**
+ * All possible homesections, synced with jellyfin-web
+ */
+enum class HomeSectionType(
+	val id: String
+) {
+	LATEST_MEDIA("latestmedia"),
+	LIBRARY_TILES_SMALL("smalllibrarytiles"),
+	LIBRARY_BUTTONS("librarybuttons"),
+	RESUME("resume"),
+	RESUME_AUDIO("resumeaudio"),
+	ACTIVE_RECORDINGS("activerecordings"),
+	NEXT_UP("nextup"),
+	LIVE_TV("livetv"),
+	NONE("none");
+
+	companion object {
+		fun getById(id: String) = values().firstOrNull { it.id == id }
+	}
+}

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

@@ -1,8 +1,5 @@
-package org.jellyfin.androidtv.model;
+package org.jellyfin.androidtv.constant;
 
-/**
- * Created by Eric on 8/22/2015.
- */
 public class ImageType {
     public static final String DEFAULT = "0";
     public static final String THUMB = "1";

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

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

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

@@ -1,12 +1,8 @@
-package org.jellyfin.androidtv.model;
+package org.jellyfin.androidtv.constant;
 
-/**
- * Created by Eric on 8/22/2015.
- */
 public class PosterSize {
     public static final String AUTO = "0";
     public static final String SMALL = "1";
     public static final String MED = "2";
     public static final String LARGE = "3";
-
 }

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

@@ -1,4 +1,4 @@
-package org.jellyfin.androidtv.querying;
+package org.jellyfin.androidtv.constant;
 
 public enum QueryType {
     Items,

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

@@ -1,8 +1,5 @@
-package org.jellyfin.androidtv.model;
+package org.jellyfin.androidtv.constant;
 
-/**
- * Created by Eric on 8/22/2015.
- */
 public class ViewType {
     public static final String SMART = "0";
     public static final String GRID = "1";

app/src/main/java/org/jellyfin/androidtv/constants/HomeSectionType.java

@@ -1,28 +0,0 @@
-package org.jellyfin.androidtv.constants;
-
-// Names used in jellyfin-web
-// Only uses those that are configurable in web settings
-public enum HomeSectionType {
-    LATEST_MEDIA("latestmedia"),
-    LIBRARY_TILES_SMALL("smalllibrarytiles"),
-    LIBRARY_BUTTONS("librarybuttons"),
-    RESUME("resume"),
-    RESUME_AUDIO("resumeaudio"),
-    ACTIVE_RECORDINGS("activerecordings"),
-    NEXT_UP("nextup"),
-    LIVE_TV("livetv");
-
-    public static HomeSectionType getByName(String name) {
-        for (HomeSectionType type : HomeSectionType.values()) {
-            if (type.name.equalsIgnoreCase(name)) return type;
-        }
-
-        return null;
-    }
-
-    public final String name;
-
-    HomeSectionType(String name) {
-        this.name = name;
-    }
-}

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

@@ -1,4 +1,4 @@
-package org.jellyfin.androidtv.model.compat;
+package org.jellyfin.androidtv.data.compat;
 
 import java.util.ArrayList;
 
@@ -193,4 +193,4 @@ public class AudioOptions {
 
         return null;
     }
-}
+}

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

@@ -1,4 +1,4 @@
-package org.jellyfin.androidtv.model.compat;
+package org.jellyfin.androidtv.data.compat;
 
 import java.util.Comparator;
 

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

@@ -1,4 +1,4 @@
-package org.jellyfin.androidtv.model.compat;
+package org.jellyfin.androidtv.data.compat;
 
 import java.util.ArrayList;
 import java.util.Comparator;

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

@@ -1,4 +1,4 @@
-package org.jellyfin.androidtv.model.compat;
+package org.jellyfin.androidtv.data.compat;
 
 /**
  * Class DrawingUtils
@@ -7,52 +7,6 @@ package org.jellyfin.androidtv.model.compat;
  */
 @Deprecated
 public final class DrawingUtils {
-    /**
-     * Resizes a set of dimensions
-     *
-     * @param currentWidth  Width of the current.
-     * @param currentHeight Height of the current.
-     * @param scaleFactor   The scale factor.
-     * @return ImageSize.
-     */
-    public static ImageSize Scale(double currentWidth, double currentHeight, double scaleFactor) {
-        ImageSize tempVar = new ImageSize();
-        tempVar.setWidth(currentWidth);
-        tempVar.setHeight(currentHeight);
-        return Scale(tempVar.clone(), scaleFactor);
-    }
-
-    /**
-     * Resizes a set of dimensions
-     *
-     * @param size        The size.
-     * @param scaleFactor The scale factor.
-     * @return ImageSize.
-     */
-    public static ImageSize Scale(ImageSize size, double scaleFactor) {
-        double newWidth = size.getWidth() * scaleFactor;
-
-        return Resize(size.getWidth(), size.getHeight(), newWidth, null, null, null);
-    }
-
-    /**
-     * Resizes a set of dimensions
-     *
-     * @param currentWidth  Width of the current.
-     * @param currentHeight Height of the current.
-     * @param width         The width.
-     * @param height        The height.
-     * @param maxWidth      A max fixed width, if desired
-     * @param maxHeight     A max fixed height, if desired
-     * @return ImageSize.
-     */
-    public static ImageSize Resize(double currentWidth, double currentHeight, Double width, Double height, Double maxWidth, Double maxHeight) {
-        ImageSize tempVar = new ImageSize();
-        tempVar.setWidth(currentWidth);
-        tempVar.setHeight(currentHeight);
-        return Resize(tempVar.clone(), width, height, maxWidth, maxHeight);
-    }
-
     /**
      * Resizes a set of dimensions
      *
@@ -125,4 +79,4 @@ public final class DrawingUtils {
 
         return scaleFactor;
     }
-}
+}

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

@@ -1,7 +1,9 @@
-package org.jellyfin.androidtv.model.compat;
+package org.jellyfin.androidtv.data.compat;
 
 import org.jellyfin.androidtv.util.Utils;
 
+import timber.log.Timber;
+
 /**
  * Struct ImageSize
  *
@@ -41,7 +43,7 @@ public final class ImageSize {
     }
 
     public boolean equals(ImageSize size) {
-        return (new Double(getWidth())).equals(size.getWidth()) && (new Double(getHeight())).equals(size.getHeight());
+        return (Double.valueOf(getWidth())).equals(size.getWidth()) && (Double.valueOf(getHeight())).equals(size.getHeight());
     }
 
     @Override
@@ -73,7 +75,9 @@ public final class ImageSize {
                 try {
                     _width = Double.parseDouble(parts[0]);
                     _height = Double.parseDouble(parts[1]);
-                } catch (NumberFormatException ex) {}
+                } catch (NumberFormatException ex) {
+                    Timber.e(ex, "Could not parse width and height");
+                }
             }
         }
     }

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

@@ -1,4 +1,4 @@
-package org.jellyfin.androidtv.model.compat;
+package org.jellyfin.androidtv.data.compat;
 
 import org.jellyfin.apiclient.model.dlna.PlaybackErrorCode;
 
@@ -13,4 +13,4 @@ public class PlaybackException extends RuntimeException {
     public final void setErrorCode(PlaybackErrorCode value) {
         ErrorCode = value;
     }
-}
+}

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

@@ -1,10 +1,9 @@
-package org.jellyfin.androidtv.model.compat;
+package org.jellyfin.androidtv.data.compat;
 
-import java.util.Arrays;
-
-import org.jellyfin.androidtv.constants.CodecTypes;
-import org.jellyfin.androidtv.constants.MediaTypes;
+import org.jellyfin.androidtv.constant.CodecTypes;
+import org.jellyfin.androidtv.constant.MediaTypes;
 import org.jellyfin.androidtv.util.Utils;
+import org.jellyfin.apiclient.logging.ILogger;
 import org.jellyfin.apiclient.model.dlna.CodecProfile;
 import org.jellyfin.apiclient.model.dlna.CodecType;
 import org.jellyfin.apiclient.model.dlna.ConditionProcessor;
@@ -21,26 +20,22 @@ import org.jellyfin.apiclient.model.dto.MediaSourceInfo;
 import org.jellyfin.apiclient.model.entities.MediaStream;
 import org.jellyfin.apiclient.model.entities.MediaStreamType;
 import org.jellyfin.apiclient.model.extensions.ListHelper;
-import org.jellyfin.apiclient.model.logging.ILogger;
 import org.jellyfin.apiclient.model.mediainfo.MediaProtocol;
 import org.jellyfin.apiclient.model.mediainfo.TransportStreamTimestamp;
 import org.jellyfin.apiclient.model.session.PlayMethod;
 
+import java.util.Arrays;
+
+import timber.log.Timber;
+
 @Deprecated
 public class StreamBuilder
 {
     private ILogger _logger;
-    private ITranscoderSupport _transcoderSupport;
-
-    public StreamBuilder(ITranscoderSupport transcoderSupport, ILogger logger)
-    {
-        _transcoderSupport = transcoderSupport;
-        _logger = logger;
-    }
 
     public StreamBuilder(ILogger logger)
     {
-        this(new FullTranscoderSupport(), logger);
+        _logger = logger;
     }
 
     public final StreamInfo BuildAudioItem(AudioOptions options)
@@ -216,12 +211,8 @@ public class StreamBuilder
         {
             if (i.getType() == playlistItem.getMediaType() && i.getContext() == options.getContext())
             {
-                String tempVar2 = i.getAudioCodec();
-                if (_transcoderSupport.CanEncodeToAudioCodec((tempVar2 != null) ? tempVar2 : i.getContainer()))
-                {
-                    transcodingProfile = i;
-                    break;
-                }
+                transcodingProfile = i;
+                break;
             }
         }
 
@@ -354,7 +345,7 @@ public class StreamBuilder
         {
             String tempVar = options.getProfile().getName();
             String tempVar2 = item.getPath();
-            _logger.Info("Profile: {0}, No direct play profiles found for Path: {1}", (tempVar != null) ? tempVar : "Unknown Profile", (tempVar2 != null) ? tempVar2 : "Unknown path");
+            _logger.info("Profile: {0}, No direct play profiles found for Path: {1}", (tempVar != null) ? tempVar : "Unknown Profile", (tempVar2 != null) ? tempVar2 : "Unknown path");
         }
 
         return playMethods;
@@ -434,7 +425,7 @@ public class StreamBuilder
 
         String tempVar4 = options.getProfile().getName();
         String tempVar5 = item.getPath();
-        _logger.Info("Profile: {0}, Path: {1}, isEligibleForDirectPlay: {2}, isEligibleForDirectStream: {3}", (tempVar4 != null) ? tempVar4 : "Unknown Profile", (tempVar5 != null) ? tempVar5 : "Unknown path", isEligibleForDirectPlay, isEligibleForDirectStream);
+        _logger.info("Profile: {0}, Path: {1}, isEligibleForDirectPlay: {2}, isEligibleForDirectStream: {3}", (tempVar4 != null) ? tempVar4 : "Unknown Profile", (tempVar5 != null) ? tempVar5 : "Unknown path", isEligibleForDirectPlay, isEligibleForDirectStream);
 
         if (isEligibleForDirectPlay || isEligibleForDirectStream)
         {
@@ -500,7 +491,9 @@ public class StreamBuilder
                 try {
                     int transcodingMaxAudioChannels = Integer.parseInt(transcodingProfile.getMaxAudioChannels());
                     playlistItem.setTranscodingMaxAudioChannels(transcodingMaxAudioChannels);
-                } catch (NumberFormatException ignored) {}
+                } catch (NumberFormatException e) {
+                    Timber.e(e);
+                }
             }
             playlistItem.setSubProtocol(transcodingProfile.getProtocol());
             playlistItem.setAudioStreamIndex(audioStreamIndex);
@@ -683,7 +676,7 @@ public class StreamBuilder
         {
             String tempVar = profile.getName();
             String tempVar2 = mediaSource.getPath();
-            _logger.Info("Profile: {0}, Cannot direct stream with no known video stream. Path: {1}", (tempVar != null) ? tempVar : "Unknown Profile", (tempVar2 != null) ? tempVar2 : "Unknown path");
+            _logger.info("Profile: {0}, Cannot direct stream with no known video stream. Path: {1}", (tempVar != null) ? tempVar : "Unknown Profile", (tempVar2 != null) ? tempVar2 : "Unknown path");
 
             return null;
         }
@@ -703,7 +696,7 @@ public class StreamBuilder
         {
             String tempVar3 = profile.getName();
             String tempVar4 = mediaSource.getPath();
-            _logger.Info("Profile: {0}, No direct play profiles found for Path: {1}", (tempVar3 != null) ? tempVar3 : "Unknown Profile", (tempVar4 != null) ? tempVar4 : "Unknown path");
+            _logger.info("Profile: {0}, No direct play profiles found for Path: {1}", (tempVar3 != null) ? tempVar3 : "Unknown Profile", (tempVar4 != null) ? tempVar4 : "Unknown path");
 
             return null;
         }
@@ -764,7 +757,7 @@ public class StreamBuilder
         {
             String tempVar6 = profile.getName();
             String tempVar7 = mediaSource.getPath();
-            _logger.Info("Profile: {0}, DirectPlay=false. Reason=Unknown video codec. Path: {1}", (tempVar6 != null) ? tempVar6 : "Unknown Profile", (tempVar7 != null) ? tempVar7 : "Unknown path");
+            _logger.info("Profile: {0}, DirectPlay=false. Reason=Unknown video codec. Path: {1}", (tempVar6 != null) ? tempVar6 : "Unknown Profile", (tempVar7 != null) ? tempVar7 : "Unknown path");
 
             return null;
         }
@@ -813,7 +806,7 @@ public class StreamBuilder
             {
                 String tempVar8 = profile.getName();
                 String tempVar9 = mediaSource.getPath();
-                _logger.Info("Profile: {0}, DirectPlay=false. Reason=Unknown audio codec. Path: {1}", (tempVar8 != null) ? tempVar8 : "Unknown Profile", (tempVar9 != null) ? tempVar9 : "Unknown path");
+                _logger.info("Profile: {0}, DirectPlay=false. Reason=Unknown audio codec. Path: {1}", (tempVar8 != null) ? tempVar8 : "Unknown Profile", (tempVar9 != null) ? tempVar9 : "Unknown path");
 
                 return null;
             }
@@ -870,7 +863,7 @@ public class StreamBuilder
         String tempVar = profile.getName();
         String tempVar2 = condition.getValue();
         String tempVar3 = mediaSource.getPath();
-        _logger.Info("Profile: {0}, DirectPlay=false. Reason={1}.{2} Condition: {3}. ConditionValue: {4}. IsRequired: {5}. Path: {6}", type, (tempVar != null) ? tempVar : "Unknown Profile", condition.getProperty(), condition.getCondition(), (tempVar2 != null) ? tempVar2 : "", condition.getIsRequired(), (tempVar3 != null) ? tempVar3 : "Unknown path");
+        _logger.info("Profile: {0}, DirectPlay=false. Reason={1}.{2} Condition: {3}. ConditionValue: {4}. IsRequired: {5}. Path: {6}", type, (tempVar != null) ? tempVar : "Unknown Profile", condition.getProperty(), condition.getCondition(), (tempVar2 != null) ? tempVar2 : "", condition.getIsRequired(), (tempVar3 != null) ? tempVar3 : "Unknown path");
     }
 
     private boolean IsEligibleForDirectPlay(MediaSourceInfo item, Integer maxBitrate, MediaStream subtitleStream, VideoOptions options, PlayMethod playMethod)
@@ -881,7 +874,7 @@ public class StreamBuilder
 
             if (subtitleProfile.getMethod() != SubtitleDeliveryMethod.External && subtitleProfile.getMethod() != SubtitleDeliveryMethod.Embed)
             {
-                _logger.Info("Not eligible for {0} due to unsupported subtitles", playMethod);
+                _logger.info("Not eligible for {0} due to unsupported subtitles", playMethod);
                 return false;
             }
         }
@@ -969,19 +962,19 @@ public class StreamBuilder
     {
         if (maxBitrate == null)
         {
-            _logger.Info("Cannot direct play due to unknown supported bitrate");
+            _logger.info("Cannot direct play due to unknown supported bitrate");
             return false;
         }
 
         if (item.getBitrate() == null)
         {
-            _logger.Info("Cannot direct play due to unknown content bitrate");
+            _logger.info("Cannot direct play due to unknown content bitrate");
             return false;
         }
 
         if (item.getBitrate() > maxBitrate)
         {
-            _logger.Info("Bitrate exceeds DirectPlay limit");
+            _logger.info("Bitrate exceeds DirectPlay limit");
             return false;
         }
 
@@ -1047,7 +1040,9 @@ public class StreamBuilder
                     try {
                         int num = Integer.parseInt(value);
                         item.setAudioBitrate(num);
-                    } catch (NumberFormatException ignored) {}
+                    } catch (NumberFormatException e) {
+                        Timber.e(e);
+                    }
                     break;
                 }
                 case AudioChannels:
@@ -1055,7 +1050,9 @@ public class StreamBuilder
                     try {
                         int num = Integer.parseInt(value);
                         item.setMaxAudioChannels(num);
-                    } catch (NumberFormatException ignored) {}
+                    } catch (NumberFormatException e) {
+                        Timber.e(e);
+                    }
                     break;
                 }
                 case IsAnamorphic:
@@ -1075,7 +1072,9 @@ public class StreamBuilder
                     try {
                         int num = Integer.parseInt(value);
                         item.setMaxRefFrames(num);
-                    } catch (NumberFormatException ignored) {}
+                    } catch (NumberFormatException e) {
+                        Timber.e(e);
+                    }
                     break;
                 }
                 case VideoBitDepth:
@@ -1083,7 +1082,9 @@ public class StreamBuilder
                     try {
                         int num = Integer.parseInt(value);
                         item.setMaxVideoBitDepth(num);
-                    } catch (NumberFormatException ignored) {}
+                    } catch (NumberFormatException e) {
+                        Timber.e(e);
+                    }
                     break;
                 }
                 case VideoProfile:
@@ -1096,7 +1097,9 @@ public class StreamBuilder
                     try {
                         int num = Integer.parseInt(value);
                         item.setMaxHeight(num);
-                    } catch (NumberFormatException ignored) {}
+                    } catch (NumberFormatException e) {
+                        Timber.e(e);
+                    }
                     break;
                 }
                 case VideoBitrate:
@@ -1104,7 +1107,9 @@ public class StreamBuilder
                     try {
                         int num = Integer.parseInt(value);
                         item.setVideoBitrate(num);
-                    } catch (NumberFormatException ignored) {}
+                    } catch (NumberFormatException e) {
+                        Timber.e(e);
+                    }
                     break;
                 }
                 case VideoFramerate:
@@ -1112,7 +1117,9 @@ public class StreamBuilder
                     try {
                         float num = Float.parseFloat(value);
                         item.setMaxFramerate(num);
-                    } catch (NumberFormatException ignored) {}
+                    } catch (NumberFormatException e) {
+                        Timber.e(e);
+                    }
                     break;
                 }
                 case VideoLevel:
@@ -1120,7 +1127,9 @@ public class StreamBuilder
                     try {
                         int num = Integer.parseInt(value);
                         item.setVideoLevel(num);
-                    } catch (NumberFormatException ignored) {}
+                    } catch (NumberFormatException e) {
+                        Timber.e(e);
+                    }
                     break;
                 }
                 case Width:
@@ -1128,7 +1137,9 @@ public class StreamBuilder
                     try {
                         int num = Integer.parseInt(value);
                         item.setMaxWidth(num);
-                    } catch (NumberFormatException ignored) {}
+                    } catch (NumberFormatException e) {
+                        Timber.e(e);
+                    }
                     break;
                 }
             }
@@ -1219,4 +1230,4 @@ public class StreamBuilder
 
         return true;
     }
-}
+}

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

@@ -1,7 +1,7 @@
-package org.jellyfin.androidtv.model.compat;
+package org.jellyfin.androidtv.data.compat;
 
-import org.jellyfin.androidtv.constants.ContainerTypes;
-import org.jellyfin.androidtv.constants.MediaTypes;
+import org.jellyfin.androidtv.constant.ContainerTypes;
+import org.jellyfin.androidtv.constant.MediaTypes;
 import org.jellyfin.androidtv.util.Utils;
 
 import java.util.ArrayList;
@@ -922,4 +922,4 @@ public class StreamInfo {
 
         return list;
     }
-}
+}

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

@@ -1,4 +1,4 @@
-package org.jellyfin.androidtv.model.compat;
+package org.jellyfin.androidtv.data.compat;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -17,4 +17,4 @@ public class StreamInfoSorter
         Collections.sort(streams, comparator);
         return streams;
     }
-}
+}

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

@@ -1,4 +1,4 @@
-package org.jellyfin.androidtv.model.compat;
+package org.jellyfin.androidtv.data.compat;
 
 import org.jellyfin.apiclient.model.mediainfo.MediaProtocol;
 import org.jellyfin.apiclient.model.session.PlayMethod;
@@ -44,4 +44,4 @@ public class StreamInfoSorterComparator extends BaseStreamInfoSorter {
 
         throw new IllegalArgumentException("Unrecognized level");
     }
-}
+}

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

@@ -1,4 +1,4 @@
-package org.jellyfin.androidtv.model.compat;
+package org.jellyfin.androidtv.data.compat;
 
 import org.jellyfin.apiclient.model.dlna.SubtitleDeliveryMethod;
 
@@ -93,4 +93,4 @@ public class SubtitleStreamInfo {
     public final void setIsExternalUrl(boolean value) {
         IsExternalUrl = value;
     }
-}
+}

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

@@ -1,4 +1,4 @@
-package org.jellyfin.androidtv.model.compat;
+package org.jellyfin.androidtv.data.compat;
 
 /**
  * Class VideoOptions.
@@ -25,4 +25,4 @@ public class VideoOptions extends AudioOptions {
     public final void setSubtitleStreamIndex(Integer value) {
         SubtitleStreamIndex = value;
     }
-}
+}

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

@@ -1,20 +1,25 @@
-package org.jellyfin.androidtv.eventhandling;
+package org.jellyfin.androidtv.data.eventhandling;
 
+import static org.koin.java.KoinJavaComponent.get;
+
+import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
+import android.os.Handler;
+import android.widget.Toast;
 
 import org.jellyfin.androidtv.R;
 import org.jellyfin.androidtv.TvApp;
-import org.jellyfin.androidtv.itemhandling.BaseRowItem;
-import org.jellyfin.androidtv.itemhandling.ItemLauncher;
-import org.jellyfin.androidtv.playback.MediaManager;
-import org.jellyfin.androidtv.querying.StdItemQuery;
+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 java.util.Arrays;
-import java.util.Calendar;
-
 import org.jellyfin.apiclient.interaction.ApiClient;
 import org.jellyfin.apiclient.interaction.ApiEventListener;
 import org.jellyfin.apiclient.interaction.Response;
@@ -23,29 +28,37 @@ 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.GeneralCommand;
+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;
 
-/**
- * Created by Eric on 2/14/2015.
- */
+import java.util.Arrays;
+
+import timber.log.Timber;
+
 public class TvApiEventListener extends ApiEventListener {
+    private final DataRefreshService dataRefreshService;
+    private final MediaManager mediaManager;
+
+    public TvApiEventListener(DataRefreshService dataRefreshService, MediaManager mediaManager) {
+        this.dataRefreshService = dataRefreshService;
+        this.mediaManager = mediaManager;
+    }
 
     @Override
     public void onPlaybackStopped(ApiClient client, SessionInfoDto info) {
         TvApp app = TvApp.getApplication();
-        app.getLogger().Debug("Got Playback stopped message from server");
+        Timber.d("Got Playback stopped message from server");
         if (info.getUserId().equals(app.getCurrentUser().getId())) {
-            app.setLastPlayback(Calendar.getInstance());
+            dataRefreshService.setLastPlayback(System.currentTimeMillis());
             if (info.getNowPlayingItem() == null) return;
             switch (info.getNowPlayingItem().getType()) {
                 case "Movie":
-                    TvApp.getApplication().setLastMoviePlayback(Calendar.getInstance());
+                    dataRefreshService.setLastMoviePlayback(System.currentTimeMillis());
                     break;
                 case "Episode":
-                    TvApp.getApplication().setLastTvPlayback(Calendar.getInstance());
+                    dataRefreshService.setLastTvPlayback(System.currentTimeMillis());
                     break;
 
             }
@@ -54,63 +67,74 @@ public class TvApiEventListener extends ApiEventListener {
 
     @Override
     public void onLibraryChanged(ApiClient client, LibraryUpdateInfo info) {
-        TvApp.getApplication().getLogger().Debug("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) TvApp.getApplication().setLastLibraryChange(Calendar.getInstance());
-    }
-
-    @Override
-    public void onGeneralCommand(ApiClient client, GeneralCommand command) {
-        TvApp.getApplication().getLogger().Info("General command is: "+command.getName());
-        switch (command.getName().toLowerCase()) {
-            case "mute":
-                TvApp.getApplication().setAudioMuted(true);
-                break;
-            case "unmute":
-                TvApp.getApplication().setAudioMuted(false);
-                break;
-            case "togglemute":
-                TvApp.getApplication().setAudioMuted(!TvApp.getApplication().isAudioMuted());
-                break;
-        }
+        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) {
-        switch (command.getCommand()) {
+        PlaybackController playbackController = TvApp.getApplication().getPlaybackController();
 
+        switch (command.getCommand()) {
             case Stop:
-                TvApp.getApplication().stopPlayback();
+                if (mediaManager.isPlayingAudio())
+                    mediaManager.stopAudio();
+                else {
+                    Activity currentActivity = TvApp.getApplication().getCurrentActivity();
+
+                    if(currentActivity instanceof PlaybackOverlayActivity)
+                        currentActivity.finish();
+                }
                 break;
             case Pause:
-                TvApp.getApplication().pausePlayback();
+                if (mediaManager.isPlayingAudio())
+                    mediaManager.pauseAudio();
+                else if(playbackController != null)
+                    playbackController.playPause();
                 break;
             case Unpause:
-                TvApp.getApplication().unPausePlayback();
+                if (mediaManager.hasAudioQueueItems())
+                    mediaManager.resumeAudio();
+                else if(playbackController != null)
+                    playbackController.playPause();
                 break;
             case NextTrack:
-                TvApp.getApplication().playbackNext();
+                if (mediaManager.hasAudioQueueItems())
+                    mediaManager.nextAudioItem();
+                else if(playbackController != null)
+                    playbackController.next();
                 break;
             case PreviousTrack:
-                TvApp.getApplication().playbackPrev();
+                if (mediaManager.hasAudioQueueItems())
+                    mediaManager.prevAudioItem();
+                else if(playbackController != null)
+                    playbackController.prev();
                 break;
             case Seek:
-                Long pos = command.getSeekPositionTicks() / 10000;
-                TvApp.getApplication().playbackSeek(pos.intValue());
+                if (playbackController == null) break;
+
+                long pos = command.getSeekPositionTicks() / 10000;
+                playbackController.seek(pos);
                 break;
             case Rewind:
-                TvApp.getApplication().playbackJumpBack();
+                if (playbackController == null) break;
+
+                playbackController.skip(-11000);
                 break;
             case FastForward:
-                TvApp.getApplication().playbackJump();
+                if (playbackController == null) break;
+
+                playbackController.skip(30000);
                 break;
         }
     }
 
     @Override
     public void onBrowseCommand(ApiClient client, BrowseRequest command) {
-        TvApp.getApplication().getLogger().Debug("Browse command received");
+        Timber.d("Browse command received");
         if (TvApp.getApplication().getCurrentActivity() == null || videoPlaying()) {
-            TvApp.getApplication().getLogger().Info("Command ignored due to no activity or playback in progress");
+            Timber.i("Command ignored due to no activity or playback in progress");
             return;
         }
         client.GetItemAsync(command.getItemId(), TvApp.getApplication().getCurrentUser().getId(), new Response<BaseItemDto>() {
@@ -139,26 +163,33 @@ public class TvApiEventListener extends ApiEventListener {
         }
 
         if (command.getItemIds().length > 1) {
-            TvApp.getApplication().getLogger().Info("Playing multiple items by remote request");
+            Timber.i("Playing multiple items by remote request");
             if (TvApp.getApplication().getCurrentActivity() == null) {
-                TvApp.getApplication().getLogger().Error("No current activity.  Cannot play");
+                Timber.e("No current activity.  Cannot play");
                 return;
             }
-            StdItemQuery query = new StdItemQuery(new ItemFields[] {ItemFields.MediaSources});
+            StdItemQuery query = new StdItemQuery(new ItemFields[]{
+                    ItemFields.MediaSources,
+                    ItemFields.ChildCount
+            });
             query.setIds(command.getItemIds());
-            TvApp.getApplication().getApiClient().GetItemsAsync(query, new Response<ItemsResult>() {
+            get(ApiClient.class).GetItemsAsync(query, new Response<ItemsResult>() {
                 @Override
                 public void onResponse(ItemsResult response) {
                     if (response.getItems() != null && response.getItems().length > 0) {
+                        PlaybackLauncher 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":
-                                MediaManager.setCurrentVideoQueue(Arrays.asList(response.getItems()));
-                                Intent intent = new Intent(TvApp.getApplication().getCurrentActivity(), TvApp.getApplication().getPlaybackActivityClass(response.getItems()[0].getBaseItemType()));
+                                Class activity = get(PlaybackLauncher.class).getPlaybackActivityClass(response.getItems()[0].getBaseItemType());
+                                mediaManager.setCurrentVideoQueue(Arrays.asList(response.getItems()));
+                                Intent intent = new Intent(TvApp.getApplication().getCurrentActivity(), activity);
                                 TvApp.getApplication().getCurrentActivity().startActivity(intent);
                                 break;
                             case "Audio":
-                                MediaManager.playNow(Arrays.asList(response.getItems()));
+                                mediaManager.playNow(Arrays.asList(response.getItems()));
                                 break;
 
                         }
@@ -168,10 +199,15 @@ public class TvApiEventListener extends ApiEventListener {
 
         } else {
             if (command.getItemIds().length > 0) {
-                TvApp.getApplication().getLogger().Info("Playing single item by remote request");
+                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() != null ? command.getStartPositionTicks() : 0, 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/ChapterItemInfo.java

@@ -1,10 +1,7 @@
-package org.jellyfin.androidtv.model;
+package org.jellyfin.androidtv.data.model;
 
 import org.jellyfin.apiclient.model.entities.ChapterInfo;
 
-/**
- * Created by Eric on 2/12/2015.
- */
 public class ChapterItemInfo extends ChapterInfo {
     private String itemId;
 

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

@@ -0,0 +1,12 @@
+package org.jellyfin.androidtv.data.model
+
+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
+}

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

@@ -1,13 +1,11 @@
-package org.jellyfin.androidtv.details;
-
-import org.jellyfin.androidtv.TvApp;
+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;
 
-/**
- * Created by Eric on 3/23/2015.
- */
+import timber.log.Timber;
+
 public class DetailItemLoadResponse extends Response<BaseItemDto> {
     private FullDetailsActivity activity;
 
@@ -22,6 +20,6 @@ public class DetailItemLoadResponse extends Response<BaseItemDto> {
 
     @Override
     public void onError(Exception exception) {
-        TvApp.getApplication().getLogger().ErrorException("Error retrieving full object", exception);
+        Timber.e(exception, "Error retrieving full object");
     }
 }

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

@@ -1,4 +1,4 @@
-package org.jellyfin.androidtv.model;
+package org.jellyfin.androidtv.data.model;
 
 import java.util.ArrayList;
 import java.util.List;

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

@@ -1,10 +1,7 @@
-package org.jellyfin.androidtv.model;
+package org.jellyfin.androidtv.data.model;
 
 import android.view.View;
 
-/**
- * Created by Eric on 12/5/2015.
- */
 public class GotFocusEvent {
     public void gotFocus(View v) {}
 }

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

@@ -1,15 +1,11 @@
-package org.jellyfin.androidtv.model;
-
-/**
- * Created by spam on 9/29/2016.
- */
+package org.jellyfin.androidtv.data.model;
 
 public class InfoItem {
     private String label;
     private String value;
 
     public InfoItem() {
-        this("","");
+        this("", "");
     }
 
     public InfoItem(String label, String value) {