Translated using Weblate (Finnish)

Currently translated at 98.3% (478 of 486 strings)

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

.editorconfig

@@ -2,8 +2,16 @@ root = true
 
 [*]
 insert_final_newline = true
+trim_trailing_whitespace = true
 
 [{*.kts, *.kt}]
 charset = utf-8
 indent_style = tab
 tab_width = 4
+# Disable wildcard imports in IntelliJ/Android Studio
+ij_kotlin_name_count_to_use_star_import = 1000
+ij_kotlin_name_count_to_use_star_import_for_members = 1000
+ij_kotlin_packages_to_use_import_on_demand =
+
+[*.md]
+trim_trailing_whitespace = false

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

@@ -0,0 +1,83 @@
+name: Media playback bug report
+description: Create a bug report related to media playback
+labels:
+  - bug
+  - playback
+body:
+  - type: textarea
+    id: description
+    attributes:
+      label: Describe the bug
+      description: |
+        A clear and concise description of the bug, including steps to reproduce it and the normally expected behavior.
+        You can also attach screenshots or screen recordings to help explain your issue.
+      placeholder: |
+        1. Go to …
+        2. Click on …
+        3. Scroll down to …
+        4. See error / the app crashes
+
+        Instead, I expect …
+    validations:
+      required: true
+  - type: textarea
+    id: logs
+    attributes:
+      label: Logs
+      description: |
+        Please paste your client logs (logcat) here, *NOT* server logs (in most cases).
+        Learn how to capture those logcats [here](https://wiki.lineageos.org/logcat.html).
+        Make sure that they don't contain any sensitive information like server URL, auth tokens or passwords.
+      placeholder: Paste logs…
+      render: shell
+  - type: textarea
+    id: logs-ffmpeg
+    attributes:
+      label: FFmpeg logs
+      description: |
+        Please paste your FFmpeg logs here. You can find these by going to the dashboard of your Jellyfin server.
+      placeholder: Paste logs…
+      render: shell
+  - type: textarea
+    id: mediainfo
+    attributes:
+      label: Media info of the file
+      description: |
+        Please share the media information for the file causing issues. You can use a variety of tools to retrieve this information.
+        - Use ffprobe (`ffprobe ./file.mp4`)
+        - Use the Media Info tool (set to text format, download here: https://mediaarea.net/en/MediaInfo)
+        - Copy the media info from the web interface
+      placeholder: Paste media info…
+      render: shell
+  - type: input
+    id: app-version
+    attributes:
+      label: Application version
+      description: The version of the installed Jellyfin Android TV app.
+      placeholder: 0.12.0
+    validations:
+      required: true
+  - type: input
+    id: device-info
+    attributes:
+      label: Device information
+      description: Manufacturer and model
+      placeholder: Nvidia Shield Pro (2017), Amazon Fire TV Stick v1 (2014)
+    validations:
+      required: true
+  - type: input
+    id: android-version
+    attributes:
+      label: Android version
+      description: Version of the OS and other information (e.g. custom ROM / OEM skin)
+      placeholder: Android 9, Fire OS 7 
+    validations:
+      required: true
+  - type: input
+    id: server-version
+    attributes:
+      label: Jellyfin server version
+      description: If on unstable, please specify the commit hash.
+      placeholder: 10.7.7
+    validations:
+      required: true

.github/ISSUE_TEMPLATE/bug-report.yaml

@@ -0,0 +1,72 @@
+name: Bug report
+description: Create a bug report
+labels:
+  - bug
+body:
+  - type: textarea
+    id: description
+    attributes:
+      label: Describe the bug
+      description: |
+        A clear and concise description of the bug, including steps to reproduce it and the normally expected behavior.
+        You can also attach screenshots or screen recordings to help explain your issue.
+      placeholder: |
+        1. Go to …
+        2. Click on …
+        3. Scroll down to …
+        4. See error / the app crashes
+
+        Instead, I expect …
+    validations:
+      required: true
+  - type: textarea
+    id: logs
+    attributes:
+      label: Logs
+      description: |
+        Please paste your client logs (logcat) here, *NOT* server logs (in most cases).
+        Learn how to capture those logcats [here](https://wiki.lineageos.org/logcat.html).
+        Make sure that they don't contain any sensitive information like server URL, auth tokens or passwords.
+      placeholder: Paste logs…
+      render: shell
+  - type: input
+    id: app-version
+    attributes:
+      label: Application version
+      description: The version of the installed Jellyfin Android TV app.
+      placeholder: 0.12.0
+    validations:
+      required: true
+  - type: dropdown
+    id: installation-source
+    attributes:
+      label: Where did you install the app from?
+      description: Choose the appropriate app store or installation method.
+      options:
+        - Google Play
+        - Amazon Appstore
+        - Sideloaded APK
+  - type: input
+    id: device-info
+    attributes:
+      label: Device information
+      description: Manufacturer and model
+      placeholder: Nvidia Shield Pro (2017), Amazon Fire TV Stick v1 (2014)
+    validations:
+      required: true
+  - type: input
+    id: android-version
+    attributes:
+      label: Android version
+      description: Version of the OS and other information (e.g. custom ROM / OEM skin)
+      placeholder: Android 9, Fire OS 7
+    validations:
+      required: true
+  - type: input
+    id: server-version
+    attributes:
+      label: Jellyfin server version
+      description: If on unstable, please specify the commit hash.
+      placeholder: 10.7.7
+    validations:
+      required: true

.github/ISSUE_TEMPLATE/bug_report.md

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

@@ -1,4 +1,4 @@
-blank_issues_enabled: true
+blank_issues_enabled: false
 contact_links:
   - name: Jellyfin documentation
     url:  https://jellyfin.org/docs/general/getting-help.html

.github/ISSUE_TEMPLATE/feature-request.yaml

@@ -0,0 +1,14 @@
+name: Feature request
+description: Request a new feature
+labels:
+  - enhancement
+body:
+  - type: textarea
+    id: description
+    attributes:
+      label: Describe the feature you'd like
+      description: |
+        A clear and concise description of what you want to request.
+        You can also attach screenshots or screen recordings to help explain your request.
+    validations:
+      required: true

.github/ISSUE_TEMPLATE/feature_request.md

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

@@ -1,29 +0,0 @@
----
-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/stale.yml

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

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Setup Java
         uses: actions/setup-java@v2
         with:

.github/workflows/app-lint.yaml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Setup Java
         uses: actions/setup-java@v2
         with:

.github/workflows/app-publish.yaml

@@ -11,7 +11,7 @@ jobs:
     if: ${{ github.repository == 'jellyfin/jellyfin-androidtv' }}
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Setup Java
         uses: actions/setup-java@v2
         with:
@@ -20,9 +20,9 @@ jobs:
       - 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
+        run: ./gradlew --no-daemon --info assemble bundleRelease versionTxt
+      - name: Sign APK
+        id: signApk
         uses: r0adkll/sign-android-release@v1
         with:
           releaseDirectory: app/build/outputs/apk/release
@@ -30,12 +30,22 @@ jobs:
           keyStorePassword: ${{ secrets.KEYSTORE_PASSWORD }}
           alias: ${{ secrets.KEY_ALIAS }}
           keyPassword: ${{ secrets.KEY_PASSWORD }}
+      - name: Sign AAB
+        id: signAab
+        uses: r0adkll/sign-android-release@v1
+        with:
+          releaseDirectory: app/build/outputs/bundle/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 ${{ steps.signApk.outputs.signedReleaseFile }} build/jellyfin-publish/jellyfin-androidtv-v${{ env.JELLYFIN_VERSION }}-release.apk
+          mv ${{ steps.signAab.outputs.signedReleaseFile }} build/jellyfin-publish/jellyfin-androidtv-v${{ env.JELLYFIN_VERSION }}-release.aab
           mv app/build/version.txt build/jellyfin-publish/
       - name: Upload release archive to GitHub release
         uses: alexellis/upload-assets@0.3.0
@@ -44,7 +54,7 @@ jobs:
         with:
           asset_paths: '["build/jellyfin-publish/*"]'
       - name: Upload release archive to repo.jellyfin.org
-        uses: burnett01/rsync-deployments@5.1
+        uses: burnett01/rsync-deployments@5.2
         with:
           switches: -vrptz
           path: build/jellyfin-publish/

.github/workflows/app-test.yaml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Setup Java
         uses: actions/setup-java@v2
         with:

.github/workflows/gradlew-update.yaml

@@ -6,11 +6,11 @@ on:
 
 jobs:
   update:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     if: github.repository == 'jellyfin/jellyfin-androidtv'
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Update Gradle Wrapper
         uses: gradle-update/update-gradle-wrapper-action@v1
         with:

.github/workflows/gradlew-validate.yaml

@@ -10,9 +10,9 @@ on:
 
 jobs:
   validate:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Validate Gradle Wrapper
         uses: gradle/wrapper-validation-action@v1

.github/workflows/repo-stale.yaml

@@ -0,0 +1,31 @@
+name: Issue stale check
+
+on:
+  schedule:
+    - cron: '30 3 * * *'
+  workflow_dispatch:
+
+permissions:
+  issues: write
+  pull-requests: write
+
+jobs:
+  stale:
+    runs-on: ubuntu-20.04
+    if: github.repository == 'jellyfin/jellyfin-androidtv'
+    steps:
+      - uses: actions/stale@v5
+        with:
+          repo-token: ${{ secrets.JF_BOT_TOKEN }}
+          days-before-stale: 120
+          days-before-pr-stale: -1
+          days-before-close: 21
+          days-before-pr-close: -1
+          exempt-issue-labels: enhancement,confirmed
+          stale-issue-label: stale
+          stale-issue-message: |-
+            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).

app/build.gradle.kts

@@ -1,19 +1,21 @@
 plugins {
 	id("com.android.application")
 	kotlin("android")
-	kotlin("plugin.serialization") version Plugins.Versions.kotlin
 	kotlin("kapt")
+	alias(libs.plugins.kotlin.serialization)
+	alias(libs.plugins.aboutlibraries)
 }
 
 android {
-	compileSdkVersion(30)
+	namespace = "org.jellyfin.androidtv"
+	compileSdk = 31
 
 	defaultConfig {
-		// Android version targets
-		minSdkVersion(21)
-		targetSdkVersion(30)
+		minSdk = 21
+		targetSdk = 31
 
 		// Release version
+		applicationId = namespace
 		versionName = project.getVersionName()
 		versionCode = getVersionCode(versionName!!)
 		setProperty("archivesBaseName", "jellyfin-androidtv-v$versionName")
@@ -34,8 +36,10 @@ android {
 		val release by getting {
 			isMinifyEnabled = false
 
-			// Add applicationId as string for XML resources
-			resValue("string", "app_id", "org.jellyfin.androidtv")
+			// Set package names used in various XML files
+			resValue("string", "app_id", namespace!!)
+			resValue("string", "app_search_suggest_authority", "${namespace}.content")
+			resValue("string", "app_search_suggest_intent_data", "content://${namespace}.content/intent")
 
 			// Set flavored application name
 			resValue("string", "app_name", "@string/app_name_release")
@@ -47,8 +51,10 @@ android {
 			// 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 package names used in various XML files
+			resValue("string", "app_id", namespace + applicationIdSuffix)
+			resValue("string", "app_search_suggest_authority", "${namespace + applicationIdSuffix}.content")
+			resValue("string", "app_search_suggest_intent_data", "content://${namespace + applicationIdSuffix}.content/intent")
 
 			// Set flavored application name
 			resValue("string", "app_name", "@string/app_name_debug")
@@ -57,10 +63,15 @@ android {
 		}
 	}
 
-	lintOptions {
+	lint {
 		lintConfig = file("$rootDir/android-lint.xml")
-		isAbortOnError = false
+		abortOnError = false
 		sarifReport = true
+		checkDependencies = true
+	}
+
+	testOptions.unitTests.all {
+		it.useJUnitPlatform()
 	}
 }
 
@@ -107,6 +118,7 @@ dependencies {
 	implementation(libs.bundles.androidx.lifecycle)
 	implementation(libs.androidx.window)
 	implementation(libs.androidx.cardview)
+	implementation(libs.androidx.startup)
 
 	// Dependency Injection
 	implementation(libs.bundles.koin)
@@ -116,6 +128,7 @@ dependencies {
 
 	// Media players
 	implementation(libs.exoplayer)
+	implementation(libs.jellyfin.exoplayer.ffmpegextension)
 	implementation(libs.libvlc)
 
 	// Image utility
@@ -126,9 +139,12 @@ dependencies {
 	// Crash Reporting
 	implementation(libs.bundles.acra)
 
+	// Licenses
+	implementation(libs.aboutlibraries)
+
 	// Logging
 	implementation(libs.timber)
-	implementation(libs.slf4j.android)
+	implementation(libs.slf4j.timber)
 
 	// Debugging
 	if (getProperty("leakcanary.enable")?.toBoolean() == true)
@@ -138,6 +154,7 @@ dependencies {
 	coreLibraryDesugaring(libs.android.desugar)
 
 	// Testing
-	testImplementation(libs.junit)
-	testImplementation(libs.mockito)
+	testImplementation(libs.kotest.runner.junit5)
+	testImplementation(libs.kotest.assertions)
+	testImplementation(libs.mockk)
 }

app/src/main/AndroidManifest.xml

@@ -59,26 +59,61 @@
                 android:resource="@xml/authenticator" />
         </service>
 
-        <receiver android:name=".util.RemoteControlReceiver">
+        <service
+            android:name=".integration.dream.LibraryDreamService"
+            android:exported="true"
+            android:permission="android.permission.BIND_DREAM_SERVICE">
+
             <intent-filter>
-                <action android:name="android.intent.action.MEDIA_BUTTON" />
+                <action android:name="android.service.dreams.DreamService" />
+                <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
-        </receiver>
+        </service>
+
+        <provider
+            android:name="androidx.startup.InitializationProvider"
+            android:authorities="${applicationId}.androidx-startup"
+            android:exported="false"
+            android:initOrder="1000"
+            tools:node="merge">
+            <meta-data
+                android:name="org.jellyfin.androidtv.LogInitializer"
+                android:value="androidx.startup" />
+            <meta-data
+                android:name="org.jellyfin.androidtv.di.KoinInitializer"
+                android:value="androidx.startup" />
+            <meta-data
+                android:name="org.jellyfin.androidtv.SessionInitializer"
+                android:value="androidx.startup" />
+        </provider>
+
+        <provider
+            android:name=".integration.MediaContentProvider"
+            android:authorities="${applicationId}.content"
+            android:exported="true"
+            android:initOrder="10" />
 
         <activity
             android:name=".ui.browsing.MainActivity"
             android:screenOrientation="landscape" />
+
         <activity
             android:name=".ui.startup.StartupActivity"
+            android:exported="true"
             android:noHistory="true"
             android:screenOrientation="landscape"
             android:windowSoftInputMode="adjustResize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.intent.action.SEARCH" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
                 <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
             </intent-filter>
+
+            <meta-data
+                android:name="android.app.searchable"
+                android:resource="@xml/searchable" />
         </activity>
 
         <activity-alias
@@ -102,11 +137,7 @@
             android:screenOrientation="landscape" />
 
         <activity
-            android:name=".ui.browsing.ByLetterActivity"
-            android:screenOrientation="landscape" />
-
-        <activity
-            android:name=".ui.browsing.ByGenreActivity"
+            android:name=".ui.browsing.GroupedItemsActivity"
             android:screenOrientation="landscape" />
 
         <activity
@@ -117,17 +148,9 @@
             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>
+            android:screenOrientation="landscape" />
 
         <activity
             android:name=".ui.itemdetail.FullDetailsActivity"

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

@@ -1,13 +1,18 @@
 package org.jellyfin.androidtv
 
 import android.content.Context
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.LifecycleObserver
-import androidx.lifecycle.OnLifecycleEvent
+import androidx.lifecycle.DefaultLifecycleObserver
+import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.ProcessLifecycleOwner
-import androidx.work.*
+import androidx.work.BackoffPolicy
+import androidx.work.ExistingPeriodicWorkPolicy
+import androidx.work.PeriodicWorkRequestBuilder
+import androidx.work.WorkManager
+import androidx.work.await
+import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
 import org.acra.config.dialog
 import org.acra.config.httpSender
 import org.acra.config.limiter
@@ -15,78 +20,44 @@ 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)
+class JellyfinApplication : TvApp() {
 	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)
+		// Register application lifecycle events
+		ProcessLifecycleOwner.get().lifecycle.addObserver(object : DefaultLifecycleObserver {
+			/**
+			 * Called by the Process Lifecycle when the app is created. It is called after [onCreate].
+			 */
+			override fun onCreate(owner: LifecycleOwner) {
+				// Register activity lifecycle callbacks
+				getKoin().getAll<ActivityLifecycleCallbacks>().forEach(::registerActivityLifecycleCallbacks)
 			}
-		}
 
-		// Initialize the logging library
-		Timber.plant(DebugTree())
-		Timber.i("Application object created")
+			/**
+			 * Called by the Process Lifecycle when the app is activated in the foreground (activity opened).
+			 */
+			override fun onStart(owner: LifecycleOwner) {
+				Timber.i("Process lifecycle started")
 
-		// 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()
+				get<SessionRepository>().restoreDefaultSession()
+			}
+		})
 	}
 
 	/**
 	 * Called from the StartupActivity when the user session is started.
 	 */
+	@DelicateCoroutinesApi
 	suspend fun onSessionStart() {
 		val workManager by inject<WorkManager>()
 		val autoBitrate by inject<AutoBitrate>()
@@ -104,9 +75,7 @@ class JellyfinApplication : TvApp(), LifecycleObserver {
 		).await()
 
 		// Detect auto bitrate
-		withContext(Dispatchers.IO) {
-			autoBitrate.detect()
-		}
+		GlobalScope.launch(Dispatchers.IO) { autoBitrate.detect() }
 	}
 
 	override fun attachBaseContext(base: Context?) {

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

@@ -0,0 +1,28 @@
+package org.jellyfin.androidtv
+
+import android.content.Context
+import androidx.startup.Initializer
+import timber.log.Timber
+
+class LogInitializer : Initializer<Unit> {
+	override fun create(context: Context) {
+		// 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(Timber.DebugTree())
+		Timber.i("Debug tree planted")
+	}
+
+	override fun dependencies() = emptyList<Class<out Initializer<*>>>()
+}

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

@@ -0,0 +1,21 @@
+package org.jellyfin.androidtv
+
+import android.content.Context
+import androidx.startup.AppInitializer
+import androidx.startup.Initializer
+import org.jellyfin.androidtv.auth.SessionRepository
+import org.jellyfin.androidtv.di.KoinInitializer
+
+@Suppress("unused")
+class SessionInitializer : Initializer<Unit> {
+	override fun create(context: Context) {
+		val koin = AppInitializer.getInstance(context)
+			.initializeComponent(KoinInitializer::class.java)
+			.koin
+
+		// Restore system session
+		koin.get<SessionRepository>().restoreDefaultSystemSession()
+	}
+
+	override fun dependencies() = listOf(KoinInitializer::class.java)
+}

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

@@ -1,32 +1,18 @@
 package org.jellyfin.androidtv;
 
-import static org.koin.java.KoinJavaComponent.inject;
-
 import android.app.Activity;
 import android.app.Application;
 
-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.Response;
 import org.jellyfin.apiclient.model.dto.BaseItemDto;
 import org.jellyfin.apiclient.model.dto.UserDto;
-import org.jellyfin.apiclient.model.entities.DisplayPreferences;
-
-import java.util.HashMap;
-
-import kotlin.Lazy;
-import timber.log.Timber;
 
 public class TvApp extends Application {
-    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;
     public static final int VIDEO_QUEUE_OPTION_ID = 3000;
@@ -38,12 +24,8 @@ public class TvApp extends Application {
     private BaseItemDto lastPlayedItem;
     private PlaybackController playbackController;
 
-    private HashMap<String, DisplayPreferences> displayPrefsCache = new HashMap<>();
-
     private Activity currentActivity;
 
-    private Lazy<ApiClient> apiClient = inject(ApiClient.class);
-
     @Override
     public void onCreate() {
         super.onCreate();
@@ -71,7 +53,6 @@ public class TvApp extends Application {
     public void setCurrentUser(UserDto currentUser) {
         this.currentUser.postValue(currentUser);
         TvManager.clearCache();
-        this.displayPrefsCache = new HashMap<>();
     }
 
     /**
@@ -96,70 +77,11 @@ public class TvApp extends Application {
         this.playbackController = playbackController;
     }
 
-    @NonNull
     public boolean canManageRecordings() {
         UserDto currentUser = getCurrentUser();
         return currentUser != null && currentUser.getPolicy().getEnableLiveTvManagement();
     }
 
-    @NonNull
-    public DisplayPreferences getCachedDisplayPrefs(String key) {
-        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) {
-        updateDisplayPrefs("ATV", preferences);
-    }
-
-    public void updateDisplayPrefs(String app, DisplayPreferences preferences) {
-        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, DISPLAY_PREFS_APP_NAME, response);
-    }
-
-    public void getDisplayPrefsAsync(final String key, String app, final Response<DisplayPreferences> outerResponse) {
-        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 {
-            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(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
-                    Timber.e(exception, "Unable to load display prefs ");
-                    DisplayPreferences prefs = new DisplayPreferences();
-                    prefs.setId(key);
-                    prefs.setSortBy("SortName");
-                    prefs.setCustomPrefs(new HashMap<String, String>());
-                    outerResponse.onResponse(prefs);
-                }
-            });
-        }
-    }
-
     @Nullable
     public BaseItemDto getLastPlayedItem() {
         return lastPlayedItem;

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

@@ -7,7 +7,7 @@ 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 java.util.UUID
 import kotlin.coroutines.resume
 import kotlin.coroutines.suspendCoroutine
 

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

@@ -6,35 +6,36 @@ import kotlinx.coroutines.launch
 import org.jellyfin.androidtv.JellyfinApplication
 import org.jellyfin.androidtv.util.apiclient.callApi
 import org.jellyfin.androidtv.util.apiclient.callApiEmpty
+import org.jellyfin.androidtv.util.sdk.legacy
 import org.jellyfin.apiclient.interaction.ApiClient
-import org.jellyfin.apiclient.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 org.jellyfin.sdk.model.DeviceInfo
 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) {
+	fun updateSession(session: Session?, deviceInfo: DeviceInfo, resultCallback: ((Boolean) -> Unit)? = null) {
 		GlobalScope.launch(Dispatchers.IO) {
 			@Suppress("TooGenericExceptionCaught")
-			try {
-				val success = updateSessionInternal(session)
-				resultCallback(success)
+			val success = try {
+				updateSessionInternal(session, deviceInfo)
 			} catch (throwable: Throwable) {
 				Timber.e(throwable, "Unable to update legacy API session.")
-				resultCallback(false)
+				false
 			}
+
+			resultCallback?.invoke(success)
 		}
 	}
 
-	private suspend fun updateSessionInternal(session: Session?): Boolean {
+	private suspend fun updateSessionInternal(session: Session?, deviceInfo: DeviceInfo): Boolean {
 		if (session == null) {
 			application.currentUser = null
 			return true
@@ -46,12 +47,12 @@ class ApiBinder(
 			return false
 		}
 
-		api.device = AuthenticationDevice(device, session.userId.toString())
+		api.device = deviceInfo.legacy()
 		api.SetAuthenticationInfo(session.accessToken, session.userId.toString())
 		api.EnableAutomaticNetworking(ServerInfo().apply {
 			id = session.serverId.toString()
 			name = server.name
-			address = server.address
+			address = server.address.removeSuffix("/")
 			userId = session.userId.toString()
 			accessToken = session.accessToken
 		})

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

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

@@ -1,25 +1,37 @@
 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.auth.model.AccountManagerAccount
+import org.jellyfin.androidtv.auth.model.AuthenticatedState
+import org.jellyfin.androidtv.auth.model.AuthenticatingState
+import org.jellyfin.androidtv.auth.model.AuthenticationStoreServer
+import org.jellyfin.androidtv.auth.model.AuthenticationStoreUser
+import org.jellyfin.androidtv.auth.model.LoginState
+import org.jellyfin.androidtv.auth.model.PrivateUser
+import org.jellyfin.androidtv.auth.model.RequireSignInState
+import org.jellyfin.androidtv.auth.model.Server
+import org.jellyfin.androidtv.auth.model.ServerVersionNotSupported
+import org.jellyfin.androidtv.auth.model.User
 import org.jellyfin.androidtv.preference.AuthenticationPreferences
 import org.jellyfin.androidtv.util.ImageUtils
-import org.jellyfin.apiclient.interaction.device.IDevice
+import org.jellyfin.androidtv.util.sdk.forUser
 import org.jellyfin.sdk.Jellyfin
-import org.jellyfin.sdk.api.client.KtorClient
+import org.jellyfin.sdk.api.client.ApiClient
 import org.jellyfin.sdk.api.client.exception.ApiClientException
 import org.jellyfin.sdk.api.client.extensions.authenticateUserByName
-import org.jellyfin.sdk.api.operations.ImageApi
-import org.jellyfin.sdk.api.operations.UserApi
+import org.jellyfin.sdk.api.client.extensions.imageApi
+import org.jellyfin.sdk.api.client.extensions.userApi
+import org.jellyfin.sdk.model.DeviceInfo
 import org.jellyfin.sdk.model.api.ImageType
 import timber.log.Timber
-import java.util.*
+import java.util.Date
+import java.util.UUID
 
 interface AuthenticationRepository {
 	fun getServers(): List<Server>
+	fun getServer(id: UUID): Server?
 	fun getUsers(server: UUID): List<PrivateUser>?
 	fun getUser(server: UUID, user: UUID): PrivateUser?
 	fun saveServer(id: UUID, name: String, address: String, version: String?, loginDisclaimer: String?)
@@ -34,25 +46,29 @@ interface AuthenticationRepository {
 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 userApiClient: ApiClient,
 	private val authenticationPreferences: AuthenticationPreferences,
+	private val defaultDeviceInfo: DeviceInfo,
 ) : AuthenticationRepository {
 	private val serverComparator = compareByDescending<Server> { it.dateLastAccessed }.thenBy { it.name }
 	private val userComparator = compareByDescending<PrivateUser> { it.lastUsed }.thenBy { it.name }
 
-	override fun getServers() = authenticationStore.getServers().map { (id, info) ->
-		Server(
+	private fun AuthenticationStoreServer.asServer(id: UUID) = Server(
 			id = id,
-			name = info.name,
-			address = info.address,
-			version = info.version,
-			loginDisclaimer = info.loginDisclaimer,
-			dateLastAccessed = Date(info.lastUsed),
-		)
-	}.sortedWith(serverComparator)
+			name = name,
+			address = address,
+			version = version,
+			loginDisclaimer = loginDisclaimer,
+			dateLastAccessed = Date(lastUsed),
+	)
+
+	override fun getServers() = authenticationStore.getServers()
+			.map { (id, entry) -> entry.asServer(id) }
+			.sortedWith(serverComparator)
+
+	override fun getServer(id: UUID) = authenticationStore.getServer(id)?.asServer(id)
 
 	private fun mapUser(
 		serverId: UUID,
@@ -114,7 +130,6 @@ class AuthenticationRepositoryImpl(
 		return authenticated
 	}
 
-	@OptIn(ExperimentalCoroutinesApi::class)
 	override fun authenticateUser(user: User): Flow<LoginState> = flow {
 		Timber.d("Authenticating serverless user %s", user)
 		emit(AuthenticatingState)
@@ -135,7 +150,6 @@ class AuthenticationRepositoryImpl(
 		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)
@@ -149,7 +163,7 @@ class AuthenticationRepositoryImpl(
 				setActiveSession(user, server) -> {
 					// Update stored user
 					try {
-						val userInfo by UserApi(userApiClient).getCurrentUser()
+						val userInfo by userApiClient.userApi.getCurrentUser()
 						val currentUser = authenticationStore.getUser(server.id, user.id)
 
 						val updatedUser = currentUser?.copy(
@@ -165,7 +179,7 @@ class AuthenticationRepositoryImpl(
 						accountManagerHelper.putAccount(AccountManagerAccount(user.id, server.id, updatedUser.name, account.accessToken))
 
 						emit(AuthenticatedState)
-					} catch(err: ApiClientException) {
+					} catch (err: ApiClientException) {
 						Timber.e(err, "Unable to get current user data")
 						emit(RequireSignInState)
 					}
@@ -185,17 +199,15 @@ class AuthenticationRepositoryImpl(
 		}
 	}
 
-	@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 api = jellyfin.createApi(server.address, deviceInfo = defaultDeviceInfo.forUser(username))
 		val result = try {
-			val response = userApi.authenticateUserByName(username, password)
+			val response = api.userApi.authenticateUserByName(username, password)
 			response.content
 		} catch (err: ApiClientException) {
 			Timber.e(err, "Unable to sign in as $username")
@@ -219,7 +231,8 @@ class AuthenticationRepositoryImpl(
 		)
 
 		authenticationStore.putUser(server.id, userId, updatedUser)
-		accountManagerHelper.putAccount(AccountManagerAccount(userId, server.id, updatedUser.name, result.accessToken))
+		val accountManagerAccount = AccountManagerAccount(userId, server.id, updatedUser.name, result.accessToken)
+		accountManagerHelper.putAccount(accountManagerAccount)
 
 		val user = PrivateUser(
 			id = userId,
@@ -230,8 +243,15 @@ class AuthenticationRepositoryImpl(
 			imageTag = userInfo.primaryImageTag,
 			lastUsed = Date().time,
 		)
-		setActiveSession(user, server)
-		emit(AuthenticatedState)
+
+		// We just added the account so it should activate properly although in rare cases it doesn't.
+		// this is often caused by issues in the platforms account manager
+		if (setActiveSession(user, server)) emit(AuthenticatedState)
+		else {
+			// Try to remove the account and ask for sign in
+			accountManagerHelper.removeAccount(accountManagerAccount)
+			emit(RequireSignInState)
+		}
 	}
 
 	override fun logout(user: User) {
@@ -244,11 +264,8 @@ class AuthenticationRepositoryImpl(
 	}
 
 	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(
+			jellyfin.createApi(baseUrl = server.address).imageApi.getUserImageUrl(
 				userId = user.id,
 				tag = imageTag,
 				imageType = ImageType.PRIMARY,

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

@@ -2,14 +2,21 @@ package org.jellyfin.androidtv.auth
 
 import android.content.Context
 import kotlinx.serialization.encodeToString
-import kotlinx.serialization.json.*
+import kotlinx.serialization.json.Json
+import kotlinx.serialization.json.JsonObject
+import kotlinx.serialization.json.JsonPrimitive
+import kotlinx.serialization.json.decodeFromJsonElement
+import kotlinx.serialization.json.encodeToJsonElement
+import kotlinx.serialization.json.intOrNull
+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.AuthenticationStoreServer
 import org.jellyfin.androidtv.auth.model.AuthenticationStoreUser
-import org.jellyfin.androidtv.util.serializer.UUIDSerializer
+import org.jellyfin.sdk.model.serializer.UUIDSerializer
 import timber.log.Timber
-import java.util.*
+import java.util.UUID
 
 /**
  * Storage for authentication related entities. Stores servers with users inside. Should be used in
@@ -27,7 +34,7 @@ class AuthenticationStore(
 	private val json = Json {
 		encodeDefaults = true
 		serializersModule = SerializersModule {
-			contextual(UUIDSerializer)
+			contextual(UUIDSerializer())
 		}
 		ignoreUnknownKeys = true
 	}

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

@@ -11,7 +11,7 @@ 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.UUIDSerializer
 import org.jellyfin.sdk.model.serializer.toUUIDOrNull
 import timber.log.Timber
 
@@ -32,7 +32,7 @@ class LegacyAccountMigration(
 			Timber.d("Starting migration of legacy credentials from $path")
 			val json = Json {
 				serializersModule = SerializersModule {
-					contextual(UUIDSerializer)
+					contextual(UUIDSerializer())
 				}
 				ignoreUnknownKeys = true
 			}
@@ -55,6 +55,7 @@ class LegacyAccountMigration(
 							address = serverAddress ?: "",
 							loginDisclaimer = null,
 							version = serverVersion,
+							lastRefreshed = 0,
 						)
 					)
 				}

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

@@ -3,22 +3,35 @@ 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 kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.emitAll
+import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.mapNotNull
+import org.jellyfin.androidtv.auth.model.ConnectedState
+import org.jellyfin.androidtv.auth.model.ConnectingState
+import org.jellyfin.androidtv.auth.model.PrivateUser
+import org.jellyfin.androidtv.auth.model.PublicUser
+import org.jellyfin.androidtv.auth.model.Server
+import org.jellyfin.androidtv.auth.model.ServerAdditionState
+import org.jellyfin.androidtv.auth.model.UnableToConnectState
+import org.jellyfin.androidtv.auth.model.User
 import org.jellyfin.androidtv.util.sdk.toPublicUser
 import org.jellyfin.androidtv.util.sdk.toServer
 import org.jellyfin.sdk.Jellyfin
 import org.jellyfin.sdk.api.client.exception.ApiClientException
-import org.jellyfin.sdk.api.operations.BrandingApi
-import org.jellyfin.sdk.api.operations.SystemApi
-import org.jellyfin.sdk.api.operations.UserApi
+import org.jellyfin.sdk.api.client.extensions.brandingApi
+import org.jellyfin.sdk.api.client.extensions.systemApi
+import org.jellyfin.sdk.api.client.extensions.userApi
 import org.jellyfin.sdk.discovery.RecommendedServerInfo
 import org.jellyfin.sdk.discovery.RecommendedServerInfoScore
 import org.jellyfin.sdk.model.api.ServerDiscoveryInfo
 import org.jellyfin.sdk.model.api.UserDto
 import org.jellyfin.sdk.model.serializer.toUUID
 import timber.log.Timber
-import java.util.*
+import java.util.Date
+import java.util.UUID
 
 interface ServerRepository {
 	fun getStoredServers(): List<Server>
@@ -31,7 +44,7 @@ interface ServerRepository {
 	suspend fun refreshServerInfo(server: Server): Boolean
 
 	companion object {
-		val minimumServerVersion = Jellyfin.minimumVersion
+		val minimumServerVersion = Jellyfin.minimumVersion.copy(build = null)
 	}
 }
 
@@ -49,11 +62,10 @@ class ServerRepositoryImpl(
 	}.flowOn(Dispatchers.IO)
 
 	private suspend fun getServerPublicUsers(server: Server): List<PublicUser> {
-		val client = jellyfin.createApi(server.address)
-		val userApi = UserApi(client)
+		val api = jellyfin.createApi(server.address)
 
 		return try {
-			val users by userApi.getPublicUsers()
+			val users by api.userApi.getPublicUsers()
 			users.mapNotNull(UserDto::toPublicUser)
 		} catch (err: ApiClientException) {
 			Timber.e(err, "Unable to retrieve public users")
@@ -71,10 +83,10 @@ class ServerRepositoryImpl(
 		if (now - serverInfo.lastRefreshed < 600000 && serverInfo.version != null) return false
 
 		return try {
-			val client = jellyfin.createApi(server.address)
+			val api = jellyfin.createApi(server.address)
 			// Get login disclaimer
-			val branding by BrandingApi(client).getBrandingOptions()
-			val systemInfo by SystemApi(client).getPublicSystemInfo()
+			val branding by api.brandingApi.getBrandingOptions()
+			val systemInfo by api.systemApi.getPublicSystemInfo()
 
 			authenticationStore.putServer(server.id, serverInfo.copy(
 				name = systemInfo.serverName ?: serverInfo.name,
@@ -105,7 +117,7 @@ class ServerRepositoryImpl(
 				val index = users.indexOfFirst { it.id == user.id }
 				if (index == -1) users.add(user)
 				else {
-					users[index] = when(val currentUser = users[index]) {
+					users[index] = when (val currentUser = users[index]) {
 						is PublicUser -> user
 						is PrivateUser -> currentUser.copy(
 							name = user.name,
@@ -133,20 +145,19 @@ class ServerRepositoryImpl(
 
 		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
-					}
+		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: ")
@@ -160,12 +171,12 @@ class ServerRepositoryImpl(
 		})
 
 		val chosenRecommendation = greatRecommendaton ?: goodRecommendations.firstOrNull()
-		if (chosenRecommendation != null) {
+		if (chosenRecommendation != null && chosenRecommendation.systemInfo.isSuccess) {
 			// Get system info
-			val systemInfo = chosenRecommendation.systemInfo!!
+			val systemInfo = chosenRecommendation.systemInfo.getOrThrow()
 
 			// Get branding info
-			val api = BrandingApi(jellyfin.createApi(chosenRecommendation.address))
+			val api = jellyfin.createApi(chosenRecommendation.address).brandingApi
 			val branding by api.getBrandingOptions()
 
 			val id = systemInfo.id!!.toUUID()
@@ -180,7 +191,10 @@ class ServerRepositoryImpl(
 			emit(ConnectedState(id, systemInfo))
 		} else {
 			// No great or good recommendations, only add bad recommendations
-			emit(UnableToConnectState(addressCandidates))
+			val addressCandidatesWithIssues = (badRecommendations + goodRecommendations)
+				.groupBy { it.address }
+				.mapValues { (_, entry) -> entry.flatMap { server -> server.issues } }
+			emit(UnableToConnectState(addressCandidatesWithIssues))
 		}
 	}
 }

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

@@ -2,12 +2,18 @@ package org.jellyfin.androidtv.auth
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
+import kotlinx.coroutines.runBlocking
 import org.jellyfin.androidtv.preference.AuthenticationPreferences
-import org.jellyfin.androidtv.preference.constant.UserSelectBehavior.*
-import org.jellyfin.sdk.api.client.KtorClient
+import org.jellyfin.androidtv.preference.PreferencesRepository
+import org.jellyfin.androidtv.preference.constant.UserSelectBehavior.DISABLED
+import org.jellyfin.androidtv.preference.constant.UserSelectBehavior.LAST_USER
+import org.jellyfin.androidtv.preference.constant.UserSelectBehavior.SPECIFIC_USER
+import org.jellyfin.androidtv.util.sdk.forUser
+import org.jellyfin.sdk.api.client.ApiClient
+import org.jellyfin.sdk.model.DeviceInfo
 import org.jellyfin.sdk.model.serializer.toUUIDOrNull
 import timber.log.Timber
-import java.util.*
+import java.util.UUID
 import kotlin.coroutines.resume
 import kotlin.coroutines.suspendCoroutine
 
@@ -33,8 +39,10 @@ class SessionRepositoryImpl(
 	private val accountManagerHelper: AccountManagerHelper,
 	private val apiBinder: ApiBinder,
 	private val authenticationStore: AuthenticationStore,
-	private val userApiClient: KtorClient,
-	private val systemApiClient: KtorClient,
+	private val userApiClient: ApiClient,
+	private val systemApiClient: ApiClient,
+	private val preferencesRepository: PreferencesRepository,
+	private val defaultDeviceInfo: DeviceInfo,
 ) : SessionRepository {
 	private val _currentSession = MutableLiveData<Session?>()
 	override val currentSession: LiveData<Session?> get() = _currentSession
@@ -96,7 +104,7 @@ class SessionRepositoryImpl(
 
 		_currentSession.value = null
 		userApiClient.applySession(null)
-		apiBinder.updateSession(null) { }
+		apiBinder.updateSession(null, userApiClient.deviceInfo)
 	}
 
 	private fun setCurrentSession(session: Session?, includeSystemUser: Boolean, callback: ((Boolean) -> Unit)? = null) {
@@ -109,14 +117,16 @@ class SessionRepositoryImpl(
 		if (includeSystemUser && systemUserBehavior == LAST_USER) setCurrentSystemSession(session)
 
 		// Update session after binding the apiclient settings
-		apiBinder.updateSession(session) { success ->
+		val deviceInfo = session?.let { defaultDeviceInfo.forUser(it.userId) } ?: defaultDeviceInfo
+		apiBinder.updateSession(session, deviceInfo) { success ->
 			Timber.d("Updating current session. userId=${session?.userId} apiBindingSuccess=${success}")
 
 			if (success) {
-				userApiClient.applySession(session)
+				userApiClient.applySession(session, deviceInfo)
+				runBlocking { preferencesRepository.onSessionChanged() }
 				_currentSession.postValue(session)
 			} else {
-				userApiClient.applySession(null)
+				userApiClient.applySession(null, deviceInfo)
 				_currentSession.postValue(null)
 			}
 
@@ -151,7 +161,9 @@ class SessionRepositoryImpl(
 		)
 	}
 
-	private fun KtorClient.applySession(session: Session?) {
+	private fun ApiClient.applySession(session: Session?, newDeviceInfo: DeviceInfo = defaultDeviceInfo) {
+		deviceInfo = newDeviceInfo
+
 		if (session == null) {
 			baseUrl = null
 			accessToken = null

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

@@ -1,6 +1,6 @@
 package org.jellyfin.androidtv.auth.model
 
-import java.util.*
+import java.util.UUID
 
 data class AccountManagerAccount(
 	val id: UUID,

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

@@ -5,8 +5,9 @@ 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.*
+import org.jellyfin.sdk.model.serializer.UUIDSerializer
+import java.util.Date
+import java.util.UUID
 
 /**
  * Locally stored server information. New properties require default values or deserialization will fail.

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

@@ -2,7 +2,7 @@ package org.jellyfin.androidtv.auth.model
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
-import java.util.*
+import java.util.Date
 
 /**
  * Locally stored user information. New properties require default values or deserialization will fail.

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

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

@@ -2,7 +2,8 @@ package org.jellyfin.androidtv.auth.model
 
 import org.jellyfin.androidtv.auth.ServerRepository
 import org.jellyfin.sdk.model.ServerVersion
-import java.util.*
+import java.util.Date
+import java.util.UUID
 
 /**
  * Server model to use locally in place of ServerInfo model in ApiClient.
@@ -18,6 +19,8 @@ data class Server(
 	private val serverVersion = version?.let(ServerVersion::fromString)
 	val versionSupported = serverVersion != null && serverVersion >= ServerRepository.minimumServerVersion
 
+	operator fun compareTo(other: ServerVersion): Int = serverVersion?.compareTo(other) ?: -1
+
 	override fun equals(other: Any?) = other is Server
 		&& id == other.id
 		&& address == other.address

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

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

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

@@ -1,6 +1,6 @@
 package org.jellyfin.androidtv.auth.model
 
-import java.util.*
+import java.util.UUID
 
 /**
  * User model used locally.

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

@@ -5,18 +5,22 @@ public class CodecTypes {
     public static final String AAC = "aac";
     public static final String AAC_LATM = "aac_latm";
     public static final String AC3 = "ac3";
+    public static final String ALAC = "alac";
     public static final String APE = "ape";
     public static final String DCA = "dca";
     public static final String DTS = "dts";
     public static final String EAC3 = "eac3";
     public static final String FLAC = "flac";
+    public static final String MLP = "mlp";
     public static final String MP2 = "mp2";
     public static final String MP3 = "mp3";
     public static final String MPA = "mpa";
     public static final String OPUS = "opus";
     public static final String PCM = "pcm";
-    public static final String PCM_S16LE = "PCM_S16LE";
-    public static final String PCM_S24LE = "PCM_S24LE";
+    public static final String PCM_ALAW = "pcm_alaw";
+    public static final String PCM_MULAW = "pcm_mulaw";
+    public static final String PCM_S16LE = "pcm_s16le";
+    public static final String PCM_S24LE = "pcm_s24le";
     public static final String TRUEHD = "truehd";
     public static final String VORBIS = "vorbis";
     public static final String WAV = "wav";

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

@@ -2,7 +2,5 @@ package org.jellyfin.androidtv.constant;
 
 public enum CustomMessage {
     RefreshCurrentItem,
-    RemoveCurrentItem,
     ActionComplete,
-    RefreshRows
 }

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

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

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

@@ -14,9 +14,5 @@ enum class GridDirection {
 	 * Vertical.
 	 */
 	@EnumDisplayOptions(R.string.grid_direction_vertical)
-	VERTICAL;
-
-	companion object {
-		fun getGridDirection(direction: String?) = values().firstOrNull { it.name == direction }
-	}
+	VERTICAL,
 }

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

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

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

@@ -1,7 +0,0 @@
-package org.jellyfin.androidtv.constant;
-
-public class ImageType {
-    public static final String DEFAULT = "0";
-    public static final String THUMB = "1";
-    public static final String BANNER = "2";
-}

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

@@ -0,0 +1,24 @@
+package org.jellyfin.androidtv.constant
+
+import org.jellyfin.androidtv.R
+import org.jellyfin.androidtv.ui.preference.dsl.EnumDisplayOptions
+
+enum class ImageType {
+	/**
+	 * Default.
+	 */
+	@EnumDisplayOptions(R.string.image_type_default)
+	DEFAULT,
+
+	/**
+	 * Thumbnail.
+	 */
+	@EnumDisplayOptions(R.string.image_type_thumbnail)
+	THUMB,
+
+	/**
+	 * Banner.
+	 */
+	@EnumDisplayOptions(R.string.image_type_banner)
+	BANNER
+}

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

@@ -1,8 +0,0 @@
-package org.jellyfin.androidtv.constant;
-
-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/PosterSize.kt

@@ -0,0 +1,30 @@
+package org.jellyfin.androidtv.constant
+
+import org.jellyfin.androidtv.R
+import org.jellyfin.androidtv.ui.preference.dsl.EnumDisplayOptions
+
+enum class PosterSize {
+	/**
+	 * Automatic.
+	 */
+	@EnumDisplayOptions(R.string.image_size_auto)
+	AUTO,
+
+	/**
+	 * Small.
+	 */
+	@EnumDisplayOptions(R.string.image_size_small)
+	SMALL,
+
+	/**
+	 * Medium.
+	 */
+	@EnumDisplayOptions(R.string.image_size_medium)
+	MED,
+
+	/**
+	 * Large.
+	 */
+	@EnumDisplayOptions(R.string.image_size_large)
+	LARGE
+}

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

@@ -10,8 +10,6 @@ public enum QueryType {
     SimilarMovies,
     StaticPeople,
     StaticChapters,
-    StaticServers,
-    Users,
     Search,
     Specials,
     Trailers,
@@ -24,7 +22,6 @@ public enum QueryType {
     StaticAudioQueueItems,
     AlbumArtists,
     AudioPlaylists,
-    ContinueWatching,
     LatestItems,
     SeriesTimer,
     Premieres

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

@@ -1,6 +0,0 @@
-package org.jellyfin.androidtv.constant;
-
-public class ViewType {
-    public static final String SMART = "0";
-    public static final String GRID = "1";
-}

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

@@ -1,11 +1,11 @@
 package org.jellyfin.androidtv.data.compat;
 
-import java.util.ArrayList;
-
 import org.jellyfin.apiclient.model.dlna.DeviceProfile;
 import org.jellyfin.apiclient.model.dlna.EncodingContext;
 import org.jellyfin.apiclient.model.dto.MediaSourceInfo;
 
+import java.util.ArrayList;
+
 /**
  * Class AudioOptions.
  *
@@ -40,26 +40,6 @@ public class AudioOptions {
         EnableDirectStream = value;
     }
 
-    private boolean ForceDirectPlay;
-
-    public final boolean getForceDirectPlay() {
-        return ForceDirectPlay;
-    }
-
-    public final void setForceDirectPlay(boolean value) {
-        ForceDirectPlay = value;
-    }
-
-    private boolean ForceDirectStream;
-
-    public final boolean getForceDirectStream() {
-        return ForceDirectStream;
-    }
-
-    public final void setForceDirectStream(boolean value) {
-        ForceDirectStream = value;
-    }
-
     private String ItemId;
 
     public final String getItemId() {
@@ -103,16 +83,6 @@ public class AudioOptions {
         MediaSourceId = value;
     }
 
-    private String DeviceId;
-
-    public final String getDeviceId() {
-        return DeviceId;
-    }
-
-    public final void setDeviceId(String value) {
-        DeviceId = value;
-    }
-
     /**
      * Allows an override of supported number of audio channels
      * Example: DeviceProfile supports five channel, but user only has stereo speakers
@@ -154,43 +124,4 @@ public class AudioOptions {
     public final void setContext(EncodingContext value) {
         Context = value;
     }
-
-    /**
-     * Gets or sets the audio transcoding bitrate.
-     *
-     * <value>The audio transcoding bitrate.</value>
-     */
-    private Integer AudioTranscodingBitrate = null;
-
-    public final Integer getAudioTranscodingBitrate() {
-        return AudioTranscodingBitrate;
-    }
-
-    public final void setAudioTranscodingBitrate(Integer value) {
-        AudioTranscodingBitrate = value;
-    }
-
-    /**
-     * Gets the maximum bitrate.
-     *
-     * @return System.Nullable&lt;System.Int32&gt;.
-     */
-    public final Integer GetMaxBitrate(boolean isAudio) {
-        if (getMaxBitrate() != null) {
-            return getMaxBitrate();
-        }
-
-        if (getProfile() != null) {
-            if (getContext() == EncodingContext.Static) {
-                if (isAudio && getProfile().getMaxStaticMusicBitrate() != null) {
-                    return getProfile().getMaxStaticMusicBitrate();
-                }
-                return getProfile().getMaxStaticBitrate();
-            }
-
-            return getProfile().getMaxStreamingBitrate();
-        }
-
-        return null;
-    }
 }

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

@@ -1,13 +0,0 @@
-package org.jellyfin.androidtv.data.compat;
-
-import java.util.Comparator;
-
-@Deprecated
-public abstract class BaseStreamInfoSorter implements Comparator<StreamInfo> {
-    protected abstract int getValue(StreamInfo info);
-
-    @Override
-    public int compare(StreamInfo lhs, StreamInfo rhs) {
-        return Integer.compare(getValue(lhs), getValue(rhs));
-    }
-}

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

@@ -1,30 +0,0 @@
-package org.jellyfin.androidtv.data.compat;
-
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.List;
-
-@Deprecated
-public class ChainedComparator<T> implements Comparator<T> {
-    private List<Comparator<T>> simpleComparators;
-
-    public ChainedComparator(Comparator<T>... simpleComparators) {
-
-        List<Comparator<T>> list = new ArrayList<>();
-
-        for (Comparator<T> comparator : simpleComparators) {
-            list.add(comparator);
-        }
-        this.simpleComparators = list;
-    }
-
-    public int compare(T o1, T o2) {
-        for (Comparator<T> comparator : simpleComparators) {
-            int result = comparator.compare(o1, o2);
-            if (result != 0) {
-                return result;
-            }
-        }
-        return 0;
-    }
-}

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

@@ -1,82 +0,0 @@
-package org.jellyfin.androidtv.data.compat;
-
-/**
- * Class DrawingUtils
- *
- * @deprecated
- */
-@Deprecated
-public final class DrawingUtils {
-    /**
-     * Resizes a set of dimensions
-     *
-     * @param size      The original size object
-     * @param width     A new fixed width, if desired
-     * @param height    A new fixed height, if desired
-     * @param maxWidth  A max fixed width, if desired
-     * @param maxHeight A max fixed height, if desired
-     * @return A new size object
-     */
-    public static ImageSize Resize(ImageSize size, Double width, Double height, Double maxWidth, Double maxHeight) {
-        double newWidth = size.getWidth();
-        double newHeight = size.getHeight();
-
-        if (width != null && height != null) {
-            newWidth = width;
-            newHeight = height;
-        } else if (height != null) {
-            newWidth = GetNewWidth(newHeight, newWidth, height);
-            newHeight = height;
-        } else if (width != null) {
-            newHeight = GetNewHeight(newHeight, newWidth, width);
-            newWidth = width;
-        }
-
-        if (maxHeight != null && maxHeight < newHeight) {
-            newWidth = GetNewWidth(newHeight, newWidth, maxHeight);
-            newHeight = maxHeight;
-        }
-
-        if (maxWidth != null && maxWidth < newWidth) {
-            newHeight = GetNewHeight(newHeight, newWidth, maxWidth);
-            newWidth = maxWidth;
-        }
-
-        ImageSize tempVar = new ImageSize();
-        tempVar.setWidth(newWidth);
-        tempVar.setHeight(newHeight);
-        return tempVar;
-    }
-
-    /**
-     * Gets the new width.
-     *
-     * @param currentHeight Height of the current.
-     * @param currentWidth  Width of the current.
-     * @param newHeight     The new height.
-     * @return System.Double.
-     */
-    private static double GetNewWidth(double currentHeight, double currentWidth, double newHeight) {
-        double scaleFactor = newHeight;
-        scaleFactor /= currentHeight;
-        scaleFactor *= currentWidth;
-
-        return scaleFactor;
-    }
-
-    /**
-     * Gets the new height.
-     *
-     * @param currentHeight Height of the current.
-     * @param currentWidth  Width of the current.
-     * @param newWidth      The new width.
-     * @return System.Double.
-     */
-    private static double GetNewHeight(double currentHeight, double currentWidth, double newWidth) {
-        double scaleFactor = newWidth;
-        scaleFactor /= currentWidth;
-        scaleFactor *= currentHeight;
-
-        return scaleFactor;
-    }
-}

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

@@ -1,93 +0,0 @@
-package org.jellyfin.androidtv.data.compat;
-
-import org.jellyfin.androidtv.util.Utils;
-
-import timber.log.Timber;
-
-/**
- * Struct ImageSize
- *
- * @deprecated
- */
-//C# TO JAVA CONVERTER WARNING: Java does not allow user-defined value types. The behavior of this class will differ from the original:
-//ORIGINAL LINE: public struct ImageSize
-@Deprecated
-public final class ImageSize {
-    private double _height;
-    private double _width;
-
-    /**
-     * Gets or sets the height.
-     *
-     * <value>The height.</value>
-     */
-    public double getHeight() {
-        return _height;
-    }
-
-    public void setHeight(double value) {
-        _height = value;
-    }
-
-    /**
-     * Gets or sets the width.
-     *
-     * <value>The width.</value>
-     */
-    public double getWidth() {
-        return _width;
-    }
-
-    public void setWidth(double value) {
-        _width = value;
-    }
-
-    public boolean equals(ImageSize size) {
-        return (Double.valueOf(getWidth())).equals(size.getWidth()) && (Double.valueOf(getHeight())).equals(size.getHeight());
-    }
-
-    @Override
-    public String toString() {
-        return String.format("%1$s-%2$s", getWidth(), getHeight());
-    }
-
-    public ImageSize() {
-    }
-
-    public ImageSize(String value) {
-        _width = 0;
-
-        _height = 0;
-
-        ParseValue(value);
-    }
-
-    public ImageSize(int width, int height) {
-        _width = width;
-        _height = height;
-    }
-
-    private void ParseValue(String value) {
-        if (Utils.isNonEmpty(value)) {
-            String[] parts = value.split("[-]", -1);
-
-            if (parts.length == 2) {
-                try {
-                    _width = Double.parseDouble(parts[0]);
-                    _height = Double.parseDouble(parts[1]);
-                } catch (NumberFormatException ex) {
-                    Timber.e(ex, "Could not parse width and height");
-                }
-            }
-        }
-    }
-
-    public ImageSize clone() {
-        ImageSize varCopy = new ImageSize();
-
-        varCopy._height = this._height;
-        varCopy._width = this._width;
-
-        return varCopy;
-    }
-}

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

@@ -1,11 +1,6 @@
 package org.jellyfin.androidtv.data.compat;
 
-import org.jellyfin.androidtv.constant.ContainerTypes;
-import org.jellyfin.androidtv.constant.MediaTypes;
 import org.jellyfin.androidtv.util.Utils;
-
-import java.util.ArrayList;
-
 import org.jellyfin.apiclient.model.dlna.DeviceProfile;
 import org.jellyfin.apiclient.model.dlna.DlnaProfileType;
 import org.jellyfin.apiclient.model.dlna.EncodingContext;
@@ -17,9 +12,10 @@ import org.jellyfin.apiclient.model.dto.NameValuePair;
 import org.jellyfin.apiclient.model.entities.MediaStream;
 import org.jellyfin.apiclient.model.entities.MediaStreamType;
 import org.jellyfin.apiclient.model.mediainfo.MediaProtocol;
-import org.jellyfin.apiclient.model.mediainfo.TransportStreamTimestamp;
 import org.jellyfin.apiclient.model.session.PlayMethod;
 
+import java.util.ArrayList;
+
 /**
  * Class StreamInfo.
  *
@@ -95,16 +91,6 @@ public class StreamInfo {
         Container = value;
     }
 
-    private String SubProtocol;
-
-    public final String getSubProtocol() {
-        return SubProtocol;
-    }
-
-    public final void setSubProtocol(String value) {
-        SubProtocol = value;
-    }
-
     private long StartPositionTicks;
 
     public final long getStartPositionTicks() {
@@ -115,56 +101,6 @@ public class StreamInfo {
         StartPositionTicks = value;
     }
 
-    private String VideoCodec;
-
-    public final String getVideoCodec() {
-        return VideoCodec;
-    }
-
-    public final void setVideoCodec(String value) {
-        VideoCodec = value;
-    }
-
-    private String VideoProfile;
-
-    public final String getVideoProfile() {
-        return VideoProfile;
-    }
-
-    public final void setVideoProfile(String value) {
-        VideoProfile = value;
-    }
-
-    private boolean CopyTimestamps;
-
-    public final boolean getCopyTimestamps() {
-        return CopyTimestamps;
-    }
-
-    public final void setCopyTimestamps(boolean value) {
-        CopyTimestamps = value;
-    }
-
-    private boolean ForceLiveStream;
-
-    public final boolean getForceLiveStream() {
-        return ForceLiveStream;
-    }
-
-    public final void setForceLiveStream(boolean value) {
-        ForceLiveStream = value;
-    }
-
-    private boolean EnableSubtitlesInManifest;
-
-    public final boolean getEnableSubtitlesInManifest() {
-        return EnableSubtitlesInManifest;
-    }
-
-    public final void setEnableSubtitlesInManifest(boolean value) {
-        EnableSubtitlesInManifest = value;
-    }
-
     private String[] AudioCodecs;
 
     public final String[] getAudioCodecs() {
@@ -175,126 +111,6 @@ public class StreamInfo {
         AudioCodecs = value;
     }
 
-    private Integer AudioStreamIndex = null;
-
-    public final Integer getAudioStreamIndex() {
-        return AudioStreamIndex;
-    }
-
-    public final void setAudioStreamIndex(Integer value) {
-        AudioStreamIndex = value;
-    }
-
-    private Integer SubtitleStreamIndex = null;
-
-    public final Integer getSubtitleStreamIndex() {
-        return SubtitleStreamIndex;
-    }
-
-    public final void setSubtitleStreamIndex(Integer value) {
-        SubtitleStreamIndex = value;
-    }
-
-    private Integer TranscodingMaxAudioChannels = null;
-
-    public final Integer getTranscodingMaxAudioChannels() {
-        return TranscodingMaxAudioChannels;
-    }
-
-    public final void setTranscodingMaxAudioChannels(Integer value) {
-        TranscodingMaxAudioChannels = value;
-    }
-
-    private Integer MaxAudioChannels = null;
-
-    public final Integer getMaxAudioChannels() {
-        return MaxAudioChannels;
-    }
-
-    public final void setMaxAudioChannels(Integer value) {
-        MaxAudioChannels = value;
-    }
-
-    private Integer AudioBitrate = null;
-
-    public final Integer getAudioBitrate() {
-        return AudioBitrate;
-    }
-
-    public final void setAudioBitrate(Integer value) {
-        AudioBitrate = value;
-    }
-
-    private Integer VideoBitrate = null;
-
-    public final Integer getVideoBitrate() {
-        return VideoBitrate;
-    }
-
-    public final void setVideoBitrate(Integer value) {
-        VideoBitrate = value;
-    }
-
-    private Integer VideoLevel = null;
-
-    public final Integer getVideoLevel() {
-        return VideoLevel;
-    }
-
-    public final void setVideoLevel(Integer value) {
-        VideoLevel = value;
-    }
-
-    private Integer MaxWidth = null;
-
-    public final Integer getMaxWidth() {
-        return MaxWidth;
-    }
-
-    public final void setMaxWidth(Integer value) {
-        MaxWidth = value;
-    }
-
-    private Integer MaxHeight = null;
-
-    public final Integer getMaxHeight() {
-        return MaxHeight;
-    }
-
-    public final void setMaxHeight(Integer value) {
-        MaxHeight = value;
-    }
-
-    private Integer MaxVideoBitDepth = null;
-
-    public final Integer getMaxVideoBitDepth() {
-        return MaxVideoBitDepth;
-    }
-
-    public final void setMaxVideoBitDepth(Integer value) {
-        MaxVideoBitDepth = value;
-    }
-
-    private Integer MaxRefFrames = null;
-
-    public final Integer getMaxRefFrames() {
-        return MaxRefFrames;
-    }
-
-    public final void setMaxRefFrames(Integer value) {
-        MaxRefFrames = value;
-    }
-
-    private Float MaxFramerate = null;
-
-    public final Float getMaxFramerate() {
-        return MaxFramerate;
-    }
-
-    public final void setMaxFramerate(Float value) {
-        MaxFramerate = value;
-    }
-
     private DeviceProfile DeviceProfile;
 
     public final DeviceProfile getDeviceProfile() {
@@ -305,16 +121,6 @@ public class StreamInfo {
         DeviceProfile = value;
     }
 
-    private String DeviceProfileId;
-
-    public final String getDeviceProfileId() {
-        return DeviceProfileId;
-    }
-
-    public final void setDeviceProfileId(String value) {
-        DeviceProfileId = value;
-    }
-
     private String DeviceId;
 
     public final String getDeviceId() {
@@ -341,20 +147,6 @@ public class StreamInfo {
         return TranscodeSeekInfo;
     }
 
-    public final void setTranscodeSeekInfo(TranscodeSeekInfo value) {
-        TranscodeSeekInfo = value;
-    }
-
-    private boolean EstimateContentLength;
-
-    public final boolean getEstimateContentLength() {
-        return EstimateContentLength;
-    }
-
-    public final void setEstimateContentLength(boolean value) {
-        EstimateContentLength = value;
-    }
-
     private MediaSourceInfo MediaSource;
 
     public final MediaSourceInfo getMediaSource() {
@@ -371,20 +163,6 @@ public class StreamInfo {
         return SubtitleDeliveryMethod;
     }
 
-    public final void setSubtitleDeliveryMethod(SubtitleDeliveryMethod value) {
-        SubtitleDeliveryMethod = value;
-    }
-
-    private String SubtitleFormat;
-
-    public final String getSubtitleFormat() {
-        return SubtitleFormat;
-    }
-
-    public final void setSubtitleFormat(String value) {
-        SubtitleFormat = value;
-    }
-
     private String PlaySessionId;
 
     public final String getPlaySessionId() {
@@ -395,16 +173,6 @@ public class StreamInfo {
         PlaySessionId = value;
     }
 
-    private ArrayList<MediaSourceInfo> AllMediaSources;
-
-    public final ArrayList<MediaSourceInfo> getAllMediaSources() {
-        return AllMediaSources;
-    }
-
-    public final void setAllMediaSources(ArrayList<MediaSourceInfo> value) {
-        AllMediaSources = value;
-    }
-
     public final String getMediaSourceId() {
         return getMediaSource() == null ? null : getMediaSource().getId();
     }
@@ -451,15 +219,6 @@ public class StreamInfo {
         return GetUrl(baseUrl, queryString);
     }
 
-    public final String ToDlnaUrl(String baseUrl, String accessToken) {
-        if (getPlayMethod() == PlayMethod.DirectPlay) {
-            return getMediaSource().getPath();
-        }
-
-        String dlnaCommand = BuildDlnaParam(this, accessToken);
-        return GetUrl(baseUrl, dlnaCommand);
-    }
-
     private String GetUrl(String baseUrl, String queryString) {
         if (Utils.isEmpty(baseUrl)) {
             throw new IllegalArgumentException(baseUrl);
@@ -471,66 +230,41 @@ public class StreamInfo {
         baseUrl = baseUrl.replaceAll("[/]+$", "");
 
         if (getMediaType() == DlnaProfileType.Audio) {
-            if (MediaTypes.HLS.equalsIgnoreCase(getSubProtocol())) {
-                return String.format("%1$s/audio/%2$s/master.m3u8?%3$s", baseUrl, getItemId(), queryString);
-            }
-
             return String.format("%1$s/audio/%2$s/stream%3$s?%4$s", baseUrl, getItemId(), extension, queryString);
         }
 
-        if (MediaTypes.HLS.equalsIgnoreCase(getSubProtocol())) {
-            return String.format("%1$s/videos/%2$s/master.m3u8?%3$s", baseUrl, getItemId(), queryString);
-        }
-
         return String.format("%1$s/videos/%2$s/stream%3$s?%4$s", baseUrl, getItemId(), extension, queryString);
     }
 
-    private static String BuildDlnaParam(StreamInfo item, String accessToken) {
-        ArrayList<String> list = new ArrayList<String>();
-
-        for (NameValuePair pair : BuildParams(item, accessToken, true)) {
-            list.add(pair.getValue());
-        }
-
-        return String.format("Params=%1$s", Utils.join(";", list));
-    }
-
     private static ArrayList<NameValuePair> BuildParams(StreamInfo item, String accessToken, boolean isDlna) {
         ArrayList<NameValuePair> list = new ArrayList<NameValuePair>();
 
         String audioCodecs = item.getAudioCodecs().length == 0 ? "" : Utils.join(",", item.getAudioCodecs());
 
-        String tempVar = item.getDeviceProfileId();
-        list.add(new NameValuePair("DeviceProfileId", (tempVar != null) ? tempVar : ""));
+        list.add(new NameValuePair("DeviceProfileId", ""));
         String tempVar2 = item.getDeviceId();
         list.add(new NameValuePair("DeviceId", (tempVar2 != null) ? tempVar2 : ""));
         String tempVar3 = item.getMediaSourceId();
         list.add(new NameValuePair("MediaSourceId", (tempVar3 != null) ? tempVar3 : ""));
         list.add(new NameValuePair(STATIC, Boolean.valueOf(item.getIsDirectStream()).toString().toLowerCase()));
-        String tempVar4 = item.getVideoCodec();
-        list.add(new NameValuePair("VideoCodec", (tempVar4 != null) ? tempVar4 : ""));
+        list.add(new NameValuePair("VideoCodec", ""));
         list.add(new NameValuePair("AudioCodec", audioCodecs));
-        list.add(new NameValuePair("AudioStreamIndex", item.getAudioStreamIndex() != null ? String.valueOf(item.getAudioStreamIndex()) : ""));
-        list.add(new NameValuePair("SubtitleStreamIndex", item.getSubtitleStreamIndex() != null && item.getSubtitleDeliveryMethod() != org.jellyfin.apiclient.model.dlna.SubtitleDeliveryMethod.External ? String.valueOf(item.getSubtitleStreamIndex()) : ""));
-        list.add(new NameValuePair("VideoBitrate", item.getVideoBitrate() != null ? String.valueOf(item.getVideoBitrate()) : ""));
-        list.add(new NameValuePair("AudioBitrate", item.getAudioBitrate() != null ? String.valueOf(item.getAudioBitrate()) : ""));
-        list.add(new NameValuePair("MaxAudioChannels", item.getMaxAudioChannels() != null ? String.valueOf(item.getMaxAudioChannels()) : ""));
-        list.add(new NameValuePair("MaxFramerate", item.getMaxFramerate() != null ? String.valueOf(item.getMaxFramerate()) : ""));
-        list.add(new NameValuePair("MaxWidth", item.getMaxWidth() != null ? String.valueOf(item.getMaxWidth()) : ""));
-        list.add(new NameValuePair("MaxHeight", item.getMaxHeight() != null ? String.valueOf(item.getMaxHeight()) : ""));
+        list.add(new NameValuePair("AudioStreamIndex", ""));
+        list.add(new NameValuePair("SubtitleStreamIndex", ""));
+        list.add(new NameValuePair("VideoBitrate", ""));
+        list.add(new NameValuePair("AudioBitrate", ""));
+        list.add(new NameValuePair("MaxAudioChannels", ""));
+        list.add(new NameValuePair("MaxFramerate", ""));
+        list.add(new NameValuePair("MaxWidth", ""));
+        list.add(new NameValuePair("MaxHeight", ""));
 
-        if (MediaTypes.HLS.equalsIgnoreCase(item.getSubProtocol()) && !item.getForceLiveStream()) {
-            list.add(new NameValuePair(START_TIME_TICKS, ""));
-        } else {
-            list.add(new NameValuePair(START_TIME_TICKS, String.valueOf(item.getStartPositionTicks())));
-        }
+        list.add(new NameValuePair(START_TIME_TICKS, String.valueOf(item.getStartPositionTicks())));
 
-        list.add(new NameValuePair("Level", item.getVideoLevel() != null ? String.valueOf(item.getVideoLevel()) : ""));
+        list.add(new NameValuePair("Level", ""));
 
-        list.add(new NameValuePair("MaxRefFrames", item.getMaxRefFrames() != null ? String.valueOf(item.getMaxRefFrames()) : ""));
-        list.add(new NameValuePair("MaxVideoBitDepth", item.getMaxVideoBitDepth() != null ? String.valueOf(item.getMaxVideoBitDepth()) : ""));
-        String tempVar5 = item.getVideoProfile();
-        list.add(new NameValuePair("Profile", (tempVar5 != null) ? tempVar5 : ""));
+        list.add(new NameValuePair("MaxRefFrames", ""));
+        list.add(new NameValuePair("MaxVideoBitDepth", ""));
+        list.add(new NameValuePair("Profile", ""));
 
         // no longer used
         list.add(new NameValuePair("Cabac", ""));
@@ -546,12 +280,12 @@ public class StreamInfo {
             list.add(new NameValuePair("ItemId", item.getItemId()));
         }
 
-        list.add(new NameValuePair("CopyTimestamps", Boolean.valueOf(item.getCopyTimestamps()).toString().toLowerCase()));
-        list.add(new NameValuePair("ForceLiveStream", Boolean.valueOf(item.getForceLiveStream()).toString().toLowerCase()));
-        list.add(new NameValuePair("SubtitleMethod", item.getSubtitleStreamIndex() != null && item.getSubtitleDeliveryMethod() != org.jellyfin.apiclient.model.dlna.SubtitleDeliveryMethod.External ? item.getSubtitleDeliveryMethod().toString() : ""));
+        list.add(new NameValuePair("CopyTimestamps", "false"));
+        list.add(new NameValuePair("ForceLiveStream", "false"));
+        list.add(new NameValuePair("SubtitleMethod", ""));
 
-        list.add(new NameValuePair("TranscodingMaxAudioChannels", item.getTranscodingMaxAudioChannels() != null ? String.valueOf(item.getTranscodingMaxAudioChannels()) : ""));
-        list.add(new NameValuePair("EnableSubtitlesInManifest", Boolean.valueOf(item.getEnableSubtitlesInManifest()).toString().toLowerCase()));
+        list.add(new NameValuePair("TranscodingMaxAudioChannels", ""));
+        list.add(new NameValuePair("EnableSubtitlesInManifest", "false"));
 
         String tempVar7 = item.getMediaSource().getETag();
         list.add(new NameValuePair("Tag", (tempVar7 != null) ? tempVar7 : ""));
@@ -559,24 +293,6 @@ public class StreamInfo {
         return list;
     }
 
-    public final ArrayList<SubtitleStreamInfo> GetExternalSubtitles(boolean includeSelectedTrackOnly, String baseUrl, String accessToken) {
-        return GetExternalSubtitles(includeSelectedTrackOnly, false, baseUrl, accessToken);
-    }
-
-    public final ArrayList<SubtitleStreamInfo> GetExternalSubtitles(boolean includeSelectedTrackOnly, boolean enableAllProfiles, String baseUrl, String accessToken) {
-        ArrayList<SubtitleStreamInfo> list = GetSubtitleProfiles(includeSelectedTrackOnly, enableAllProfiles, baseUrl, accessToken);
-        ArrayList<SubtitleStreamInfo> newList = new ArrayList<SubtitleStreamInfo>();
-
-        // First add the selected track
-        for (SubtitleStreamInfo stream : list) {
-            if (stream.getDeliveryMethod() == SubtitleDeliveryMethod.External) {
-                newList.add(stream);
-            }
-        }
-
-        return newList;
-    }
-
     public final ArrayList<SubtitleStreamInfo> GetSubtitleProfiles(boolean includeSelectedTrackOnly, String baseUrl, String accessToken) {
         return GetSubtitleProfiles(includeSelectedTrackOnly, false, baseUrl, accessToken);
     }
@@ -585,20 +301,11 @@ public class StreamInfo {
         ArrayList<SubtitleStreamInfo> list = new ArrayList<SubtitleStreamInfo>();
 
         // HLS will preserve timestamps so we can just grab the full subtitle stream
-        long startPositionTicks = MediaTypes.HLS.equalsIgnoreCase(getSubProtocol()) ? 0 : (getPlayMethod() == PlayMethod.Transcode && !getCopyTimestamps() ? getStartPositionTicks() : 0);
-
-        // First add the selected track
-        if (getSubtitleStreamIndex() != null) {
-            for (MediaStream stream : getMediaSource().getMediaStreams()) {
-                if (stream.getType() == MediaStreamType.Subtitle && stream.getIndex() == getSubtitleStreamIndex()) {
-                    AddSubtitleProfiles(list, stream, enableAllProfiles, baseUrl, accessToken, startPositionTicks);
-                }
-            }
-        }
+        long startPositionTicks = getPlayMethod() == PlayMethod.Transcode ? getStartPositionTicks() : 0;
 
         if (!includeSelectedTrackOnly) {
             for (MediaStream stream : getMediaSource().getMediaStreams()) {
-                if (stream.getType() == MediaStreamType.Subtitle && (getSubtitleStreamIndex() == null || stream.getIndex() != getSubtitleStreamIndex())) {
+                if (stream.getType() == MediaStreamType.Subtitle) {
                     AddSubtitleProfiles(list, stream, enableAllProfiles, baseUrl, accessToken, startPositionTicks);
                 }
             }
@@ -624,8 +331,6 @@ public class StreamInfo {
     private SubtitleStreamInfo GetSubtitleStreamInfo(MediaStream stream, String baseUrl, String accessToken, long startPositionTicks, SubtitleProfile[] subtitleProfiles) {
         SubtitleProfile subtitleProfile = StreamBuilder.GetSubtitleProfile(stream, subtitleProfiles, getPlayMethod());
         SubtitleStreamInfo tempVar = new SubtitleStreamInfo();
-        tempVar.setIsForced(stream.getIsForced());
-        tempVar.setLanguage(stream.getLanguage());
         String tempVar2 = stream.getLanguage();
         tempVar.setName((tempVar2 != null) ? tempVar2 : "Unknown");
         tempVar.setFormat(subtitleProfile.getFormat());
@@ -641,276 +346,18 @@ public class StreamInfo {
                 if (!Utils.isEmpty(accessToken)) {
                     info.setUrl(info.getUrl() + "?api_key=" + accessToken);
                 }
-
-                info.setIsExternalUrl(false);
             } else {
                 info.setUrl(stream.getPath());
-                info.setIsExternalUrl(true);
             }
         }
 
         return info;
     }
 
-    /**
-     * Returns the audio stream that will be used
-     */
-    public final MediaStream getTargetAudioStream() {
-        if (getMediaSource() != null) {
-            return getMediaSource().GetDefaultAudioStream(getAudioStreamIndex());
-        }
-
-        return null;
-    }
-
-    /**
-     * Returns the video stream that will be used
-     */
-    public final MediaStream getTargetVideoStream() {
-        if (getMediaSource() != null) {
-            return getMediaSource().getVideoStream();
-        }
-
-        return null;
-    }
-
-    /**
-     * Predicts the audio sample rate that will be in the output stream
-     */
-    public final Integer getTargetAudioSampleRate() {
-        MediaStream stream = getTargetAudioStream();
-        return stream == null ? null : stream.getSampleRate();
-    }
-
-    /**
-     * Predicts the audio sample rate that will be in the output stream
-     */
-    public final Integer getTargetVideoBitDepth() {
-        MediaStream stream = getTargetVideoStream();
-        return stream == null || !getIsDirectStream() ? null : stream.getBitDepth();
-    }
-
-    /**
-     * Gets the target reference frames.
-     *
-     * <value>The target reference frames.</value>
-     */
-    public final Integer getTargetRefFrames() {
-        MediaStream stream = getTargetVideoStream();
-        return stream == null || !getIsDirectStream() ? null : stream.getRefFrames();
-    }
-
-    /**
-     * Predicts the audio sample rate that will be in the output stream
-     */
-    public final Float getTargetFramerate() {
-        MediaStream stream = getTargetVideoStream();
-        Float tempVar = stream.getAverageFrameRate();
-        return getMaxFramerate() != null && !getIsDirectStream() ? getMaxFramerate() : stream == null ? null : (tempVar != null) ? tempVar : stream.getRealFrameRate();
-    }
-
-    /**
-     * Predicts the audio sample rate that will be in the output stream
-     */
-    public final Double getTargetVideoLevel() {
-        MediaStream stream = getTargetVideoStream();
-        return getVideoLevel() != null && !getIsDirectStream() ? getVideoLevel() : stream == null ? null : stream.getLevel();
-    }
-
-    /**
-     * Predicts the audio sample rate that will be in the output stream
-     */
-    public final Integer getTargetPacketLength() {
-        MediaStream stream = getTargetVideoStream();
-        return !getIsDirectStream() ? null : stream == null ? null : stream.getPacketLength();
-    }
-
-    /**
-     * Predicts the audio sample rate that will be in the output stream
-     */
-    public final String getTargetVideoProfile() {
-        MediaStream stream = getTargetVideoStream();
-        return !Utils.isEmpty(getVideoProfile()) && !getIsDirectStream() ? getVideoProfile() : stream == null ? null : stream.getProfile();
-    }
-
-    /**
-     * Gets the target video codec tag.
-     *
-     * <value>The target video codec tag.</value>
-     */
-    public final String getTargetVideoCodecTag() {
-        MediaStream stream = getTargetVideoStream();
-        return !getIsDirectStream() ? null : stream == null ? null : stream.getCodecTag();
-    }
-
-    /**
-     * Predicts the audio bitrate that will be in the output stream
-     */
-    public final Integer getTargetAudioBitrate() {
-        MediaStream stream = getTargetAudioStream();
-        return getAudioBitrate() != null && !getIsDirectStream() ? getAudioBitrate() : stream == null ? null : stream.getBitRate();
-    }
-
-    /**
-     * Predicts the audio channels that will be in the output stream
-     */
-    public final Integer getTargetAudioChannels() {
-        MediaStream stream = getTargetAudioStream();
-        Integer streamChannels = stream == null ? null : stream.getChannels();
-
-        if (getMaxAudioChannels() != null && !getIsDirectStream()) {
-            if (streamChannels != null) {
-                return Math.min(getMaxAudioChannels(), streamChannels);
-            }
-
-            return getMaxAudioChannels();
-        }
-
-        return streamChannels;
-    }
-
-    /**
-     * Predicts the audio codec that will be in the output stream
-     */
-    public final String getTargetAudioCodec() {
-        MediaStream stream = getTargetAudioStream();
-
-        String inputCodec = stream == null ? null : stream.getCodec();
-
-        if (getIsDirectStream()) {
-            return inputCodec;
-        }
-
-        for (String codec : getAudioCodecs()) {
-            if (codec.equalsIgnoreCase(inputCodec)) {
-                return codec;
-            }
-        }
-
-        return getAudioCodecs().length == 0 ? null : getAudioCodecs()[0];
-    }
-
-    /**
-     * Predicts the audio channels that will be in the output stream
-     */
-    public final Long getTargetSize() {
-        if (getIsDirectStream()) {
-            return getMediaSource().getSize();
-        }
-
-        if (getRunTimeTicks() != null) {
-            Integer totalBitrate = getTargetTotalBitrate();
-
-            double totalSeconds = getRunTimeTicks();
-            // Convert to ms
-            totalSeconds /= 10000;
-            // Convert to seconds
-            totalSeconds /= 1000;
-
-            return totalBitrate != null ? java.lang.Math.round(totalBitrate * totalSeconds) : (Long) null;
-        }
-
-        return null;
-    }
-
-    public final Integer getTargetVideoBitrate() {
-        MediaStream stream = getTargetVideoStream();
-
-        return getVideoBitrate() != null && !getIsDirectStream() ? getVideoBitrate() : stream == null ? null : stream.getBitRate();
-    }
-
-    public final TransportStreamTimestamp getTargetTimestamp() {
-        TransportStreamTimestamp defaultValue = ContainerTypes.M2TS.equalsIgnoreCase(getContainer()) ? TransportStreamTimestamp.Valid : TransportStreamTimestamp.None;
-        TransportStreamTimestamp tempVar = getMediaSource().getTimestamp();
-        return !getIsDirectStream() ? defaultValue : getMediaSource() == null ? defaultValue : (tempVar != null) ? tempVar : TransportStreamTimestamp.None;
-    }
-
-    public final Integer getTargetTotalBitrate() {
-        Integer tempVar = getTargetAudioBitrate();
-        Integer tempVar2 = getTargetVideoBitrate();
-        return ((tempVar != null) ? tempVar : 0) + ((tempVar2 != null) ? tempVar2 : 0);
-    }
-
-    public final Boolean getIsTargetAnamorphic() {
-        if (getIsDirectStream()) {
-            return getTargetVideoStream() == null ? null : getTargetVideoStream().getIsAnamorphic();
-        }
-
-        return false;
-    }
-
-    public final Integer getTargetWidth() {
-        MediaStream videoStream = getTargetVideoStream();
-
-        if (videoStream != null && videoStream.getWidth() != null && videoStream.getHeight() != null) {
-            ImageSize tempVar = new ImageSize();
-            tempVar.setWidth(videoStream.getWidth());
-            tempVar.setHeight(videoStream.getHeight());
-            ImageSize size = tempVar.clone();
-
-            Double maxWidth = getMaxWidth() != null ? (double) getMaxWidth() : (Double) null;
-            Double maxHeight = getMaxHeight() != null ? (double) getMaxHeight() : (Double) null;
-
-            ImageSize newSize = DrawingUtils.Resize(size.clone(), null, null, maxWidth, maxHeight);
-
-            return (int) newSize.getWidth();
-        }
-
-        return getMaxWidth();
-    }
-
-    public final Integer getTargetHeight() {
-        MediaStream videoStream = getTargetVideoStream();
-
-        if (videoStream != null && videoStream.getWidth() != null && videoStream.getHeight() != null) {
-            ImageSize tempVar = new ImageSize();
-            tempVar.setWidth(videoStream.getWidth());
-            tempVar.setHeight(videoStream.getHeight());
-            ImageSize size = tempVar.clone();
-
-            Double maxWidth = getMaxWidth() != null ? (double) getMaxWidth() : (Double) null;
-            Double maxHeight = getMaxHeight() != null ? (double) getMaxHeight() : (Double) null;
-
-            ImageSize newSize = DrawingUtils.Resize(size.clone(), null, null, maxWidth, maxHeight);
-
-            return (int) newSize.getHeight();
-        }
-
-        return getMaxHeight();
-    }
-
-    public final Integer getTargetVideoStreamCount() {
-        if (getIsDirectStream()) {
-            return GetMediaStreamCount(MediaStreamType.Video, Integer.MAX_VALUE);
-        }
-        return GetMediaStreamCount(MediaStreamType.Video, 1);
-    }
-
-    public final Integer getTargetAudioStreamCount() {
-        if (getIsDirectStream()) {
-            return GetMediaStreamCount(MediaStreamType.Audio, Integer.MAX_VALUE);
-        }
-        return GetMediaStreamCount(MediaStreamType.Audio, 1);
-    }
-
-    private Integer GetMediaStreamCount(MediaStreamType type, int limit) {
-        Integer count = getMediaSource().GetStreamCount(type);
-
-        if (count != null) {
-            count = Math.min(count, limit);
-        }
-
-        return count;
-    }
-
     public final ArrayList<MediaStream> GetSelectableAudioStreams() {
         return GetSelectableStreams(MediaStreamType.Audio);
     }
 
-    public final ArrayList<MediaStream> GetSelectableSubtitleStreams() {
-        return GetSelectableStreams(MediaStreamType.Subtitle);
-    }
-
     public final ArrayList<MediaStream> GetSelectableStreams(MediaStreamType type) {
         ArrayList<MediaStream> list = new ArrayList<MediaStream>();
 

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

@@ -1,20 +0,0 @@
-package org.jellyfin.androidtv.data.compat;
-
-import java.util.ArrayList;
-import java.util.Collections;
-
-@Deprecated
-public class StreamInfoSorter
-{
-    public static ArrayList<StreamInfo> SortMediaSources(ArrayList<StreamInfo> streams, Integer maxBitrate)
-    {
-        ChainedComparator<StreamInfo> comparator = new ChainedComparator<>(
-                new StreamInfoSorterComparator(0),
-                new StreamInfoSorterComparator(1),
-                new StreamInfoSorterComparator(2)
-        );
-
-        Collections.sort(streams, comparator);
-        return streams;
-    }
-}

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

@@ -1,47 +0,0 @@
-package org.jellyfin.androidtv.data.compat;
-
-import org.jellyfin.apiclient.model.mediainfo.MediaProtocol;
-import org.jellyfin.apiclient.model.session.PlayMethod;
-
-@Deprecated
-public class StreamInfoSorterComparator extends BaseStreamInfoSorter {
-    private int level;
-
-    public StreamInfoSorterComparator(int level) {
-        this.level = level;
-    }
-
-    @Override
-    protected int getValue(StreamInfo info) {
-        switch (level) {
-            case 0: {
-                // Nothing beats direct playing a file
-                if (info.getPlayMethod() == PlayMethod.DirectPlay && info.getMediaSource().getProtocol() == MediaProtocol.File) {
-                    return 0;
-                }
-
-                return 1;
-            }
-            case 1: {
-                switch (info.getPlayMethod()) {
-                    // Let's assume direct streaming a file is just as desirable as direct playing a remote url
-                    case DirectStream:
-                    case DirectPlay:
-                        return 0;
-                    default:
-                        return 1;
-                }
-            }
-            case 2: {
-                switch (info.getMediaSource().getProtocol()) {
-                    case File:
-                        return 0;
-                    default:
-                        return 1;
-                }
-            }
-        }
-
-        throw new IllegalArgumentException("Unrecognized level");
-    }
-}

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

@@ -14,16 +14,6 @@ public class SubtitleStreamInfo {
         Url = value;
     }
 
-    private String Language;
-
-    public final String getLanguage() {
-        return Language;
-    }
-
-    public final void setLanguage(String value) {
-        Language = value;
-    }
-
     private String Name;
 
     public final String getName() {
@@ -34,16 +24,6 @@ public class SubtitleStreamInfo {
         Name = value;
     }
 
-    private boolean IsForced;
-
-    public final boolean getIsForced() {
-        return IsForced;
-    }
-
-    public final void setIsForced(boolean value) {
-        IsForced = value;
-    }
-
     private String Format;
 
     public final String getFormat() {
@@ -83,14 +63,4 @@ public class SubtitleStreamInfo {
     public final void setDeliveryMethod(SubtitleDeliveryMethod value) {
         DeliveryMethod = value;
     }
-
-    private boolean IsExternalUrl;
-
-    public final boolean getIsExternalUrl() {
-        return IsExternalUrl;
-    }
-
-    public final void setIsExternalUrl(boolean value) {
-        IsExternalUrl = value;
-    }
 }

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

@@ -1,11 +1,10 @@
 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.os.Looper;
 import android.widget.Toast;
 
 import org.jellyfin.androidtv.R;
@@ -32,6 +31,7 @@ import org.jellyfin.apiclient.model.session.MessageCommand;
 import org.jellyfin.apiclient.model.session.PlayRequest;
 import org.jellyfin.apiclient.model.session.PlaystateRequest;
 import org.jellyfin.apiclient.model.session.SessionInfoDto;
+import org.koin.java.KoinJavaComponent;
 
 import java.util.Arrays;
 
@@ -40,10 +40,14 @@ import timber.log.Timber;
 public class TvApiEventListener extends ApiEventListener {
     private final DataRefreshService dataRefreshService;
     private final MediaManager mediaManager;
+    private final Handler mainThreadHandler;
 
     public TvApiEventListener(DataRefreshService dataRefreshService, MediaManager mediaManager) {
         this.dataRefreshService = dataRefreshService;
         this.mediaManager = mediaManager;
+
+        //handler to interact with the players (exoplayer doesn't allow access from another thread)
+        mainThreadHandler = new Handler(Looper.getMainLooper());
     }
 
     @Override
@@ -75,57 +79,53 @@ public class TvApiEventListener extends ApiEventListener {
     @Override
     public void onPlaystateCommand(ApiClient client, PlaystateRequest command) {
         PlaybackController playbackController = TvApp.getApplication().getPlaybackController();
+        Timber.d("caught playstate command: %s", command.getCommand());
 
         switch (command.getCommand()) {
             case Stop:
-                if (mediaManager.isPlayingAudio())
-                    mediaManager.stopAudio();
+                if (mediaManager.getIsAudioPlayerInitialized())
+                    mainThreadHandler.post(() -> mediaManager.stopAudio(true));
                 else {
                     Activity currentActivity = TvApp.getApplication().getCurrentActivity();
-
+                    if(playbackController != null && mediaManager.hasVideoQueueItems() && playbackController.hasInitializedVideoManager())
+                        mainThreadHandler.post(() -> playbackController.endPlayback());
                     if(currentActivity instanceof PlaybackOverlayActivity)
                         currentActivity.finish();
                 }
                 break;
             case Pause:
-                if (mediaManager.isPlayingAudio())
-                    mediaManager.pauseAudio();
-                else if(playbackController != null)
-                    playbackController.playPause();
-                break;
             case Unpause:
-                if (mediaManager.hasAudioQueueItems())
-                    mediaManager.resumeAudio();
-                else if(playbackController != null)
-                    playbackController.playPause();
+            case PlayPause:
+                if (mediaManager.getIsAudioPlayerInitialized())
+                    mainThreadHandler.post(() -> mediaManager.playPauseAudio());
+                else if(playbackController != null && mediaManager.hasVideoQueueItems() && playbackController.hasInitializedVideoManager())
+                    mainThreadHandler.post(() -> playbackController.playPause());
                 break;
             case NextTrack:
-                if (mediaManager.hasAudioQueueItems())
-                    mediaManager.nextAudioItem();
-                else if(playbackController != null)
-                    playbackController.next();
+                if (mediaManager.getIsAudioPlayerInitialized() && mediaManager.hasAudioQueueItems())
+                    mainThreadHandler.post(() -> mediaManager.nextAudioItem());
+                else if(playbackController != null && mediaManager.hasVideoQueueItems() && playbackController.hasInitializedVideoManager())
+                    mainThreadHandler.post(() -> playbackController.next());
                 break;
             case PreviousTrack:
-                if (mediaManager.hasAudioQueueItems())
-                    mediaManager.prevAudioItem();
-                else if(playbackController != null)
-                    playbackController.prev();
+                if (mediaManager.getIsAudioPlayerInitialized() && mediaManager.hasAudioQueueItems())
+                    mainThreadHandler.post(() -> mediaManager.prevAudioItem());
+                else if(playbackController != null && mediaManager.hasVideoQueueItems() && playbackController.hasInitializedVideoManager())
+                    mainThreadHandler.post(() -> playbackController.prev());
                 break;
             case Seek:
-                if (playbackController == null) break;
-
-                long pos = command.getSeekPositionTicks() / 10000;
-                playbackController.seek(pos);
+                if(playbackController != null && mediaManager.hasVideoQueueItems() && playbackController.hasInitializedVideoManager()) {
+                    long pos = command.getSeekPositionTicks() / 10000;
+                    mainThreadHandler.post(() -> playbackController.seek(pos));
+                }
                 break;
             case Rewind:
-                if (playbackController == null) break;
-
-                playbackController.skip(-11000);
+                if (playbackController != null && mediaManager.hasVideoQueueItems() && playbackController.hasInitializedVideoManager())
+                    mainThreadHandler.post(() -> playbackController.skip(-11000));
                 break;
             case FastForward:
-                if (playbackController == null) break;
-
-                playbackController.skip(30000);
+                if (playbackController != null && mediaManager.hasVideoQueueItems() && playbackController.hasInitializedVideoManager())
+                    mainThreadHandler.post(() -> playbackController.skip(30000));
                 break;
         }
     }
@@ -133,77 +133,82 @@ public class TvApiEventListener extends ApiEventListener {
     @Override
     public void onBrowseCommand(ApiClient client, BrowseRequest command) {
         Timber.d("Browse command received");
-        if (TvApp.getApplication().getCurrentActivity() == null || videoPlaying()) {
-            Timber.i("Command ignored due to no activity or playback in progress");
-            return;
-        }
-        client.GetItemAsync(command.getItemId(), TvApp.getApplication().getCurrentUser().getId(), new Response<BaseItemDto>() {
-            @Override
-            public void onResponse(BaseItemDto response) {
-                //Create a rowItem and pass to our handler
-                ItemLauncher.launch(new BaseRowItem(0, response), null, -1, TvApp.getApplication().getCurrentActivity(), true);
-            }
-        });
-    }
+        if (Utils.isEmpty(command.getItemId())) return;
 
-    private boolean videoPlaying() {
-        return (TvApp.getApplication().getPlaybackController() != null && (TvApp.getApplication().getPlaybackController().isPlaying() || TvApp.getApplication().getPlaybackController().isPaused()));
+        mainThreadHandler.post(() -> {
+            if (TvApp.getApplication().getCurrentActivity() == null ||
+                    (TvApp.getApplication().getPlaybackController() != null && (TvApp.getApplication().getPlaybackController().isPlaying() || TvApp.getApplication().getPlaybackController().isPaused()))) {
+                Timber.i("Command ignored due to no activity or playback in progress");
+                return;
+            }
+            client.GetItemAsync(command.getItemId(), TvApp.getApplication().getCurrentUser().getId(), new Response<BaseItemDto>() {
+                @Override
+                public void onResponse(BaseItemDto response) {
+                    //Create a rowItem and pass to our handler
+                    ItemLauncher.launch(new BaseRowItem(0, response), null, -1, TvApp.getApplication().getCurrentActivity(), true);
+                }
+            });
+        });
     }
 
     @Override
     public void onPlayCommand(ApiClient client, PlayRequest command) {
-        if (videoPlaying()) {
-            TvApp.getApplication().getCurrentActivity().runOnUiThread(new Runnable() {
-                @Override
-                public void run() {
-                    Utils.showToast(TvApp.getApplication().getCurrentActivity(), TvApp.getApplication().getString(R.string.msg_remote_already_playing));
-                }
-            });
-            return;
-        }
-
-        if (command.getItemIds().length > 1) {
-            Timber.i("Playing multiple items by remote request");
-            if (TvApp.getApplication().getCurrentActivity() == null) {
-                Timber.e("No current activity.  Cannot play");
+        mainThreadHandler.post(() -> {
+            if (TvApp.getApplication().getPlaybackController() != null && (TvApp.getApplication().getPlaybackController().isPlaying() || TvApp.getApplication().getPlaybackController().isPaused())) {
+                TvApp.getApplication().getCurrentActivity().runOnUiThread(new Runnable() {
+                    @Override
+                    public void run() {
+                        Utils.showToast(TvApp.getApplication().getCurrentActivity(), TvApp.getApplication().getString(R.string.msg_remote_already_playing));
+                    }
+                });
                 return;
             }
-            StdItemQuery query = new StdItemQuery(new ItemFields[]{
-                    ItemFields.MediaSources,
-                    ItemFields.ChildCount
-            });
-            query.setIds(command.getItemIds());
-            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":
-                                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()));
-                                break;
+            if (command.getItemIds().length > 1) {
+                Timber.i("Playing multiple items by remote request");
+                if (TvApp.getApplication().getCurrentActivity() == null) {
+                    Timber.e("No current activity.  Cannot play");
+                    return;
+                }
+                int startIndex = command.getStartIndex() == null ? 0 : command.getStartIndex().intValue();
+                int startPosition = command.getStartPositionTicks() == null || command.getStartPositionTicks().longValue() == 0 ? 0 : Long.valueOf(command.getStartPositionTicks() / 10000L).intValue();
+                Timber.d("got queue start index: %s position %s", startIndex, startPosition);
+                StdItemQuery query = new StdItemQuery(new ItemFields[]{
+                        ItemFields.MediaSources,
+                        ItemFields.ChildCount
+                });
+                query.setIds(command.getItemIds());
+                KoinJavaComponent.<ApiClient>get(ApiClient.class).GetItemsAsync(query, new Response<ItemsResult>() {
+                    @Override
+                    public void onResponse(ItemsResult response) {
+                        if (response.getItems() != null && response.getItems().length > 0) {
+                            PlaybackLauncher playbackLauncher = KoinJavaComponent.<PlaybackLauncher>get(PlaybackLauncher.class);
+                            if (playbackLauncher.interceptPlayRequest(TvApp.getApplication(), response.getItems()[0])) return;
 
+                            //peek at first item to see what type it is
+                            switch (response.getItems()[0].getMediaType()) {
+                                case "Video":
+                                    Class activity = KoinJavaComponent.<PlaybackLauncher>get(PlaybackLauncher.class).getPlaybackActivityClass(response.getItems()[0].getBaseItemType());
+                                    mediaManager.setCurrentVideoQueue(Arrays.asList(response.getItems()));
+                                    Intent intent = new Intent(TvApp.getApplication().getCurrentActivity(), activity);
+                                    intent.putExtra("Position", startPosition);
+                                    TvApp.getApplication().getCurrentActivity().startActivity(intent);
+                                    break;
+                                case "Audio":
+                                    mediaManager.playNow(TvApp.getApplication().getCurrentActivity(), Arrays.asList(response.getItems()), startIndex, false);
+                                    break;
+                            }
                         }
                     }
-                }
-            });
+                });
 
-        } else {
-            if (command.getItemIds().length > 0) {
-                Timber.i("Playing single item by remote request");
-                Context context = TvApp.getApplication().getCurrentActivity() != null ? TvApp.getApplication().getCurrentActivity() : TvApp.getApplication();
-                PlaybackHelper.retrieveAndPlay(command.getItemIds()[0], false, command.getStartPositionTicks() != null ? command.getStartPositionTicks() : 0, context);
+            } else {
+                if (command.getItemIds().length > 0) {
+                    Timber.i("Playing single item by remote request");
+                    Context context = TvApp.getApplication().getCurrentActivity() != null ? TvApp.getApplication().getCurrentActivity() : TvApp.getApplication();
+                    PlaybackHelper.retrieveAndPlay(command.getItemIds()[0], false, command.getStartPositionTicks(), context);
+                }
             }
-        }
+        });
     }
 
     @Override

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

@@ -1,10 +1,10 @@
 package org.jellyfin.androidtv.data.model;
 
+import org.jellyfin.apiclient.model.querying.ItemFilter;
+
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jellyfin.apiclient.model.querying.ItemFilter;
-
 public class FilterOptions {
     private boolean favoriteOnly;
     private boolean unwatchedOnly;

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

@@ -1,12 +0,0 @@
-package org.jellyfin.androidtv.data.model;
-
-public class LiveTvPrefs {
-    public String channelOrder = "DatePlayed";
-    public boolean showNewIndicator;
-    public boolean showRepeatIndicator;
-    public boolean showPremiereIndicator = true;
-    public boolean favsAtTop = true;
-    public boolean showLiveIndicator = true;
-    public boolean showHDIndicator;
-    public boolean colorCodeGuide;
-}

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

@@ -1,7 +1,6 @@
 package org.jellyfin.androidtv.data.querying;
 
 import org.jellyfin.androidtv.TvApp;
-
 import org.jellyfin.apiclient.model.querying.ItemFields;
 import org.jellyfin.apiclient.model.querying.ItemQuery;
 

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

@@ -0,0 +1,38 @@
+package org.jellyfin.androidtv.data.repository
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.liveData
+import org.jellyfin.apiclient.model.entities.CollectionType
+import org.jellyfin.sdk.api.client.ApiClient
+import org.jellyfin.sdk.api.client.extensions.userViewsApi
+import org.jellyfin.sdk.model.api.BaseItemDto
+
+interface UserViewsRepository {
+	val views: LiveData<Collection<BaseItemDto>>
+
+	fun isSupported(collectionType: String?): Boolean
+	fun allowViewSelection(collectionType: String?): Boolean
+}
+
+class UserViewsRepositoryImpl(
+	private val api: ApiClient,
+) : UserViewsRepository {
+	override val views: LiveData<Collection<BaseItemDto>> = liveData {
+		val views by api.userViewsApi.getUserViews()
+		val filteredViews = views.items
+			.orEmpty()
+			.filter { isSupported(it.collectionType) }
+		emit(filteredViews)
+	}
+
+	override fun isSupported(collectionType: String?) = collectionType !in unsupportedCollectionTypes
+	override fun allowViewSelection(collectionType: String?) = collectionType != CollectionType.Music
+
+	private companion object {
+		private val unsupportedCollectionTypes = arrayOf(
+			CollectionType.Books,
+			CollectionType.Games,
+			CollectionType.Folders
+		)
+	}
+}

app/src/main/java/org/jellyfin/androidtv/data/service/BackgroundService.kt

@@ -17,16 +17,24 @@ import androidx.core.graphics.drawable.toBitmap
 import androidx.core.graphics.drawable.toDrawable
 import androidx.fragment.app.FragmentActivity
 import androidx.fragment.app.add
-import androidx.window.WindowManager
+import androidx.window.layout.WindowMetricsCalculator
 import com.bumptech.glide.Glide
-import kotlinx.coroutines.*
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.MainScope
+import kotlinx.coroutines.async
+import kotlinx.coroutines.awaitAll
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import org.jellyfin.androidtv.R
 import org.jellyfin.androidtv.preference.UserPreferences
-import org.jellyfin.apiclient.interaction.ApiClient
 import org.jellyfin.apiclient.model.dto.BaseItemDto
-import org.jellyfin.apiclient.model.dto.ImageOptions
-import org.jellyfin.apiclient.model.entities.ImageType
 import org.jellyfin.apiclient.model.search.SearchHint
+import org.jellyfin.sdk.api.client.ApiClient
+import org.jellyfin.sdk.api.client.extensions.imageApi
+import org.jellyfin.sdk.model.api.ImageType
+import org.jellyfin.sdk.model.serializer.toUUID
 import timber.log.Timber
 import java.util.concurrent.ExecutionException
 
@@ -37,7 +45,7 @@ class BackgroundService(
 ) {
 	companion object {
 		const val TRANSITION_DURATION = 400L // 0.4 seconds
-		const val SLIDESHOW_DURATION = 10000L // 10 seconds
+		const val SLIDESHOW_DURATION = 30000L // 30 seconds
 		const val UPDATE_INTERVAL = 500L // 0.5 seconds
 		val FRAGMENT_TAG = BackgroundServiceFragment::class.qualifiedName!!
 	}
@@ -99,8 +107,8 @@ class BackgroundService(
 		backgroundDrawable.setDrawableByLayerId(R.id.background_static, windowBackground)
 
 		// Store size of window manager for this activity
-		windowSize = WindowManager(activity).getCurrentWindowMetrics().bounds.let {
-			Size(it.right, it.bottom)
+		windowSize = WindowMetricsCalculator.getOrCreate().computeCurrentWindowMetrics(activity).let {
+			Size(it.bounds.width(), it.bounds.height())
 		}
 
 		// Add a fragment to the activity to automatically set the background on resume
@@ -122,11 +130,12 @@ class BackgroundService(
 		if (itemId == null || isNullOrEmpty()) return emptyList()
 
 		return mapIndexed { index, tag ->
-			apiClient.GetImageUrl(itemId, ImageOptions().apply {
-				imageType = ImageType.Backdrop
-				setImageIndex(index)
-				setTag(tag)
-			})
+			apiClient.imageApi.getItemImageUrl(
+				itemId = itemId.toUUID(),
+				imageType = ImageType.BACKDROP,
+				tag = tag,
+				imageIndex = index,
+			)
 		}
 	}
 
@@ -155,11 +164,13 @@ class BackgroundService(
 			return clearBackgrounds()
 
 		// Manually grab the backdrop URL
-		val options = ImageOptions()
-		options.imageType = ImageType.Backdrop
-		options.tag = searchHint.backdropImageTag
-
-		val backdropUrls = setOfNotNull(searchHint.backdropImageItemId?.let { apiClient.GetImageUrl(it, options) })
+		val backdropUrls = setOfNotNull(searchHint.backdropImageItemId?.let { itemId ->
+			apiClient.imageApi.getItemImageUrl(
+				itemId = itemId.toUUID(),
+				imageType = ImageType.BACKDROP,
+				tag = searchHint.backdropImageTag,
+			)
+		})
 
 		loadBackgrounds(backdropUrls)
 	}

app/src/main/java/org/jellyfin/androidtv/di/ActivityLifecycleCallbacksModule.kt

@@ -8,7 +8,7 @@ import org.koin.dsl.bind
 import org.koin.dsl.module
 
 val activityLifecycleCallbacksModule = module {
-	single { AuthenticatedUserCallbacks() } bind Application.ActivityLifecycleCallbacks::class
+	single { AuthenticatedUserCallbacks(get()) } bind Application.ActivityLifecycleCallbacks::class
 	single { AppThemeCallbacks(get()) } bind Application.ActivityLifecycleCallbacks::class
 	single { CurrentActivityCallbacks() } bind Application.ActivityLifecycleCallbacks::class
 }

app/src/main/java/org/jellyfin/androidtv/di/AppModule.kt

@@ -6,18 +6,21 @@ import org.jellyfin.androidtv.auth.ServerRepository
 import org.jellyfin.androidtv.auth.ServerRepositoryImpl
 import org.jellyfin.androidtv.data.eventhandling.TvApiEventListener
 import org.jellyfin.androidtv.data.model.DataRefreshService
+import org.jellyfin.androidtv.data.repository.UserViewsRepository
+import org.jellyfin.androidtv.data.repository.UserViewsRepositoryImpl
 import org.jellyfin.androidtv.data.service.BackgroundService
 import org.jellyfin.androidtv.ui.playback.MediaManager
 import org.jellyfin.androidtv.ui.playback.nextup.NextUpViewModel
 import org.jellyfin.androidtv.ui.startup.LoginViewModel
+import org.jellyfin.androidtv.util.sdk.legacy
 import org.jellyfin.apiclient.AppInfo
 import org.jellyfin.apiclient.android
-import org.jellyfin.apiclient.interaction.AndroidDevice
-import org.jellyfin.apiclient.interaction.device.IDevice
 import org.jellyfin.apiclient.logging.AndroidLogger
 import org.jellyfin.apiclient.serialization.GsonJsonSerializer
-import org.jellyfin.sdk.android
+import org.jellyfin.sdk.android.androidDevice
+import org.jellyfin.sdk.createJellyfin
 import org.jellyfin.sdk.model.ClientInfo
+import org.jellyfin.sdk.model.DeviceInfo
 import org.koin.android.ext.koin.androidApplication
 import org.koin.android.ext.koin.androidContext
 import org.koin.androidx.viewmodel.dsl.viewModel
@@ -26,18 +29,20 @@ import org.koin.dsl.module
 import org.jellyfin.apiclient.Jellyfin as JellyfinApiClient
 import org.jellyfin.sdk.Jellyfin as JellyfinSdk
 
+val defaultDeviceInfo = named("defaultDeviceInfo")
 val userApiClient = named("userApiClient")
 val systemApiClient = named("systemApiClient")
 
 val appModule = module {
 	// New SDK
+	single(defaultDeviceInfo) { androidDevice(get()) }
 	single {
-		JellyfinSdk {
-			// Set deviceInfo and discovery provider
-			android(androidContext())
+		createJellyfin {
+			context = androidContext()
 
 			// Add client info
 			clientInfo = ClientInfo("Android TV", BuildConfig.VERSION_NAME)
+			// FIXME (SDK 1.2.0) deviceInfo = get(defaultDeviceInfo)
 		}
 	}
 
@@ -62,13 +67,9 @@ val appModule = module {
 		}
 	}
 
-	single<IDevice> {
-		AndroidDevice.fromContext(androidApplication())
-	}
-
 	single {
 		get<JellyfinApiClient>().createApi(
-			device = get(),
+			device = get<DeviceInfo>(defaultDeviceInfo).legacy(),
 			eventListener = TvApiEventListener(get(), get())
 		)
 	}
@@ -76,15 +77,15 @@ val appModule = module {
 	// Non API related
 	single { MediaManager() }
 
-
 	single { DataRefreshService() }
 
 	factory { WorkManager.getInstance(androidContext()) }
 
 	single<ServerRepository> { ServerRepositoryImpl(get(), get(), get(), get()) }
+	single<UserViewsRepository> { UserViewsRepositoryImpl(get(userApiClient)) }
 
 	viewModel { LoginViewModel(get(), get(), get()) }
-	viewModel { NextUpViewModel(get(), get(), get()) }
+	viewModel { NextUpViewModel(get(), get(), get(), get(), get()) }
 
-	single { BackgroundService(get(), get(), get()) }
+	single { BackgroundService(get(), get(userApiClient), get()) }
 }

app/src/main/java/org/jellyfin/androidtv/di/AuthModule.kt

@@ -2,7 +2,14 @@ package org.jellyfin.androidtv.di
 
 import androidx.core.content.getSystemService
 import org.jellyfin.androidtv.JellyfinApplication
-import org.jellyfin.androidtv.auth.*
+import org.jellyfin.androidtv.auth.AccountManagerHelper
+import org.jellyfin.androidtv.auth.ApiBinder
+import org.jellyfin.androidtv.auth.AuthenticationRepository
+import org.jellyfin.androidtv.auth.AuthenticationRepositoryImpl
+import org.jellyfin.androidtv.auth.AuthenticationStore
+import org.jellyfin.androidtv.auth.LegacyAccountMigration
+import org.jellyfin.androidtv.auth.SessionRepository
+import org.jellyfin.androidtv.auth.SessionRepositoryImpl
 import org.koin.android.ext.koin.androidApplication
 import org.koin.android.ext.koin.androidContext
 import org.koin.dsl.module
@@ -11,11 +18,11 @@ val authModule = module {
 	single { AuthenticationStore(androidContext()) }
 	single { AccountManagerHelper(androidContext().getSystemService()!!) }
 	single<AuthenticationRepository> {
-		AuthenticationRepositoryImpl(get(), get(), get(), get(), get(), get(userApiClient), get())
+		AuthenticationRepositoryImpl(get(), get(), get(), get(), get(userApiClient), get(), get(defaultDeviceInfo))
 	}
 	single<SessionRepository> {
-		SessionRepositoryImpl(get(), get(), get(), get(), get(userApiClient), get(systemApiClient))
+		SessionRepositoryImpl(get(), get(), get(), get(), get(userApiClient), get(systemApiClient), get(), get(defaultDeviceInfo))
 	}
 	single { LegacyAccountMigration(androidContext(), get(), get(), get()) }
-	single { ApiBinder(androidApplication() as JellyfinApplication, get(), get(), get()) }
+	single { ApiBinder(androidApplication() as JellyfinApplication, get(), get()) }
 }

app/src/main/java/org/jellyfin/androidtv/di/KoinInitializer.kt

@@ -0,0 +1,26 @@
+package org.jellyfin.androidtv.di
+
+import android.content.Context
+import androidx.startup.Initializer
+import org.jellyfin.androidtv.LogInitializer
+import org.koin.android.ext.koin.androidContext
+import org.koin.core.KoinApplication
+import org.koin.core.context.startKoin
+
+class KoinInitializer : Initializer<KoinApplication> {
+	override fun create(context: Context): KoinApplication = startKoin {
+		androidContext(context)
+
+		modules(
+			appModule,
+			authModule,
+			activityLifecycleCallbacksModule,
+			playbackModule,
+			preferenceModule,
+			utilsModule
+		)
+	}
+
+	override fun dependencies() = listOf(LogInitializer::class.java)
+}
+

app/src/main/java/org/jellyfin/androidtv/di/PlaybackModule.kt

@@ -5,17 +5,11 @@ import org.jellyfin.androidtv.preference.UserPreferences
 import org.jellyfin.androidtv.ui.playback.GarbagePlaybackLauncher
 import org.jellyfin.androidtv.ui.playback.PlaybackManager
 import org.jellyfin.androidtv.ui.playback.RewritePlaybackLauncher
-import org.jellyfin.apiclient.interaction.AndroidDevice
-import org.jellyfin.apiclient.logging.AndroidLogger
-import org.koin.android.ext.koin.androidApplication
 import org.koin.dsl.module
 
 val playbackModule = module {
 	single {
-		PlaybackManager(
-			AndroidDevice.fromContext(androidApplication()),
-			AndroidLogger("PlaybackManager")
-		)
+		PlaybackManager(get(userApiClient))
 	}
 
 	factory {

app/src/main/java/org/jellyfin/androidtv/di/PreferenceModule.kt

@@ -1,12 +1,19 @@
 package org.jellyfin.androidtv.di
 
 import org.jellyfin.androidtv.preference.AuthenticationPreferences
+import org.jellyfin.androidtv.preference.LiveTvPreferences
+import org.jellyfin.androidtv.preference.PreferencesRepository
 import org.jellyfin.androidtv.preference.SystemPreferences
 import org.jellyfin.androidtv.preference.UserPreferences
+import org.jellyfin.androidtv.preference.UserSettingPreferences
 import org.koin.android.ext.koin.androidApplication
 import org.koin.dsl.module
 
 val preferenceModule = module {
+	single { PreferencesRepository(get(userApiClient), get(), get()) }
+
+	single { LiveTvPreferences(get(userApiClient)) }
+	single { UserSettingPreferences(get(userApiClient)) }
 	single { AuthenticationPreferences(androidApplication()) }
 	single { UserPreferences(androidApplication()) }
 	single { SystemPreferences(androidApplication()) }

app/src/main/java/org/jellyfin/androidtv/di/UtilsModule.kt

@@ -1,8 +1,10 @@
 package org.jellyfin.androidtv.di
 
 import org.jellyfin.androidtv.util.AutoBitrate
+import org.jellyfin.androidtv.util.ImageHelper
 import org.koin.dsl.module
 
 val utilsModule = module {
 	single { AutoBitrate(get(userApiClient)) }
+	single { ImageHelper(get(userApiClient)) }
 }

app/src/main/java/org/jellyfin/androidtv/integration/LeanbackChannelWorker.kt

@@ -8,27 +8,42 @@ import android.os.Build
 import androidx.core.content.res.ResourcesCompat
 import androidx.core.graphics.drawable.toBitmap
 import androidx.core.net.toUri
-import androidx.tvprovider.media.tv.*
+import androidx.tvprovider.media.tv.Channel
+import androidx.tvprovider.media.tv.ChannelLogoUtils
+import androidx.tvprovider.media.tv.PreviewProgram
+import androidx.tvprovider.media.tv.TvContractCompat
 import androidx.tvprovider.media.tv.TvContractCompat.WatchNextPrograms
+import androidx.tvprovider.media.tv.WatchNextProgram
 import androidx.work.CoroutineWorker
 import androidx.work.WorkerParameters
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.async
+import kotlinx.coroutines.withContext
 import org.jellyfin.androidtv.R
+import org.jellyfin.androidtv.data.repository.UserViewsRepository
 import org.jellyfin.androidtv.di.systemApiClient
 import org.jellyfin.androidtv.preference.UserPreferences
-import org.jellyfin.androidtv.ui.itemhandling.ItemRowAdapter
 import org.jellyfin.androidtv.ui.startup.StartupActivity
 import org.jellyfin.androidtv.util.ImageUtils
 import org.jellyfin.androidtv.util.dp
 import org.jellyfin.androidtv.util.sdk.isUsable
-import org.jellyfin.sdk.api.client.KtorClient
-import org.jellyfin.sdk.api.operations.ImageApi
-import org.jellyfin.sdk.api.operations.TvShowsApi
-import org.jellyfin.sdk.api.operations.UserViewsApi
-import org.jellyfin.sdk.model.api.*
+import org.jellyfin.apiclient.model.dto.BaseItemType
+import org.jellyfin.apiclient.model.entities.MediaType
+import org.jellyfin.sdk.api.client.ApiClient
+import org.jellyfin.sdk.api.client.exception.ApiClientException
+import org.jellyfin.sdk.api.client.exception.TimeoutException
+import org.jellyfin.sdk.api.client.extensions.imageApi
+import org.jellyfin.sdk.api.client.extensions.itemsApi
+import org.jellyfin.sdk.api.client.extensions.tvShowsApi
+import org.jellyfin.sdk.api.client.extensions.userViewsApi
+import org.jellyfin.sdk.model.api.BaseItemDto
+import org.jellyfin.sdk.model.api.ImageFormat
+import org.jellyfin.sdk.model.api.ImageType
+import org.jellyfin.sdk.model.api.ItemFields
 import org.jellyfin.sdk.model.serializer.toUUIDOrNull
-import org.koin.core.component.KoinApiExtension
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
+import timber.log.Timber
 import java.time.ZoneOffset
 
 /**
@@ -36,7 +51,6 @@ import java.time.ZoneOffset
  *
  * More info: https://developer.android.com/training/tv/discovery/recommendations-channel.
  */
-@KoinApiExtension
 class LeanbackChannelWorker(
 	private val context: Context,
 	workerParams: WorkerParameters,
@@ -50,11 +64,9 @@ class LeanbackChannelWorker(
 		const val PERIODIC_UPDATE_REQUEST_NAME = "LeanbackChannelPeriodicUpdateRequest"
 	}
 
-	private val apiClient by inject<KtorClient>(systemApiClient)
-	private val userViewsApi by lazy { UserViewsApi(apiClient) }
-	private val imageApi by lazy { ImageApi(apiClient) }
-	private val tvShowsApi by lazy { TvShowsApi(apiClient) }
+	private val api by inject<ApiClient>(systemApiClient)
 	private val userPreferences by inject<UserPreferences>()
+	private val userViewsRepository by inject<UserViewsRepository>()
 
 	/**
 	 * Check if the app can use Leanback features and is API level 26 or higher.
@@ -72,10 +84,10 @@ class LeanbackChannelWorker(
 		// Fail when not supported
 		!isSupported -> Result.failure()
 		// Retry later if no authenticated user is found
-		!apiClient.isUsable -> Result.retry()
-		else -> {
+		!api.isUsable -> Result.retry()
+		else -> try {
 			// Get next up episodes
-			val nextUpItems = getNextUpItems()
+			val (resumeItems, nextUpItems) = getNextUpItems()
 
 			// Delete current items from the My Media and Next Up channels
 			context.contentResolver.delete(TvContractCompat.PreviewPrograms.CONTENT_URI, null, null)
@@ -83,10 +95,18 @@ class LeanbackChannelWorker(
 			// Update various channels
 			updateMyMedia()
 			updateNextUp(nextUpItems)
-			updateWatchNext(nextUpItems)
+			updateWatchNext(resumeItems + nextUpItems)
 
 			// Success!
 			Result.success()
+		} catch (err: TimeoutException) {
+			Timber.w(err, "Server unreachable, trying again later")
+
+			Result.retry()
+		} catch (err: ApiClientException) {
+			Timber.e(err, "SDK error, trying again later")
+
+			Result.retry()
 		}
 	}
 
@@ -95,7 +115,7 @@ class LeanbackChannelWorker(
 	 * update or create the channel. The [name] parameter is used to store the id and should be
 	 * unique.
 	 */
-	private fun getChannelUri(name: String, settings: Channel): Uri {
+	private fun getChannelUri(name: String, settings: Channel, default: Boolean = false): Uri {
 		val store = context.getSharedPreferences("leanback_channels", Context.MODE_PRIVATE)
 
 		val uri = if (store.contains(name)) {
@@ -107,16 +127,16 @@ class LeanbackChannelWorker(
 			// Create new channel and save uri
 			context.contentResolver.insert(TvContractCompat.Channels.CONTENT_URI, settings.toContentValues())!!.also { uri ->
 				store.edit().putString(name, uri.toString()).apply()
+				if (default) {
+					// Set as default row to display (we can request one row to automatically be added to the home screen)
+					TvContractCompat.requestChannelBrowsable(context, ContentUris.parseId(uri))
+				}
 			}
-
-			// Set as default row to display (we can request one row to automatically be added to the home screen)
-			// Should be enabled when we add a row that we want to display by default
-			// TvContractCompat.requestChannelBrowsable(application, ContentUris.parseId(uri))
 		}
 
 		// Update logo
 		ResourcesCompat.getDrawable(context.resources, R.drawable.app_icon, null)?.let {
-			ChannelLogoUtils.storeChannelLogo(context, ContentUris.parseId(uri), it.toBitmap(80.dp, 80.dp))
+			ChannelLogoUtils.storeChannelLogo(context, ContentUris.parseId(uri), it.toBitmap(80.dp(context), 80.dp(context)))
 		}
 
 		return uri
@@ -125,23 +145,24 @@ class LeanbackChannelWorker(
 	/**
 	 * Updates the "my media" row with current media libraries.
 	 */
+	@Suppress("RestrictedApi")
 	private suspend fun updateMyMedia() {
 		// Get channel
 		val channelUri = getChannelUri("my_media", Channel.Builder()
 			.setType(TvContractCompat.Channels.TYPE_PREVIEW)
 			.setDisplayName(context.getString(R.string.lbl_my_media))
 			.setAppLinkIntent(Intent(context, StartupActivity::class.java))
-			.build())
+			.build(), default = true)
 
-		val response by userViewsApi.getUserViews(includeHidden = false)
+		val response by api.userViewsApi.getUserViews(includeHidden = false)
 
 		// Add new items
 		val items = response.items
 			.orEmpty()
-			.filterNot { it.collectionType in ItemRowAdapter.ignoredCollectionTypes }
+			.filter { userViewsRepository.isSupported(it.collectionType) }
 			.map { item ->
 				val imageUri = if (item.imageTags?.contains(ImageType.PRIMARY) == true)
-					imageApi.getItemImageUrl(item.id, ImageType.PRIMARY).toUri()
+					api.imageApi.getItemImageUrl(item.id, ImageType.PRIMARY).toUri()
 				else
 					ImageUtils.getResourceUrl(context, R.drawable.tile_land_tv).toUri()
 
@@ -167,14 +188,14 @@ class LeanbackChannelWorker(
 	 */
 	private fun BaseItemDto.getPosterArtImageUrl(preferParentThumb: Boolean): Uri = when {
 		(preferParentThumb || imageTags?.contains(ImageType.PRIMARY) != true)
-			&& parentThumbItemId?.toUUIDOrNull() != null -> imageApi.getItemImageUrl(
+			&& parentThumbItemId?.toUUIDOrNull() != null -> api.imageApi.getItemImageUrl(
 			itemId = parentThumbItemId!!.toUUIDOrNull()!!,
 			imageType = ImageType.THUMB,
 			format = ImageFormat.WEBP,
 			width = 512,
 			height = 288
 		)
-		else -> imageApi.getItemImageUrl(
+		else -> api.imageApi.getItemImageUrl(
 			itemId = id,
 			imageType = ImageType.PRIMARY,
 			format = ImageFormat.WEBP,
@@ -184,22 +205,42 @@ class LeanbackChannelWorker(
 	}.let(Uri::parse)
 
 	/**
-	 * Gets the next up episodes or returns null.
+	 * Gets the resume and next up episodes. The returned pair contains two lists:
+	 * 1. resume items
+	 * 2. next up items
 	 */
-	private suspend fun getNextUpItems(): BaseItemDtoQueryResult? {
-		return tvShowsApi.getNextUp(
-			userId = apiClient.userId,
-			imageTypeLimit = 1,
-			limit = 10,
-			fields = listOf(ItemFields.DATE_CREATED)
-		).content
+	private suspend fun getNextUpItems(): Pair<List<BaseItemDto>, List<BaseItemDto>> = withContext(Dispatchers.IO) {
+		val resume = async {
+			api.itemsApi.getResumeItems(
+				fields = listOf(ItemFields.DATE_CREATED),
+				imageTypeLimit = 1,
+				limit = 10,
+				mediaTypes = listOf(MediaType.Video)
+			).content.items.orEmpty().filter { item ->
+				// Movies are not supported right now
+				item.type.equals(BaseItemType.Episode.toString(), true)
+			}
+		}
+
+		val nextup = async {
+			api.tvShowsApi.getNextUp(
+				userId = api.userId,
+				imageTypeLimit = 1,
+				limit = 10,
+				fields = listOf(ItemFields.DATE_CREATED),
+			).content.items.orEmpty()
+		}
+
+		// Concat
+		Pair(resume.await(), nextup.await())
 	}
 
 	/**
 	 * Updates the "next up" row with current episodes. Uses the [nextUpItems] parameter to store
 	 * items returned by a NextUpQuery().
 	 */
-	private suspend fun updateNextUp(nextUpItems: BaseItemDtoQueryResult?) {
+	@Suppress("RestrictedApi")
+	private fun updateNextUp(nextUpItems: List<BaseItemDto>) {
 		val preferParentThumb = userPreferences[UserPreferences.seriesThumbnailsEnabled]
 
 		// Get channel
@@ -210,7 +251,7 @@ class LeanbackChannelWorker(
 			.build())
 
 		// Add new items
-		nextUpItems?.items?.map { item ->
+		nextUpItems.map { item ->
 			val imageUri = item.getPosterArtImageUrl(preferParentThumb)
 
 			val seasonString = item.parentIndexNumber?.toString().orEmpty()
@@ -235,7 +276,7 @@ class LeanbackChannelWorker(
 				})
 				.build()
 				.toContentValues()
-		}?.let { context.contentResolver.bulkInsert(TvContractCompat.PreviewPrograms.CONTENT_URI, it.toTypedArray()) }
+		}.let { context.contentResolver.bulkInsert(TvContractCompat.PreviewPrograms.CONTENT_URI, it.toTypedArray()) }
 	}
 
 	/**
@@ -243,22 +284,21 @@ class LeanbackChannelWorker(
 	 * or other types of media. Uses the [nextUpItems] parameter to store items returned by a
 	 * NextUpQuery().
 	 */
-	private suspend fun updateWatchNext(nextUpItems: BaseItemDtoQueryResult?) {
+	private fun updateWatchNext(nextUpItems: List<BaseItemDto>) {
 		// Delete current items
 		context.contentResolver.delete(WatchNextPrograms.CONTENT_URI, null, null)
 
 		// Add new items
-		nextUpItems?.items?.let { items ->
-			context.contentResolver.bulkInsert(
-				WatchNextPrograms.CONTENT_URI,
-				items.map { item -> getBaseItemAsWatchNextProgram(item).toContentValues() }.toTypedArray()
-			)
-		}
+		context.contentResolver.bulkInsert(
+			WatchNextPrograms.CONTENT_URI,
+			nextUpItems.map { item -> getBaseItemAsWatchNextProgram(item).toContentValues() }.toTypedArray()
+		)
 	}
 
 	/**
 	 * Convert [BaseItemDto] to [WatchNextProgram]. Assumes the item type is "episode".
 	 */
+	@Suppress("RestrictedApi")
 	private fun getBaseItemAsWatchNextProgram(item: BaseItemDto) = WatchNextProgram.Builder().apply {
 		val preferParentThumb = userPreferences[UserPreferences.seriesThumbnailsEnabled]
 
@@ -272,25 +312,25 @@ class LeanbackChannelWorker(
 		setPosterArtAspectRatio(WatchNextPrograms.ASPECT_RATIO_16_9)
 
 		// Use date created or fallback to current time if unavailable
-		setLastEngagementTimeUtcMillis(item.dateCreated?.toInstant(ZoneOffset.UTC)?.toEpochMilli()
-			?: System.currentTimeMillis())
+		var engagement = item.dateCreated
 
 		when {
 			// User has started playing the episode
 			item.userData?.playbackPositionTicks ?: 0 > 0 -> {
 				setWatchNextType(WatchNextPrograms.WATCH_NEXT_TYPE_CONTINUE)
 				setLastPlaybackPositionMillis((item.userData!!.playbackPositionTicks / TICKS_IN_MILLISECOND).toInt())
+				// Use last played date to prioritze
+				engagement = item.userData?.lastPlayedDate
 			}
 			// First episode of the season
-			item.indexNumber == 1 -> {
-				setWatchNextType(WatchNextPrograms.WATCH_NEXT_TYPE_NEW)
-			}
+			item.indexNumber == 1 -> setWatchNextType(WatchNextPrograms.WATCH_NEXT_TYPE_NEW)
 			// Default
-			else -> {
-				setWatchNextType(WatchNextPrograms.WATCH_NEXT_TYPE_NEXT)
-			}
+			else -> setWatchNextType(WatchNextPrograms.WATCH_NEXT_TYPE_NEXT)
 		}
 
+		setLastEngagementTimeUtcMillis(engagement?.toInstant(ZoneOffset.UTC)?.toEpochMilli()
+			?: System.currentTimeMillis())
+
 		// Episode runtime has been determined
 		item.runTimeTicks?.let { runTimeTicks ->
 			setDurationMillis((runTimeTicks / TICKS_IN_MILLISECOND).toInt())

app/src/main/java/org/jellyfin/androidtv/integration/MediaContentProvider.kt

@@ -0,0 +1,134 @@
+package org.jellyfin.androidtv.integration
+
+import android.app.SearchManager
+import android.content.ContentProvider
+import android.content.ContentValues
+import android.content.Intent
+import android.content.UriMatcher
+import android.database.Cursor
+import android.database.MatrixCursor
+import android.net.Uri
+import android.provider.BaseColumns
+import kotlinx.coroutines.runBlocking
+import org.jellyfin.androidtv.BuildConfig
+import org.jellyfin.androidtv.R
+import org.jellyfin.androidtv.di.systemApiClient
+import org.jellyfin.androidtv.util.ImageUtils
+import org.jellyfin.androidtv.util.sdk.isUsable
+import org.jellyfin.sdk.api.client.ApiClient
+import org.jellyfin.sdk.api.client.exception.ApiClientException
+import org.jellyfin.sdk.api.client.extensions.imageApi
+import org.jellyfin.sdk.api.client.extensions.itemsApi
+import org.jellyfin.sdk.model.api.BaseItemDtoQueryResult
+import org.jellyfin.sdk.model.api.ImageType
+import org.jellyfin.sdk.model.api.ItemFields
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.inject
+import timber.log.Timber
+import java.time.ZoneId
+
+class MediaContentProvider : ContentProvider(), KoinComponent {
+	companion object {
+		private const val AUTHORITY = "${BuildConfig.APPLICATION_ID}.content"
+		private const val SUGGEST_PATH = "suggestions"
+		private const val SEARCH_SUGGEST = 1
+		private const val TICKS_IN_MILLISECOND = 10000
+		private const val DEFAULT_LIMIT = 10
+		private val uriMatcher = UriMatcher(UriMatcher.NO_MATCH).apply {
+			addURI(AUTHORITY, "$SUGGEST_PATH/${SearchManager.SUGGEST_URI_PATH_QUERY}", SEARCH_SUGGEST)
+			addURI(AUTHORITY, "$SUGGEST_PATH/${SearchManager.SUGGEST_URI_PATH_QUERY}/*", SEARCH_SUGGEST)
+		}
+	}
+
+	private val api by inject<ApiClient>(systemApiClient)
+
+	override fun onCreate(): Boolean = api.isUsable
+
+	override fun query(
+		uri: Uri,
+		projection: Array<String>?,
+		selection: String?,
+		selectionArgs: Array<String>?,
+		sortOrder: String?
+	): Cursor? {
+		Timber.d("Query: %s", uri)
+
+		when (uriMatcher.match(uri)) {
+			SEARCH_SUGGEST -> {
+				val query = selectionArgs?.firstOrNull() ?: uri.lastPathSegment ?: return null
+				Timber.d("Search query: $query")
+
+				val limit = uri.getQueryParameter(SearchManager.SUGGEST_PARAMETER_LIMIT)?.toIntOrNull()
+					?: DEFAULT_LIMIT
+				return getSuggestions(query, limit)
+			}
+			else -> throw IllegalArgumentException("Unknown Uri: $uri")
+		}
+	}
+
+	/**
+	 * Gets the resumable items or returns null
+	 */
+	private suspend fun searchItems(query: String, limit: Int): BaseItemDtoQueryResult? = try {
+		val items by api.itemsApi.getItemsByUserId(
+			searchTerm = query,
+			recursive = true,
+			limit = limit,
+			fields = setOf(ItemFields.TAGLINES)
+		)
+
+		items
+	} catch (err: ApiClientException) {
+		Timber.e(err, "Unable to query API for search results")
+		null
+	}
+
+	private fun getSuggestions(query: String, limit: Int) = runBlocking {
+		val searchResult = searchItems(query, limit)
+		if (searchResult != null) Timber.d("Query resulted in %d items", searchResult.totalRecordCount)
+
+		val columns = arrayOf(
+			BaseColumns._ID,
+			SearchManager.SUGGEST_COLUMN_DURATION,
+			SearchManager.SUGGEST_COLUMN_IS_LIVE,
+			SearchManager.SUGGEST_COLUMN_LAST_ACCESS_HINT,
+			SearchManager.SUGGEST_COLUMN_PRODUCTION_YEAR,
+			SearchManager.SUGGEST_COLUMN_QUERY,
+			SearchManager.SUGGEST_COLUMN_RESULT_CARD_IMAGE,
+			SearchManager.SUGGEST_COLUMN_TEXT_1,
+			SearchManager.SUGGEST_COLUMN_TEXT_2,
+			SearchManager.SUGGEST_COLUMN_INTENT_ACTION,
+			SearchManager.SUGGEST_COLUMN_INTENT_DATA,
+		)
+
+		MatrixCursor(columns).also { cursor ->
+			searchResult?.items?.forEach { item ->
+				// Note: Image loading might fail if the image is served over HTTP
+				val imageUri = if (item.imageTags?.contains(ImageType.PRIMARY) == true)
+					api.imageApi.getItemImageUrl(item.id, ImageType.PRIMARY)
+				else
+					ImageUtils.getResourceUrl(context, R.drawable.tile_land_tv)
+
+				cursor.newRow().apply {
+					add(BaseColumns._ID, item.id)
+					add(SearchManager.SUGGEST_COLUMN_DURATION, item.runTimeTicks?.run { div(TICKS_IN_MILLISECOND) })
+					add(SearchManager.SUGGEST_COLUMN_IS_LIVE, if (item.isLive == true) 1 else 0)
+					val lastAccess = item.userData?.lastPlayedDate?.atZone(ZoneId.systemDefault())?.toEpochSecond()
+					add(SearchManager.SUGGEST_COLUMN_LAST_ACCESS_HINT, lastAccess)
+					add(SearchManager.SUGGEST_COLUMN_PRODUCTION_YEAR, item.premiereDate?.year)
+					add(SearchManager.SUGGEST_COLUMN_QUERY, item.name)
+					add(SearchManager.SUGGEST_COLUMN_RESULT_CARD_IMAGE, imageUri)
+					add(SearchManager.SUGGEST_COLUMN_TEXT_1, item.name)
+					add(SearchManager.SUGGEST_COLUMN_TEXT_2, item.taglines?.firstOrNull())
+					add(SearchManager.SUGGEST_COLUMN_INTENT_ACTION, Intent.ACTION_VIEW)
+					add(SearchManager.SUGGEST_COLUMN_INTENT_DATA, item.id)
+				}
+			}
+		}
+	}
+
+	override fun getType(p0: Uri): String = SearchManager.SUGGEST_MIME_TYPE
+	override fun insert(p0: Uri, p1: ContentValues?): Uri? = null
+	override fun delete(p0: Uri, p1: String?, p2: Array<out String>?): Int = 0
+	override fun update(p0: Uri, p1: ContentValues?, p2: String?, p3: Array<out String>?): Int = 0
+}

app/src/main/java/org/jellyfin/androidtv/integration/dream/LibraryDreamItem.kt

@@ -0,0 +1,9 @@
+package org.jellyfin.androidtv.integration.dream
+
+import android.graphics.drawable.Drawable
+import org.jellyfin.sdk.model.api.BaseItemDto
+
+data class LibraryDreamItem(
+	val baseItem: BaseItemDto,
+	val background: Drawable,
+)

app/src/main/java/org/jellyfin/androidtv/integration/dream/LibraryDreamItemView.kt

@@ -0,0 +1,34 @@
+package org.jellyfin.androidtv.integration.dream
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import android.view.animation.AccelerateDecelerateInterpolator
+import android.widget.FrameLayout
+import org.jellyfin.androidtv.databinding.ViewDreamLibraryItemBinding
+import org.jellyfin.androidtv.util.KenBurnsTransitionGenerator
+
+class LibraryDreamItemView @JvmOverloads constructor(
+	context: Context,
+	attrs: AttributeSet? = null,
+	defStyleAttr: Int = 0,
+	defStyleRes: Int = 0,
+) : FrameLayout(context, attrs, defStyleAttr, defStyleRes) {
+	val binding = ViewDreamLibraryItemBinding.inflate(LayoutInflater.from(context), this, true)
+
+	private val kenburnsTransitionGenerator = KenBurnsTransitionGenerator(
+		LibraryDreamService.UPDATE_DELAY,
+		AccelerateDecelerateInterpolator()
+	)
+
+	init {
+		binding.background.setTransitionGenerator(kenburnsTransitionGenerator)
+	}
+
+	fun setItem(item: LibraryDreamItem) {
+		kenburnsTransitionGenerator.reset()
+
+		binding.background.setImageDrawable(item.background)
+		binding.title.text = item.baseItem.name
+	}
+}

app/src/main/java/org/jellyfin/androidtv/integration/dream/LibraryDreamService.kt

@@ -0,0 +1,142 @@
+package org.jellyfin.androidtv.integration.dream
+
+import android.graphics.drawable.Drawable
+import android.service.dreams.DreamService
+import android.view.LayoutInflater
+import androidx.core.view.isVisible
+import com.bumptech.glide.Glide
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.isActive
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import org.jellyfin.androidtv.databinding.DreamLibraryBinding
+import org.jellyfin.androidtv.di.systemApiClient
+import org.jellyfin.androidtv.preference.UserPreferences
+import org.jellyfin.androidtv.preference.constant.ClockBehavior
+import org.jellyfin.sdk.api.client.ApiClient
+import org.jellyfin.sdk.api.client.exception.ApiClientException
+import org.jellyfin.sdk.api.client.extensions.imageApi
+import org.jellyfin.sdk.api.client.extensions.itemsApi
+import org.jellyfin.sdk.model.api.BaseItemDto
+import org.jellyfin.sdk.model.api.ImageFormat
+import org.jellyfin.sdk.model.api.ImageType
+import org.koin.android.ext.android.inject
+import timber.log.Timber
+import java.util.concurrent.ExecutionException
+
+/**
+ * An Android [DreamService] (screensaver) that shows TV series and movies from all libraries.
+ * Use `adb shell am start -n "com.android.systemui/.Somnambulator"` to start after changing the
+ * default screensaver in the device settings.
+ */
+class LibraryDreamService : DreamService() {
+	companion object {
+		const val INITIAL_DELAY = 2_000L // 2s
+		const val UPDATE_DELAY = 30_000L // 30s
+		const val TRANSITION_DURATION = 1_000L // 1s
+	}
+
+	private val scope = CoroutineScope(Dispatchers.IO + SupervisorJob())
+	private val api: ApiClient by inject(systemApiClient)
+	private val userPreferences: UserPreferences by inject()
+
+	private lateinit var binding: DreamLibraryBinding
+
+	override fun onAttachedToWindow() {
+		super.onAttachedToWindow()
+
+		isInteractive = false
+		isFullscreen = true
+
+		binding = DreamLibraryBinding.inflate(LayoutInflater.from(window.context), null, false)
+		binding.clock.isVisible = when (userPreferences[UserPreferences.clockBehavior]) {
+			ClockBehavior.ALWAYS, ClockBehavior.IN_MENUS -> true
+			else -> false
+		}
+
+		setContentView(binding.root)
+	}
+
+	override fun onDreamingStarted() {
+		super.onDreamingStarted()
+
+		scope.launch {
+			delay(INITIAL_DELAY)
+
+			while (isActive) {
+				update()
+				delay(UPDATE_DELAY)
+			}
+		}
+	}
+
+	private suspend fun getRandomItem(): BaseItemDto? = try {
+		val response by api.itemsApi.getItemsByUserId(
+			includeItemTypes = listOf("Movie", "Series"),
+			recursive = true,
+			sortBy = listOf("Random"),
+			limit = 1,
+			imageTypes = listOf(ImageType.BACKDROP)
+		)
+
+		response.items?.firstOrNull()
+	} catch (err: ApiClientException) {
+		Timber.e(err)
+		null
+	}
+
+	private suspend fun loadBackdrop(item: BaseItemDto): Drawable? {
+		val tag = item.backdropImageTags?.randomOrNull()
+			?: item.imageTags?.get(ImageType.BACKDROP)
+
+		val url = api.imageApi.getItemImageUrl(
+			itemId = item.id,
+			imageType = ImageType.BACKDROP,
+			tag = tag,
+			format = ImageFormat.WEBP,
+		)
+
+		return withContext(Dispatchers.IO) {
+			// Sometimes the backdrop doesn't exist
+			// make sure to return a null value in those cases
+			try {
+				Glide.with(binding.root)
+					.load(url)
+					.submit()
+					.get()
+			} catch (err: ExecutionException) {
+				Timber.e(err)
+				null
+			}
+		}
+	}
+
+	private suspend fun update() {
+		val item = getRandomItem()
+		val background = item?.let { loadBackdrop(it) }
+
+		withContext(Dispatchers.Main) {
+			if (item == null || background == null) {
+				binding.itemSwitcher.hideAllViews()
+			} else with(binding.itemSwitcher) {
+				getNextView<LibraryDreamItemView>().setItem(
+					item = LibraryDreamItem(
+						baseItem = item,
+						background = background,
+					)
+				)
+				showNextView()
+			}
+		}
+	}
+
+	override fun onDreamingStopped() {
+		super.onDreamingStopped()
+
+		scope.cancel()
+	}
+}

app/src/main/java/org/jellyfin/androidtv/preference/AsyncPreferenceStore.kt

@@ -0,0 +1,54 @@
+package org.jellyfin.androidtv.preference
+
+import kotlinx.coroutines.runBlocking
+
+interface AsyncPreferenceStore : PreferenceStore {
+	val shouldUpdate: Boolean
+
+	/**
+	 * Save values to store.
+	 */
+	suspend fun commit(): Boolean
+
+	/**
+	 * Update values from store.
+	 */
+	suspend fun update(): Boolean
+
+	/**
+	 * Modify the preferences in store and [commit] afterwards. Automatically calls [update] if
+	 * [shouldUpdate] is true. Use `this` keyword to access preferences.
+	 *
+	 * ```kotlin
+	 * store.transaction {
+	 * 	// get
+	 * 	val value = this[Preference.x]
+	 * 	// set
+	 * 	this[Preference.x] = value
+	 * 	// get default
+	 * 	getDefaultValue(Preference.x)
+	 * 	// set default
+	 * 	reset(Preference.x)
+	 * 	// delete
+	 * 	delete(Preference.x)
+	 * }
+	 * ```
+	 */
+	suspend fun transaction(body: AsyncPreferenceStore.() -> Unit): Boolean {
+		if (shouldUpdate) update()
+
+		body()
+
+		return commit()
+	}
+
+	/**
+	 * Compatability with old Java classes.
+	 */
+	fun updateBlocking() = runBlocking { update() }
+
+	/**
+	 * Compatability with old Java classes.
+	 */
+	fun commitBlocking() = runBlocking { commit() }
+}

app/src/main/java/org/jellyfin/androidtv/preference/DisplayPreferencesStore.kt

@@ -0,0 +1,129 @@
+package org.jellyfin.androidtv.preference
+
+import org.jellyfin.sdk.api.client.ApiClient
+import org.jellyfin.sdk.api.client.exception.ApiClientException
+import org.jellyfin.sdk.api.client.extensions.displayPreferencesApi
+import org.jellyfin.sdk.model.api.DisplayPreferencesDto
+import org.jellyfin.sdk.model.api.ScrollDirection
+import org.jellyfin.sdk.model.api.SortOrder
+import timber.log.Timber
+
+abstract class DisplayPreferencesStore(
+	protected var displayPreferencesId: String,
+	protected var app: String = "jellyfin-androidtv",
+	private val api: ApiClient,
+) : AsyncPreferenceStore {
+	private var displayPreferencesDto: DisplayPreferencesDto? = null
+	private var cachedPreferences: MutableMap<String, String?> = mutableMapOf()
+	override val shouldUpdate: Boolean
+		get() = displayPreferencesDto == null
+
+	override suspend fun commit(): Boolean {
+		if (displayPreferencesDto == null) return false
+
+		try {
+			api.displayPreferencesApi.updateDisplayPreferences(
+				displayPreferencesId = displayPreferencesId,
+				client = app,
+				data = displayPreferencesDto!!.copy(
+					customPrefs = cachedPreferences
+				)
+			)
+		} catch (err: ApiClientException) {
+			Timber.e(err, "Unable to save displaypreferences. (displayPreferencesId=$displayPreferencesId, app=$app)")
+			return false
+		}
+
+		return true
+	}
+
+	/**
+	 * Clear local copy of display preferences and require an update for new modifications.
+	 */
+	fun clearCache(): Boolean {
+		if (displayPreferencesDto == null) return false
+
+		displayPreferencesDto = null
+		cachedPreferences.clear()
+
+		return true
+	}
+
+	override suspend fun update(): Boolean {
+		try {
+			val result by api.displayPreferencesApi.getDisplayPreferences(
+				displayPreferencesId = displayPreferencesId,
+				client = app
+			)
+			displayPreferencesDto = result
+			cachedPreferences = result.customPrefs.toMutableMap()
+
+			return true
+		} catch (err: ApiClientException) {
+			Timber.e(err, "Unable to retrieve displaypreferences. (displayPreferencesId=$displayPreferencesId, app=$app)")
+
+			if (displayPreferencesDto == null) {
+				Timber.i("Creating an empty DisplayPreferencesDto for next commit.")
+				displayPreferencesDto = DisplayPreferencesDto.empty()
+			}
+
+			return false
+		}
+	}
+
+	@Suppress("UNCHECKED_CAST")
+	override fun <T : Preference<V>, V : Any> get(preference: T) = when (preference.type) {
+		Int::class -> cachedPreferences[preference.key]?.toIntOrNull() ?: preference.defaultValue
+		Long::class -> cachedPreferences[preference.key]?.toLongOrNull() ?: preference.defaultValue
+		Boolean::class -> cachedPreferences[preference.key]?.toBooleanStrictOrNull()
+			?: preference.defaultValue
+		String::class -> cachedPreferences[preference.key] ?: preference.defaultValue
+
+		else -> throw IllegalArgumentException("${preference.type.simpleName} type is not supported")
+	} as V
+
+	override fun <T : Preference<V>, V : Any> set(preference: T, value: V) = when (preference.type) {
+		Int::class -> cachedPreferences[preference.key] = (value as Int).toString()
+		Long::class -> cachedPreferences[preference.key] = (value as Long).toString()
+		Boolean::class -> cachedPreferences[preference.key] = (value as Boolean).toString()
+		String::class -> cachedPreferences[preference.key] = (value as String).toString()
+		Enum::class -> cachedPreferences[preference.key] = value.toString()
+
+		else -> throw IllegalArgumentException("${preference.type.simpleName} type is not supported")
+	}
+
+	override fun <T : Preference<V>, V : Enum<V>> get(preference: T): V {
+		val stringValue = cachedPreferences[preference.key]
+
+		return if (stringValue.isNullOrBlank()) preference.defaultValue
+		else preference.type.java.enumConstants?.find {
+			(it is PreferenceEnum && it.serializedName == stringValue) || it.name == stringValue
+		} ?: preference.defaultValue
+	}
+
+	override fun <T : Preference<V>, V : Enum<V>> set(preference: T, value: V) {
+		cachedPreferences[preference.key] = when (value) {
+			is PreferenceEnum -> value.serializedName
+			else -> value.toString()
+		}
+	}
+
+	override fun <T : Preference<V>, V : Any> delete(preference: T) {
+		cachedPreferences.remove(preference.key)
+	}
+
+	/**
+	 * Create an empty [DisplayPreferencesDto] with default values.
+	 */
+	private fun DisplayPreferencesDto.Companion.empty() = DisplayPreferencesDto(
+		primaryImageHeight = 0,
+		primaryImageWidth = 0,
+		customPrefs = emptyMap(),
+		rememberIndexing = false,
+		scrollDirection = ScrollDirection.HORIZONTAL,
+		rememberSorting = false,
+		showBackdrop = false,
+		showSidebar = false,
+		sortOrder = SortOrder.ASCENDING
+	)
+}

app/src/main/java/org/jellyfin/androidtv/preference/LibraryPreferences.kt

@@ -0,0 +1,30 @@
+package org.jellyfin.androidtv.preference
+
+import org.jellyfin.androidtv.constant.GridDirection
+import org.jellyfin.androidtv.constant.ImageType
+import org.jellyfin.androidtv.constant.PosterSize
+import org.jellyfin.apiclient.model.entities.SortOrder
+import org.jellyfin.sdk.api.client.ApiClient
+
+class LibraryPreferences(
+	displayPreferencesId: String,
+	api: ApiClient,
+) : DisplayPreferencesStore(
+	displayPreferencesId = displayPreferencesId,
+	api = api,
+) {
+	companion object {
+		val posterSize = Preference.enum("PosterSize", PosterSize.AUTO)
+		val imageType = Preference.enum("ImageType", ImageType.DEFAULT)
+		val gridDirection = Preference.enum("GridDirection", GridDirection.HORIZONTAL)
+		val enableSmartScreen = Preference.boolean("SmartScreen", false)
+
+		// Filters
+		val filterFavoritesOnly = Preference.boolean("FilterFavoritesOnly", false)
+		val filterUnwatchedOnly = Preference.boolean("FilterUnwatchedOnly", false)
+
+		// Item sorting
+		val sortBy = Preference.string("SortBy", "SortName")
+		val sortOrder = Preference.enum("SortOrder", SortOrder.Ascending)
+	}
+}

app/src/main/java/org/jellyfin/androidtv/preference/LiveTvPreferences.kt

@@ -0,0 +1,21 @@
+package org.jellyfin.androidtv.preference
+
+import org.jellyfin.sdk.api.client.ApiClient
+
+class LiveTvPreferences(
+	api: ApiClient,
+) : DisplayPreferencesStore(
+	displayPreferencesId = "livetv",
+	api = api,
+) {
+	companion object {
+		val channelOrder = Preference.string("livetv-channelorder", "DatePlayed")
+		val colorCodeGuide = Preference.boolean("guide-colorcodedbackgrounds", false)
+		val favsAtTop = Preference.boolean("livetv-favoritechannelsattop", true)
+		val showHDIndicator = Preference.boolean("guide-indicator-hd", false)
+		val showLiveIndicator = Preference.boolean("guide-indicator-live", true)
+		val showNewIndicator = Preference.boolean("guide-indicator-new", false)
+		val showPremiereIndicator = Preference.boolean("guide-indicator-premiere", true)
+		val showRepeatIndicator = Preference.boolean("guide-indicator-repeat", false)
+	}
+}

app/src/main/java/org/jellyfin/androidtv/preference/PreferenceEnum.kt

@@ -0,0 +1,5 @@
+package org.jellyfin.androidtv.preference
+
+interface PreferenceEnum {
+	val serializedName: String
+}

app/src/main/java/org/jellyfin/androidtv/preference/PreferenceStore.kt

@@ -13,10 +13,14 @@ interface PreferenceStore {
 	operator fun <T : Preference<V>, V : Enum<V>> set(preference: T, value: V)
 
 	// store.getDefaultValue(Preference.x)
-	fun <T : Preference<V>, V : Any> getDefaultValue(preference: T): V
+	fun <T : Preference<V>, V : Any> getDefaultValue(preference: T): V {
+		return preference.defaultValue
+	}
 
 	// store.reset(Preference.x)
-	fun <T : Preference<V>, V : Any> reset(preference: T)
+	fun <T : Preference<V>, V : Any> reset(preference: T) {
+		this[preference] = getDefaultValue(preference)
+	}
 
 	// store.delete(Preference.x)
 	fun <T : Preference<V>, V : Any> delete(preference: T)

app/src/main/java/org/jellyfin/androidtv/preference/PreferencesRepository.kt

@@ -0,0 +1,35 @@
+package org.jellyfin.androidtv.preference
+
+import org.jellyfin.sdk.api.client.ApiClient
+import kotlin.collections.set
+
+/**
+ * Repository to access special preference stores.
+ */
+class PreferencesRepository(
+	private val api: ApiClient,
+	private val liveTvPreferences: LiveTvPreferences,
+	private val userSettingPreferences: UserSettingPreferences,
+) {
+	private val libraryPreferences = mutableMapOf<String, LibraryPreferences>()
+
+	fun getLibraryPreferences(preferencesId: String): LibraryPreferences {
+		val store = libraryPreferences[preferencesId] ?: LibraryPreferences(preferencesId, api)
+
+		libraryPreferences[preferencesId] = store
+
+		// FIXME: Make [getLibraryPreferences] suspended when usages are converted to Kotlin
+		if (store.shouldUpdate) store.updateBlocking()
+
+		return store
+	}
+
+	suspend fun onSessionChanged() {
+		// Note: Do not run parallel as the server can't deal with that
+		// Relevant server issue: https://github.com/jellyfin/jellyfin/issues/5261
+		liveTvPreferences.update()
+		userSettingPreferences.update()
+
+		libraryPreferences.clear()
+	}
+}

app/src/main/java/org/jellyfin/androidtv/preference/SharedPreferenceStore.kt

@@ -1,6 +1,7 @@
 package org.jellyfin.androidtv.preference
 
 import android.content.SharedPreferences
+import org.jellyfin.androidtv.preference.migrations.MigrationContext
 import timber.log.Timber
 
 /**
@@ -38,16 +39,14 @@ abstract class SharedPreferenceStore(
 	// Getters and setters
 	// Primitive types
 	@Suppress("UNCHECKED_CAST")
-	override operator fun <T : Preference<V>, V : Any> get(preference: T): V {
-		return when (preference.type) {
-			Int::class -> sharedPreferences.getInt(preference.key, preference.defaultValue as Int) as V
-			Long::class -> sharedPreferences.getLong(preference.key, preference.defaultValue as Long) as V
-			Boolean::class -> sharedPreferences.getBoolean(preference.key, preference.defaultValue as Boolean) as V
-			String::class -> sharedPreferences.getString(preference.key, preference.defaultValue as String) as V
+	override operator fun <T : Preference<V>, V : Any> get(preference: T) = when (preference.type) {
+		Int::class -> sharedPreferences.getInt(preference.key, preference.defaultValue as Int)
+		Long::class -> sharedPreferences.getLong(preference.key, preference.defaultValue as Long)
+		Boolean::class -> sharedPreferences.getBoolean(preference.key, preference.defaultValue as Boolean)
+		String::class -> sharedPreferences.getString(preference.key, preference.defaultValue as String)
 
-			else -> throw IllegalArgumentException("${preference.type.simpleName} type is not supported")
-		}
-	}
+		else -> throw IllegalArgumentException("${preference.type.simpleName} type is not supported")
+	} as V
 
 	override operator fun <T : Preference<V>, V : Any> set(preference: T, value: V) = transaction {
 		when (preference.type) {
@@ -65,57 +64,34 @@ abstract class SharedPreferenceStore(
 	override operator fun <T : Preference<V>, V : Enum<V>> get(preference: T): V {
 		val stringValue = sharedPreferences.getString(preference.key, null)
 
-		return if (stringValue == null) preference.defaultValue
-		else preference.type.java.enumConstants?.find { it.name == stringValue }
-			?: preference.defaultValue
+		return if (stringValue.isNullOrBlank()) preference.defaultValue
+		else preference.type.java.enumConstants?.find {
+			(it is PreferenceEnum && it.serializedName == stringValue) || it.name == stringValue
+		} ?: preference.defaultValue
 	}
 
-	override operator fun <T : Preference<V>, V : Enum<V>> set(preference: T, value: V) = transaction {
-		putString(preference.key, value.toString())
+	override fun <T : Preference<V>, V : Enum<V>> set(preference: T, value: V) = transaction {
+		putString(preference.key, when (value) {
+			is PreferenceEnum -> value.serializedName
+			else -> value.toString()
+		})
 	}
 
 	// Additional mutations
-	override fun <T : Preference<V>, V : Any> getDefaultValue(preference: T): V {
-		return preference.defaultValue
-	}
-
-	override fun <T : Preference<V>, V : Any> reset(preference: T) {
-		this[preference] = getDefaultValue(preference)
-	}
-
 	override fun <T : Preference<V>, V : Any> delete(preference: T) = transaction {
 		remove(preference.key)
 	}
 
 	// Migrations
-	/**
-	 * Migration function to upgrade the preferences in older app versions
-	 *
-	 * Migrations should be added to the `init` block of a store and look like this:
-	 * ```kotlin
-	 * migration(toVersion = 1) {
-	 * 	// Get a value
-	 * 	it.getString("example", "default")
-	 * 	// Set a value
-	 * 	setString("example", "new value")
-	 * }
-	 *
-	 * @param toVersion The new version to upgrade to
-	 * @param body Actual migrationb code
-	 */
-	protected fun migration(toVersion: Int, body: MigrationEditor.(SharedPreferences) -> Unit) {
-		// Check if migration should be performed
-		val currentVersion = this[VERSION]
-		if (currentVersion < toVersion) {
-			Timber.i("Migrating a preference store from version $currentVersion to $toVersion")
+	protected fun runMigrations(body: MigrationContext<MigrationEditor, SharedPreferences>.() -> Unit) {
+		val context = MigrationContext<MigrationEditor, SharedPreferences>()
+		context.body()
 
-			// Create a new editor and execute the migration
-			transaction {
-				body(sharedPreferences)
-			}
+		this[VERSION] = context.applyMigrations(this[VERSION]) { migration ->
+			Timber.i("Migrating a preference store to version ${migration.toVersion}")
 
-			// Update current store version
-			this[VERSION] = toVersion
+			// Create a new transaction and execute the migration
+			transaction { migration.body(this, sharedPreferences) }
 		}
 	}
 
@@ -123,6 +99,6 @@ abstract class SharedPreferenceStore(
 		/**
 		 * Version of the preference store. Used for migration.
 		 */
-		val VERSION = Preference.int("store_version", 1)
+		val VERSION = Preference.int("store_version", -1)
 	}
 }

app/src/main/java/org/jellyfin/androidtv/preference/UserPreferences.kt

@@ -87,7 +87,7 @@ class UserPreferences(context: Context) : SharedPreferenceStore(
 		/**
 		 * Preferred video player.
 		 */
-		var videoPlayer = Preference.enum("video_player", PreferredVideoPlayer.AUTO)
+		var videoPlayer = Preference.enum("video_player", PreferredVideoPlayer.EXOPLAYER)
 
 		/**
 		 * Enable refresh rate switching when device supports it
@@ -187,40 +187,49 @@ class UserPreferences(context: Context) : SharedPreferenceStore(
 		 * Enable series thumbnails in home screen rows
 		 */
 		var seriesThumbnailsEnabled = Preference.boolean("pref_enable_series_thumbnails", true)
+
+		/**
+		 * Enable subtitles background
+		 */
+		var subtitlesBackgroundEnabled = Preference.boolean("subtitles_background_enabled", true)
+
+		/**
+		 * Set default subtitles font size
+		 */
+		var defaultSubtitlesSize = Preference.int("subtitles_size", 28)
 	}
 
 	init {
-		// Migrations
-		// v0.10.x to v0.11.x: Old migrations
-		migration(toVersion = 2) {
-			// Migrate to video player enum
-			// Note: This is the only time we need to check if the value is not set yet because the version numbers were reset
-			if (!it.contains("video_player"))
-				putEnum("video_player", if (it.getBoolean("pref_video_use_external", false)) PreferredVideoPlayer.EXTERNAL else PreferredVideoPlayer.AUTO)
-		}
+		// Note: Create a single migration per app version
+		// Note: Migrations are never executed for fresh installs
+		runMigrations {
+			// v0.10.x to v0.11.x
+			migration(toVersion = 2) {
+				// Migrate to video player enum
+				// Note: This is the only time we need to check if the value is not set yet because the version numbers were reset
+				if (!it.contains("video_player"))
+					putEnum("video_player", if (it.getBoolean("pref_video_use_external", false)) PreferredVideoPlayer.EXTERNAL else PreferredVideoPlayer.AUTO)
+			}
 
-		// v0.11.x to v0.12.x: Migrates from the old way of storing preferences to the current
-		migration(toVersion = 3) {
-			// Migrate to audio behavior enum
-			putEnum("audio_behavior", if (it.getString("pref_audio_option", "0") == "1") AudioBehavior.DOWNMIX_TO_STEREO else AudioBehavior.DIRECT_STREAM)
+			// v0.11.x to v0.12.x
+			migration(toVersion = 5) {
+				// Migrate to audio behavior enum
+				putEnum("audio_behavior", if (it.getString("pref_audio_option", "0") == "1") AudioBehavior.DOWNMIX_TO_STEREO else AudioBehavior.DIRECT_STREAM)
 
-			// Migrate live tv player to use enum
-			putEnum("live_tv_video_player",
-				when {
-					it.getBoolean("pref_live_tv_use_external", false) -> PreferredVideoPlayer.EXTERNAL
-					it.getBoolean("pref_enable_vlc_livetv", false) -> PreferredVideoPlayer.VLC
-					else -> PreferredVideoPlayer.AUTO
-				})
-		}
+				// Migrate live tv player to use enum
+				putEnum("live_tv_video_player",
+					when {
+						it.getBoolean("pref_live_tv_use_external", false) -> PreferredVideoPlayer.EXTERNAL
+						it.getBoolean("pref_enable_vlc_livetv", false) -> PreferredVideoPlayer.VLC
+						else -> PreferredVideoPlayer.AUTO
+					})
 
-		// Change audio delay type from long to int
-		migration(toVersion = 4) {
-			putInt("libvlc_audio_delay", it.getLong("libvlc_audio_delay", 0).toInt())
-		}
+				// Change audio delay type from long to int
+				putInt("libvlc_audio_delay", it.getLong("libvlc_audio_delay", 0).toInt())
 
-		// Disable AC3 (Dolby Digital) on Fire Stick Gen 1 devices
-		migration(toVersion = 5) {
-			if (DeviceUtils.isFireTvStickGen1()) putBoolean("pref_bitstream_ac3", false)
+				// Disable AC3 (Dolby Digital) on Fire Stick Gen 1 devices
+				if (DeviceUtils.isFireTvStickGen1()) putBoolean("pref_bitstream_ac3", false)
+			}
 		}
 	}
 }

app/src/main/java/org/jellyfin/androidtv/preference/UserSettingPreferences.kt

@@ -0,0 +1,30 @@
+package org.jellyfin.androidtv.preference
+
+import org.jellyfin.androidtv.constant.HomeSectionType
+import org.jellyfin.sdk.api.client.ApiClient
+
+class UserSettingPreferences(
+	api: ApiClient,
+) : DisplayPreferencesStore(
+	displayPreferencesId = "usersettings",
+	api = api,
+	app = "emby",
+) {
+	companion object {
+		val skipBackLength = Preference.int("skipBackLength", 10000)
+		val skipForwardLength = Preference.int("skipForwardLength", 30000)
+
+		val homesection0 = Preference.enum("homesection0", HomeSectionType.LIBRARY_TILES_SMALL)
+		val homesection1 = Preference.enum("homesection1", HomeSectionType.RESUME)
+		val homesection2 = Preference.enum("homesection2", HomeSectionType.RESUME_AUDIO)
+		val homesection3 = Preference.enum("homesection3", HomeSectionType.RESUME_BOOK)
+		val homesection4 = Preference.enum("homesection4", HomeSectionType.LIVE_TV)
+		val homesection5 = Preference.enum("homesection5", HomeSectionType.NEXT_UP)
+		val homesection6 = Preference.enum("homesection6", HomeSectionType.LATEST_MEDIA)
+	}
+
+	val homesections
+		get() = listOf(homesection0, homesection1, homesection2, homesection3, homesection4, homesection5, homesection6)
+			.map(::get)
+			.filterNot { it == HomeSectionType.NONE }
+}

app/src/main/java/org/jellyfin/androidtv/preference/constant/NextUpBehavior.kt

@@ -22,3 +22,5 @@ enum class NextUpBehavior {
 	@EnumDisplayOptions(R.string.lbl_never)
 	DISABLED
 }
+
+const val NEXTUP_TIMER_DISABLED: Int = 0

app/src/main/java/org/jellyfin/androidtv/preference/migrations/MigrationContext.kt

@@ -0,0 +1,64 @@
+package org.jellyfin.androidtv.preference.migrations
+
+import timber.log.Timber
+import java.lang.Integer.max
+
+class MigrationContext<E, V> {
+	private val migrations = mutableListOf<Migration<E, V>>()
+	private var highVersion: Int = -1
+
+	/**
+	 * Migration function to upgrade the preferences from older app versions.
+	 *
+	 * Migrations look like this:
+	 * ```kotlin
+	 * migration(toVersion = 1) {
+	 * 	// Get a value
+	 * 	it.getString("example", "default")
+	 * 	// Set a value
+	 * 	setString("example", "new value")
+	 * }
+	 *
+	 * @param toVersion The new version to upgrade to
+	 * @param body Actual migration code
+	 */
+	inline fun migration(toVersion: Int, noinline body: E.(V) -> Unit) = migration(Migration(toVersion, body))
+
+	fun migration(definition: Migration<E, V>) {
+		if (definition.toVersion > highVersion) highVersion = definition.toVersion
+		migrations.add(definition)
+	}
+
+	/**
+	 * Apply all defined migrations. Do not call manually.
+	 * When [currentVersion] is -1 all migrations are skipped.
+	 *
+	 * @return The new version of the store. This is the highest "toVersion" number.
+	 */
+	fun applyMigrations(currentVersion: Int, executeMigration: (Migration<E, V>) -> Unit): Int {
+		Timber.i("Requested migration from $currentVersion to $highVersion. Found ${migrations.size} migrations in total.")
+		return when {
+			// No migrations
+			highVersion == -1 -> currentVersion
+			// All migrations already applied
+			currentVersion >= highVersion -> currentVersion
+			// Skip migrations (fresh install)
+			currentVersion == -1 -> highVersion
+			// Run migrations
+			else -> migrations
+				// Filter out old migrations
+				.filter { it.toVersion > currentVersion }
+				// Execute in order
+				.sortedBy { it.toVersion }
+				// Call executor
+				.forEach { executeMigration(it) }
+				// Return highest version
+				.let { max(highVersion, currentVersion) }
+		}
+	}
+
+	data class Migration<E, V>(
+		val toVersion: Int,
+		val body: E.(V) -> Unit
+	)
+}

app/src/main/java/org/jellyfin/androidtv/ui/AudioDelayPopup.java

@@ -10,7 +10,7 @@ import android.widget.PopupWindow;
 
 import androidx.annotation.Nullable;
 
-import org.jellyfin.androidtv.R;
+import org.jellyfin.androidtv.databinding.AudioDelayPopupBinding;
 import org.jellyfin.androidtv.util.Utils;
 
 public class AudioDelayPopup {
@@ -20,19 +20,19 @@ public class AudioDelayPopup {
 
     public AudioDelayPopup(Context context, View anchor, ValueChangedListener<Long> listener) {
         LayoutInflater inflater = LayoutInflater.from(context);
-        View layout = inflater.inflate(R.layout.audio_delay_popup, null);
+        AudioDelayPopupBinding binding = AudioDelayPopupBinding.inflate(inflater, null, false);
 
         int width = Utils.convertDpToPixel(context, 240);
         int height = Utils.convertDpToPixel(context, 130);
 
-        mPopup = new PopupWindow(layout, width, height);
+        mPopup = new PopupWindow(binding.getRoot(), width, height);
         mPopup.setFocusable(true);
         mPopup.setOutsideTouchable(true);
         mPopup.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT)); // necessary for popup to dismiss
 
         mAnchor = anchor;
 
-        mDelaySpinner = layout.findViewById(R.id.numberSpinner);
+        mDelaySpinner = binding.numberSpinner;
         mDelaySpinner.setOnChangeListener(listener);
     }
 
@@ -49,10 +49,4 @@ public class AudioDelayPopup {
         mDelaySpinner.setValue(value);
         mPopup.showAsDropDown(mAnchor, 0, 0, Gravity.END);
     }
-
-    public void dismiss() {
-        if (mPopup != null && mPopup.isShowing()) {
-            mPopup.dismiss();
-        }
-    }
 }

app/src/main/java/org/jellyfin/androidtv/ui/ClockUserView.kt

@@ -14,11 +14,9 @@ import org.jellyfin.androidtv.preference.constant.ClockBehavior
 import org.jellyfin.androidtv.ui.playback.PlaybackOverlayActivity
 import org.jellyfin.androidtv.util.ImageUtils
 import org.jellyfin.androidtv.util.getActivity
-import org.koin.core.component.KoinApiExtension
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.get
 
-@KoinApiExtension
 class ClockUserView @JvmOverloads constructor(
 	context: Context,
 	attrs: AttributeSet? = null,
@@ -42,7 +40,7 @@ class ClockUserView @JvmOverloads constructor(
 		if (currentUser != null && !isInEditMode) {
 			if (currentUser.primaryImageTag != null) {
 				Glide.with(context)
-					.load(ImageUtils.getPrimaryImageUrl(currentUser, get()))
+					.load(ImageUtils.getPrimaryImageUrl(currentUser))
 					.placeholder(R.drawable.ic_user)
 					.centerInside()
 					.circleCrop()

app/src/main/java/org/jellyfin/androidtv/ui/DetailRowView.java

@@ -5,9 +5,11 @@ import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.widget.FrameLayout;
 
-import org.jellyfin.androidtv.R;
+import org.jellyfin.androidtv.databinding.NewDetailsOverviewRowBinding;
 
 public class DetailRowView extends FrameLayout {
+    private NewDetailsOverviewRowBinding binding;
+
     public DetailRowView(Context context) {
         super(context);
         inflateView(context);
@@ -20,6 +22,10 @@ public class DetailRowView extends FrameLayout {
 
     private void inflateView(Context context) {
         LayoutInflater inflater = LayoutInflater.from(context);
-        inflater.inflate(R.layout.new_details_overview_row, this);
+        binding = NewDetailsOverviewRowBinding.inflate(inflater, this, true);
+    }
+
+    public NewDetailsOverviewRowBinding getBinding() {
+        return binding;
     }
 }

app/src/main/java/org/jellyfin/androidtv/ui/ExpandableTextView.kt

@@ -37,7 +37,7 @@ class ExpandableTextView(context: Context, attrs: AttributeSet?) : AppCompatText
 
 			// Show popup
 			popup.showAtLocation(rootView, Gravity.CENTER, 0, 0)
-			popup.setOutsideTouchable(true)
+			popup.isOutsideTouchable = true
 
 			// Focus on scroll view
 			popupContentBinding.scrollContainer.requestFocus()

app/src/main/java/org/jellyfin/androidtv/ui/FadeViewSwitcher.kt

@@ -0,0 +1,62 @@
+package org.jellyfin.androidtv.ui
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.View
+import android.view.animation.AlphaAnimation
+import android.widget.FrameLayout
+import androidx.annotation.IntRange
+import org.jellyfin.androidtv.integration.dream.LibraryDreamService
+
+class FadeViewSwitcher @JvmOverloads constructor(
+	context: Context,
+	attrs: AttributeSet? = null,
+	defStyleAttr: Int = 0,
+	defStyleRes: Int = 0,
+) : FrameLayout(context, attrs, defStyleAttr, defStyleRes) {
+	companion object {
+		const val VIEW_NONE = -1
+	}
+
+	private var currentView = VIEW_NONE
+	private val nextViewId
+		get() = if (currentView >= childCount - 1) 0 else currentView + 1
+	private val previousViewId
+		get() = if (currentView <= 0) childCount - 1 else currentView - 1
+
+	override fun onViewAdded(child: View?) {
+		super.onViewAdded(child)
+
+		// Hide new views by default
+		child?.alpha = 0f
+	}
+
+	fun showNextView() = showView(nextViewId)
+	fun showPreviousView() = showView(previousViewId)
+	fun hideAllViews() = showView(VIEW_NONE)
+
+	fun <V : View> getNextView() = getChildAt(nextViewId) as V
+	fun <V : View> getCurrentView() = if (currentView == VIEW_NONE) null else currentView as V
+	fun <V : View> getPreviousView() = getChildAt(previousViewId) as V
+
+	fun showView(@IntRange(from = -1) view: Int) {
+		// TODO: right now crossfades, need to be smarter to hide old view after new view is completely visible
+		if (currentView != VIEW_NONE) getChildAt(currentView).fadeOut()
+		if (view != VIEW_NONE) getChildAt(view).fadeIn()
+
+		currentView = view
+	}
+
+	private fun View.fadeIn() {
+		alpha = 1f
+		startAnimation(AlphaAnimation(0f, 1f).apply {
+			duration = LibraryDreamService.TRANSITION_DURATION
+			fillAfter = true
+		})
+	}
+
+	private fun View.fadeOut() = startAnimation(AlphaAnimation(1f, 0f).apply {
+		duration = LibraryDreamService.TRANSITION_DURATION
+		fillAfter = true
+	})
+}

app/src/main/java/org/jellyfin/androidtv/ui/GridFragment.java

@@ -5,10 +5,11 @@ import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.FrameLayout;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.leanback.widget.BaseGridView;
 import androidx.leanback.widget.ObjectAdapter;
@@ -20,8 +21,8 @@ import androidx.leanback.widget.RowPresenter;
 import androidx.leanback.widget.VerticalGridPresenter;
 
 import org.jellyfin.androidtv.R;
-import org.jellyfin.androidtv.TvApp;
 import org.jellyfin.androidtv.data.model.FilterOptions;
+import org.jellyfin.androidtv.databinding.HorizontalGridBrowseBinding;
 import org.jellyfin.androidtv.ui.itemhandling.BaseRowItem;
 import org.jellyfin.androidtv.ui.itemhandling.ItemRowAdapter;
 import org.jellyfin.androidtv.ui.presentation.HorizontalGridPresenter;
@@ -50,25 +51,59 @@ public class GridFragment extends Fragment {
     private int mSelectedPosition = -1;
     private int mCardHeight;
 
-    protected int SMALL_CARD = Utils.convertDpToPixel(TvApp.getApplication(), 116);
-    protected int MED_CARD = Utils.convertDpToPixel(TvApp.getApplication(), 175);
-    protected int LARGE_CARD = Utils.convertDpToPixel(TvApp.getApplication(), 210);
-    protected int SMALL_BANNER = Utils.convertDpToPixel(TvApp.getApplication(), 58);
-    protected int MED_BANNER = Utils.convertDpToPixel(TvApp.getApplication(), 88);
-    protected int LARGE_BANNER = Utils.convertDpToPixel(TvApp.getApplication(), 105);
+    protected int SMALL_CARD;
+    protected int MED_CARD;
+    protected int LARGE_CARD;
+    protected int SMALL_BANNER;
+    protected int MED_BANNER;
+    protected int LARGE_BANNER;
+    protected int SMALL_VERTICAL_POSTER;
+    protected int MED_VERTICAL_POSTER;
+    protected int LARGE_VERTICAL_POSTER;
+    protected int SMALL_VERTICAL_SQUARE;
+    protected int MED_VERTICAL_SQUARE;
+    protected int LARGE_VERTICAL_SQUARE;
+    protected int SMALL_VERTICAL_THUMB;
+    protected int MED_VERTICAL_THUMB;
+    protected int LARGE_VERTICAL_THUMB;
+    protected int SMALL_VERTICAL_BANNER;
+    protected int MED_VERTICAL_BANNER;
+    protected int LARGE_VERTICAL_BANNER;
 
-    protected int SMALL_VERTICAL_POSTER = Utils.convertDpToPixel(TvApp.getApplication(), 116);
-    protected int MED_VERTICAL_POSTER = Utils.convertDpToPixel(TvApp.getApplication(), 171);
-    protected int LARGE_VERTICAL_POSTER = Utils.convertDpToPixel(TvApp.getApplication(), 202);
-    protected int SMALL_VERTICAL_SQUARE = Utils.convertDpToPixel(TvApp.getApplication(), 114);
-    protected int MED_VERTICAL_SQUARE = Utils.convertDpToPixel(TvApp.getApplication(), 163);
-    protected int LARGE_VERTICAL_SQUARE = Utils.convertDpToPixel(TvApp.getApplication(), 206);
-    protected int SMALL_VERTICAL_THUMB = Utils.convertDpToPixel(TvApp.getApplication(), 116);
-    protected int MED_VERTICAL_THUMB = Utils.convertDpToPixel(TvApp.getApplication(), 155);
-    protected int LARGE_VERTICAL_THUMB = Utils.convertDpToPixel(TvApp.getApplication(), 210);
-    protected int SMALL_VERTICAL_BANNER = Utils.convertDpToPixel(TvApp.getApplication(), 51);
-    protected int MED_VERTICAL_BANNER = Utils.convertDpToPixel(TvApp.getApplication(), 77);
-    protected int LARGE_VERTICAL_BANNER = Utils.convertDpToPixel(TvApp.getApplication(), 118);
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        SMALL_CARD = Utils.convertDpToPixel(getContext(), 116);
+        MED_CARD = Utils.convertDpToPixel(getContext(), 175);
+        LARGE_CARD = Utils.convertDpToPixel(getContext(), 210);
+        SMALL_BANNER = Utils.convertDpToPixel(getContext(), 58);
+        MED_BANNER = Utils.convertDpToPixel(getContext(), 88);
+        LARGE_BANNER = Utils.convertDpToPixel(getContext(), 105);
+        SMALL_VERTICAL_POSTER = Utils.convertDpToPixel(getContext(), 116);
+        MED_VERTICAL_POSTER = Utils.convertDpToPixel(getContext(), 171);
+        LARGE_VERTICAL_POSTER = Utils.convertDpToPixel(getContext(), 202);
+        SMALL_VERTICAL_SQUARE = Utils.convertDpToPixel(getContext(), 114);
+        MED_VERTICAL_SQUARE = Utils.convertDpToPixel(getContext(), 163);
+        LARGE_VERTICAL_SQUARE = Utils.convertDpToPixel(getContext(), 206);
+        SMALL_VERTICAL_THUMB = Utils.convertDpToPixel(getContext(), 116);
+        MED_VERTICAL_THUMB = Utils.convertDpToPixel(getContext(), 155);
+        LARGE_VERTICAL_THUMB = Utils.convertDpToPixel(getContext(), 210);
+        SMALL_VERTICAL_BANNER = Utils.convertDpToPixel(getContext(), 51);
+        MED_VERTICAL_BANNER = Utils.convertDpToPixel(getContext(), 77);
+        LARGE_VERTICAL_BANNER = Utils.convertDpToPixel(getContext(), 118);
+
+        sortOptions = new HashMap<>();
+        {
+            sortOptions.put(0, new SortOption(getString(R.string.lbl_name), "SortName", SortOrder.Ascending));
+            sortOptions.put(1, new SortOption(getString(R.string.lbl_date_added), "DateCreated,SortName", SortOrder.Descending));
+            sortOptions.put(2, new SortOption(getString(R.string.lbl_premier_date), "PremiereDate,SortName", SortOrder.Descending));
+            sortOptions.put(3, new SortOption(getString(R.string.lbl_rating), "OfficialRating,SortName", SortOrder.Ascending));
+            sortOptions.put(4, new SortOption(getString(R.string.lbl_community_rating), "CommunityRating,SortName", SortOrder.Descending));
+            sortOptions.put(5,new SortOption(getString(R.string.lbl_critic_rating), "CriticRating,SortName", SortOrder.Descending));
+            sortOptions.put(6, new SortOption(getString(R.string.lbl_last_played), "DatePlayed,SortName", SortOrder.Descending));
+        };
+    }
 
     /**
      * Sets the grid presenter.
@@ -127,7 +162,7 @@ public class GridFragment extends Fragment {
     public void setItem(BaseRowItem item) {
         if (item != null) {
             mTitleView.setText(item.getFullName(requireContext()));
-            InfoLayoutHelper.addInfoRow(getActivity(), item, mInfoRow, true, true);
+            InfoLayoutHelper.addInfoRow(requireContext(), item, mInfoRow, true, true);
         } else {
             mTitleView.setText("");
             mInfoRow.removeAllViews();
@@ -146,16 +181,7 @@ public class GridFragment extends Fragment {
         }
     }
 
-    protected Map<Integer, SortOption> sortOptions = new HashMap<>();
-    {
-        sortOptions.put(0, new SortOption(TvApp.getApplication().getString(R.string.lbl_name), "SortName", SortOrder.Ascending));
-        sortOptions.put(1, new SortOption(TvApp.getApplication().getString(R.string.lbl_date_added), "DateCreated,SortName", SortOrder.Descending));
-        sortOptions.put(2, new SortOption(TvApp.getApplication().getString(R.string.lbl_premier_date), "PremiereDate,SortName", SortOrder.Descending));
-        sortOptions.put(3,new SortOption(TvApp.getApplication().getString(R.string.lbl_rating), "OfficialRating,SortName", SortOrder.Ascending));
-        sortOptions.put(4,new SortOption(TvApp.getApplication().getString(R.string.lbl_community_rating), "CommunityRating,SortName", SortOrder.Descending));
-        sortOptions.put(5,new SortOption(TvApp.getApplication().getString(R.string.lbl_critic_rating), "CriticRating,SortName", SortOrder.Descending));
-        sortOptions.put(6,new SortOption(TvApp.getApplication().getString(R.string.lbl_last_played), "DatePlayed,SortName", SortOrder.Descending));
-    }
+    protected Map<Integer, SortOption> sortOptions;
 
     protected String getSortFriendlyName(String value) {
         return getSortOption(value).name;
@@ -175,20 +201,20 @@ public class GridFragment extends Fragment {
     }
 
     public void setStatusText(String folderName) {
-        String text = TvApp.getApplication().getResources().getString(R.string.lbl_showing) + " ";
+        String text = getString(R.string.lbl_showing) + " ";
         FilterOptions filters = mAdapter.getFilters();
         if (filters == null || (!filters.isFavoriteOnly() && !filters.isUnwatchedOnly())) {
-            text += TvApp.getApplication().getResources().getString(R.string.lbl_all_items);
+            text += getString(R.string.lbl_all_items);
         } else {
-            text += (filters.isUnwatchedOnly() ? TvApp.getApplication().getResources().getString(R.string.lbl_unwatched) : "") + " " +
-                    (filters.isFavoriteOnly() ? TvApp.getApplication().getResources().getString(R.string.lbl_favorites) : "");
+            text += (filters.isUnwatchedOnly() ? getString(R.string.lbl_unwatched) : "") + " " +
+                    (filters.isFavoriteOnly() ? getString(R.string.lbl_favorites) : "");
         }
 
         if (mAdapter.getStartLetter() != null) {
-            text += " " + TvApp.getApplication().getResources().getString(R.string.lbl_starting_with) + " " + mAdapter.getStartLetter();
+            text += " " + getString(R.string.lbl_starting_with) + " " + mAdapter.getStartLetter();
         }
 
-        text += " " + TvApp.getApplication().getString(R.string.lbl_from) + " '" + folderName + "' " + TvApp.getApplication().getString(R.string.lbl_sorted_by) + " " + getSortFriendlyName(mAdapter.getSortBy());
+        text += " " + getString(R.string.lbl_from) + " '" + folderName + "' " + getString(R.string.lbl_sorted_by) + " " + getSortFriendlyName(mAdapter.getSortBy());
 
         mStatusText.setText(text);
     }
@@ -275,26 +301,25 @@ public class GridFragment extends Fragment {
     }
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        ViewGroup root = (ViewGroup) inflater.inflate(R.layout.horizontal_grid_browse,
-                container, false);
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
+                             @Nullable Bundle savedInstanceState) {
+        HorizontalGridBrowseBinding binding = HorizontalGridBrowseBinding.inflate(inflater, container, false);
 
-        mTitleView = (TextView) root.findViewById(R.id.title);
-        mStatusText = (TextView) root.findViewById(R.id.statusText);
-        mInfoRow = (LinearLayout) root.findViewById(R.id.infoRow);
-        mToolBar = (LinearLayout) root.findViewById(R.id.toolBar);
-        mCounter = (TextView) root.findViewById(R.id.counter);
-        mGridDock = (ViewGroup) root.findViewById(R.id.rowsFragment);
+        mTitleView = binding.title;
+        mStatusText = binding.statusText;
+        mInfoRow = binding.infoRow;
+        mToolBar = binding.toolBar;
+        mCounter = binding.counter;
+        mGridDock = binding.rowsFragment;
 
         // Hide the description because we don't have room for it
-        ((NowPlayingBug)root.findViewById(R.id.npBug)).showDescription(false);
+        binding.npBug.showDescription(false);
 
-        return root;
+        return binding.getRoot();
     }
 
     @Override
-    public void onViewCreated(View view, Bundle savedInstanceState) {
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         createGrid();
     }
 
@@ -329,16 +354,6 @@ public class GridFragment extends Fragment {
         mGridView = null;
     }
 
-    /**
-     * Sets the selected item position.
-     */
-    public void setSelectedPosition(int position) {
-        mSelectedPosition = position;
-        if(mGridView != null && mGridView.getAdapter() != null) {
-            mGridView.setSelectedPositionSmooth(position);
-        }
-    }
-
     private void updateAdapter() {
         if (mGridView != null) {
             mGridPresenter.onBindViewHolder(mGridViewHolder, mAdapter);

app/src/main/java/org/jellyfin/androidtv/ui/GuideChannelHeader.java

@@ -14,36 +14,33 @@ import androidx.core.content.ContextCompat;
 import com.bumptech.glide.Glide;
 
 import org.jellyfin.androidtv.R;
-import org.jellyfin.androidtv.TvApp;
-import org.jellyfin.androidtv.ui.livetv.ILiveTvGuide;
-import org.jellyfin.androidtv.ui.livetv.LiveTvGuideActivity;
+import org.jellyfin.androidtv.ui.livetv.LiveTvGuide;
 import org.jellyfin.androidtv.util.ImageUtils;
 import org.jellyfin.androidtv.util.Utils;
 import org.jellyfin.apiclient.interaction.ApiClient;
 import org.jellyfin.apiclient.model.livetv.ChannelInfoDto;
-
-import static org.koin.java.KoinJavaComponent.get;
+import org.koin.java.KoinJavaComponent;
 
 public class GuideChannelHeader extends RelativeLayout {
     private ImageView mChannelImage;
     private ImageView mFavImage;
     private ChannelInfoDto mChannel;
     private Context mContext;
-    private ILiveTvGuide mTvGuide;
+    private LiveTvGuide mTvGuide;
 
-    public GuideChannelHeader(Context context, ILiveTvGuide tvGuide, ChannelInfoDto channel) {
+    public GuideChannelHeader(Context context, LiveTvGuide tvGuide, ChannelInfoDto channel) {
         super(context);
         initComponent(context, tvGuide, channel);
     }
 
-    private void initComponent(Context context, ILiveTvGuide tvGuide, ChannelInfoDto channel) {
+    private void initComponent(Context context, LiveTvGuide tvGuide, ChannelInfoDto channel) {
         mContext = context;
         mChannel = channel;
         mTvGuide = tvGuide;
         LayoutInflater inflater = LayoutInflater.from(context);
         View v = inflater.inflate(R.layout.channel_header, this, false);
         int headerWidth = Utils.convertDpToPixel(context, 160);
-        v.setLayoutParams(new AbsListView.LayoutParams(headerWidth, LiveTvGuideActivity.ROW_HEIGHT));
+        v.setLayoutParams(new AbsListView.LayoutParams(headerWidth, Utils.convertDpToPixel(context, 55)));
         this.addView(v);
         this.setFocusable(true);
         ((TextView) findViewById(R.id.channelName)).setText(channel.getName());
@@ -60,7 +57,7 @@ public class GuideChannelHeader extends RelativeLayout {
         int imageHeight = Utils.convertDpToPixel(mContext, 30);
 
         Glide.with(mContext)
-                .load(ImageUtils.getPrimaryImageUrl(mChannel, get(ApiClient.class)))
+                .load(ImageUtils.getPrimaryImageUrl(mChannel, KoinJavaComponent.<ApiClient>get(ApiClient.class)))
                 .override(imageWidth, imageHeight)
                 .centerInside()
                 .into(mChannelImage);

app/src/main/java/org/jellyfin/androidtv/ui/GuidePagingButton.java

@@ -9,8 +9,9 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import org.jellyfin.androidtv.R;
-import org.jellyfin.androidtv.ui.livetv.ILiveTvGuide;
+import org.jellyfin.androidtv.ui.livetv.LiveTvGuide;
 import org.jellyfin.androidtv.ui.livetv.LiveTvGuideActivity;
+import org.jellyfin.androidtv.util.Utils;
 
 public class GuidePagingButton extends RelativeLayout {
 
@@ -26,7 +27,7 @@ public class GuidePagingButton extends RelativeLayout {
         super(context, attrs);
     }
 
-    public GuidePagingButton(final Activity activity, final ILiveTvGuide guide, int start, String label) {
+    public GuidePagingButton(final Activity activity, final LiveTvGuide guide, int start, String label) {
         super(activity);
 
         us = this;
@@ -34,7 +35,7 @@ public class GuidePagingButton extends RelativeLayout {
 
         setBackgroundResource(R.drawable.gray_gradient);
         TextView txtLabel = new TextView(activity);
-        txtLabel.setHeight(LiveTvGuideActivity.PAGEBUTTON_HEIGHT);
+        txtLabel.setHeight(Utils.convertDpToPixel(getContext(), 55));
         txtLabel.setTextColor(Color.BLACK);
         setPadding(100,0,0,0);
         txtLabel.setFocusable(true);

app/src/main/java/org/jellyfin/androidtv/ui/ItemListView.java

@@ -7,20 +7,19 @@ import android.view.View;
 import android.widget.FrameLayout;
 import android.widget.LinearLayout;
 
-import org.jellyfin.androidtv.R;
 import org.jellyfin.androidtv.TvApp;
 import org.jellyfin.androidtv.data.querying.StdItemQuery;
+import org.jellyfin.androidtv.databinding.ItemListBinding;
 import org.jellyfin.apiclient.interaction.ApiClient;
 import org.jellyfin.apiclient.interaction.Response;
 import org.jellyfin.apiclient.model.dto.BaseItemDto;
 import org.jellyfin.apiclient.model.querying.ItemFields;
 import org.jellyfin.apiclient.model.querying.ItemsResult;
+import org.koin.java.KoinJavaComponent;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import static org.koin.java.KoinJavaComponent.get;
-
 public class ItemListView extends FrameLayout {
     Context mContext;
     LinearLayout mList;
@@ -40,9 +39,9 @@ public class ItemListView extends FrameLayout {
 
     private void inflateView(Context context) {
         LayoutInflater inflater = LayoutInflater.from(context);
-        inflater.inflate(R.layout.item_list, this);
+        ItemListBinding binding = ItemListBinding.inflate(inflater, this, true);
         mContext = context;
-        mList = findViewById(R.id.songList);
+        mList = binding.songList;
     }
 
     public void setRowSelectedListener(ItemRowView.RowSelectedListener listener) { mRowSelectedListener = listener; }
@@ -88,7 +87,7 @@ public class ItemListView extends FrameLayout {
         query.setUserId(TvApp.getApplication().getCurrentUser().getId());
         String[] ids = new String[mItemIds.size()];
         query.setIds(mItemIds.toArray(ids));
-        get(ApiClient.class).GetItemsAsync(query, new Response<ItemsResult>() {
+        KoinJavaComponent.<ApiClient>get(ApiClient.class).GetItemsAsync(query, new Response<ItemsResult>() {
             @Override
             public void onResponse(ItemsResult response) {
                 if (response.getItems() != null) {

app/src/main/java/org/jellyfin/androidtv/ui/ItemRowView.java

@@ -13,7 +13,7 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import org.jellyfin.androidtv.R;
-import org.jellyfin.androidtv.util.TextUtilsKt;
+import org.jellyfin.androidtv.databinding.ItemRowBinding;
 import org.jellyfin.androidtv.util.TimeUtils;
 import org.jellyfin.androidtv.util.apiclient.BaseItemUtils;
 import org.jellyfin.apiclient.model.dto.BaseItemDto;
@@ -64,14 +64,14 @@ public class ItemRowView extends FrameLayout {
 
     private void inflateView(Context context) {
         LayoutInflater inflater = LayoutInflater.from(context);
-        inflater.inflate(R.layout.item_row, this);
+        ItemRowBinding binding = ItemRowBinding.inflate(inflater, this, true);
         mContext = context;
-        mWholeRow = findViewById(R.id.wholeRow);
-        mIndexNo = findViewById(R.id.indexNo);
-        mItemName = findViewById(R.id.songName);
-        mExtraName = findViewById(R.id.artistName);
-        mRunTime = findViewById(R.id.runTime);
-        mWatchedMark = findViewById(R.id.watchedMark);
+        mWholeRow = binding.wholeRow;
+        mIndexNo = binding.indexNo;
+        mItemName = binding.songName;
+        mExtraName = binding.artistName;
+        mRunTime = binding.runTime;
+        mWatchedMark = binding.watchedMark;
         normalBackground = mWholeRow.getBackground();
         setFocusable(true);
     }
@@ -121,7 +121,7 @@ public class ItemRowView extends FrameLayout {
     public void updateWatched() {
         if (mBaseItem == null) return;
         if ("Video".equals(mBaseItem.getMediaType()) && mBaseItem.getUserData() != null && mBaseItem.getUserData().getPlayed()) {
-            mWatchedMark.setText(TextUtilsKt.toHtmlSpanned("✓"));
+            mWatchedMark.setText("✓");
         } else {
             mWatchedMark.setText("");
         }

app/src/main/java/org/jellyfin/androidtv/ui/LiveProgramDetailPopup.java

@@ -1,6 +1,5 @@
 package org.jellyfin.androidtv.ui;
 
-import static org.koin.java.KoinJavaComponent.get;
 import static org.koin.java.KoinJavaComponent.inject;
 
 import android.app.AlertDialog;
@@ -21,7 +20,7 @@ import androidx.core.content.ContextCompat;
 import org.jellyfin.androidtv.R;
 import org.jellyfin.androidtv.TvApp;
 import org.jellyfin.androidtv.data.model.DataRefreshService;
-import org.jellyfin.androidtv.ui.livetv.ILiveTvGuide;
+import org.jellyfin.androidtv.ui.livetv.LiveTvGuide;
 import org.jellyfin.androidtv.ui.livetv.TvManager;
 import org.jellyfin.androidtv.ui.shared.BaseActivity;
 import org.jellyfin.androidtv.util.InfoLayoutHelper;
@@ -34,6 +33,7 @@ import org.jellyfin.apiclient.model.dto.BaseItemDto;
 import org.jellyfin.apiclient.model.dto.UserItemDataDto;
 import org.jellyfin.apiclient.model.livetv.ChannelInfoDto;
 import org.jellyfin.apiclient.model.livetv.SeriesTimerInfoDto;
+import org.koin.java.KoinJavaComponent;
 
 import java.util.Date;
 
@@ -45,7 +45,7 @@ public class LiveProgramDetailPopup {
     private BaseItemDto mProgram;
     private ProgramGridCell mSelectedProgramView;
     private BaseActivity mActivity;
-    private ILiveTvGuide mTvGuide;
+    private LiveTvGuide mTvGuide;
     private TextView mDTitle;
     private TextView mDSummary;
     private TextView mDRecordInfo;
@@ -64,7 +64,7 @@ public class LiveProgramDetailPopup {
 
     private Lazy<ApiClient> apiClient = inject(ApiClient.class);
 
-    public LiveProgramDetailPopup(BaseActivity activity, ILiveTvGuide tvGuide, int width, EmptyResponse tuneAction) {
+    public LiveProgramDetailPopup(BaseActivity activity, LiveTvGuide tvGuide, int width, EmptyResponse tuneAction) {
         mActivity = activity;
         mTvGuide = tvGuide;
         mTuneAction = tuneAction;
@@ -361,7 +361,7 @@ public class LiveProgramDetailPopup {
                         channel.setUserData(response);
                         fave.setImageDrawable(ContextCompat.getDrawable(mActivity, response.getIsFavorite() ? R.drawable.ic_heart_red : R.drawable.ic_heart));
                         mTvGuide.refreshFavorite(channel.getId());
-                        DataRefreshService dataRefreshService = get(DataRefreshService.class);
+                        DataRefreshService dataRefreshService = KoinJavaComponent.<DataRefreshService>get(DataRefreshService.class);
                         dataRefreshService.setLastFavoriteUpdate(System.currentTimeMillis());
                     }
                 });

app/src/main/java/org/jellyfin/androidtv/ui/NowPlayingBug.java

@@ -1,6 +1,5 @@
 package org.jellyfin.androidtv.ui;
 
-import static org.koin.java.KoinJavaComponent.get;
 import static org.koin.java.KoinJavaComponent.inject;
 
 import android.content.Context;
@@ -16,14 +15,13 @@ import android.widget.TextView;
 import com.bumptech.glide.Glide;
 
 import org.jellyfin.androidtv.R;
-import org.jellyfin.androidtv.TvApp;
+import org.jellyfin.androidtv.databinding.NowPlayingBugBinding;
 import org.jellyfin.androidtv.ui.playback.AudioEventListener;
 import org.jellyfin.androidtv.ui.playback.AudioNowPlayingActivity;
 import org.jellyfin.androidtv.ui.playback.MediaManager;
 import org.jellyfin.androidtv.ui.playback.PlaybackController;
 import org.jellyfin.androidtv.util.ImageUtils;
 import org.jellyfin.androidtv.util.TimeUtils;
-import org.jellyfin.apiclient.interaction.ApiClient;
 import org.jellyfin.apiclient.model.dto.BaseItemDto;
 
 import kotlin.Lazy;
@@ -49,19 +47,17 @@ public class NowPlayingBug extends FrameLayout {
     private void init(Context context) {
         this.context = context;
         LayoutInflater inflater = LayoutInflater.from(context);
-        View v = inflater.inflate(R.layout.now_playing_bug, this, true);
+        NowPlayingBugBinding binding = NowPlayingBugBinding.inflate(inflater, this, true);
         if (!isInEditMode()) {
-            npIcon = (ImageView)v.findViewById(R.id.npIcon);
-            npDesc = ((TextView) v.findViewById(R.id.npDesc));
-            npStatus = ((TextView) v.findViewById(R.id.npStatus));
+            npIcon = binding.npIcon;
+            npDesc = binding.npDesc;
+            npStatus = binding.npStatus;
             this.setFocusable(true);
             this.setOnClickListener(new OnClickListener() {
                 @Override
                 public void onClick(View v) {
-                    if (TvApp.getApplication().getCurrentActivity() != null) {
-                        Intent np = new Intent(TvApp.getApplication(), AudioNowPlayingActivity.class);
-                        TvApp.getApplication().getCurrentActivity().startActivity(np);
-                    }
+                    Intent np = new Intent(context, AudioNowPlayingActivity.class);
+                    context.startActivity(np);
                 }
             });
         }
@@ -81,7 +77,14 @@ public class NowPlayingBug extends FrameLayout {
     AudioEventListener listener = new AudioEventListener() {
         @Override
         public void onPlaybackStateChange(PlaybackController.PlaybackState newState, BaseItemDto currentItem) {
-            if (newState == PlaybackController.PlaybackState.PLAYING && currentItem != null) setInfo(currentItem);
+            if (currentItem == null)
+                return;
+
+            if (newState == PlaybackController.PlaybackState.PLAYING) {
+                setInfo(currentItem);
+            } else if (newState == PlaybackController.PlaybackState.IDLE && isShown()) {
+                setStatus(mediaManager.getValue().getCurrentAudioPosition());
+            }
         }
 
         @Override
@@ -128,7 +131,7 @@ public class NowPlayingBug extends FrameLayout {
         if (item == null) return;
 
         Glide.with(context)
-                .load(ImageUtils.getPrimaryImageUrl(item, get(ApiClient.class)))
+                .load(ImageUtils.getPrimaryImageUrl(item))
                 .error(R.drawable.ic_album)
                 .centerInside()
                 .into(npIcon);