Fix crash when checking whether a person is a folder or not

(cherry picked from commit efc6be8d3d)

.github/workflows/app-build.yaml

@@ -15,20 +15,20 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout repository
-        uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # tag=v3
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       - name: Setup Java
-        uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc # tag=v3
+        uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0
         with:
           distribution: temurin
           java-version: 17
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@3fbe033aaae657f011f88f29be9e65ed26bd29ef # tag=v2
+        uses: gradle/gradle-build-action@8cbcb9948b5892387aed077daf6f90e1f0ba5b27 # v2.11.0
       - name: Assemble debug APKs
         run: ./gradlew assembleDebug
       - name: Create publish bundle
         run: mkdir -p build/gh-app-publish/; find app/build/ -iname "*.apk" -exec mv "{}" build/gh-app-publish/ \;
       - name: Upload artifacts
-        uses: actions/upload-artifact@83fd05a356d7e2593de66fc9913b3002723633cb # tag=v3
+        uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4.0.0
         with:
           name: build-artifacts
           retention-days: 14

.github/workflows/app-lint.yaml

@@ -17,18 +17,18 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout repository
-        uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # tag=v3
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       - name: Setup Java
-        uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc # tag=v3
+        uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0
         with:
           distribution: temurin
           java-version: 17
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@3fbe033aaae657f011f88f29be9e65ed26bd29ef # tag=v2
+        uses: gradle/gradle-build-action@8cbcb9948b5892387aed077daf6f90e1f0ba5b27 # v2.11.0
       - name: Run detekt and lint tasks
         run: ./gradlew detekt lint
       - name: Upload SARIF files
-        uses: github/codeql-action/upload-sarif@678fc3afe258fb2e0cdc165ccf77b85719de7b3c # v2
+        uses: github/codeql-action/upload-sarif@b374143c1149a9115d881581d29b8390bbcbb59c # v3.22.11
         if: ${{ always() }}
         with:
           sarif_file: .

.github/workflows/app-publish.yaml

@@ -12,14 +12,14 @@ jobs:
     if: ${{ contains(github.repository_owner, 'jellyfin') }}
     steps:
       - name: Checkout repository
-        uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # tag=v3
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       - name: Setup Java
-        uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc # tag=v3
+        uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0
         with:
           distribution: temurin
           java-version: 17
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@3fbe033aaae657f011f88f29be9e65ed26bd29ef # tag=v2
+        uses: gradle/gradle-build-action@8cbcb9948b5892387aed077daf6f90e1f0ba5b27 # v2.11.0
       - name: Set JELLYFIN_VERSION
         run: echo "JELLYFIN_VERSION=$(echo ${GITHUB_REF#refs/tags/v} | tr / -)" >> $GITHUB_ENV
       - name: Assemble release files
@@ -27,6 +27,8 @@ jobs:
       - name: Sign APK
         id: signApk
         uses: r0adkll/sign-android-release@349ebdef58775b1e0d8099458af0816dc79b6407 # tag=v1
+        env:
+          BUILD_TOOLS_VERSION: "34.0.0"
         with:
           releaseDirectory: app/build/outputs/apk/release
           signingKeyBase64: ${{ secrets.KEYSTORE }}
@@ -36,6 +38,8 @@ jobs:
       - name: Sign app bundle
         id: signAab
         uses: r0adkll/sign-android-release@349ebdef58775b1e0d8099458af0816dc79b6407 # tag=v1
+        env:
+          BUILD_TOOLS_VERSION: "34.0.0"
         with:
           releaseDirectory: app/build/outputs/bundle/release
           signingKeyBase64: ${{ secrets.KEYSTORE }}
@@ -66,7 +70,7 @@ jobs:
           remote_user: ${{ secrets.DEPLOY_USER }}
           remote_key: ${{ secrets.DEPLOY_KEY }}
       - name: Update repo.jellyfin.org symlinks
-        uses: appleboy/ssh-action@f9010ff7f1bbd7db1a0b4bab661437550cea20c0 # tag=v0.1.5
+        uses: appleboy/ssh-action@55dabf81b49d4120609345970c91507e2d734799 # v1.0.0
         with:
           host: ${{ secrets.DEPLOY_HOST }}
           username: ${{ secrets.DEPLOY_USER }}

.github/workflows/app-test.yaml

@@ -16,13 +16,13 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout repository
-        uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # tag=v3
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       - name: Setup Java
-        uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc # tag=v3
+        uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0
         with:
           distribution: temurin
           java-version: 17
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@3fbe033aaae657f011f88f29be9e65ed26bd29ef # tag=v2
+        uses: gradle/gradle-build-action@8cbcb9948b5892387aed077daf6f90e1f0ba5b27 # v2.11.0
       - name: Run test task
         run: ./gradlew test

.github/workflows/gradlew-update.yaml

@@ -1,18 +0,0 @@
-name: Gradle / Update wrapper
-
-on:
-  schedule:
-    - cron: '0 4 * * *'
-
-jobs:
-  update:
-    name: Update
-    runs-on: ubuntu-22.04
-    if: ${{ contains(github.repository_owner, 'jellyfin') }}
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # tag=v3
-      - name: Update Gradle Wrapper
-        uses: gradle-update/update-gradle-wrapper-action@981c551b17dbcf1940b1b4435afdb79babb7c13a # tag=v1
-        with:
-          repo-token: ${{ secrets.JF_BOT_TOKEN }}

.github/workflows/gradlew-validate.yaml

@@ -17,6 +17,6 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout repository
-        uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # tag=v3
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@55e685c48d84285a5b0418cd094606e199cca3b6 # tag=v1
+        uses: gradle/wrapper-validation-action@56b90f209b02bf6d1deae490e9ef18b21a389cd4 # v1.1.0

.github/workflows/repo-stale.yaml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-22.04
     if: ${{ contains(github.repository_owner, 'jellyfin') }}
     steps:
-      - uses: actions/stale@5ebf00ea0e4c1561e9b43a292ed34424fb1d4578 # tag=v6
+      - uses: actions/stale@28ca1036281a5e5922ead5184a1bbf96e5fc984e # v9.0.0
         with:
           repo-token: ${{ secrets.JF_BOT_TOKEN }}
           days-before-stale: 120

CONTRIBUTORS.md

@@ -11,6 +11,8 @@
  - [Niels van Velzen](https://github.com/nielsvanvelzen)
  - [GodTamIt](https://github.com/GodTamIt)
  - [sparky3387](https://github.com/sparky3387)
+ - [mohd-akram](https://github.com/mohd-akram)
+ - [3l0w](https://github.com/3l0w)
 
 # Emby Contributors
 

README.md

@@ -35,6 +35,9 @@
 <a href="https://www.amazon.com/gp/aw/d/B07TX7Z725">
 <img width="153" alt="Jellyfin on Amazon Appstore" src="https://jellyfin.org/images/store-icons/amazon.png"/>
 </a>
+<a href="https://f-droid.org/en/packages/org.jellyfin.androidtv/">
+<img width="153" alt="Jellyfin on F-Droid" src="https://jellyfin.org/images/store-icons/fdroid.png"/>
+</a>
 <br/>
 <a href="https://repo.jellyfin.org/releases/client/androidtv/">Download archive</a>
 </p>

android-lint.xml

@@ -13,6 +13,9 @@
     <issue id="MangledCRLF" severity="warning" />
     <issue id="NegativeMargin" severity="warning" />
     <issue id="NoHardKeywords" severity="warning" />
+    <issue id="NotificationPermission">
+        <ignore regexp="com.bumptech.glide.request.target.NotificationTarget" />
+    </issue>
     <issue id="Registered" severity="warning" />
     <issue id="RequiredSize" severity="error" />
     <issue id="Typos" severity="ignore" />

app/baselineWorkaround.gradle

@@ -0,0 +1,39 @@
+buildscript {
+	repositories {
+		mavenCentral()
+		google()
+	}
+
+	dependencies {
+		classpath libs.android.gradle
+	}
+}
+
+import com.android.tools.profgen.ArtProfileKt
+import com.android.tools.profgen.ArtProfileSerializer
+import com.android.tools.profgen.DexFile
+
+/**
+ * This is a temporary workaround for https://issuetracker.google.com/issues/231837768
+ * which will be fixed in AGP 8.1.0, at which point the workaround may be deleted.
+ */
+project.afterEvaluate {
+	tasks.compileReleaseArtProfile.doLast {
+		outputs.files.each { file ->
+			if (file.toString().endsWith(".profm")) {
+				println("Sorting ${file}")
+				def version = ArtProfileSerializer.valueOf("METADATA_0_0_2")
+				def profile = ArtProfileKt.ArtProfile(file)
+				def keys = new ArrayList(profile.profileData.keySet())
+				def sortedData = new LinkedHashMap()
+				Collections.sort keys, new DexFile.Companion()
+				keys.each { key -> sortedData[key] = profile.profileData[key] }
+				new FileOutputStream(file).with {
+					write(version.magicBytes$profgen)
+					write(version.versionBytes$profgen)
+					version.write$profgen(it, sortedData, "")
+				}
+			}
+		}
+	}
+}

app/build.gradle.kts

@@ -1,14 +1,16 @@
 plugins {
 	id("com.android.application")
 	kotlin("android")
-	alias(libs.plugins.kotlin.ksp)
 	alias(libs.plugins.kotlin.serialization)
 	alias(libs.plugins.aboutlibraries)
 }
 
+// Apply workaround
+apply("baselineWorkaround.gradle")
+
 android {
 	namespace = "org.jellyfin.androidtv"
-	compileSdk = 33
+	compileSdk = 34
 
 	defaultConfig {
 		minSdk = 21
@@ -22,6 +24,7 @@ android {
 	}
 
 	buildFeatures {
+		buildConfig = true
 		viewBinding = true
 		compose = true
 	}
@@ -136,8 +139,10 @@ dependencies {
 	implementation(libs.bundles.koin)
 
 	// Media players
-	implementation(libs.exoplayer)
-	implementation(libs.jellyfin.exoplayer.ffmpegextension)
+	implementation(libs.androidx.media3.exoplayer)
+	implementation(libs.androidx.media3.exoplayer.hls)
+	implementation(libs.androidx.media3.ui)
+	implementation(libs.jellyfin.androidx.media3.ffmpeg.decoder)
 	implementation(libs.libvlc)
 
 	// Markdown
@@ -145,9 +150,7 @@ dependencies {
 
 	// Image utility
 	implementation(libs.blurhash)
-	implementation(libs.glide.core)
-	ksp(libs.glide.ksp)
-	implementation(libs.kenburnsview)
+	implementation(libs.bundles.coil)
 
 	// Crash Reporting
 	implementation(libs.bundles.acra)

app/src/main/AndroidManifest.xml

@@ -6,23 +6,13 @@
     <!-- Android TV Integration -->
     <uses-permission android:name="com.android.providers.tv.permission.WRITE_EPG_DATA" />
 
-    <!-- AccountManager permissions -->
-    <uses-permission
-        android:name="android.permission.AUTHENTICATE_ACCOUNTS"
-        android:maxSdkVersion="22" />
-    <uses-permission
-        android:name="android.permission.GET_ACCOUNTS"
-        android:maxSdkVersion="22" />
-    <uses-permission
-        android:name="android.permission.MANAGE_ACCOUNTS"
-        android:maxSdkVersion="22" />
-
     <!-- Generic permissions -->
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission
         android:name="android.permission.ACCESS_WIFI_STATE"
         tools:ignore="LeanbackUsesWifi" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 
     <!-- Search permissions (voice to text) -->
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
@@ -38,6 +28,15 @@
         android:name="android.hardware.microphone"
         android:required="false" />
 
+    <queries>
+        <intent>
+            <action android:name="android.intent.action.VIEW" />
+            <data
+                android:host="youtube.com"
+                android:scheme="https" />
+        </intent>
+    </queries>
+
     <application
         android:name=".JellyfinApplication"
         android:allowBackup="true"
@@ -52,6 +51,8 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.Jellyfin"
         android:usesCleartextTraffic="true">
+
+        <!-- Legacy service required for AccountManagerMigration -->
         <service
             android:name=".auth.service.AuthenticatorService"
             android:exported="false">
@@ -90,9 +91,6 @@
             <meta-data
                 android:name="org.jellyfin.androidtv.SessionInitializer"
                 android:value="androidx.startup" />
-            <meta-data
-                android:name="org.jellyfin.androidtv.ProcessLifecycleInitializer"
-                android:value="androidx.startup" />
         </provider>
 
         <provider
@@ -117,6 +115,7 @@
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.intent.action.SEARCH" />
+                <action android:name="android.intent.action.VIEW" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
                 <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
@@ -138,20 +137,11 @@
 
         <activity
             android:name=".ui.preference.PreferencesActivity"
+            android:screenOrientation="behind"
             android:theme="@style/Theme.Jellyfin.Preferences" />
 
-        <!-- Playback related activities -->
-        <activity
-            android:name=".ui.playback.PlaybackOverlayActivity"
-            android:screenOrientation="landscape" />
-
         <activity android:name=".ui.playback.ExternalPlayerActivity" />
 
-        <activity
-            android:name=".ui.playback.nextup.NextUpActivity"
-            android:noHistory="true"
-            android:screenOrientation="landscape" />
-
         <!-- Playback Rewrite - Temporary -->
         <activity android:name=".ui.playback.rewrite.PlaybackForwardingActivity" />
     </application>

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

@@ -9,7 +9,6 @@ import androidx.work.ExistingPeriodicWorkPolicy
 import androidx.work.PeriodicWorkRequestBuilder
 import androidx.work.WorkManager
 import androidx.work.await
-import com.bumptech.glide.Glide
 import com.vanniktech.blurhash.BlurHash
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -51,7 +50,7 @@ class JellyfinApplication : Application() {
 			// Recreate periodic workers
 			workManager.enqueueUniquePeriodicWork(
 				LeanbackChannelWorker.PERIODIC_UPDATE_REQUEST_NAME,
-				ExistingPeriodicWorkPolicy.REPLACE,
+				ExistingPeriodicWorkPolicy.UPDATE,
 				PeriodicWorkRequestBuilder<LeanbackChannelWorker>(1, TimeUnit.HOURS)
 					.setBackoffCriteria(BackoffPolicy.LINEAR, 10, TimeUnit.MINUTES)
 					.build()
@@ -70,13 +69,6 @@ class JellyfinApplication : Application() {
 		super.onLowMemory()
 
 		BlurHash.clearCache()
-		Glide.with(this).onLowMemory()
-	}
-
-	override fun onTrimMemory(level: Int) {
-		super.onTrimMemory(level)
-
-		Glide.with(this).onTrimMemory(level)
 	}
 
 	override fun attachBaseContext(base: Context?) {

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

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

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

@@ -1,50 +0,0 @@
-package org.jellyfin.androidtv
-
-import android.app.Application
-import android.content.Context
-import androidx.lifecycle.DefaultLifecycleObserver
-import androidx.lifecycle.LifecycleOwner
-import androidx.lifecycle.ProcessLifecycleOwner
-import androidx.lifecycle.lifecycleScope
-import androidx.startup.AppInitializer
-import androidx.startup.Initializer
-import kotlinx.coroutines.launch
-import org.jellyfin.androidtv.auth.repository.SessionRepository
-import org.jellyfin.androidtv.di.KoinInitializer
-import timber.log.Timber
-
-@Suppress("unused")
-class ProcessLifecycleInitializer : Initializer<Unit> {
-	override fun create(context: Context) {
-		val koin = AppInitializer.getInstance(context)
-			.initializeComponent(KoinInitializer::class.java)
-			.koin
-
-		// 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
-				val callbacks = koin.getAll<Application.ActivityLifecycleCallbacks>()
-				Timber.i("Registering ${callbacks.size} ActivityLifecycleCallbacks")
-				val app = context.applicationContext as Application
-				callbacks.forEach { callback -> app.registerActivityLifecycleCallbacks(callback) }
-			}
-
-			/**
-			 * 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")
-
-				owner.lifecycleScope.launch {
-					koin.get<SessionRepository>().restoreSession()
-				}
-			}
-		})
-	}
-
-	override fun dependencies() = listOf(KoinInitializer::class.java)
-}

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

@@ -18,7 +18,7 @@ class SessionInitializer : Initializer<Unit> {
 
 		// Restore system session
 		ProcessLifecycleOwner.get().lifecycleScope.launch {
-			koin.get<SessionRepository>().restoreSession()
+			koin.get<SessionRepository>().restoreSession(destroyOnly = false)
 		}
 	}
 

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

@@ -0,0 +1,48 @@
+package org.jellyfin.androidtv.auth
+
+import android.accounts.AccountManager
+import android.content.Context
+import androidx.core.content.getSystemService
+import org.jellyfin.androidtv.BuildConfig
+import org.jellyfin.androidtv.auth.model.AuthenticationStoreServer
+import org.jellyfin.sdk.model.serializer.toUUIDOrNull
+import timber.log.Timber
+import java.util.UUID
+
+class AccountManagerMigration(
+	context: Context,
+) {
+	private val accountManager = requireNotNull(context.getSystemService<AccountManager>())
+
+	fun migrate(
+		servers: Map<UUID, AuthenticationStoreServer>,
+	) = servers.mapValues { (serverId, server) ->
+		Timber.i("Migrating server $serverId (${server.name})")
+		server.copy(
+			users = server.users.mapValues { (userId, user) ->
+				val accessToken = getAccessToken(serverId, userId)
+				Timber.i("Migrating user $userId (${user.name}): ${if (accessToken != null) "success" else "no token"}")
+				user.copy(accessToken = accessToken)
+			}
+		)
+	}
+
+	@Suppress("MissingPermission")
+	private fun getAccessToken(serverId: UUID, userId: UUID): String? = runCatching {
+		accountManager.getAccountsByType(ACCOUNT_TYPE)
+			.firstOrNull {
+				val validServerId = accountManager.getUserData(it, ACCOUNT_DATA_SERVER)?.toUUIDOrNull() == serverId
+				val validUserId = accountManager.getUserData(it, ACCOUNT_DATA_ID)?.toUUIDOrNull() == userId
+
+				validServerId && validUserId
+			}
+			?.let { account -> accountManager.peekAuthToken(account, ACCOUNT_ACCESS_TOKEN_TYPE) }
+	}.getOrNull()
+
+	companion object {
+		const val ACCOUNT_TYPE = BuildConfig.APPLICATION_ID
+		const val ACCOUNT_DATA_ID = "$ACCOUNT_TYPE.id"
+		const val ACCOUNT_DATA_SERVER = "$ACCOUNT_TYPE.server"
+		const val ACCOUNT_ACCESS_TOKEN_TYPE = "$ACCOUNT_TYPE.access_token"
+	}
+}

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

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

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

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

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

@@ -12,5 +12,6 @@ data class AuthenticationStoreUser(
 	val name: String,
 	@SerialName("last_used") val lastUsed: Long = Date().time,
 	@SerialName("require_password") val requirePassword: Boolean = true,
-	@SerialName("image_tag") val imageTag: String? = null
+	@SerialName("image_tag") val imageTag: String? = null,
+	@SerialName("access_token") val accessToken: String? = null,
 )

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

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

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

@@ -4,7 +4,7 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.emitAll
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.flowOf
-import org.jellyfin.androidtv.auth.model.AccountManagerAccount
+import org.jellyfin.androidtv.auth.model.ApiClientErrorLoginState
 import org.jellyfin.androidtv.auth.model.AuthenticateMethod
 import org.jellyfin.androidtv.auth.model.AuthenticatedState
 import org.jellyfin.androidtv.auth.model.AuthenticatingState
@@ -19,7 +19,6 @@ import org.jellyfin.androidtv.auth.model.Server
 import org.jellyfin.androidtv.auth.model.ServerUnavailableState
 import org.jellyfin.androidtv.auth.model.ServerVersionNotSupported
 import org.jellyfin.androidtv.auth.model.User
-import org.jellyfin.androidtv.auth.store.AccountManagerStore
 import org.jellyfin.androidtv.auth.store.AuthenticationPreferences
 import org.jellyfin.androidtv.auth.store.AuthenticationStore
 import org.jellyfin.androidtv.util.ImageUtils
@@ -51,7 +50,6 @@ interface AuthenticationRepository {
 class AuthenticationRepositoryImpl(
 	private val jellyfin: Jellyfin,
 	private val sessionRepository: SessionRepository,
-	private val accountManagerStore: AccountManagerStore,
 	private val authenticationStore: AuthenticationStore,
 	private val userApiClient: ApiClient,
 	private val authenticationPreferences: AuthenticationPreferences,
@@ -69,14 +67,14 @@ class AuthenticationRepositoryImpl(
 	}
 
 	private fun authenticateAutomatic(server: Server, user: User): Flow<LoginState> {
-		Timber.d("Authenticating user %s", user)
+		Timber.i("Authenticating user %s", user)
 
 		// Automatic logic is disabled when the always authenticate preference is enabled
 		if (authenticationPreferences[AuthenticationPreferences.alwaysAuthenticate]) return flowOf(RequireSignInState)
 
-		val account = accountManagerStore.getAccount(user.id)
+		val authStoreUser = authenticationStore.getUser(server.id, user.id)
 		// Try login with access token
-		return if (account?.accessToken != null) authenticateToken(server, user.withToken(account.accessToken))
+		return if (authStoreUser?.accessToken != null) authenticateToken(server, user.withToken(authStoreUser.accessToken))
 		// Try login without password
 		else if (!user.requirePassword) authenticateCredential(server, user.name, "")
 		// Require login
@@ -94,7 +92,7 @@ class AuthenticationRepositoryImpl(
 			return@flow
 		} catch (err: ApiClientException) {
 			Timber.e(err, "Unable to sign in as $username")
-			emit(RequireSignInState)
+			emit(ApiClientErrorLoginState(err))
 			return@flow
 		}
 
@@ -106,9 +104,13 @@ class AuthenticationRepositoryImpl(
 		val result = try {
 			val response = api.userApi.authenticateWithQuickConnect(secret)
 			response.content
+		} catch (err: TimeoutException) {
+			Timber.e(err, "Failed to connect to server")
+			emit(ServerUnavailableState)
+			return@flow
 		} catch (err: ApiClientException) {
 			Timber.e(err, "Unable to sign in with Quick Connect secret")
-			emit(RequireSignInState)
+			emit(ApiClientErrorLoginState(err))
 			return@flow
 		}
 
@@ -116,7 +118,7 @@ class AuthenticationRepositoryImpl(
 	}
 
 	private fun authenticateAuthenticationResult(server: Server, result: AuthenticationResult) = flow {
-		val accessToken = result.accessToken ?:return@flow emit(RequireSignInState)
+		val accessToken = result.accessToken ?: return@flow emit(RequireSignInState)
 		val userInfo = result.user ?: return@flow emit(RequireSignInState)
 		val user = PrivateUser(
 			id = userInfo.id,
@@ -130,8 +132,12 @@ class AuthenticationRepositoryImpl(
 
 		authenticateFinish(server, userInfo, accessToken)
 		val success = setActiveSession(user, server)
-		if (success) emit(AuthenticatedState)
-		else emit(RequireSignInState)
+		if (success) {
+			emit(AuthenticatedState)
+		} else {
+			Timber.w("Failed to set active session after authenticating")
+			emit(RequireSignInState)
+		}
 	}
 
 	private fun authenticateToken(server: Server, user: User) = flow {
@@ -145,9 +151,13 @@ class AuthenticationRepositoryImpl(
 			val userInfo by userApiClient.userApi.getCurrentUser()
 			authenticateFinish(server, userInfo, user.accessToken.orEmpty())
 			emit(AuthenticatedState)
+		} catch (err: TimeoutException) {
+			Timber.e(err, "Failed to connect to server")
+			emit(ServerUnavailableState)
+			return@flow
 		} catch (err: ApiClientException) {
 			Timber.e(err, "Unable to get current user data")
-			emit(RequireSignInState)
+			emit(ApiClientErrorLoginState(err))
 		}
 	}
 
@@ -158,20 +168,19 @@ class AuthenticationRepositoryImpl(
 			name = userInfo.name!!,
 			lastUsed = Date().time,
 			requirePassword = userInfo.hasPassword,
-			imageTag = userInfo.primaryImageTag
+			imageTag = userInfo.primaryImageTag,
+			accessToken = accessToken,
 		) ?: AuthenticationStoreUser(
 			name = userInfo.name!!,
 			requirePassword = userInfo.hasPassword,
-			imageTag = userInfo.primaryImageTag
+			imageTag = userInfo.primaryImageTag,
+			accessToken = accessToken,
 		)
 		authenticationStore.putUser(server.id, userInfo.id, updatedUser)
-
-		val accountManagerAccount = AccountManagerAccount(userInfo.id, server.id, updatedUser.name, accessToken)
-		accountManagerStore.putAccount(accountManagerAccount)
 	}
 
 	private suspend fun setActiveSession(user: User, server: Server): Boolean {
-		val authenticated = sessionRepository.switchCurrentSession(user.id)
+		val authenticated = sessionRepository.switchCurrentSession(server.id, user.id)
 
 		if (authenticated) {
 			// Update last use in store
@@ -188,8 +197,12 @@ class AuthenticationRepositoryImpl(
 	}
 
 	override fun logout(user: User): Boolean {
-		val authInfo = accountManagerStore.getAccount(user.id) ?: return false
-		return accountManagerStore.removeAccount(authInfo)
+		val authStoreUser = authenticationStore
+			.getUser(user.serverId, user.id)
+			?.copy(accessToken = null)
+
+		return if (authStoreUser != null) authenticationStore.putUser(user.serverId, user.id, authStoreUser)
+		else false
 	}
 
 	override fun getUserImageUrl(server: Server, user: User): String? = user.imageTag?.let { tag ->

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

@@ -4,7 +4,6 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.map
 import org.jellyfin.androidtv.auth.model.AuthenticationStoreServer
@@ -47,6 +46,7 @@ interface ServerRepository {
 
 	companion object {
 		val minimumServerVersion = Jellyfin.minimumVersion.copy(build = null)
+		val recommendedServerVersion = Jellyfin.apiVersion.copy(build = null)
 	}
 }
 
@@ -83,12 +83,12 @@ class ServerRepositoryImpl(
 
 	// Mutating data
 	override fun addServer(address: String): Flow<ServerAdditionState> = flow {
-		Timber.d("Adding server %s", address)
+		Timber.i("Adding server %s", address)
 
 		emit(ConnectingState(address))
 
 		val addressCandidates = jellyfin.discovery.getAddressCandidates(address)
-		Timber.d("Found ${addressCandidates.size} candidates")
+		Timber.i("Found ${addressCandidates.size} candidates")
 
 		val goodRecommendations = mutableListOf<RecommendedServerInfo>()
 		val badRecommendations = mutableListOf<RecommendedServerInfo>()

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

@@ -3,7 +3,6 @@ package org.jellyfin.androidtv.auth.repository
 import org.jellyfin.androidtv.auth.model.PrivateUser
 import org.jellyfin.androidtv.auth.model.PublicUser
 import org.jellyfin.androidtv.auth.model.Server
-import org.jellyfin.androidtv.auth.store.AccountManagerStore
 import org.jellyfin.androidtv.auth.store.AuthenticationStore
 import org.jellyfin.androidtv.util.sdk.toPublicUser
 import org.jellyfin.sdk.Jellyfin
@@ -27,14 +26,13 @@ interface ServerUserRepository {
 class ServerUserRepositoryImpl(
 	private val jellyfin: Jellyfin,
 	private val authenticationStore: AuthenticationStore,
-	private val accountManagerStore: AccountManagerStore,
 ) : ServerUserRepository {
 	override fun getStoredServerUsers(server: Server) = authenticationStore.getUsers(server.id)
 		?.mapNotNull { (userId, userInfo) ->
-			val authInfo = accountManagerStore.getAccount(userId)
+			val authInfo = authenticationStore.getUser(server.id, userId)
 			PrivateUser(
-				id = authInfo?.id ?: userId,
-				serverId = authInfo?.server ?: server.id,
+				id = userId,
+				serverId = server.id,
 				name = userInfo.name,
 				accessToken = authInfo?.accessToken,
 				requirePassword = userInfo.requirePassword,
@@ -62,10 +60,5 @@ class ServerUserRepositoryImpl(
 	override fun deleteStoredUser(user: PrivateUser) {
 		// Remove user info from store
 		authenticationStore.removeUser(user.serverId, user.id)
-
-		// Remove authentication info from system account manager
-		accountManagerStore.getAccount(user.id)?.let { accountManagerAccount ->
-			accountManagerStore.removeAccount(accountManagerAccount)
-		}
 	}
 }

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

@@ -1,12 +1,13 @@
 package org.jellyfin.androidtv.auth.repository
 
+import kotlinx.coroutines.NonCancellable
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
+import kotlinx.coroutines.withContext
 import org.jellyfin.androidtv.auth.apiclient.ApiBinder
-import org.jellyfin.androidtv.auth.store.AccountManagerStore
 import org.jellyfin.androidtv.auth.store.AuthenticationPreferences
 import org.jellyfin.androidtv.auth.store.AuthenticationStore
 import org.jellyfin.androidtv.preference.PreferencesRepository
@@ -40,14 +41,13 @@ interface SessionRepository {
 	val currentSession: StateFlow<Session?>
 	val state: StateFlow<SessionRepositoryState>
 
-	suspend fun restoreSession()
-	suspend fun switchCurrentSession(userId: UUID): Boolean
+	suspend fun restoreSession(destroyOnly: Boolean)
+	suspend fun switchCurrentSession(serverId: UUID, userId: UUID): Boolean
 	fun destroyCurrentSession()
 }
 
 class SessionRepositoryImpl(
 	private val authenticationPreferences: AuthenticationPreferences,
-	private val accountManagerStore: AccountManagerStore,
 	private val apiBinder: ApiBinder,
 	private val authenticationStore: AuthenticationStore,
 	private val userApiClient: ApiClient,
@@ -63,34 +63,44 @@ class SessionRepositoryImpl(
 	private val _state = MutableStateFlow(SessionRepositoryState.READY)
 	override val state = _state.asStateFlow()
 
-	override suspend fun restoreSession(): Unit = currentSessionMutex.withLock {
-		Timber.d("Restoring session")
-		_state.value = SessionRepositoryState.RESTORING_SESSION
+	override suspend fun restoreSession(destroyOnly: Boolean): Unit = withContext(NonCancellable) {
+		currentSessionMutex.withLock {
+			Timber.i("Restoring session")
 
-		if (authenticationPreferences[AuthenticationPreferences.alwaysAuthenticate]) return destroyCurrentSession()
+			_state.value = SessionRepositoryState.RESTORING_SESSION
 
-		val behavior = authenticationPreferences[AuthenticationPreferences.autoLoginUserBehavior]
-		val userId = authenticationPreferences[AuthenticationPreferences.autoLoginUserId].toUUIDOrNull()
+			val alwaysAuthenticate = authenticationPreferences[AuthenticationPreferences.alwaysAuthenticate]
+			val autoLoginBehavior = authenticationPreferences[AuthenticationPreferences.autoLoginUserBehavior]
 
-		when (behavior) {
-			DISABLED -> destroyCurrentSession()
-			LAST_USER -> setCurrentSession(createLastUserSession())
-			SPECIFIC_USER -> setCurrentSession(createUserSession(userId))
+			when {
+				alwaysAuthenticate -> destroyCurrentSession()
+				autoLoginBehavior == DISABLED -> destroyCurrentSession()
+				autoLoginBehavior == LAST_USER && !destroyOnly -> setCurrentSession(createLastUserSession())
+				autoLoginBehavior == SPECIFIC_USER && !destroyOnly -> {
+					val serverId = authenticationPreferences[AuthenticationPreferences.autoLoginServerId].toUUIDOrNull()
+					val userId = authenticationPreferences[AuthenticationPreferences.autoLoginUserId].toUUIDOrNull()
+					if (serverId != null && userId != null) setCurrentSession(createUserSession(serverId, userId))
+				}
+			}
+
+			_state.value = SessionRepositoryState.READY
 		}
-
-		_state.value = SessionRepositoryState.READY
 	}
 
-	override suspend fun switchCurrentSession(userId: UUID): Boolean {
+	override suspend fun switchCurrentSession(serverId: UUID, userId: UUID): Boolean {
 		// No change in user - don't switch
-		if (currentSession.value?.userId == userId) return false
+		if (currentSession.value?.userId == userId) {
+			Timber.d("Current session user is the same as the requested user")
+			return false
+		}
 
 		_state.value = SessionRepositoryState.SWITCHING_SESSION
-		Timber.d("Switching current session to user $userId")
+		Timber.i("Switching current session to user $userId")
 
-		val session = createUserSession(userId)
+		val session = createUserSession(serverId, userId)
 		if (session == null) {
-			Timber.d("Could not switch to non-existing session for user $userId")
+			Timber.w("Could not switch to non-existing session for user $userId")
+			_state.value = SessionRepositoryState.READY
 			return false
 		}
 
@@ -100,11 +110,10 @@ class SessionRepositoryImpl(
 	}
 
 	override fun destroyCurrentSession() {
-		Timber.d("Destroying current session")
+		Timber.i("Destroying current session")
 
 		userRepository.updateCurrentUser(null)
 		_currentSession.value = null
-		userApiClient.applySession(null)
 		apiBinder.updateSession(null, userApiClient.deviceInfo)
 		_state.value = SessionRepositoryState.READY
 	}
@@ -115,6 +124,7 @@ class SessionRepositoryImpl(
 			if (currentSession.value?.userId == session.userId) return true
 
 			// Update last active user
+			authenticationPreferences[AuthenticationPreferences.lastServerId] = session.serverId.toString()
 			authenticationPreferences[AuthenticationPreferences.lastUserId] = session.userId.toString()
 
 			// Check if server version is supported
@@ -125,12 +135,12 @@ class SessionRepositoryImpl(
 		// Update session after binding the apiclient settings
 		val deviceInfo = session?.let { defaultDeviceInfo.forUser(it.userId) } ?: defaultDeviceInfo
 		val success = apiBinder.updateSession(session, deviceInfo)
-		Timber.d("Updating current session. userId=${session?.userId} apiBindingSuccess=${success}")
+		Timber.i("Updating current session. userId=${session?.userId} apiBindingSuccess=${success}")
 
 		if (success) {
-			userApiClient.applySession(session, deviceInfo)
+			val applied = userApiClient.applySession(session, deviceInfo)
 
-			if (session != null) {
+			if (applied && session != null) {
 				// Update crash reporting URL
 				val crashReportUrl = userApiClient.clientLogApi.logFileUrl(includeCredentials = false)
 				telemetryPreferences[TelemetryPreferences.crashReportUrl] = crashReportUrl
@@ -156,23 +166,24 @@ class SessionRepositoryImpl(
 
 	private fun createLastUserSession(): Session? {
 		val lastUserId = authenticationPreferences[AuthenticationPreferences.lastUserId].toUUIDOrNull()
-		return createUserSession(lastUserId)
+		val lastServerId = authenticationPreferences[AuthenticationPreferences.lastServerId].toUUIDOrNull()
+
+		return if (lastUserId != null && lastServerId != null) createUserSession(lastServerId, lastUserId)
+		else null
 	}
 
-	private fun createUserSession(userId: UUID?): Session? {
-		if (userId == null) return null
-
-		val account = accountManagerStore.getAccount(userId)
+	private fun createUserSession(serverId: UUID, userId: UUID): Session? {
+		val account = authenticationStore.getUser(serverId, userId)
 		if (account?.accessToken == null) return null
 
 		return Session(
-			userId = account.id,
-			serverId = account.server,
+			userId = userId,
+			serverId = serverId,
 			accessToken = account.accessToken
 		)
 	}
 
-	private fun ApiClient.applySession(session: Session?, newDeviceInfo: DeviceInfo = defaultDeviceInfo) {
+	private fun ApiClient.applySession(session: Session?, newDeviceInfo: DeviceInfo = defaultDeviceInfo): Boolean {
 		deviceInfo = newDeviceInfo
 
 		if (session == null) {
@@ -181,10 +192,12 @@ class SessionRepositoryImpl(
 			userId = null
 		} else {
 			val server = authenticationStore.getServer(session.serverId)
-				?: return applySession(null)
+				?: return false
 			baseUrl = server.address
 			accessToken = session.accessToken
 			userId = session.userId
 		}
+
+		return true
 	}
 }

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

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

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

@@ -14,12 +14,30 @@ class AuthenticationPreferences(context: Context) : SharedPreferenceStore(
 	companion object {
 		// Preferences
 		val autoLoginUserBehavior = enumPreference("auto_login_user_behavior", UserSelectBehavior.LAST_USER)
+		val autoLoginServerId = stringPreference("auto_login_server_id", "")
 		val autoLoginUserId = stringPreference("auto_login_user_id", "")
 
 		val sortBy = enumPreference("sort_by", AuthenticationSortBy.LAST_USE)
 		val alwaysAuthenticate = booleanPreference("always_authenticate", false)
 
 		// Persistent state
+		val lastServerId = stringPreference("last_server_id", "")
 		val lastUserId = stringPreference("last_user_id", "")
 	}
+
+	init {
+		runMigrations {
+			// v0.15.4 to v0.15.5
+			migration(toVersion = 2) {
+				// Unfortunately we cannot migrate the "specific user" login option
+				// so we'll reset the preference to disabled if it was used
+				if (it.getString("auto_login_user_behavior", null) === UserSelectBehavior.SPECIFIC_USER.name) {
+					putString("auto_login_user_id", "")
+					putString("auto_login_user_behavior", UserSelectBehavior.DISABLED.name)
+				}
+
+				putString("last_user_id", "")
+			}
+		}
+	}
 }

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

@@ -13,6 +13,7 @@ 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.AccountManagerMigration
 import org.jellyfin.androidtv.auth.model.AuthenticationStoreServer
 import org.jellyfin.androidtv.auth.model.AuthenticationStoreUser
 import org.jellyfin.sdk.model.serializer.UUIDSerializer
@@ -20,14 +21,14 @@ import timber.log.Timber
 import java.util.UUID
 
 /**
- * Storage for authentication related entities. Stores servers with users inside. Should be used in
- * combination with the [AccountManagerStore] to store access tokens and integrate with the
- * operating system.
+ * Storage for authentication related entities. Stores servers with users inside, including
+ * access tokens.
  *
  * The data is stored in a JSON file located in the applications data directory.
  */
 class AuthenticationStore(
-	private val context: Context
+	private val context: Context,
+	private val accountManagerMigration: AccountManagerMigration,
 ) {
 	private val storePath
 		get() = context.filesDir.resolve("authentication_store.json")
@@ -59,10 +60,17 @@ class AuthenticationStore(
 		// Check for version
 		return when (root["version"]?.jsonPrimitive?.intOrNull) {
 			1 -> json.decodeFromJsonElement<Map<UUID, AuthenticationStoreServer>>(root["servers"]!!)
+				// Add access tokens from account manager to stored users and save the migrated data
+				.let { servers -> accountManagerMigration.migrate(servers) }
+				.also { servers -> write(servers) }
+
+			2 -> json.decodeFromJsonElement<Map<UUID, AuthenticationStoreServer>>(root["servers"]!!)
+
 			null -> {
 				Timber.e("Authentication Store is corrupt!")
 				emptyMap()
 			}
+
 			else -> {
 				Timber.e("Authentication Store is using an unknown version!")
 				emptyMap()
@@ -70,10 +78,10 @@ class AuthenticationStore(
 		}
 	}
 
-	private fun save(): Boolean {
+	private fun write(servers: Map<UUID, AuthenticationStoreServer>): Boolean {
 		val root = JsonObject(mapOf(
-			"version" to JsonPrimitive(1),
-			"servers" to json.encodeToJsonElement(store)
+			"version" to JsonPrimitive(2),
+			"servers" to json.encodeToJsonElement(servers)
 		))
 
 		storePath.writeText(json.encodeToString(root))
@@ -81,6 +89,10 @@ class AuthenticationStore(
 		return true
 	}
 
+	private fun save(): Boolean {
+		return write(store)
+	}
+
 	fun getServers(): Map<UUID, AuthenticationStoreServer> = store
 
 	fun getUsers(server: UUID): Map<UUID, AuthenticationStoreUser>? = getServer(server)?.users

app/src/main/java/org/jellyfin/androidtv/auth/ui/ActivityAuthenticationExtensions.kt

@@ -1,31 +0,0 @@
-package org.jellyfin.androidtv.auth.ui
-
-import android.content.Intent
-import androidx.fragment.app.FragmentActivity
-import org.jellyfin.androidtv.auth.repository.SessionRepository
-import org.jellyfin.androidtv.auth.repository.UserRepository
-import org.jellyfin.androidtv.ui.startup.StartupActivity
-import org.koin.android.ext.android.inject
-import timber.log.Timber
-
-/**
- * Extension function to check authentication. Should be called in [FragmentActivity.onCreate] and
- * [FragmentActivity.onResume]. It validates the current session and opens the authentication screen
- * when no session is found.
- *
- * @return whether to proceed creating the activity or not. When `false` is returned the
- * [FragmentActivity.finish] function is automatically called.
- */
-fun FragmentActivity.validateAuthentication(): Boolean {
-	val sessionRepository by inject<SessionRepository>()
-	val userRepository by inject<UserRepository>()
-
-	if (sessionRepository.currentSession.value == null || userRepository.currentUser.value == null) {
-		Timber.w("Activity ${this::class.qualifiedName} started without a session, bouncing to StartupActivity")
-		startActivity(Intent(this, StartupActivity::class.java))
-		finish()
-		return false
-	}
-
-	return true
-}

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

@@ -62,10 +62,12 @@ object Codec {
 		const val MPEG2VIDEO = "mpeg2video"
 		const val VP8 = "vp8"
 		const val VP9 = "vp9"
+		const val AV1 = "av1"
 	}
 
 	object Subtitle {
 		const val ASS = "ass"
+		const val DVBSUB = "dvbsub"
 		const val DVDSUB = "dvdsub"
 		const val IDX = "idx"
 		const val PGS = "pgs"

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

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

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

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

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

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

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

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

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

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

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

@@ -20,9 +20,11 @@ enum class QueryType {
 	StaticItems,
 	Persons,
 	StaticAudioQueueItems,
+	Artists,
 	AlbumArtists,
 	AudioPlaylists,
 	LatestItems,
 	SeriesTimer,
 	Premieres,
+	Resume,
 }

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

@@ -1,6 +1,8 @@
 package org.jellyfin.androidtv.data.eventhandling
 
 import android.content.Context
+import android.media.AudioManager
+import android.os.Build
 import android.widget.Toast
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -12,6 +14,7 @@ import org.jellyfin.androidtv.ui.navigation.Destinations
 import org.jellyfin.androidtv.ui.navigation.NavigationRepository
 import org.jellyfin.androidtv.ui.playback.MediaManager
 import org.jellyfin.androidtv.ui.playback.PlaybackControllerContainer
+import org.jellyfin.androidtv.ui.playback.rewrite.RewriteMediaManager
 import org.jellyfin.androidtv.util.apiclient.PlaybackHelper
 import org.jellyfin.sdk.api.client.ApiClient
 import org.jellyfin.sdk.api.client.exception.ApiClientException
@@ -42,6 +45,7 @@ class SocketHandler(
 	private val mediaManager: MediaManager,
 	private val playbackControllerContainer: PlaybackControllerContainer,
 	private val navigationRepository: NavigationRepository,
+	private val audioManager: AudioManager,
 ) {
 	private val coroutineScope = CoroutineScope(Dispatchers.IO)
 	val state = socketInstance.state
@@ -51,11 +55,23 @@ class SocketHandler(
 			api.sessionApi.postCapabilities(
 				playableMediaTypes = listOf(MediaType.Video, MediaType.Audio),
 				supportsMediaControl = true,
-				supportedCommands = listOf(
-					GeneralCommandType.DISPLAY_MESSAGE,
-					GeneralCommandType.SEND_STRING,
-					GeneralCommandType.DISPLAY_CONTENT,
-				),
+				supportedCommands = buildList {
+					add(GeneralCommandType.DISPLAY_CONTENT)
+
+					add(GeneralCommandType.DISPLAY_MESSAGE)
+					add(GeneralCommandType.SEND_STRING)
+
+					// Note: These are used in the PlaySessionSocketService
+					if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && !audioManager.isVolumeFixed) {
+						add(GeneralCommandType.VOLUME_UP)
+						add(GeneralCommandType.VOLUME_DOWN)
+						add(GeneralCommandType.SET_VOLUME)
+
+						add(GeneralCommandType.MUTE)
+						add(GeneralCommandType.UNMUTE)
+						add(GeneralCommandType.TOGGLE_MUTE)
+					}
+				},
 			)
 		} catch (err: ApiClientException) {
 			Timber.e(err, "Unable to update capabilities")
@@ -111,48 +127,65 @@ class SocketHandler(
 	private fun onPlayMessage(message: PlayMessage) {
 		val itemId = message.request.itemIds?.firstOrNull() ?: return
 
-		PlaybackHelper.retrieveAndPlay(
-			itemId.toString(),
-			false,
-			message.request.startPositionTicks,
-			context
-		)
+		runCatching {
+			PlaybackHelper.retrieveAndPlay(
+				itemId.toString(),
+				false,
+				message.request.startPositionTicks,
+				context
+			)
+		}.onFailure { Timber.w(it, "Failed to start playback") }
 	}
 
 	@Suppress("ComplexMethod")
 	private fun onPlayStateMessage(message: PlayStateMessage) = coroutineScope.launch(Dispatchers.Main) {
 		Timber.i("Received PlayStateMessage with command ${message.request.command}")
-		val playbackController = playbackControllerContainer.playbackController
-		// Audio playback uses the mediaManager, video playback and live tv use the playbackController
-		if (mediaManager.isAudioPlayerInitialized) when (message.request.command) {
-			PlaystateCommand.STOP -> mediaManager.stopAudio(true)
-			PlaystateCommand.PAUSE, PlaystateCommand.UNPAUSE, PlaystateCommand.PLAY_PAUSE -> mediaManager.playPauseAudio()
-			PlaystateCommand.NEXT_TRACK -> mediaManager.nextAudioItem()
-			PlaystateCommand.PREVIOUS_TRACK -> mediaManager.prevAudioItem()
-			// Not implemented
-			PlaystateCommand.SEEK,
-			PlaystateCommand.REWIND,
-			PlaystateCommand.FAST_FORWARD -> Unit
-		} else when (message.request.command) {
-			PlaystateCommand.STOP -> playbackController?.endPlayback(true)
-			PlaystateCommand.PAUSE, PlaystateCommand.UNPAUSE, PlaystateCommand.PLAY_PAUSE -> playbackController?.playPause()
-			PlaystateCommand.NEXT_TRACK -> playbackController?.next()
-			PlaystateCommand.PREVIOUS_TRACK -> playbackController?.prev()
-			PlaystateCommand.SEEK -> playbackController?.seek(
-				(message.request.seekPositionTicks ?: 0) / TICKS_TO_MS
-			)
-			// FIXME get rewind/forward amount from displayprefs
-			PlaystateCommand.REWIND -> playbackController?.skip(REWIND_MS)
-			PlaystateCommand.FAST_FORWARD -> playbackController?.skip(FORWARD_MS)
+
+		// Audio playback uses (Rewrite)MediaManager, (legacy) video playback uses playbackController
+		when {
+			// Ignore RewriteMediaManager
+			mediaManager is RewriteMediaManager && mediaManager.hasAudioQueueItems() -> {
+				Timber.i("Ignoring PlayStateMessage: should be handled by PlaySessionSocketService")
+				return@launch
+			}
+
+			// LegacyMediaManager
+			mediaManager.hasAudioQueueItems() -> when (message.request.command) {
+				PlaystateCommand.STOP -> mediaManager.stopAudio(true)
+				PlaystateCommand.PAUSE, PlaystateCommand.UNPAUSE, PlaystateCommand.PLAY_PAUSE -> mediaManager.playPauseAudio()
+				PlaystateCommand.NEXT_TRACK -> mediaManager.nextAudioItem()
+				PlaystateCommand.PREVIOUS_TRACK -> mediaManager.prevAudioItem()
+				// Not implemented
+				PlaystateCommand.SEEK,
+				PlaystateCommand.REWIND,
+				PlaystateCommand.FAST_FORWARD -> Unit
+			}
+
+			// PlaybackController
+			else -> {
+				val playbackController = playbackControllerContainer.playbackController
+				when (message.request.command) {
+					PlaystateCommand.STOP -> playbackController?.endPlayback(true)
+					PlaystateCommand.PAUSE, PlaystateCommand.UNPAUSE, PlaystateCommand.PLAY_PAUSE -> playbackController?.playPause()
+					PlaystateCommand.NEXT_TRACK -> playbackController?.next()
+					PlaystateCommand.PREVIOUS_TRACK -> playbackController?.prev()
+					PlaystateCommand.SEEK -> playbackController?.seek(
+						(message.request.seekPositionTicks ?: 0) / TICKS_TO_MS
+					)
+
+					PlaystateCommand.REWIND -> playbackController?.rewind()
+					PlaystateCommand.FAST_FORWARD -> playbackController?.fastForward()
+				}
+			}
 		}
 	}
 
-	private fun onDisplayContent(itemId: UUID, itemKind: BaseItemKind) {
+	private fun onDisplayContent(itemId: UUID, itemKind: BaseItemKind) = coroutineScope.launch(Dispatchers.Main) {
 		val playbackController = playbackControllerContainer.playbackController
 
 		if (playbackController?.isPlaying == true || playbackController?.isPaused == true) {
 			Timber.i("Not launching $itemId: playback in progress")
-			return
+			return@launch
 		}
 
 		Timber.i("Launching $itemId")
@@ -163,6 +196,7 @@ class SocketHandler(
 				val item by api.userLibraryApi.getItem(itemId = itemId)
 				ItemLauncher.launchUserView(item)
 			}
+
 			else -> navigationRepository.navigate(Destinations.itemDetails(itemId))
 		}
 	}
@@ -180,7 +214,5 @@ class SocketHandler(
 
 	companion object {
 		const val TICKS_TO_MS = 10000L
-		const val REWIND_MS = -11000
-		const val FORWARD_MS = 30000
 	}
 }

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

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

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

@@ -1,9 +1,10 @@
 package org.jellyfin.androidtv.data.model
 
 import org.jellyfin.sdk.model.api.BaseItemDto
+import java.util.UUID
 
 class DataRefreshService {
-	var lastDeletedItemId: String? = null
+	var lastDeletedItemId: UUID? = null
 	var lastPlayback: Long = 0
 	var lastMoviePlayback: Long = 0
 	var lastTvPlayback: Long = 0

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

@@ -0,0 +1,5 @@
+package org.jellyfin.androidtv.data.querying
+
+import org.jellyfin.apiclient.model.querying.ArtistsQuery
+
+class AlbumArtistsQuery : ArtistsQuery()

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

@@ -2,13 +2,13 @@ package org.jellyfin.androidtv.data.repository
 
 import android.app.UiModeManager
 import android.content.Context
-import android.content.res.Configuration
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import org.jellyfin.androidtv.BuildConfig
 import org.jellyfin.androidtv.R
 import org.jellyfin.androidtv.data.model.AppNotification
 import org.jellyfin.androidtv.preference.SystemPreferences
+import org.jellyfin.androidtv.util.isTvDevice
 
 interface NotificationsRepository {
 	val notifications: StateFlow<List<AppNotification>>
@@ -34,18 +34,15 @@ class NotificationsRepositoryImpl(
 		addBetaNotification()
 	}
 
-	private fun addNotification(message: String, dismiss: () -> Unit = {}) {
-		notifications.value = notifications.value + AppNotification(message, dismiss)
+	private fun addNotification(message: String, public: Boolean = false, dismiss: () -> Unit = {}) {
+		notifications.value = notifications.value + AppNotification(message, dismiss, public)
 	}
 
 	private fun addUiModeNotification() {
-		val supportedUiModes = setOf(Configuration.UI_MODE_TYPE_TELEVISION, Configuration.UI_MODE_TYPE_UNDEFINED)
-		val invalidUiMode = !supportedUiModes.contains(uiModeManager.currentModeType)
-		val isTouch = context.packageManager.hasSystemFeature("android.hardware.touchscreen")
-		val hasHdmiCec = context.packageManager.hasSystemFeature("android.hardware.hdmi.cec")
+		val disableUiModeWarning = systemPreferences[SystemPreferences.disableUiModeWarning]
 
-		if (invalidUiMode && isTouch && !hasHdmiCec) {
-			addNotification(context.getString(R.string.app_notification_uimode_invalid))
+		if (!context.isTvDevice() && !disableUiModeWarning) {
+			addNotification(context.getString(R.string.app_notification_uimode_invalid), public = true)
 		}
 	}
 

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

@@ -1,33 +1,18 @@
 package org.jellyfin.androidtv.data.service
 
-import android.animation.ValueAnimator
 import android.content.Context
-import android.graphics.Color
-import android.graphics.drawable.ColorDrawable
-import android.graphics.drawable.Drawable
-import android.graphics.drawable.LayerDrawable
-import android.util.Size
-import android.view.animation.AccelerateDecelerateInterpolator
-import androidx.annotation.MainThread
-import androidx.core.animation.doOnEnd
-import androidx.core.content.ContextCompat
-import androidx.core.graphics.BlendModeColorFilterCompat
-import androidx.core.graphics.BlendModeCompat
+import androidx.compose.ui.graphics.ImageBitmap
+import androidx.compose.ui.graphics.asImageBitmap
 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.layout.WindowMetricsCalculator
-import com.bumptech.glide.Glide
+import coil.ImageLoader
+import coil.request.ImageRequest
 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.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import org.jellyfin.androidtv.R
 import org.jellyfin.androidtv.auth.model.Server
 import org.jellyfin.androidtv.preference.UserPreferences
 import org.jellyfin.sdk.Jellyfin
@@ -35,98 +20,34 @@ import org.jellyfin.sdk.api.client.ApiClient
 import org.jellyfin.sdk.api.client.extensions.imageApi
 import org.jellyfin.sdk.model.api.BaseItemDto
 import org.jellyfin.sdk.model.api.ImageType
-import org.jellyfin.sdk.model.api.SearchHint
-import org.jellyfin.sdk.model.serializer.toUUID
-import timber.log.Timber
 import java.util.UUID
-import java.util.concurrent.ExecutionException
+import kotlin.time.Duration
+import kotlin.time.Duration.Companion.milliseconds
+import kotlin.time.Duration.Companion.seconds
 
 class BackgroundService(
 	private val context: Context,
 	private val jellyfin: Jellyfin,
 	private val api: ApiClient,
 	private val userPreferences: UserPreferences,
+	private val imageLoader: ImageLoader,
 ) {
 	companion object {
-		const val TRANSITION_DURATION = 400L // 0.4 seconds
-		const val SLIDESHOW_DURATION = 30000L // 30 seconds
-		const val UPDATE_INTERVAL = 500L // 0.5 seconds
-		val FRAGMENT_TAG = BackgroundServiceFragment::class.qualifiedName!!
+		val SLIDESHOW_DURATION = 30.seconds
+		val TRANSITION_DURATION = 800.milliseconds
 	}
 
 	// Async
 	private val scope = MainScope()
 	private var loadBackgroundsJob: Job? = null
 	private var updateBackgroundTimerJob: Job? = null
-	private var lastBackgroundUpdate = 0L
+	private var lastBackgroundTimerUpdate = 0L
 
-	// All background drawables currently showing
-	internal val backgrounds = mutableListOf<Drawable>()
-
-	// Current background index
-	private var currentIndex = 0
-
-	// Preferred display size, set when calling [attach].
-	private var windowSize = Size(0, 0)
-	private var windowBackground: Drawable = ColorDrawable(Color.BLACK)
-
-	// Background layers
-	internal val backgroundDrawable = ContextCompat.getDrawable(context, R.drawable.layer_background) as LayerDrawable
-
-	// Filter to darken backgrounds
-	private val colorFilter = BlendModeColorFilterCompat.createBlendModeColorFilterCompat(
-		ContextCompat.getColor(context, R.color.background_filter),
-		BlendModeCompat.SRC_ATOP
-	)
-
-	// Animation
-	@Suppress("MagicNumber")
-	private val backgroundAnimator = ValueAnimator.ofInt(0, 255).apply {
-		interpolator = AccelerateDecelerateInterpolator()
-		duration = TRANSITION_DURATION
-
-		addUpdateListener { animation ->
-			// Set alpha
-			val value = animation.animatedValue as Int
-			backgroundDrawable.findDrawableByLayerId(R.id.background_next).alpha = value
-			backgroundDrawable.invalidateSelf()
-		}
-
-		doOnEnd {
-			// Set next as current and clear next
-			val drawable = backgroundDrawable.findDrawableByLayerId(R.id.background_next)
-			backgroundDrawable.setDrawableByLayerId(R.id.background_current, drawable)
-			backgroundDrawable.setDrawableByLayerId(R.id.background_next, ColorDrawable(Color.TRANSPARENT))
-			backgroundDrawable.invalidateSelf()
-		}
-	}
-
-	/**
-	 * Attach the bakground to [activity].
-	 */
-	fun attach(activity: FragmentActivity) {
-		// Set default background to current if it's not layered
-		val current = activity.window.decorView.background
-		windowBackground = if (current !is LayerDrawable) current.copy() else ColorDrawable(Color.BLACK)
-		backgroundDrawable.setDrawableByLayerId(R.id.background_static, windowBackground)
-
-		// Store size of window manager for this activity
-		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
-		val fragment = activity.supportFragmentManager.findFragmentByTag(FRAGMENT_TAG)
-		if (fragment == null) {
-			// Add fragment
-			Timber.i("Adding BackgroundServiceFragment to activity")
-
-			activity.supportFragmentManager
-				.beginTransaction()
-				.add<BackgroundServiceFragment>(FRAGMENT_TAG)
-				.commit()
-		}
-	}
+	// Current background data
+	private var _backgrounds = emptyList<ImageBitmap>()
+	private var _currentIndex = 0
+	private var _currentBackground = MutableStateFlow<ImageBitmap?>(null)
+	val currentBackground get() = _currentBackground.asStateFlow()
 
 	// Helper function for [setBackground]
 	private fun List<String>?.getUrls(itemId: UUID?): List<String> {
@@ -139,6 +60,8 @@ class BackgroundService(
 				imageType = ImageType.BACKDROP,
 				tag = tag,
 				imageIndex = index,
+				fillWidth = context.resources.displayMetrics.widthPixels,
+				fillHeight = context.resources.displayMetrics.heightPixels,
 			)
 		}
 	}
@@ -159,26 +82,6 @@ class BackgroundService(
 		loadBackgrounds(backdropUrls)
 	}
 
-	/**
-	 * Use backdrop from [searchHint] as background.
-	 */
-	fun setBackground(searchHint: SearchHint) {
-		// Check if item is set and backgrounds are enabled
-		if (!userPreferences[UserPreferences.backdropEnabled])
-			return clearBackgrounds()
-
-		// Manually grab the backdrop URL
-		val backdropUrls = setOfNotNull(searchHint.backdropImageItemId?.let { itemId ->
-			api.imageApi.getItemImageUrl(
-				itemId = itemId.toUUID(),
-				imageType = ImageType.BACKDROP,
-				tag = searchHint.backdropImageTag,
-			)
-		})
-
-		loadBackgrounds(backdropUrls)
-	}
-
 	/**
 	 * Use splashscreen from [server] as background.
 	 */
@@ -194,6 +97,7 @@ class BackgroundService(
 		// Manually grab the backdrop URL
 		val api = jellyfin.createApi(baseUrl = server.address)
 		val splashscreenUrl = api.imageApi.getSplashscreenUrl()
+
 		loadBackgrounds(setOf(splashscreenUrl))
 	}
 
@@ -203,92 +107,53 @@ class BackgroundService(
 		// Cancel current loading job
 		loadBackgroundsJob?.cancel()
 		loadBackgroundsJob = scope.launch(Dispatchers.IO) {
-			val backdropDrawables = backdropUrls
-				.map { url ->
-					Glide.with(context)
-						.load(url)
-						.override(windowSize.width, windowSize.height)
-						.centerCrop()
-						.submit()
-				}
-				.map { future ->
-					async {
-						try {
-							future.get()
-						} catch (ex: ExecutionException) {
-							Timber.e(ex, "There was an error fetching the background image.")
-							null
-						}
-					}
-				}
-				.awaitAll()
-				.filterNotNull()
-				.onEach { it.colorFilter = colorFilter }
-
-			backgrounds.clear()
-			backgrounds.addAll(backdropDrawables)
-
-			withContext(Dispatchers.Main) {
-				// Go to first background
-				currentIndex = 0
-				update()
+			_backgrounds = backdropUrls.mapNotNull { url ->
+				imageLoader.execute(
+					request = ImageRequest.Builder(context).data(url).build()
+				).drawable?.toBitmap()?.asImageBitmap()
 			}
+
+			// Go to first background
+			_currentIndex = 0
+			update()
 		}
 	}
 
 	fun clearBackgrounds() {
 		loadBackgroundsJob?.cancel()
 
-		if (backgrounds.isEmpty()) return
+		if (_backgrounds.isEmpty()) return
 
-		backgrounds.clear()
+		_backgrounds = emptyList()
 		update()
 	}
 
-	@MainThread
 	internal fun update() {
 		val now = System.currentTimeMillis()
-		if (lastBackgroundUpdate > now - UPDATE_INTERVAL)
-			return setTimer(lastBackgroundUpdate - now + UPDATE_INTERVAL, false)
+		if (lastBackgroundTimerUpdate > now - TRANSITION_DURATION.inWholeMilliseconds)
+			return setTimer((lastBackgroundTimerUpdate - now).milliseconds + TRANSITION_DURATION, false)
 
-		lastBackgroundUpdate = now
-
-		// Snapshot the current state if an animation is running and draw the new
-		// background on top.
-		if (backgroundAnimator.isRunning) {
-			val current = backgroundDrawable
-				.toBitmap(windowSize.width, windowSize.height)
-				.toDrawable(context.resources)
-			backgroundAnimator.end()
-			backgroundDrawable.setDrawableByLayerId(R.id.background_current, current)
-		}
+		lastBackgroundTimerUpdate = now
 
 		// Get next background to show
-		if (currentIndex >= backgrounds.size) currentIndex = 0
+		if (_currentIndex >= _backgrounds.size) _currentIndex = 0
 
-		backgroundDrawable.setDrawableByLayerId(
-			R.id.background_next,
-			backgrounds.getOrElse(currentIndex) { windowBackground.copy() }
-		)
-
-		// Animate
-		backgroundAnimator.start()
+		// Set background
+		_currentBackground.value = _backgrounds.getOrNull(_currentIndex)
 
 		// Set timer for next background
-		if (backgrounds.size > 1) setTimer()
+		if (_backgrounds.size > 1) setTimer()
 		else updateBackgroundTimerJob?.cancel()
 	}
 
-	private fun setTimer(updateDelay: Long = SLIDESHOW_DURATION, increaseIndex: Boolean = true) {
+	private fun setTimer(updateDelay: Duration = SLIDESHOW_DURATION, increaseIndex: Boolean = true) {
 		updateBackgroundTimerJob?.cancel()
 		updateBackgroundTimerJob = scope.launch {
 			delay(updateDelay)
 
-			if (increaseIndex) currentIndex++
+			if (increaseIndex) _currentIndex++
 
 			update()
 		}
 	}
-
-	private fun Drawable.copy() = constantState!!.newDrawable().mutate()
 }

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

@@ -1,43 +0,0 @@
-package org.jellyfin.androidtv.data.service
-
-import android.graphics.drawable.Drawable
-import androidx.fragment.app.Fragment
-import org.koin.android.ext.android.inject
-import timber.log.Timber
-
-/**
- * Fragment used to hook into the activity lifecycle and set the background when neccesary.
- */
-internal class BackgroundServiceFragment : Fragment() {
-	private val backgroundService by inject<BackgroundService>()
-	private var backgrounds: Array<Drawable>? = null
-
-	override fun onResume() {
-		super.onResume()
-
-		if (backgrounds != null) {
-			Timber.d("Restoring active backgrounds")
-
-			backgroundService.backgrounds.clear()
-			backgroundService.backgrounds.addAll(backgrounds!!)
-			backgroundService.update()
-		}
-
-		activity?.window?.decorView?.apply {
-			Timber.d("Restoring background drawable")
-
-			// We need to force the system to add a new callback
-			// this won't happen if we set the background to the same one
-			// so we set it to null first
-			if (background == backgroundService.backgroundDrawable) background = null
-
-			background = backgroundService.backgroundDrawable
-		}
-	}
-
-	override fun onPause() {
-		super.onPause()
-
-		backgrounds = backgroundService.backgrounds.toTypedArray()
-	}
-}

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

@@ -1,7 +1,7 @@
 package org.jellyfin.androidtv.di
 
-import android.accounts.AccountManager
 import android.app.UiModeManager
+import android.media.AudioManager
 import androidx.core.content.getSystemService
 import androidx.work.WorkManager
 import org.koin.android.ext.koin.androidApplication
@@ -11,7 +11,7 @@ import org.koin.dsl.module
  * Provides DI for Android system components
  */
 val androidModule = module {
-	factory { androidApplication().getSystemService<AccountManager>()!! }
 	factory { androidApplication().getSystemService<UiModeManager>()!! }
+	factory { androidApplication().getSystemService<AudioManager>()!! }
 	factory { WorkManager.getInstance(get()) }
 }

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

@@ -1,5 +1,11 @@
 package org.jellyfin.androidtv.di
 
+import android.content.Context
+import android.os.Build
+import coil.ImageLoader
+import coil.decode.GifDecoder
+import coil.decode.ImageDecoderDecoder
+import coil.decode.SvgDecoder
 import org.jellyfin.androidtv.BuildConfig
 import org.jellyfin.androidtv.auth.repository.ServerRepository
 import org.jellyfin.androidtv.auth.repository.UserRepository
@@ -15,13 +21,17 @@ import org.jellyfin.androidtv.data.repository.NotificationsRepositoryImpl
 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.ScreensaverViewModel
 import org.jellyfin.androidtv.ui.navigation.Destinations
 import org.jellyfin.androidtv.ui.navigation.NavigationRepository
 import org.jellyfin.androidtv.ui.navigation.NavigationRepositoryImpl
 import org.jellyfin.androidtv.ui.picture.PictureViewerViewModel
-import org.jellyfin.androidtv.ui.playback.MediaManager
 import org.jellyfin.androidtv.ui.playback.PlaybackControllerContainer
 import org.jellyfin.androidtv.ui.playback.nextup.NextUpViewModel
+import org.jellyfin.androidtv.ui.search.SearchFragmentDelegate
+import org.jellyfin.androidtv.ui.search.SearchRepository
+import org.jellyfin.androidtv.ui.search.SearchRepositoryImpl
+import org.jellyfin.androidtv.ui.search.SearchViewModel
 import org.jellyfin.androidtv.ui.startup.ServerAddViewModel
 import org.jellyfin.androidtv.ui.startup.StartupViewModel
 import org.jellyfin.androidtv.ui.startup.UserLoginViewModel
@@ -68,7 +78,7 @@ val appModule = module {
 
 	single { get<ApiClient>().ws() }
 
-	single { SocketHandler(get(), get(), get(), get(), get(), get(), get()) }
+	single { SocketHandler(get(), get(), get(), get(), get(), get(), get(), get()) }
 
 	// Old apiclient
 	single {
@@ -85,9 +95,18 @@ val appModule = module {
 		)
 	}
 
-	// Non API related
-	single { MediaManager(get()) }
+	// Coil (images)
+	single {
+		ImageLoader.Builder(androidContext()).apply {
+			components {
+				if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) add(ImageDecoderDecoder.Factory())
+				else add(GifDecoder.Factory())
+				add(SvgDecoder.Factory())
+			}
+		}.build()
+	}
 
+	// Non API related
 	single { DataRefreshService() }
 	single { PlaybackControllerContainer() }
 
@@ -97,14 +116,19 @@ val appModule = module {
 	single<ItemMutationRepository> { ItemMutationRepositoryImpl(get(), get()) }
 	single<CustomMessageRepository> { CustomMessageRepositoryImpl() }
 	single<NavigationRepository> { NavigationRepositoryImpl(Destinations.home) }
+	single<SearchRepository> { SearchRepositoryImpl(get()) }
 
 	viewModel { StartupViewModel(get(), get(), get(), get()) }
 	viewModel { UserLoginViewModel(get(), get(), get(), get(defaultDeviceInfo)) }
 	viewModel { ServerAddViewModel(get()) }
 	viewModel { NextUpViewModel(get(), get(), get(), get()) }
 	viewModel { PictureViewerViewModel(get()) }
+	viewModel { ScreensaverViewModel(get()) }
+	viewModel { SearchViewModel(get()) }
 
-	single { BackgroundService(get(), get(), get(), get()) }
+	single { BackgroundService(get(), get(), get(), get(), get()) }
 
 	single { MarkdownRenderer(get()) }
+
+	factory { (context: Context) -> SearchFragmentDelegate(context, get()) }
 }

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

@@ -1,5 +1,6 @@
 package org.jellyfin.androidtv.di
 
+import org.jellyfin.androidtv.auth.AccountManagerMigration
 import org.jellyfin.androidtv.auth.apiclient.ApiBinder
 import org.jellyfin.androidtv.auth.repository.AuthenticationRepository
 import org.jellyfin.androidtv.auth.repository.AuthenticationRepositoryImpl
@@ -9,23 +10,22 @@ import org.jellyfin.androidtv.auth.repository.ServerUserRepository
 import org.jellyfin.androidtv.auth.repository.ServerUserRepositoryImpl
 import org.jellyfin.androidtv.auth.repository.SessionRepository
 import org.jellyfin.androidtv.auth.repository.SessionRepositoryImpl
-import org.jellyfin.androidtv.auth.store.AccountManagerStore
 import org.jellyfin.androidtv.auth.store.AuthenticationPreferences
 import org.jellyfin.androidtv.auth.store.AuthenticationStore
 import org.koin.dsl.module
 
 val authModule = module {
-	single { AuthenticationStore(get()) }
-	single { AccountManagerStore(get()) }
+	single { AccountManagerMigration(get()) }
+	single { AuthenticationStore(get(), get()) }
 	single { AuthenticationPreferences(get()) }
 
 	single<AuthenticationRepository> {
-		AuthenticationRepositoryImpl(get(), get(), get(), get(), get(), get(), get(defaultDeviceInfo))
+		AuthenticationRepositoryImpl(get(), get(), get(), get(), get(), get(defaultDeviceInfo))
 	}
 	single<ServerRepository> { ServerRepositoryImpl(get(), get()) }
-	single<ServerUserRepository> { ServerUserRepositoryImpl(get(), get(), get()) }
+	single<ServerUserRepository> { ServerUserRepositoryImpl(get(), get()) }
 	single<SessionRepository> {
-		SessionRepositoryImpl(get(), get(), get(), get(), get(), get(), get(defaultDeviceInfo), get(), get(), get())
+		SessionRepositoryImpl(get(), get(), get(), get(), get(), get(defaultDeviceInfo), get(), get(), get())
 	}
 
 	single { ApiBinder(get(), get()) }

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

@@ -1,22 +1,83 @@
 package org.jellyfin.androidtv.di
 
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.app.PendingIntent
+import android.content.Intent
+import android.os.Build
+import androidx.core.app.NotificationManagerCompat
 import org.jellyfin.androidtv.BuildConfig
+import org.jellyfin.androidtv.R
 import org.jellyfin.androidtv.preference.UserPreferences
+import org.jellyfin.androidtv.preference.UserSettingPreferences
+import org.jellyfin.androidtv.ui.browsing.MainActivity
 import org.jellyfin.androidtv.ui.playback.GarbagePlaybackLauncher
-import org.jellyfin.androidtv.ui.playback.PlaybackManager
+import org.jellyfin.androidtv.ui.playback.LegacyMediaManager
 import org.jellyfin.androidtv.ui.playback.RewritePlaybackLauncher
+import org.jellyfin.androidtv.ui.playback.VideoQueueManager
+import org.jellyfin.androidtv.ui.playback.rewrite.RewriteMediaManager
+import org.jellyfin.playback.core.mediasession.MediaSessionOptions
+import org.jellyfin.playback.core.mediasession.mediaSessionPlugin
+import org.jellyfin.playback.core.playbackManager
+import org.jellyfin.playback.exoplayer.exoPlayerPlugin
+import org.jellyfin.playback.jellyfin.jellyfinPlugin
+import org.koin.android.ext.koin.androidContext
+import org.koin.core.scope.Scope
 import org.koin.dsl.module
+import kotlin.time.Duration.Companion.milliseconds
+import org.jellyfin.androidtv.ui.playback.PlaybackManager as LegacyPlaybackManager
 
 val playbackModule = module {
-	single {
-		PlaybackManager(get())
+	single { LegacyPlaybackManager(get()) }
+	single { VideoQueueManager() }
+	single { LegacyMediaManager(get()) }
+	single { RewriteMediaManager(get(), get(), get(), get()) }
+
+	factory {
+		val preferences = get<UserPreferences>()
+		val useRewrite = preferences[UserPreferences.playbackRewriteAudioEnabled]
+
+		if (useRewrite) get<RewriteMediaManager>()
+		else get<LegacyMediaManager>()
 	}
 
 	factory {
 		val preferences = get<UserPreferences>()
-		val useRewrite = preferences[UserPreferences.playbackRewriteEnabled] && BuildConfig.DEVELOPMENT
+		val useRewrite = preferences[UserPreferences.playbackRewriteVideoEnabled] && BuildConfig.DEVELOPMENT
 
 		if (useRewrite) RewritePlaybackLauncher()
 		else GarbagePlaybackLauncher(get())
 	}
+
+	single { createPlaybackManager() }
+}
+
+fun Scope.createPlaybackManager() = playbackManager(androidContext()) {
+	install(exoPlayerPlugin(get()))
+	install(jellyfinPlugin(get(), get()))
+
+	val activityIntent = Intent(get(), MainActivity::class.java)
+	val pendingIntent = PendingIntent.getActivity(get(), 0, activityIntent, PendingIntent.FLAG_IMMUTABLE)
+
+	val notificationChannelId = "mediasession"
+	if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+		val channel = NotificationChannel(
+			notificationChannelId,
+			notificationChannelId,
+			NotificationManager.IMPORTANCE_LOW
+		)
+		NotificationManagerCompat.from(get()).createNotificationChannel(channel)
+	}
+
+	install(mediaSessionPlugin(get(), MediaSessionOptions(
+		channelId = notificationChannelId,
+		notificationId = 1,
+		iconSmall = R.drawable.app_icon_foreground,
+		openIntent = pendingIntent,
+	)))
+
+	// Options
+	val userSettingPreferences = get<UserSettingPreferences>()
+	defaultRewindAmount = { userSettingPreferences[UserSettingPreferences.skipBackLength].milliseconds }
+	defaultFastForwardAmount = { userSettingPreferences[UserSettingPreferences.skipForwardLength].milliseconds }
 }

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

@@ -1,13 +1,14 @@
 package org.jellyfin.androidtv.integration
 
+import android.annotation.SuppressLint
 import android.content.ContentUris
+import android.content.ContentValues
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
 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.Channel
 import androidx.tvprovider.media.tv.ChannelLogoUtils
 import androidx.tvprovider.media.tv.PreviewProgram
@@ -33,6 +34,7 @@ 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.userLibraryApi
 import org.jellyfin.sdk.api.client.extensions.userViewsApi
 import org.jellyfin.sdk.model.api.BaseItemDto
 import org.jellyfin.sdk.model.api.BaseItemKind
@@ -40,10 +42,14 @@ 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.constant.MediaType
+import org.jellyfin.sdk.model.extensions.ticks
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
 import timber.log.Timber
 import java.time.ZoneOffset
+import java.time.format.DateTimeFormatter
+import kotlin.time.Duration
+
 
 /**
  * Manages channels on the android tv home screen.
@@ -55,11 +61,6 @@ class LeanbackChannelWorker(
 	workerParams: WorkerParameters,
 ) : CoroutineWorker(context, workerParams), KoinComponent {
 	companion object {
-		/**
-		 * Amount of ticks found in a millisecond, used for calculation.
-		 */
-		private const val TICKS_IN_MILLISECOND = 10000
-
 		const val PERIODIC_UPDATE_REQUEST_NAME = "LeanbackChannelPeriodicUpdateRequest"
 	}
 
@@ -87,13 +88,73 @@ class LeanbackChannelWorker(
 		else -> try {
 			// Get next up episodes
 			val (resumeItems, nextUpItems) = getNextUpItems()
-
-			// Delete current items from the My Media and Next Up channels
+			// Get latest media
+			val (latestEpisodes, latestMovies, latestMedia) = getLatestMedia()
+			val myMedia = getMyMedia()
+			// Delete current items from the channels
 			context.contentResolver.delete(TvContractCompat.PreviewPrograms.CONTENT_URI, null, null)
 
-			// Update various channels
-			updateMyMedia()
-			updateNextUp(nextUpItems)
+			// Get channel URIs
+			val latestMediaChannel = getChannelUri(
+				"latest_media", Channel.Builder()
+				.setType(TvContractCompat.Channels.TYPE_PREVIEW)
+				.setDisplayName(context.getString(R.string.home_section_latest_media))
+				.setAppLinkIntent(Intent(context, StartupActivity::class.java))
+				.build(),
+				default = true
+			)
+			val myMediaChannel = 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()
+			)
+			val nextUpChannel = getChannelUri(
+				"next_up", Channel.Builder()
+				.setType(TvContractCompat.Channels.TYPE_PREVIEW)
+				.setDisplayName(context.getString(R.string.lbl_next_up))
+				.setAppLinkIntent(Intent(context, StartupActivity::class.java))
+				.build()
+			)
+			val latestMoviesChannel = getChannelUri(
+				"latest_movies", Channel.Builder()
+				.setType(TvContractCompat.Channels.TYPE_PREVIEW)
+				.setDisplayName(context.getString(R.string.lbl_movies))
+				.setAppLinkIntent(Intent(context, StartupActivity::class.java))
+				.build()
+			)
+			val latestEpisodesChannel = getChannelUri(
+				"latest_episodes", Channel.Builder()
+				.setType(TvContractCompat.Channels.TYPE_PREVIEW)
+				.setDisplayName(context.getString(R.string.lbl_new_episodes))
+				.setAppLinkIntent(Intent(context, StartupActivity::class.java))
+				.build()
+			)
+			val preferParentThumb = userPreferences[UserPreferences.seriesThumbnailsEnabled]
+
+			// Add new items
+			arrayOf(
+				nextUpItems to nextUpChannel,
+				latestMedia to latestMediaChannel,
+				latestMovies to latestMoviesChannel,
+				latestEpisodes to latestEpisodesChannel,
+				myMedia to myMediaChannel,
+			).forEach { (items, channel) ->
+				Timber.d("Updating channel %s", channel)
+				items.map { item ->
+					createPreviewProgram(
+						channel,
+						item,
+						preferParentThumb
+					)
+				}.let {
+					context.contentResolver.bulkInsert(
+						TvContractCompat.PreviewPrograms.CONTENT_URI,
+						it.toTypedArray()
+					)
+				}
+			}
 			updateWatchNext(resumeItems + nextUpItems)
 
 			// Success!
@@ -124,7 +185,10 @@ class LeanbackChannelWorker(
 			}
 		} else {
 			// Create new channel and save uri
-			context.contentResolver.insert(TvContractCompat.Channels.CONTENT_URI, settings.toContentValues())!!.also { 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)
@@ -135,7 +199,11 @@ class LeanbackChannelWorker(
 
 		// Update logo
 		ResourcesCompat.getDrawable(context.resources, R.drawable.app_icon, context.theme)?.let {
-			ChannelLogoUtils.storeChannelLogo(context, ContentUris.parseId(uri), it.toBitmap(80.dp(context), 80.dp(context)))
+			ChannelLogoUtils.storeChannelLogo(
+				context,
+				ContentUris.parseId(uri),
+				it.toBitmap(80.dp(context), 80.dp(context))
+			)
 		}
 
 		return uri
@@ -145,53 +213,29 @@ 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(), default = true)
-
+	private suspend fun getMyMedia(): List<BaseItemDto> {
 		val response by api.userViewsApi.getUserViews(includeHidden = false)
 
 		// Add new items
-		val items = response.items
+		return response.items
 			.orEmpty()
 			.filter { userViewsRepository.isSupported(it.collectionType) }
-			.map { item ->
-				val imageUri = if (item.imageTags?.contains(ImageType.PRIMARY) == true)
-					ImageProvider.getImageUri(api.imageApi.getItemImageUrl(item.id, ImageType.PRIMARY))
-				else
-					ImageUtils.getResourceUrl(context, R.drawable.tile_land_tv).toUri()
-
-				PreviewProgram.Builder()
-					.setChannelId(ContentUris.parseId(channelUri))
-					.setType(TvContractCompat.PreviewPrograms.TYPE_CHANNEL)
-					.setTitle(item.name)
-					.setPosterArtUri(imageUri)
-					.setPosterArtAspectRatio(TvContractCompat.PreviewPrograms.ASPECT_RATIO_16_9)
-					.setIntent(Intent(context, StartupActivity::class.java).apply {
-						putExtra(StartupActivity.EXTRA_ITEM_ID, item.id.toString())
-						putExtra(StartupActivity.EXTRA_ITEM_IS_USER_VIEW, true)
-					})
-					.build()
-					.toContentValues()
-			}.toTypedArray()
-		context.contentResolver.bulkInsert(TvContractCompat.PreviewPrograms.CONTENT_URI, items)
 	}
 
 	/**
 	 * Gets the poster art for an item. Uses the [preferParentThumb] parameter to fetch the series
 	 * image when preferred.
 	 */
-	private fun BaseItemDto.getPosterArtImageUrl(preferParentThumb: Boolean): Uri = when {
-		type == BaseItemKind.MOVIE -> api.imageApi.getItemImageUrl(
+	private fun BaseItemDto.getPosterArtImageUrl(
+		preferParentThumb: Boolean
+	): Uri = when {
+		type == BaseItemKind.MOVIE || type == BaseItemKind.SERIES -> api.imageApi.getItemImageUrl(
 			itemId = id,
 			imageType = ImageType.PRIMARY,
 			format = ImageFormat.WEBP,
 			width = 106.dp(context),
 			height = 153.dp(context),
+			tag = imageTags?.get(ImageType.PRIMARY),
 		)
 
 		(preferParentThumb || imageTags?.contains(ImageType.PRIMARY) != true) && parentThumbItemId != null -> api.imageApi.getItemImageUrl(
@@ -200,15 +244,19 @@ class LeanbackChannelWorker(
 			format = ImageFormat.WEBP,
 			width = 272.dp(context),
 			height = 153.dp(context),
+			tag = imageTags?.get(ImageType.THUMB),
 		)
 
-		else -> api.imageApi.getItemImageUrl(
+		imageTags?.containsKey(ImageType.PRIMARY) == true -> api.imageApi.getItemImageUrl(
 			itemId = id,
 			imageType = ImageType.PRIMARY,
 			format = ImageFormat.WEBP,
 			width = 272.dp(context),
 			height = 153.dp(context),
+			tag = imageTags?.get(ImageType.PRIMARY),
 		)
+
+		else -> ImageUtils.getResourceUrl(context, R.drawable.tile_land_tv)
 	}.let(ImageProvider::getImageUri)
 
 	/**
@@ -216,73 +264,133 @@ class LeanbackChannelWorker(
 	 * 1. resume items
 	 * 2. next up items
 	 */
-	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),
-				includeItemTypes = listOf(BaseItemKind.EPISODE, BaseItemKind.MOVIE),
-				excludeActiveSessions = true,
-			).content.items.orEmpty()
-		}
-
-		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().
-	 */
-	@Suppress("RestrictedApi")
-	private fun updateNextUp(nextUpItems: List<BaseItemDto>) {
-		val preferParentThumb = userPreferences[UserPreferences.seriesThumbnailsEnabled]
-
-		// Get channel
-		val channelUri = getChannelUri("next_up", Channel.Builder()
-			.setType(TvContractCompat.Channels.TYPE_PREVIEW)
-			.setDisplayName(context.getString(R.string.lbl_next_up))
-			.setAppLinkIntent(Intent(context, StartupActivity::class.java))
-			.build())
-
-		// Add new items
-		nextUpItems.map { item ->
-			val imageUri = item.getPosterArtImageUrl(preferParentThumb)
-
-			val seasonString = item.parentIndexNumber?.toString().orEmpty()
-
-			val episodeString = when {
-				item.indexNumberEnd != null && item.indexNumber != null ->
-					"${item.indexNumber}-${item.indexNumberEnd}"
-				else -> item.indexNumber?.toString().orEmpty()
+	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),
+					includeItemTypes = listOf(BaseItemKind.EPISODE, BaseItemKind.MOVIE),
+					excludeActiveSessions = true,
+				).content.items.orEmpty()
 			}
 
-			PreviewProgram.Builder()
-				.setChannelId(ContentUris.parseId(channelUri))
-				.setType(WatchNextPrograms.TYPE_TV_EPISODE)
-				.setTitle(item.seriesName)
-				.setEpisodeTitle(item.name)
-				.setSeasonNumber(seasonString, item.parentIndexNumber ?: 0)
-				.setEpisodeNumber(episodeString, item.indexNumber ?: 0)
-				.setPosterArtUri(imageUri)
-				.setPosterArtAspectRatio(TvContractCompat.PreviewPrograms.ASPECT_RATIO_16_9)
-				.setIntent(Intent(context, StartupActivity::class.java).apply {
-					putExtra(StartupActivity.EXTRA_ITEM_ID, item.id.toString())
-				})
-				.build()
-				.toContentValues()
-		}.let { context.contentResolver.bulkInsert(TvContractCompat.PreviewPrograms.CONTENT_URI, it.toTypedArray()) }
+			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())
+		}
+
+	private suspend fun getLatestMedia(): Triple<List<BaseItemDto>, List<BaseItemDto>, List<BaseItemDto>> =
+		withContext(Dispatchers.IO) {
+			val latestEpisodes = async {
+				api.userLibraryApi.getLatestMedia(
+					fields = listOf(
+						ItemFields.OVERVIEW,
+					),
+					limit = 50,
+					includeItemTypes = listOf(BaseItemKind.EPISODE),
+					isPlayed = false
+				).content
+			}
+
+			val latestMovies = async {
+				api.userLibraryApi.getLatestMedia(
+					fields = listOf(
+						ItemFields.OVERVIEW,
+					),
+					limit = 50,
+					includeItemTypes = listOf(BaseItemKind.MOVIE),
+					isPlayed = false
+				).content
+			}
+
+			val latestMedia = async {
+				api.userLibraryApi.getLatestMedia(
+					fields = listOf(
+						ItemFields.OVERVIEW,
+					),
+					limit = 50,
+					includeItemTypes = listOf(BaseItemKind.MOVIE, BaseItemKind.SERIES),
+					isPlayed = false
+				).content
+			}
+
+			// Concat
+			Triple(latestEpisodes.await(), latestMovies.await(), latestMedia.await())
+		}
+
+	@SuppressLint("RestrictedApi")
+	private fun createPreviewProgram(
+		channelUri: Uri,
+		item: BaseItemDto,
+		preferParentThumb: Boolean
+	): ContentValues {
+		val imageUri = item.getPosterArtImageUrl(preferParentThumb)
+		val seasonString = item.parentIndexNumber?.toString().orEmpty()
+
+		val episodeString = when {
+			item.indexNumberEnd != null && item.indexNumber != null ->
+				"${item.indexNumber}-${item.indexNumberEnd}"
+
+			else -> item.indexNumber?.toString().orEmpty()
+		}
+
+		return PreviewProgram.Builder()
+			.setChannelId(ContentUris.parseId(channelUri))
+			.setType(
+				when (item.type) {
+					BaseItemKind.SERIES -> WatchNextPrograms.TYPE_TV_SERIES
+					BaseItemKind.MOVIE -> WatchNextPrograms.TYPE_MOVIE
+					BaseItemKind.EPISODE -> WatchNextPrograms.TYPE_TV_EPISODE
+					BaseItemKind.AUDIO -> WatchNextPrograms.TYPE_TRACK
+					BaseItemKind.PLAYLIST -> WatchNextPrograms.TYPE_PLAYLIST
+					else -> WatchNextPrograms.TYPE_CHANNEL
+				}
+			)
+			.setTitle(item.seriesName ?: item.name)
+			.setEpisodeTitle(if (item.type == BaseItemKind.EPISODE) item.name else null)
+			.setSeasonNumber(seasonString, item.parentIndexNumber ?: 0)
+			.setEpisodeNumber(episodeString, item.indexNumber ?: 0)
+			.setDescription(item.overview)
+			.setReleaseDate(
+				if (item.premiereDate != null) DateTimeFormatter.ISO_DATE.format(item.premiereDate)
+				else null
+			)
+			.setDurationMillis(
+				if (item.runTimeTicks?.ticks != null) {
+					// If we are resuming, we need to show remaining time, cause GoogleTV
+					// ignores setLastPlaybackPositionMillis
+					val duration = item.runTimeTicks?.ticks ?: Duration.ZERO
+					val playbackPosition = item.userData?.playbackPositionTicks?.ticks
+						?: Duration.ZERO
+					(duration - playbackPosition).inWholeMilliseconds.toInt()
+				} else 0
+			)
+			.setPosterArtUri(imageUri)
+			.setPosterArtAspectRatio(
+				when (item.type) {
+					BaseItemKind.COLLECTION_FOLDER,
+					BaseItemKind.EPISODE -> TvContractCompat.PreviewPrograms.ASPECT_RATIO_16_9
+
+					else -> TvContractCompat.PreviewPrograms.ASPECT_RATIO_MOVIE_POSTER
+				}
+			)
+			.setIntent(Intent(context, StartupActivity::class.java).apply {
+				putExtra(StartupActivity.EXTRA_ITEM_ID, item.id.toString())
+				putExtra(StartupActivity.EXTRA_ITEM_IS_USER_VIEW, item.type == BaseItemKind.COLLECTION_FOLDER)
+			})
+			.build()
+			.toContentValues()
 	}
 
 	/**
@@ -297,7 +405,8 @@ class LeanbackChannelWorker(
 		// Add new items
 		context.contentResolver.bulkInsert(
 			WatchNextPrograms.CONTENT_URI,
-			nextUpItems.map { item -> getBaseItemAsWatchNextProgram(item).toContentValues() }.toTypedArray()
+			nextUpItems.map { item -> getBaseItemAsWatchNextProgram(item).toContentValues() }
+				.toTypedArray()
 		)
 	}
 
@@ -305,55 +414,58 @@ class LeanbackChannelWorker(
 	 * 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]
+	private fun getBaseItemAsWatchNextProgram(item: BaseItemDto) =
+		WatchNextProgram.Builder().apply {
+			val preferParentThumb = userPreferences[UserPreferences.seriesThumbnailsEnabled]
 
-		setInternalProviderId(item.id.toString())
+			setInternalProviderId(item.id.toString())
 
-		// Poster size & type
-		if (item.type == BaseItemKind.EPISODE) {
-			setType(WatchNextPrograms.TYPE_TV_EPISODE)
-			setPosterArtAspectRatio(WatchNextPrograms.ASPECT_RATIO_16_9)
-		} else if (item.type == BaseItemKind.MOVIE) {
-			setType(WatchNextPrograms.TYPE_MOVIE)
-			setPosterArtAspectRatio(WatchNextPrograms.ASPECT_RATIO_MOVIE_POSTER)
-		}
-
-		// Name
-		if (item.seriesName != null) setTitle("${item.seriesName} - ${item.name}")
-		else setTitle(item.name)
-
-		// Poster
-		setPosterArtUri(item.getPosterArtImageUrl(preferParentThumb))
-
-		// Use date created or fallback to current time if unavailable
-		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
+			// Poster size & type
+			if (item.type == BaseItemKind.EPISODE) {
+				setType(WatchNextPrograms.TYPE_TV_EPISODE)
+				setPosterArtAspectRatio(WatchNextPrograms.ASPECT_RATIO_16_9)
+			} else if (item.type == BaseItemKind.MOVIE) {
+				setType(WatchNextPrograms.TYPE_MOVIE)
+				setPosterArtAspectRatio(WatchNextPrograms.ASPECT_RATIO_MOVIE_POSTER)
 			}
-			// First episode of the season
-			item.indexNumber == 1 -> setWatchNextType(WatchNextPrograms.WATCH_NEXT_TYPE_NEW)
-			// Default
-			else -> setWatchNextType(WatchNextPrograms.WATCH_NEXT_TYPE_NEXT)
-		}
 
-		setLastEngagementTimeUtcMillis(engagement?.toInstant(ZoneOffset.UTC)?.toEpochMilli()
-			?: System.currentTimeMillis())
+			// Name
+			if (item.seriesName != null) setTitle("${item.seriesName} - ${item.name}")
+			else setTitle(item.name)
 
-		// Episode runtime has been determined
-		item.runTimeTicks?.let { runTimeTicks ->
-			setDurationMillis((runTimeTicks / TICKS_IN_MILLISECOND).toInt())
-		}
+			// Poster
+			setPosterArtUri(item.getPosterArtImageUrl(preferParentThumb))
 
-		// Set intent to open the episode
-		setIntent(Intent(context, StartupActivity::class.java).apply {
-			putExtra(StartupActivity.EXTRA_ITEM_ID, item.id.toString())
-		})
-	}.build()
+			// Use date created or fallback to current time if unavailable
+			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.inWholeMilliseconds.toInt())
+					// Use last played date to prioritize
+					engagement = item.userData?.lastPlayedDate
+				}
+				// First episode of the season
+				item.indexNumber == 1 -> setWatchNextType(WatchNextPrograms.WATCH_NEXT_TYPE_NEW)
+				// Default
+				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.inWholeMilliseconds.toInt())
+			}
+
+			// Set intent to open the episode
+			setIntent(Intent(context, StartupActivity::class.java).apply {
+				putExtra(StartupActivity.EXTRA_ITEM_ID, item.id.toString())
+			})
+		}.build()
 }

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

@@ -0,0 +1,60 @@
+package org.jellyfin.androidtv.integration.dream
+
+import android.service.dreams.DreamService
+import androidx.annotation.CallSuper
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.platform.ComposeView
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleRegistry
+import androidx.lifecycle.setViewTreeLifecycleOwner
+import androidx.savedstate.SavedStateRegistry
+import androidx.savedstate.SavedStateRegistryController
+import androidx.savedstate.SavedStateRegistryOwner
+import androidx.savedstate.setViewTreeSavedStateRegistryOwner
+
+abstract class DreamServiceCompat : DreamService(), SavedStateRegistryOwner {
+	@Suppress("LeakingThis")
+	private val lifecycleRegistry = LifecycleRegistry(this)
+
+	@Suppress("LeakingThis")
+	private val savedStateRegistryController = SavedStateRegistryController.create(this).apply {
+		performAttach()
+	}
+
+	override val lifecycle: Lifecycle get() = lifecycleRegistry
+	override val savedStateRegistry: SavedStateRegistry get() = savedStateRegistryController.savedStateRegistry
+
+	@CallSuper
+	override fun onCreate() {
+		super.onCreate()
+
+		savedStateRegistryController.performRestore(null)
+		lifecycleRegistry.currentState = Lifecycle.State.CREATED
+	}
+
+	override fun onDreamingStarted() {
+		super.onDreamingStarted()
+
+		lifecycleRegistry.currentState = Lifecycle.State.STARTED
+	}
+
+	override fun onDreamingStopped() {
+		super.onDreamingStopped()
+
+		lifecycleRegistry.currentState = Lifecycle.State.CREATED
+	}
+
+	fun setContent(content: @Composable () -> Unit) {
+		val view = ComposeView(this)
+
+		// Inject dependencies normally added by appcompat activities
+		view.setViewTreeLifecycleOwner(this)
+		view.setViewTreeSavedStateRegistryOwner(this)
+
+		// Set content composable
+		view.setContent(content)
+
+		// Set content view
+		setContentView(view)
+	}
+}

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

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

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

@@ -1,143 +1,22 @@
 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.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.BaseItemKind
-import org.jellyfin.sdk.model.api.ImageFormat
-import org.jellyfin.sdk.model.api.ImageType
-import org.jellyfin.sdk.model.constant.ItemSortBy
-import org.koin.android.ext.android.inject
-import timber.log.Timber
-import java.util.concurrent.ExecutionException
+import org.jellyfin.androidtv.integration.dream.composable.DreamHost
 
 /**
  * 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()
-	private val userPreferences: UserPreferences by inject()
-
-	private lateinit var binding: DreamLibraryBinding
-
+class LibraryDreamService : DreamServiceCompat() {
 	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
+		setContent {
+			DreamHost()
 		}
-
-		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(BaseItemKind.MOVIE, BaseItemKind.SERIES),
-			recursive = true,
-			sortBy = listOf(ItemSortBy.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/integration/dream/composable/DreamContentLibraryShowcase.kt

@@ -0,0 +1,58 @@
+package org.jellyfin.androidtv.integration.dream.composable
+
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.asImageBitmap
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.unit.sp
+import org.jellyfin.androidtv.integration.dream.model.DreamContent
+import org.jellyfin.androidtv.ui.composable.ZoomBox
+import org.jellyfin.androidtv.ui.composable.overscan
+
+@Composable
+fun DreamContentLibraryShowcase(
+	content: DreamContent.LibraryShowcase,
+) = Box(
+	modifier = Modifier.fillMaxSize(),
+) {
+	ZoomBox(
+		initialValue = 1f,
+		targetValue = 1.1f,
+		delayMillis = 1_000,
+		durationMillis = 30_000,
+	) {
+		Image(
+			bitmap = content.backdrop.asImageBitmap(),
+			contentDescription = null,
+			alignment = Alignment.Center,
+			contentScale = ContentScale.Crop,
+			modifier = Modifier.fillMaxSize()
+		)
+
+		// Image vignette
+		DreamContentVignette()
+	}
+
+	// Overlay
+	Row(
+		modifier = Modifier
+			.align(Alignment.BottomStart)
+			.overscan(),
+	) {
+		Text(
+			text = content.item.name.orEmpty(),
+			style = TextStyle(
+				color = Color.White,
+				fontSize = 32.sp
+			),
+		)
+	}
+}

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

@@ -0,0 +1,30 @@
+package org.jellyfin.androidtv.integration.dream.composable
+
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.width
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import org.jellyfin.androidtv.R
+
+@Composable
+fun DreamContentLogo() = Box(
+	modifier = Modifier
+		.fillMaxSize()
+		.background(Color.Black),
+) {
+	Image(
+		painter = painterResource(R.drawable.app_logo),
+		contentDescription = stringResource(R.string.app_name),
+		modifier = Modifier
+			.align(Alignment.Center)
+			.width(400.dp)
+	)
+}

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

@@ -0,0 +1,155 @@
+package org.jellyfin.androidtv.integration.dream.composable
+
+import android.widget.ImageView
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.LinearProgressIndicator
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableFloatStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.StrokeCap
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.unit.IntSize
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import org.jellyfin.androidtv.integration.dream.model.DreamContent
+import org.jellyfin.androidtv.ui.composable.AsyncImage
+import org.jellyfin.androidtv.ui.composable.blurHashPainter
+import org.jellyfin.androidtv.ui.composable.overscan
+import org.jellyfin.androidtv.ui.playback.AudioEventListener
+import org.jellyfin.androidtv.ui.playback.MediaManager
+import org.jellyfin.sdk.api.client.ApiClient
+import org.jellyfin.sdk.api.client.extensions.imageApi
+import org.jellyfin.sdk.model.api.ImageFormat
+import org.jellyfin.sdk.model.api.ImageType
+import org.jellyfin.sdk.model.extensions.ticks
+import org.koin.compose.rememberKoinInject
+import kotlin.time.Duration
+import kotlin.time.Duration.Companion.milliseconds
+
+@Composable
+fun DreamContentNowPlaying(
+	content: DreamContent.NowPlaying,
+) = Box(
+	modifier = Modifier.fillMaxSize(),
+) {
+	val api = rememberKoinInject<ApiClient>()
+	val mediaManager = rememberKoinInject<MediaManager>()
+	val item = content.item ?: return@Box
+
+	val primaryImageTag = item.imageTags?.get(ImageType.PRIMARY)
+	val (imageItemId, imageTag) = when {
+		primaryImageTag != null -> item.id to primaryImageTag
+		(item.albumId != null && item.albumPrimaryImageTag != null) -> item.albumId to item.albumPrimaryImageTag
+		else -> null to null
+	}
+
+	val imageBlurHash = imageTag?.let { tag -> item.imageBlurHashes?.get(ImageType.PRIMARY)?.get(tag) }
+	if (imageBlurHash != null) {
+		Image(
+			painter = blurHashPainter(imageBlurHash, IntSize(32, 32)),
+			contentDescription = null,
+			alignment = Alignment.Center,
+			contentScale = ContentScale.Crop,
+			modifier = Modifier.fillMaxSize(),
+		)
+
+		DreamContentVignette()
+	}
+
+	// Overlay
+	Row(
+		verticalAlignment = Alignment.Bottom,
+		horizontalArrangement = Arrangement.spacedBy(20.dp),
+		modifier = Modifier
+			.align(Alignment.BottomStart)
+			.overscan(),
+	) {
+		if (imageItemId != null) {
+			AsyncImage(
+				url = api.imageApi.getItemImageUrl(
+					itemId = imageItemId,
+					imageType = ImageType.PRIMARY,
+					tag = imageTag,
+					format = ImageFormat.WEBP,
+				),
+				blurHash = imageBlurHash,
+				scaleType = ImageView.ScaleType.CENTER_CROP,
+				modifier = Modifier
+					.size(128.dp)
+					.clip(RoundedCornerShape(5.dp))
+			)
+		}
+
+		Column(
+			modifier = Modifier
+				.padding(bottom = 10.dp)
+		) {
+			Text(
+				text = item.name.orEmpty(),
+				style = TextStyle(
+					color = Color.White,
+					fontSize = 26.sp,
+				),
+			)
+
+			Text(
+				text = item.run {
+					if (!artists.isNullOrEmpty()) return@run artists?.joinToString(", ")
+					val albumArtistNames = albumArtists?.mapNotNull { it.name }
+					if (!albumArtistNames.isNullOrEmpty()) return@run albumArtistNames.joinToString(", ")
+					return@run albumArtist
+				}.orEmpty(),
+				style = TextStyle(
+					color = Color(0.8f, 0.8f, 0.8f),
+					fontSize = 18.sp,
+				),
+			)
+
+			Spacer(modifier = Modifier.height(10.dp))
+
+			var progress by remember { mutableFloatStateOf(0f) }
+			DisposableEffect(Unit) {
+				val listener = object : AudioEventListener {
+					override fun onProgress(pos: Long) {
+						val duration = item.runTimeTicks?.ticks ?: Duration.ZERO
+						progress = (pos.milliseconds / duration).toFloat()
+					}
+				}
+
+				mediaManager.addAudioEventListener(listener)
+
+				onDispose {
+					mediaManager.removeAudioEventListener(listener)
+				}
+			}
+
+			LinearProgressIndicator(
+				progress = progress,
+				color = Color.White,
+				backgroundColor = Color.White.copy(alpha = 0.2f),
+				strokeCap = StrokeCap.Round,
+				modifier = Modifier.fillMaxWidth()
+			)
+		}
+	}
+}

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

@@ -0,0 +1,34 @@
+package org.jellyfin.androidtv.integration.dream.composable
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.geometry.Size
+import androidx.compose.ui.geometry.center
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.RadialGradientShader
+import androidx.compose.ui.graphics.Shader
+import androidx.compose.ui.graphics.ShaderBrush
+
+private val vignetteBrush = object : ShaderBrush() {
+	override fun createShader(size: Size): Shader = RadialGradientShader(
+		colors = listOf(
+			Color.Black.copy(alpha = 0.2f),
+			Color.Black.copy(alpha = 0.7f),
+		),
+		center = size.center,
+		radius = maxOf(size.width, size.height) / 2f,
+		colorStops = listOf(0f, 0.95f)
+	)
+}
+
+@Composable
+fun DreamContentVignette(
+	modifier: Modifier = Modifier
+) = Box(
+	modifier = modifier
+		.background(vignetteBrush)
+		.fillMaxSize()
+)

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

@@ -0,0 +1,72 @@
+package org.jellyfin.androidtv.integration.dream.composable
+
+import android.text.format.DateUtils
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import org.jellyfin.androidtv.R
+import org.jellyfin.androidtv.ui.composable.overscan
+import org.jellyfin.androidtv.ui.composable.rememberCurrentTime
+
+@Composable
+fun DreamHeader(
+	showLogo: Boolean,
+	showClock: Boolean,
+) {
+	Row(
+		horizontalArrangement = Arrangement.SpaceBetween,
+		modifier = Modifier
+			.fillMaxWidth()
+			.overscan(),
+	) {
+		// Logo
+		AnimatedVisibility(
+			visible = showLogo,
+			enter = fadeIn(),
+			exit = fadeOut(),
+			modifier = Modifier.height(41.dp),
+		) {
+			Image(
+				painter = painterResource(R.drawable.app_logo),
+				contentDescription = stringResource(R.string.app_name),
+			)
+		}
+
+		Spacer(
+			modifier = Modifier
+				.fillMaxWidth(0f)
+		)
+
+		// Clock
+		AnimatedVisibility(
+			visible = showClock,
+			enter = fadeIn(),
+			exit = fadeOut(),
+		) {
+			val time = rememberCurrentTime()
+			Text(
+				text = DateUtils.formatDateTime(LocalContext.current, time, DateUtils.FORMAT_SHOW_TIME),
+				style = TextStyle(
+					color = Color.White,
+					fontSize = 20.sp
+				),
+			)
+		}
+	}
+}

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

@@ -0,0 +1,111 @@
+package org.jellyfin.androidtv.integration.dream.composable
+
+import android.content.Context
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.platform.LocalContext
+import androidx.core.graphics.drawable.toBitmap
+import coil.ImageLoader
+import coil.request.ImageRequest
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.withContext
+import org.jellyfin.androidtv.integration.dream.model.DreamContent
+import org.jellyfin.androidtv.preference.UserPreferences
+import org.jellyfin.androidtv.preference.constant.ClockBehavior
+import org.jellyfin.androidtv.ui.composable.rememberMediaItem
+import org.jellyfin.androidtv.ui.playback.MediaManager
+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.BaseItemKind
+import org.jellyfin.sdk.model.api.ImageFormat
+import org.jellyfin.sdk.model.api.ImageType
+import org.jellyfin.sdk.model.constant.ItemSortBy
+import org.koin.compose.rememberKoinInject
+import timber.log.Timber
+import kotlin.time.Duration.Companion.seconds
+
+@Composable
+fun DreamHost() {
+	val api = rememberKoinInject<ApiClient>()
+	val userPreferences = rememberKoinInject<UserPreferences>()
+	val mediaManager = rememberKoinInject<MediaManager>()
+	val imageLoader = rememberKoinInject<ImageLoader>()
+	val context = LocalContext.current
+
+	var libraryShowcase by remember { mutableStateOf<DreamContent.LibraryShowcase?>(null) }
+	val mediaItem by rememberMediaItem(mediaManager)
+
+	LaunchedEffect(true) {
+		delay(2.seconds)
+
+		while (true) {
+			libraryShowcase = getRandomLibraryShowcase(api, imageLoader, context)
+			delay(30.seconds)
+		}
+	}
+
+	DreamView(
+		content = when {
+			mediaItem != null -> DreamContent.NowPlaying(mediaItem)
+			libraryShowcase != null -> libraryShowcase!!
+			else -> DreamContent.Logo
+		},
+		showClock = when (userPreferences[UserPreferences.clockBehavior]) {
+			ClockBehavior.ALWAYS, ClockBehavior.IN_MENUS -> true
+			else -> false
+		}
+	)
+}
+
+private suspend fun getRandomLibraryShowcase(
+	api: ApiClient,
+	imageLoader: ImageLoader,
+	context: Context
+): DreamContent.LibraryShowcase? {
+	try {
+		val response by api.itemsApi.getItemsByUserId(
+			includeItemTypes = listOf(BaseItemKind.MOVIE, BaseItemKind.SERIES),
+			recursive = true,
+			sortBy = listOf(ItemSortBy.Random),
+			limit = 5,
+			imageTypes = listOf(ImageType.BACKDROP),
+			// TODO: Add preferences for these two settings
+			maxOfficialRating = "PG-13",
+			// hasParentalRating = true,
+		)
+
+		val item = response.items?.firstOrNull { item ->
+			!item.backdropImageTags.isNullOrEmpty()
+		} ?: return null
+
+		Timber.i("Loading random library showcase item ${item.id}")
+
+		val tag = item.backdropImageTags!!.randomOrNull()
+			?: item.imageTags?.get(ImageType.BACKDROP)
+
+		val backdropUrl = api.imageApi.getItemImageUrl(
+			itemId = item.id,
+			imageType = ImageType.BACKDROP,
+			tag = tag,
+			format = ImageFormat.WEBP,
+		)
+
+		val backdrop = withContext(Dispatchers.IO) {
+			imageLoader.execute(
+				request = ImageRequest.Builder(context).data(backdropUrl).build()
+			).drawable?.toBitmap()
+		} ?: return null
+
+		return DreamContent.LibraryShowcase(item, backdrop)
+	} catch (err: ApiClientException) {
+		Timber.e(err)
+		return null
+	}
+}

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

@@ -0,0 +1,44 @@
+package org.jellyfin.androidtv.integration.dream.composable
+
+import androidx.compose.animation.AnimatedContent
+import androidx.compose.animation.ExperimentalAnimationApi
+import androidx.compose.animation.core.snap
+import androidx.compose.animation.core.tween
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.animation.togetherWith
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import org.jellyfin.androidtv.integration.dream.model.DreamContent
+
+@OptIn(ExperimentalAnimationApi::class)
+@Composable
+fun DreamView(
+	content: DreamContent,
+	showClock: Boolean,
+) = Box(
+	modifier = Modifier
+		.fillMaxSize()
+) {
+	AnimatedContent(
+		targetState = content,
+		transitionSpec = {
+			fadeIn(tween(durationMillis = 1_000)) togetherWith fadeOut(snap(delayMillis = 1_000))
+		},
+		label = "DreamContentTransition"
+	) { content ->
+		when (content) {
+			DreamContent.Logo -> DreamContentLogo()
+			is DreamContent.LibraryShowcase -> DreamContentLibraryShowcase(content)
+			is DreamContent.NowPlaying -> DreamContentNowPlaying(content)
+		}
+	}
+
+	// Header overlay
+	DreamHeader(
+		showLogo = content != DreamContent.Logo,
+		showClock = showClock,
+	)
+}

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

@@ -0,0 +1,10 @@
+package org.jellyfin.androidtv.integration.dream.model
+
+import android.graphics.Bitmap
+import org.jellyfin.sdk.model.api.BaseItemDto
+
+sealed interface DreamContent {
+	data object Logo : DreamContent
+	data class LibraryShowcase(val item: BaseItemDto, val backdrop: Bitmap) : DreamContent
+	data class NowPlaying(val item: BaseItemDto?) : DreamContent
+}

app/src/main/java/org/jellyfin/androidtv/integration/provider/ImageProvider.kt

@@ -7,18 +7,18 @@ import android.graphics.drawable.Drawable
 import android.net.Uri
 import android.os.Build
 import android.os.ParcelFileDescriptor
+import androidx.core.graphics.drawable.toBitmap
 import androidx.core.net.toUri
-import androidx.lifecycle.ProcessLifecycleOwner
-import androidx.lifecycle.lifecycleScope
-import com.bumptech.glide.Glide
-import com.bumptech.glide.request.target.CustomTarget
-import com.bumptech.glide.request.transition.Transition
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
+import coil.ImageLoader
+import coil.request.ImageRequest
 import org.jellyfin.androidtv.BuildConfig
 import org.jellyfin.androidtv.R
+import org.koin.android.ext.android.inject
+import java.io.IOException
 
 class ImageProvider : ContentProvider() {
+	private val imageLoader by inject<ImageLoader>()
+
 	override fun onCreate(): Boolean = true
 
 	override fun getType(uri: Uri) = null
@@ -33,30 +33,40 @@ class ImageProvider : ContentProvider() {
 		val (read, write) = ParcelFileDescriptor.createPipe()
 		val outputStream = ParcelFileDescriptor.AutoCloseOutputStream(write)
 
-		ProcessLifecycleOwner.get().lifecycleScope.launch(Dispatchers.IO) {
-			Glide.with(context!!)
-				.asBitmap()
-				.error(R.drawable.placeholder_icon)
-				.load(src)
-				.into(object : CustomTarget<Bitmap>() {
-					override fun onResourceReady(resource: Bitmap, transition: Transition<in Bitmap>?) {
-						@Suppress("DEPRECATION")
-						val format = when {
-							Build.VERSION.SDK_INT >= Build.VERSION_CODES.R -> Bitmap.CompressFormat.WEBP_LOSSY
-							else -> Bitmap.CompressFormat.WEBP
-						}
-						resource.compress(format, 95, outputStream)
-						outputStream.close()
-					}
-
-					override fun onLoadCleared(placeholder: Drawable?) = outputStream.close()
-				})
-		}
+		imageLoader.enqueue(ImageRequest.Builder(context!!).apply {
+			data(src)
+			error(R.drawable.placeholder_icon)
+			target(
+				onSuccess = { drawable -> writeDrawable(drawable, outputStream) },
+				onError = { drawable -> writeDrawable(requireNotNull(drawable), outputStream) }
+			)
+		}.build())
 
 		return read
 	}
 
+	private fun writeDrawable(
+		drawable: Drawable,
+		outputStream: ParcelFileDescriptor.AutoCloseOutputStream
+	) {
+		@Suppress("DEPRECATION")
+		val format = when {
+			Build.VERSION.SDK_INT >= Build.VERSION_CODES.R -> Bitmap.CompressFormat.WEBP_LOSSY
+			else -> Bitmap.CompressFormat.WEBP
+		}
+
+		try {
+			outputStream.use {
+				drawable.toBitmap().compress(format, COMPRESSION_QUALITY, outputStream)
+			}
+		} catch (_: IOException) {
+			// Ignore IOException as this is commonly thrown when the load request is cancelled
+		}
+	}
+
 	companion object {
+		private const val COMPRESSION_QUALITY = 95
+
 		/**
 		 * Get a [Uri] that uses the [ImageProvider] to load an image. The input should be a valid
 		 * Jellyfin image URL created using the SDK.

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

@@ -69,5 +69,10 @@ class SystemPreferences(context: Context) : SharedPreferenceStore(
 		 * The version name for the latest dismissed beta notification or empty if none.
 		 */
 		val dismissedBetaNotificationVersion = stringPreference("dismissed_beta_notification_version", "")
+
+		/**
+		 * Whether to disable the "UI mode" warning that shows when using the app on non TV devices.
+		 */
+		val disableUiModeWarning = booleanPreference("disable_ui_mode_warning", false)
 	}
 }

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

@@ -4,7 +4,6 @@ import android.content.Context
 import android.view.KeyEvent
 import androidx.preference.PreferenceManager
 import org.jellyfin.androidtv.preference.constant.AppTheme
-import org.jellyfin.androidtv.preference.constant.AudioBehavior
 import org.jellyfin.androidtv.preference.constant.ClockBehavior
 import org.jellyfin.androidtv.preference.constant.NextUpBehavior
 import org.jellyfin.androidtv.preference.constant.PreferredVideoPlayer
@@ -17,9 +16,9 @@ import org.jellyfin.preference.booleanPreference
 import org.jellyfin.preference.enumPreference
 import org.jellyfin.preference.intPreference
 import org.jellyfin.preference.longPreference
-import org.jellyfin.preference.migration.putEnum
 import org.jellyfin.preference.store.SharedPreferenceStore
 import org.jellyfin.preference.stringPreference
+import kotlin.time.Duration.Companion.minutes
 
 /**
  * User preferences are configurable by the user and change behavior of the application.
@@ -52,6 +51,11 @@ class UserPreferences(context: Context) : SharedPreferenceStore(
 		 */
 		var premieresEnabled = booleanPreference("pref_enable_premieres", false)
 
+		/**
+		 * Enable management of media like deleting items when the user has sufficient permisisons.
+		 */
+		var mediaManagementEnabled = booleanPreference("enable_media_management", false)
+
 		/* Playback - General*/
 		/**
 		 * Maximum bitrate in megabit for playback. A value of [MAX_BITRATE_AUTO] is used when
@@ -122,6 +126,11 @@ class UserPreferences(context: Context) : SharedPreferenceStore(
 		 */
 		var libVLCAudioDelay = intPreference("libvlc_audio_delay", 0)
 
+		/**
+		 * Use playback rewrite module for audio
+		 */
+		var playbackRewriteAudioEnabled = booleanPreference("playback_new_audio", true)
+
 		/* Live TV */
 		/**
 		 * Use direct play
@@ -150,9 +159,9 @@ class UserPreferences(context: Context) : SharedPreferenceStore(
 		var debuggingEnabled = booleanPreference("pref_enable_debug", false)
 
 		/**
-		 * Use playback rewrite module
+		 * Use playback rewrite module for video
 		 */
-		var playbackRewriteEnabled = booleanPreference("playback_new", false)
+		var playbackRewriteVideoEnabled = booleanPreference("playback_new", false)
 
 		/**
 		 * When to show the clock.
@@ -198,47 +207,32 @@ class UserPreferences(context: Context) : SharedPreferenceStore(
 		 * Subtitles foreground color
 		 */
 		var subtitlesTextColor = longPreference("subtitles_text_color", 0xFFFFFFFF)
+
+		/**
+		 * Show screensaver in app
+		 */
+		var screensaverInAppEnabled = booleanPreference("screensaver_inapp_enabled", true)
+
+		/**
+		 * Timeout before showing the screensaver in app, depends on [screensaverInAppEnabled].
+		 */
+		var screensaverInAppTimeout = longPreference("screensaver_inapp_timeout", 5.minutes.inWholeMilliseconds)
+
+		/**
+		 * Enable reactive homepage
+		 */
+		var homeReactive = booleanPreference("home_reactive", false)
 	}
 
 	init {
 		// Note: Create a single migration per app version
 		// Note: Migrations are never executed for fresh installs
+		// Note: Old migrations are removed occasionally
 		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
-			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
-					})
-
-				// 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
-				if (DeviceUtils.isFireTvStickGen1) putBoolean("pref_bitstream_ac3", false)
-			}
-
-			// v0.13.3 to v0.13.4
-			migration(toVersion = 6) {
-				putEnum("refresh_rate_switching_behavior",
-					when {
-						it.getBoolean("pref_refresh_switching", false) -> RefreshRateSwitchingBehavior.SCALE_ON_TV
-						else -> RefreshRateSwitchingBehavior.DISABLED
-					})
+			// v0.15.z to v0.16.0
+			migration(toVersion = 7) {
+				// Enable playback rewrite for music
+				putBoolean("playback_new_audio", true)
 			}
 		}
 	}

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

@@ -14,8 +14,8 @@ class UserSettingPreferences(
 	app = "emby",
 ) {
 	companion object {
-		val skipBackLength = intPreference("skipBackLength", 10000)
-		val skipForwardLength = intPreference("skipForwardLength", 30000)
+		val skipBackLength = intPreference("skipBackLength", 10_000)
+		val skipForwardLength = intPreference("skipForwardLength", 30_000)
 
 		val homesection0 = enumPreference("homesection0", HomeSectionType.LIBRARY_TILES_SMALL)
 		val homesection1 = enumPreference("homesection1", HomeSectionType.RESUME)

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

@@ -1,24 +1,23 @@
 package org.jellyfin.androidtv.preference.constant
 
 import org.jellyfin.androidtv.R
-import org.jellyfin.androidtv.ui.preference.dsl.EnumDisplayOptions
+import org.jellyfin.preference.PreferenceEnum
 
-enum class AppTheme {
+enum class AppTheme(
+	override val nameRes: Int,
+) : PreferenceEnum {
 	/**
 	 * The default dark theme
 	 */
-	@EnumDisplayOptions(R.string.pref_theme_dark)
-	DARK,
+	DARK(R.string.pref_theme_dark),
 
 	/**
 	 * The "classic" emerald theme
 	 */
-	@EnumDisplayOptions(R.string.pref_theme_emerald)
-	EMERALD,
+	EMERALD(R.string.pref_theme_emerald),
 
 	/**
 	 * A theme with a more muted accent color, inspired by CTalvio's Monochromic CSS theme for Jellyfin Web
 	 */
-	@EnumDisplayOptions(R.string.pref_theme_muted_purple)
-	MUTED_PURPLE,
+	MUTED_PURPLE(R.string.pref_theme_muted_purple),
 }

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

@@ -1,22 +1,22 @@
 package org.jellyfin.androidtv.preference.constant
 
 import org.jellyfin.androidtv.R
-import org.jellyfin.androidtv.ui.preference.dsl.EnumDisplayOptions
 import org.jellyfin.androidtv.util.DeviceUtils
+import org.jellyfin.preference.PreferenceEnum
 
-enum class AudioBehavior {
+enum class AudioBehavior(
+	override val nameRes: Int,
+) : PreferenceEnum {
 	/**
 	 * Directly stream audio without any changes
 	 */
-	@EnumDisplayOptions(R.string.pref_audio_direct)
-	DIRECT_STREAM,
+	DIRECT_STREAM(R.string.pref_audio_direct),
 
 	/**
 	 * Downnmix audio to stereo. Disables the AC3, EAC3 and AAC_LATM audio codecs.
 	 */
-	@EnumDisplayOptions(R.string.pref_audio_compat)
-	DOWNMIX_TO_STEREO
+	DOWNMIX_TO_STEREO(R.string.pref_audio_compat),
 }
 
 val defaultAudioBehavior = if (DeviceUtils.isChromecastWithGoogleTV) AudioBehavior.DOWNMIX_TO_STEREO
-	else AudioBehavior.DIRECT_STREAM
+else AudioBehavior.DIRECT_STREAM

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

@@ -1,30 +1,28 @@
 package org.jellyfin.androidtv.preference.constant
 
 import org.jellyfin.androidtv.R
-import org.jellyfin.androidtv.ui.preference.dsl.EnumDisplayOptions
+import org.jellyfin.preference.PreferenceEnum
 
-enum class ClockBehavior {
+enum class ClockBehavior(
+	override val nameRes: Int,
+) : PreferenceEnum {
 	/**
 	 * Always show clock.
 	 */
-	@EnumDisplayOptions(R.string.lbl_always)
-	ALWAYS,
+	ALWAYS(R.string.lbl_always),
 
 	/**
 	 * Show clock in menus only.
 	 */
-	@EnumDisplayOptions(R.string.pref_clock_display_browsing)
-	IN_MENUS,
+	IN_MENUS(R.string.pref_clock_display_browsing),
 
 	/**
 	 * Show clock in video only.
 	 */
-	@EnumDisplayOptions(R.string.pref_clock_display_playback)
-	IN_VIDEO,
+	IN_VIDEO(R.string.pref_clock_display_playback),
 
 	/**
 	 * Show clock never.
 	 */
-	@EnumDisplayOptions(R.string.lbl_never)
-	NEVER
+	NEVER(R.string.lbl_never),
 }

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

@@ -1,17 +1,15 @@
 package org.jellyfin.androidtv.preference.constant
 
 import org.jellyfin.androidtv.R
-import org.jellyfin.androidtv.ui.preference.dsl.EnumDisplayOptions
+import org.jellyfin.preference.PreferenceEnum
 import org.jellyfin.sdk.model.constant.ItemSortBy
 
 enum class LiveTvChannelOrder(
-	val stringValue: String
-) {
-	@EnumDisplayOptions(R.string.lbl_guide_option_played)
-	LAST_PLAYED(ItemSortBy.DatePlayed),
-
-	@EnumDisplayOptions(R.string.lbl_guide_option_number)
-	CHANNEL_NUMBER(ItemSortBy.SortName);
+	override val nameRes: Int,
+	val stringValue: String,
+) : PreferenceEnum {
+	LAST_PLAYED(R.string.lbl_guide_option_played, ItemSortBy.DatePlayed),
+	CHANNEL_NUMBER(R.string.lbl_guide_option_number, ItemSortBy.SortName);
 
 	companion object {
 		fun fromString(value: String) = values()

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

@@ -1,26 +1,25 @@
 package org.jellyfin.androidtv.preference.constant
 
 import org.jellyfin.androidtv.R
-import org.jellyfin.androidtv.ui.preference.dsl.EnumDisplayOptions
+import org.jellyfin.preference.PreferenceEnum
 
-enum class NextUpBehavior {
+enum class NextUpBehavior(
+	override val nameRes: Int,
+) : PreferenceEnum {
 	/**
 	 * Enable the Next Up screen - show the item's thumbnail
 	 */
-	@EnumDisplayOptions(R.string.lbl_next_up_extended)
-	EXTENDED,
+	EXTENDED(R.string.lbl_next_up_extended),
 
 	/**
 	 * Enable the Next Up screen - hide the item's thumbnail
 	 */
-	@EnumDisplayOptions(R.string.lbl_next_up_minimal)
-	MINIMAL,
+	MINIMAL(R.string.lbl_next_up_minimal),
 
 	/**
 	 * Disable the Next Up screen
 	 */
-	@EnumDisplayOptions(R.string.lbl_never)
-	DISABLED
+	DISABLED(R.string.lbl_never),
 }
 
 const val NEXTUP_TIMER_DISABLED: Int = 0

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

@@ -1,36 +1,33 @@
 package org.jellyfin.androidtv.preference.constant
 
 import org.jellyfin.androidtv.R
-import org.jellyfin.androidtv.ui.preference.dsl.EnumDisplayOptions
+import org.jellyfin.preference.PreferenceEnum
 
-enum class PreferredVideoPlayer {
+enum class PreferredVideoPlayer(
+	override val nameRes: Int,
+) : PreferenceEnum {
 	/**
 	 *  Automatically selects between exoplayer and vlc
 	 */
-	@EnumDisplayOptions(R.string.pref_video_player_auto)
-	AUTO,
+	AUTO(R.string.pref_video_player_auto),
 
 	/**
 	 *  Force ExoPlayer
 	 */
-	@EnumDisplayOptions(R.string.pref_video_player_exoplayer)
-	EXOPLAYER,
+	EXOPLAYER(R.string.pref_video_player_exoplayer),
 
 	/**
 	 * Force libVLC
 	 */
-	@EnumDisplayOptions(R.string.pref_video_player_vlc)
-	VLC,
+	VLC(R.string.pref_video_player_vlc),
 
 	/**
 	 * Use external player
 	 */
-	@EnumDisplayOptions(R.string.pref_video_player_external)
-	EXTERNAL,
+	EXTERNAL(R.string.pref_video_player_external),
 
 	/**
 	 * Choose a player - play with button
 	 */
-	@EnumDisplayOptions(R.string.pref_video_player_choose)
-	CHOOSE
+	CHOOSE(R.string.pref_video_player_choose),
 }

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

@@ -1,24 +1,23 @@
 package org.jellyfin.androidtv.preference.constant
 
 import org.jellyfin.androidtv.R
-import org.jellyfin.androidtv.ui.preference.dsl.EnumDisplayOptions
+import org.jellyfin.preference.PreferenceEnum
 
-enum class RatingType {
+enum class RatingType(
+	override val nameRes: Int,
+) : PreferenceEnum {
 	/**
 	 * Sets default rating type to tomatoes.
 	 */
-	@EnumDisplayOptions(R.string.lbl_tomatoes)
-	RATING_TOMATOES,
+	RATING_TOMATOES(R.string.lbl_tomatoes),
 
 	/**
 	 * Sets the default rating type to stars.
 	 */
-	@EnumDisplayOptions(R.string.lbl_stars)
-	RATING_STARS,
+	RATING_STARS(R.string.lbl_stars),
 
 	/**
 	 * Sets the default rating type to hidden.
 	 */
-	@EnumDisplayOptions(R.string.lbl_hidden)
-	RATING_HIDDEN
+	RATING_HIDDEN(R.string.lbl_hidden),
 }

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

@@ -1,22 +1,21 @@
 package org.jellyfin.androidtv.preference.constant
 
 import org.jellyfin.androidtv.R
-import org.jellyfin.androidtv.ui.preference.dsl.EnumDisplayOptions
+import org.jellyfin.preference.PreferenceEnum
 
-enum class RefreshRateSwitchingBehavior {
-	@EnumDisplayOptions(R.string.state_disabled)
-	DISABLED,
+enum class RefreshRateSwitchingBehavior(
+	override val nameRes: Int,
+) : PreferenceEnum {
+	DISABLED(R.string.state_disabled),
 
 	/**
 	 * When comparing modes, use difference in resolution to rank modes.
 	 */
-	@EnumDisplayOptions(R.string.pref_refresh_rate_scale_on_tv)
-	SCALE_ON_TV,
+	SCALE_ON_TV(R.string.pref_refresh_rate_scale_on_tv),
 
 	/**
 	 *  When comparing modes, rank native resolution modes highest.
 	 *  Otherwise use difference in resolution to rank modes.
 	 */
-	@EnumDisplayOptions(R.string.pref_refresh_rate_scale_on_device)
-	SCALE_ON_DEVICE,
+	SCALE_ON_DEVICE(R.string.pref_refresh_rate_scale_on_device),
 }

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

@@ -1,30 +1,28 @@
 package org.jellyfin.androidtv.preference.constant
 
 import org.jellyfin.androidtv.R
-import org.jellyfin.androidtv.ui.preference.dsl.EnumDisplayOptions
+import org.jellyfin.preference.PreferenceEnum
 
-enum class WatchedIndicatorBehavior {
+enum class WatchedIndicatorBehavior(
+	override val nameRes: Int,
+) : PreferenceEnum {
 	/**
 	 * Always show watched indicators.
 	 */
-	@EnumDisplayOptions(R.string.lbl_always)
-	ALWAYS,
+	ALWAYS(R.string.lbl_always),
 
 	/**
 	 * Hide unwatched count indicator, show watched check mark only.
 	 */
-	@EnumDisplayOptions(R.string.lbl_hide_unwatched_count)
-	HIDE_UNWATCHED,
+	HIDE_UNWATCHED(R.string.lbl_hide_unwatched_count),
 
 	/**
 	 * Hide unwatched count indicator, show watched check mark on individual episodes only.
 	 */
-	@EnumDisplayOptions(R.string.lbl_episode_marks)
-	EPISODES_ONLY,
+	EPISODES_ONLY(R.string.lbl_episode_marks),
 
 	/**
 	 * Never show watched indicators.
 	 */
-	@EnumDisplayOptions(R.string.lbl_never)
-	NEVER
+	NEVER(R.string.lbl_never),
 }

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

@@ -119,7 +119,7 @@ abstract class DisplayPreferencesStore(
 	override fun <V : Enum<V>> setEnum(preference: Preference<*>, value: Enum<V>) =
 		setString(
 			preference.key, when (value) {
-				is PreferenceEnum -> value.serializedName
+				is PreferenceEnum -> value.serializedName ?: value.toString()
 				else -> value.toString()
 			}
 		)

app/src/main/java/org/jellyfin/androidtv/telemetry/TelemetryService.kt

@@ -32,6 +32,7 @@ object TelemetryService {
 			buildConfigClass = BuildConfig::class.java
 			sharedPreferencesName = TelemetryPreferences.SHARED_PREFERENCES_NAME
 			pluginLoader = AcraPluginLoader(AcraReportSenderFactory::class.java)
+			applicationLogFileLines = 250
 
 			toast {
 				text = context.getString(R.string.crash_report_toast)

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

@@ -9,12 +9,16 @@ import androidx.core.graphics.drawable.toDrawable
 import androidx.core.view.doOnAttach
 import androidx.lifecycle.findViewTreeLifecycleOwner
 import androidx.lifecycle.lifecycleScope
-import com.bumptech.glide.Glide
+import coil.ImageLoader
+import coil.request.ImageRequest
+import coil.transform.CircleCropTransformation
 import com.vanniktech.blurhash.BlurHash
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.jellyfin.androidtv.R
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.inject
 import kotlin.math.round
 import kotlin.time.Duration.Companion.milliseconds
 
@@ -27,9 +31,10 @@ class AsyncImageView @JvmOverloads constructor(
 	context: Context,
 	attrs: AttributeSet? = null,
 	defStyleAttr: Int = 0,
-) : AppCompatImageView(context, attrs, defStyleAttr) {
+) : AppCompatImageView(context, attrs, defStyleAttr), KoinComponent {
 	private val lifeCycleOwner get() = findViewTreeLifecycleOwner()
 	private val styledAttributes = context.obtainStyledAttributes(attrs, R.styleable.AsyncImageView, defStyleAttr, 0)
+	private val imageLoader by inject<ImageLoader>()
 
 	/**
 	 * The duration of the crossfade when changing switching the images of the url, blurhash and
@@ -69,15 +74,25 @@ class AsyncImageView @JvmOverloads constructor(
 			}
 
 			// Start loading image or placeholder
-			Glide.with(this@AsyncImageView)
-				.load(url ?: placeholder).apply {
+			if (url == null) {
+				imageLoader.enqueue(ImageRequest.Builder(context).apply {
+					target(this@AsyncImageView)
+					data(placeholder)
+					if (circleCrop) transformations(CircleCropTransformation())
+				}.build())
+			} else {
+				imageLoader.enqueue(ImageRequest.Builder(context).apply {
+					val crossFadeDurationMs = crossFadeDuration.inWholeMilliseconds.toInt()
+					if (crossFadeDurationMs > 0) crossfade(crossFadeDurationMs)
+					else crossfade(false)
+
+					target(this@AsyncImageView)
+					data(url)
 					placeholder(placeholderOrBlurHash)
+					if (circleCrop) transformations(CircleCropTransformation())
 					error(placeholder)
-					if (circleCrop) circleCrop()
-					// FIXME: Glide is unable to scale the image when transitions are enabled
-					//transition(DrawableTransitionOptions.withCrossFade(crossFadeDuration.inWholeMilliseconds.toInt()))
-				}
-				.into(this@AsyncImageView)
+				}.build())
+			}
 		}
 	}
 }

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

@@ -11,9 +11,7 @@ import org.jellyfin.androidtv.auth.repository.UserRepository
 import org.jellyfin.androidtv.databinding.ClockUserBugBinding
 import org.jellyfin.androidtv.preference.UserPreferences
 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.KoinComponent
 import org.koin.core.component.inject
 
@@ -27,16 +25,15 @@ class ClockUserView @JvmOverloads constructor(
 	private val userPreferences by inject<UserPreferences>()
 	private val userRepository by inject<UserRepository>()
 
-	init {
-		val showClock = userPreferences[UserPreferences.clockBehavior]
-
-		binding.clock.isVisible = when (showClock) {
-			ClockBehavior.ALWAYS -> true
-			ClockBehavior.NEVER -> false
-			ClockBehavior.IN_VIDEO -> context.getActivity() is PlaybackOverlayActivity
-			ClockBehavior.IN_MENUS -> context.getActivity() !is PlaybackOverlayActivity
+	var isVideoPlayer = false
+		set(value) {
+			field = value
+			updateClockVisibility()
 		}
 
+	init {
+		updateClockVisibility()
+
 		val currentUser = userRepository.currentUser.value
 
 		binding.clockUserImage.load(
@@ -46,4 +43,15 @@ class ClockUserView @JvmOverloads constructor(
 
 		binding.clockUserImage.isVisible = currentUser != null
 	}
+
+	private fun updateClockVisibility() {
+		val showClock = userPreferences[UserPreferences.clockBehavior]
+
+		binding.clock.isVisible = when (showClock) {
+			ClockBehavior.ALWAYS -> true
+			ClockBehavior.NEVER -> false
+			ClockBehavior.IN_VIDEO -> isVideoPlayer
+			ClockBehavior.IN_MENUS -> !isVideoPlayer
+		}
+	}
 }

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

@@ -48,5 +48,6 @@ class DetailRowView @JvmOverloads constructor(
 
 	init {
 		binding.fdButtonRow.setOnHierarchyChangeListener(buttonsHierarchyChangeListener)
+		binding.mainImage.clipToOutline = true
 	}
 }

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

@@ -39,7 +39,7 @@ public class FriendlyDateButton extends FrameLayout {
         super.onFocusChanged(gainFocus, direction, previouslyFocusedRect);
 
         if (gainFocus) {
-            setBackgroundColor(getResources().getColor(R.color.lb_default_brand_color));
+            setBackgroundColor(getResources().getColor(androidx.leanback.R.color.lb_default_brand_color));
         } else {
             setBackgroundColor(0);
         }

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

@@ -2,10 +2,10 @@ package org.jellyfin.androidtv.ui
 
 import androidx.annotation.DrawableRes
 
-open class GridButton(
+open class GridButton @JvmOverloads constructor(
 	val id: Int,
 	val text: String,
-	@DrawableRes val imageRes: Int,
+	@DrawableRes val imageRes: Int? = null,
 ) {
 	override fun toString() = text
 }

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

@@ -1,6 +1,5 @@
 package org.jellyfin.androidtv.ui;
 
-import android.app.Activity;
 import android.content.Context;
 import android.graphics.Rect;
 import android.util.AttributeSet;
@@ -23,14 +22,14 @@ public class GuidePagingButton extends RelativeLayout {
         super(context, attrs);
     }
 
-    public GuidePagingButton(final Activity activity, final LiveTvGuide guide, int start, String label) {
-        super(activity);
+    public GuidePagingButton(Context context, final LiveTvGuide guide, int start, String label) {
+        super(context);
 
-        LayoutInflater inflater = LayoutInflater.from(activity);
+        LayoutInflater inflater = LayoutInflater.from(context);
         ProgramGridCellBinding binding = ProgramGridCellBinding.inflate(inflater, this, true);
         binding.programName.setText(label);
 
-        setBackgroundColor(Utils.getThemeColor(activity, R.attr.buttonDefaultNormalBackground));
+        setBackgroundColor(Utils.getThemeColor(context, R.attr.buttonDefaultNormalBackground));
         setFocusable(true);
         setOnClickListener(v -> guide.displayChannels(start, LiveTvGuideFragment.PAGE_SIZE));
     }

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

@@ -7,23 +7,17 @@ import android.view.View;
 import android.widget.FrameLayout;
 import android.widget.LinearLayout;
 
-import org.jellyfin.androidtv.auth.repository.UserRepository;
-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 org.jellyfin.sdk.model.api.BaseItemDto;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.UUID;
 
 public class ItemListView extends FrameLayout {
     Context mContext;
     LinearLayout mList;
-    List<String> mItemIds = new ArrayList<>();
+    List<UUID> mItemIds = new ArrayList<>();
     ItemRowView.RowSelectedListener mRowSelectedListener;
     ItemRowView.RowClickedListener mRowClickedListener;
 
@@ -76,32 +70,4 @@ public class ItemListView extends FrameLayout {
         }
         return ret;
     }
-
-    public void refresh() {
-        //update watched state for all items
-        //get them in batch for better performance
-        StdItemQuery query = new StdItemQuery(new ItemFields[] {
-                ItemFields.MediaSources,
-                ItemFields.ChildCount
-        });
-        query.setUserId(KoinJavaComponent.<UserRepository>get(UserRepository.class).getCurrentUser().getValue().getId().toString());
-        String[] ids = new String[mItemIds.size()];
-        query.setIds(mItemIds.toArray(ids));
-        KoinJavaComponent.<ApiClient>get(ApiClient.class).GetItemsAsync(query, new Response<ItemsResult>() {
-            @Override
-            public void onResponse(ItemsResult response) {
-                if (response.getItems() != null) {
-                    int i = 0;
-                    for (BaseItemDto item : response.getItems()) {
-                        // we have title view as first one
-                        View view = mList.getChildAt(i + 1);
-                        if (view instanceof ItemRowView) {
-                            ItemRowView row = (ItemRowView) view;
-                            row.setItem(item, i++);
-                        }
-                    }
-                }
-            }
-        });
-    }
 }

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

@@ -0,0 +1,32 @@
+package org.jellyfin.androidtv.ui
+
+import androidx.lifecycle.findViewTreeLifecycleOwner
+import androidx.lifecycle.lifecycleScope
+import kotlinx.coroutines.launch
+import org.jellyfin.sdk.api.client.ApiClient
+import org.jellyfin.sdk.api.client.extensions.itemsApi
+import org.jellyfin.sdk.model.api.ItemFields
+import org.koin.java.KoinJavaComponent
+
+fun ItemListView.refresh() {
+	val api by KoinJavaComponent.inject<ApiClient>(ApiClient::class.java)
+
+	findViewTreeLifecycleOwner()?.lifecycleScope?.launch {
+		val response by api.itemsApi.getItemsByUserId(
+			ids = mItemIds,
+			fields = setOf(
+				ItemFields.PRIMARY_IMAGE_ASPECT_RATIO,
+				ItemFields.OVERVIEW,
+				ItemFields.ITEM_COUNTS,
+				ItemFields.DISPLAY_PREFERENCES_ID,
+				ItemFields.CHILD_COUNT,
+				ItemFields.MEDIA_SOURCES,
+			)
+		)
+
+		response.items?.forEachIndexed { index, item ->
+			val view = mList.getChildAt(index)
+			if (view is ItemRowView) view.setItem(item, index)
+		}
+	}
+}

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

@@ -15,8 +15,7 @@ import org.jellyfin.androidtv.R;
 import org.jellyfin.androidtv.databinding.ItemRowBinding;
 import org.jellyfin.androidtv.util.TimeUtils;
 import org.jellyfin.androidtv.util.sdk.BaseItemExtensionsKt;
-import org.jellyfin.androidtv.util.sdk.compat.ModelCompat;
-import org.jellyfin.apiclient.model.dto.BaseItemDto;
+import org.jellyfin.sdk.model.api.BaseItemDto;
 import org.jellyfin.sdk.model.constant.MediaType;
 
 public class ItemRowView extends FrameLayout {
@@ -91,8 +90,8 @@ public class ItemRowView extends FrameLayout {
         mBaseItem = item;
         ourIndex = ndx + 1;
         mIndexNo.setText(Integer.toString(ourIndex));
-        switch (item.getBaseItemType()) {
-            case Audio:
+        switch (item.getType()) {
+            case AUDIO:
                 mItemName.setText(item.getName());
                 String artist = item.getArtists() != null && item.getArtists().size() > 0 ? item.getArtists().get(0) : !TextUtils.isEmpty(item.getAlbumArtist()) ? item.getAlbumArtist() : null;
                 if (!TextUtils.isEmpty(artist)) {
@@ -102,7 +101,7 @@ public class ItemRowView extends FrameLayout {
                 }
                 break;
             default:
-                String series = item.getSeriesName() != null ? BaseItemExtensionsKt.getFullName(ModelCompat.asSdk(item), mContext) : null;
+                String series = item.getSeriesName() != null ? BaseItemExtensionsKt.getFullName(item, mContext) : null;
                 if (!TextUtils.isEmpty(series)) {
                     mItemName.setText(series);
                     mExtraName.setText(item.getName());

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

@@ -48,7 +48,7 @@ class NowPlayingView @JvmOverloads constructor(
 
 			if (mediaManager.hasAudioQueueItems()) {
 				isVisible = true
-				setInfo(mediaManager.currentAudioItem)
+				setInfo(mediaManager.currentAudioItem!!)
 				setStatus(mediaManager.currentAudioPosition)
 			} else isVisible = false
 		}
@@ -95,7 +95,7 @@ class NowPlayingView @JvmOverloads constructor(
 
 			if (hasQueue) {
 				// may have just added one so update display
-				setInfo(mediaManager.currentAudioItem)
+				setInfo(mediaManager.currentAudioItem!!)
 				setStatus(mediaManager.currentAudioPosition)
 			}
 		}

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

@@ -82,7 +82,7 @@ public class ProgramGridCell extends RelativeLayout implements RecordingIndicato
         }
 
         if (liveTvPreferences.get(LiveTvPreferences.Companion.getShowRepeatIndicator()) && Utils.isTrue(program.getIsRepeat())) {
-            InfoLayoutHelper.addBlockText(context, mInfoRow, context.getString(R.string.lbl_repeat), 10, Color.GRAY, R.color.lb_default_brand_color);
+            InfoLayoutHelper.addBlockText(context, mInfoRow, context.getString(R.string.lbl_repeat), 10, Color.GRAY, androidx.leanback.R.color.lb_default_brand_color);
         }
 
         if (program.getOfficialRating() != null && !program.getOfficialRating().equals("0")) {

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

@@ -26,6 +26,7 @@ import org.jellyfin.androidtv.R;
 import org.jellyfin.androidtv.auth.repository.UserRepository;
 import org.jellyfin.androidtv.constant.CustomMessage;
 import org.jellyfin.androidtv.data.repository.CustomMessageRepository;
+import org.jellyfin.androidtv.util.ContextExtensionsKt;
 import org.jellyfin.androidtv.util.TimeUtils;
 import org.jellyfin.androidtv.util.Utils;
 import org.jellyfin.androidtv.util.apiclient.EmptyLifecycleAwareResponse;
@@ -81,14 +82,14 @@ public class RecordPopup {
 
         mPaddingDisplayOptions = new ArrayList<>(Arrays.asList(
                 mActivity.getString(R.string.lbl_on_schedule),
-                "1  " + mActivity.getString(R.string.lbl_minute),
-                "5  " + mActivity.getString(R.string.lbl_minutes),
-                "15 " + mActivity.getString(R.string.lbl_minutes),
-                "30 " + mActivity.getString(R.string.lbl_minutes),
-                "60 " + mActivity.getString(R.string.lbl_minutes),
-                "90 " + mActivity.getString(R.string.lbl_minutes),
-                "2  " + mActivity.getString(R.string.lbl_hours),
-                "3  " + mActivity.getString(R.string.lbl_hours)
+                ContextExtensionsKt.getQuantityString(activity, R.plurals.minutes, 1),
+                ContextExtensionsKt.getQuantityString(activity, R.plurals.minutes, 5),
+                ContextExtensionsKt.getQuantityString(activity, R.plurals.minutes, 15),
+                ContextExtensionsKt.getQuantityString(activity, R.plurals.minutes, 30),
+                ContextExtensionsKt.getQuantityString(activity, R.plurals.minutes, 60),
+                ContextExtensionsKt.getQuantityString(activity, R.plurals.minutes, 90),
+                ContextExtensionsKt.getQuantityString(activity, R.plurals.hours, 2),
+                ContextExtensionsKt.getQuantityString(activity, R.plurals.hours, 3)
         ));
 
         LayoutInflater inflater = (LayoutInflater) mActivity.getSystemService(Context.LAYOUT_INFLATER_SERVICE);

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

@@ -0,0 +1,103 @@
+package org.jellyfin.androidtv.ui
+
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleEventObserver
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.launch
+import org.jellyfin.androidtv.preference.UserPreferences
+import kotlin.time.Duration.Companion.milliseconds
+
+class ScreensaverViewModel(
+	private val userPreferences: UserPreferences,
+) : ViewModel() {
+	private var timer: Job? = null
+	private var locks = 0
+
+	// Preferences
+
+	val inAppEnabled get() = userPreferences[UserPreferences.screensaverInAppEnabled]
+	private val timeout get() = userPreferences[UserPreferences.screensaverInAppTimeout].milliseconds
+
+	// State
+
+	private val _visible = MutableStateFlow(false)
+	val visible get() = _visible.asStateFlow()
+
+	private val _keepScreenOn = MutableStateFlow(inAppEnabled)
+	val keepScreenOn get() = _keepScreenOn.asStateFlow()
+
+	var activityPaused: Boolean = false
+		set(value) {
+			field = value
+			notifyInteraction(true)
+		}
+
+	init {
+		notifyInteraction(true)
+	}
+
+	fun notifyInteraction(canCancel: Boolean) {
+		// Cancel pending timer (if any)
+		timer?.cancel()
+
+		// Hide when interacted with allowed cancelation or when disabled
+		if (_visible.value && (canCancel || !inAppEnabled || activityPaused)) {
+			_visible.value = false
+		}
+
+		// Create new timer to show screensaver when enabled
+		if (inAppEnabled && !activityPaused && locks == 0) {
+			timer = viewModelScope.launch {
+				delay(timeout)
+				_visible.value = true
+			}
+		}
+
+		// Update KEEP_SCREEN_ON flag value
+		_keepScreenOn.value = inAppEnabled || locks > 0
+	}
+
+	/**
+	 * Create a lock that prevents the screensaver for running until the returned function is called
+	 * or the lifecycle is destroyed.
+	 *
+	 * @return Function to cancel the lock
+	 */
+	fun addLifecycleLock(lifecycle: Lifecycle): () -> Unit {
+		if (lifecycle.currentState == Lifecycle.State.DESTROYED) return {}
+
+		val lock = ScreensaverLock(lifecycle)
+		lock.activate()
+		return lock::cancel
+	}
+
+	private inner class ScreensaverLock(private val lifecycle: Lifecycle) : LifecycleEventObserver {
+		private var active: Boolean = false
+
+		override fun onStateChanged(source: LifecycleOwner, event: Lifecycle.Event) {
+			if (event == Lifecycle.Event.ON_DESTROY) cancel()
+		}
+
+		fun activate() {
+			if (active) return
+			lifecycle.addObserver(this)
+			locks++
+			notifyInteraction(true)
+			active = true
+		}
+
+		fun cancel() {
+			if (!active) return
+			locks--
+			lifecycle.removeObserver(this)
+			notifyInteraction(false)
+			active = false
+		}
+	}
+}

app/src/main/java/org/jellyfin/androidtv/ui/background/AppBackground.kt

@@ -0,0 +1,89 @@
+package org.jellyfin.androidtv.ui.background
+
+import android.graphics.drawable.ColorDrawable
+import androidx.compose.animation.AnimatedContent
+import androidx.compose.animation.ExperimentalAnimationApi
+import androidx.compose.animation.core.snap
+import androidx.compose.animation.core.tween
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.animation.togetherWith
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.BlendMode
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.ColorFilter
+import androidx.compose.ui.graphics.asImageBitmap
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.colorResource
+import androidx.core.graphics.drawable.toBitmap
+import org.jellyfin.androidtv.R
+import org.jellyfin.androidtv.data.service.BackgroundService
+import org.koin.compose.rememberKoinInject
+
+@Composable
+private fun AppThemeBackground() {
+	val context = LocalContext.current
+	val themeBackground = remember(context.theme) {
+		val attributes = context.theme.obtainStyledAttributes(intArrayOf(android.R.attr.windowBackground))
+		val drawable = attributes.getDrawable(0)
+		attributes.recycle()
+
+		if (drawable is ColorDrawable) drawable.toBitmap(1, 1).asImageBitmap()
+		else drawable?.toBitmap()?.asImageBitmap()
+	}
+
+	if (themeBackground != null) {
+		Image(
+			bitmap = themeBackground,
+			contentDescription = null,
+			alignment = Alignment.Center,
+			contentScale = ContentScale.Crop,
+			modifier = Modifier.fillMaxSize()
+		)
+	} else {
+		Box(
+			modifier = Modifier
+				.fillMaxSize()
+				.background(Color.Black)
+		)
+	}
+}
+
+@Composable
+@OptIn(ExperimentalAnimationApi::class)
+fun AppBackground() {
+	val backgroundService = rememberKoinInject<BackgroundService>()
+	val currentBackground by backgroundService.currentBackground.collectAsState()
+
+	AnimatedContent(
+		targetState = currentBackground,
+		transitionSpec = {
+			val duration = (BackgroundService.TRANSITION_DURATION.inWholeMilliseconds / 2).toInt()
+			fadeIn(tween(durationMillis = duration)) togetherWith fadeOut(snap(delayMillis = duration))
+		},
+		label = "BackgroundTransition",
+	) { background ->
+		if (background != null) {
+			Image(
+				bitmap = background,
+				contentDescription = null,
+				alignment = Alignment.Center,
+				contentScale = ContentScale.Crop,
+				colorFilter = ColorFilter.tint(colorResource(R.color.background_filter), BlendMode.SrcAtop),
+				modifier = Modifier.fillMaxSize()
+			)
+		} else {
+			AppThemeBackground()
+		}
+	}
+}

app/src/main/java/org/jellyfin/androidtv/ui/browsing/BrowseFolderFragment.kt

@@ -17,9 +17,7 @@ import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
 import kotlinx.coroutines.launch
-import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json
-import org.jellyfin.androidtv.R
 import org.jellyfin.androidtv.constant.Extras
 import org.jellyfin.androidtv.data.service.BackgroundService
 import org.jellyfin.androidtv.preference.UserPreferences
@@ -52,9 +50,6 @@ abstract class BrowseFolderFragment : BrowseSupportFragment(), RowLoader {
 		folder = Json.decodeFromString<BaseItemDto>(arguments?.getString(Extras.Folder)!!)
 		includeType = arguments?.getString(Extras.IncludeType)
 
-		// Attach background service
-		backgroundService.attach(requireActivity())
-
 		// Set BrowseSupportFragment properties
 		title = folder?.name
 		headersState = HEADERS_DISABLED
@@ -66,7 +61,7 @@ abstract class BrowseFolderFragment : BrowseSupportFragment(), RowLoader {
 					item,
 					(row as ListRow).adapter as ItemRowAdapter,
 					item.index,
-					activity
+					requireContext()
 				)
 			}
 		}
@@ -125,10 +120,10 @@ abstract class BrowseFolderFragment : BrowseSupportFragment(), RowLoader {
 		val showClock = userPreferences[clockBehavior]
 		if (showClock !== ClockBehavior.ALWAYS && showClock !== ClockBehavior.IN_MENUS) return
 
-		val root = requireActivity().findViewById<ViewGroup>(R.id.browse_frame)
+		val root = requireActivity().findViewById<ViewGroup>(androidx.leanback.R.id.browse_frame)
 
 		// Move the title to the left to make way for the clock
-		val titleView = root.findViewById<TextView>(R.id.title_text)
+		val titleView = root.findViewById<TextView>(androidx.leanback.R.id.title_text)
 		if (titleView != null) {
 			val layoutParams = titleView.layoutParams as FrameLayout.LayoutParams
 			layoutParams.rightMargin = convertDpToPixel(root.context, 120)

app/src/main/java/org/jellyfin/androidtv/ui/browsing/BrowseGridFragment.java

@@ -2,7 +2,6 @@ package org.jellyfin.androidtv.ui.browsing;
 
 import static org.koin.java.KoinJavaComponent.inject;
 
-import android.app.Activity;
 import android.os.Bundle;
 import android.os.Handler;
 import android.util.DisplayMetrics;
@@ -19,6 +18,7 @@ import android.widget.PopupWindow;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
 import androidx.leanback.widget.BaseGridView;
 import androidx.leanback.widget.OnItemViewClickedListener;
 import androidx.leanback.widget.OnItemViewSelectedListener;
@@ -38,6 +38,7 @@ import org.jellyfin.androidtv.constant.ImageType;
 import org.jellyfin.androidtv.constant.PosterSize;
 import org.jellyfin.androidtv.constant.QueryType;
 import org.jellyfin.androidtv.data.model.FilterOptions;
+import org.jellyfin.androidtv.data.querying.AlbumArtistsQuery;
 import org.jellyfin.androidtv.data.querying.StdItemQuery;
 import org.jellyfin.androidtv.data.querying.ViewQuery;
 import org.jellyfin.androidtv.data.repository.CustomMessageRepository;
@@ -53,7 +54,6 @@ import org.jellyfin.androidtv.ui.itemhandling.ItemLauncher;
 import org.jellyfin.androidtv.ui.itemhandling.ItemRowAdapter;
 import org.jellyfin.androidtv.ui.navigation.Destinations;
 import org.jellyfin.androidtv.ui.navigation.NavigationRepository;
-import org.jellyfin.androidtv.ui.playback.MediaManager;
 import org.jellyfin.androidtv.ui.presentation.CardPresenter;
 import org.jellyfin.androidtv.ui.presentation.HorizontalGridPresenter;
 import org.jellyfin.androidtv.util.CoroutineUtils;
@@ -62,6 +62,7 @@ import org.jellyfin.androidtv.util.InfoLayoutHelper;
 import org.jellyfin.androidtv.util.KeyProcessor;
 import org.jellyfin.androidtv.util.Utils;
 import org.jellyfin.androidtv.util.apiclient.EmptyLifecycleAwareResponse;
+import org.jellyfin.androidtv.util.apiclient.LifecycleAwareResponse;
 import org.jellyfin.apiclient.model.querying.ArtistsQuery;
 import org.jellyfin.apiclient.model.querying.ItemFields;
 import org.jellyfin.sdk.model.api.BaseItemDto;
@@ -84,7 +85,7 @@ public class BrowseGridFragment extends Fragment implements View.OnKeyListener {
     private final static int CHUNK_SIZE_MINIMUM = 25;
 
     private String mainTitle;
-    private Activity mActivity;
+    private FragmentActivity mActivity;
     private BaseRowItem mCurrentItem;
     private CompositeClickedListener mClickedListener = new CompositeClickedListener();
     private CompositeSelectedListener mSelectedListener = new CompositeSelectedListener();
@@ -117,7 +118,6 @@ public class BrowseGridFragment extends Fragment implements View.OnKeyListener {
     private int mGridPaddingTop = 0;
 
     private final Lazy<BackgroundService> backgroundService = inject(BackgroundService.class);
-    private final Lazy<MediaManager> mediaManager = inject(MediaManager.class);
     private final Lazy<PreferencesRepository> preferencesRepository = inject(PreferencesRepository.class);
     private final Lazy<UserViewsRepository> userViewsRepository = inject(UserViewsRepository.class);
     private final Lazy<UserRepository> userRepository = inject(UserRepository.class);
@@ -157,7 +157,6 @@ public class BrowseGridFragment extends Fragment implements View.OnKeyListener {
         }
 
         mActivity = getActivity();
-        backgroundService.getValue().attach(requireActivity());
 
         mFolder = Json.Default.decodeFromString(BaseItemDto.Companion.serializer(), getArguments().getString(Extras.Folder));
         mParentId = mFolder.getId();
@@ -188,27 +187,6 @@ public class BrowseGridFragment extends Fragment implements View.OnKeyListener {
         // Hide the description because we don't have room for it
         binding.npBug.showDescription(false);
 
-        // NOTE: we only get the 100% correct grid size if we render it once, so hook into it here
-        binding.rowsFragment.post(() -> {
-            if (binding.rowsFragment.getHeight() > 0 && binding.rowsFragment.getWidth() > 0) {
-                if (mGridView == null) {
-                    return;
-                }
-                // prevent adaption on minor size delta's
-                if (Math.abs(mGridHeight - binding.rowsFragment.getHeight()) > MIN_GRIDSIZE_CHANGE_DELTA || Math.abs(mGridWidth - binding.rowsFragment.getWidth()) > MIN_GRIDSIZE_CHANGE_DELTA) {
-                    mGridHeight = Math.round(binding.rowsFragment.getHeight() / getResources().getDisplayMetrics().density);
-                    mGridWidth = Math.round(binding.rowsFragment.getWidth() / getResources().getDisplayMetrics().density);
-                    Timber.d("Auto-Adapting grid size to height <%s> width <%s>", binding.rowsFragment.getHeight(), binding.rowsFragment.getWidth());
-                    mDirty = true;
-                    determiningPosterSize = true;
-                    setAutoCardGridValues();
-                    createGrid();
-                    loadGrid();
-                    determiningPosterSize = false;
-                }
-            }
-        });
-
         return binding.getRoot();
     }
 
@@ -223,19 +201,15 @@ public class BrowseGridFragment extends Fragment implements View.OnKeyListener {
 
     @Override
     public boolean onKey(View v, int keyCode, KeyEvent event) {
-        if (event.getAction() != KeyEvent.ACTION_DOWN) return false;
-
-        if (keyCode == KeyEvent.KEYCODE_MEDIA_PLAY || keyCode == KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE) {
-            mediaManager.getValue().setCurrentMediaAdapter(mAdapter);
-            mediaManager.getValue().setCurrentMediaPosition(mCurrentItem.getIndex());
-            mediaManager.getValue().setCurrentMediaTitle(mFolder.getName());
-        }
+        if (event.getAction() != KeyEvent.ACTION_UP) return false;
         return KeyProcessor.HandleKey(keyCode, mCurrentItem, mActivity);
     }
 
     @Override
     public void onDestroyView() {
         super.onDestroyView();
+
+        binding = null;
         mGridView = null;
     }
 
@@ -244,7 +218,9 @@ public class BrowseGridFragment extends Fragment implements View.OnKeyListener {
         if (mGridViewHolder instanceof HorizontalGridPresenter.ViewHolder) {
             mGridView = ((HorizontalGridPresenter.ViewHolder) mGridViewHolder).getGridView();
             mGridView.setGravity(Gravity.CENTER_VERTICAL);
-            mGridView.setPadding(mGridPaddingLeft, mGridPaddingTop, mGridPaddingLeft, mGridPaddingTop); // prevent initial card cutoffs
+            ViewGroup.MarginLayoutParams titleMargin = (ViewGroup.MarginLayoutParams) binding.title.getLayoutParams();
+            ViewGroup.MarginLayoutParams clockMargin = (ViewGroup.MarginLayoutParams) binding.clock.getLayoutParams();
+            mGridView.setPadding(titleMargin.getMarginStart(), mGridPaddingTop, clockMargin.getMarginEnd(), mGridPaddingTop); // prevent initial card cutoffs
         } else if (mGridViewHolder instanceof VerticalGridPresenter.ViewHolder) {
             mGridView = ((VerticalGridPresenter.ViewHolder) mGridViewHolder).getGridView();
             mGridView.setGravity(Gravity.CENTER_HORIZONTAL);
@@ -594,7 +570,7 @@ public class BrowseGridFragment extends Fragment implements View.OnKeyListener {
                     //Special queries needed for album artists
                     String includeType = getArguments().getString(Extras.IncludeType);
                     if ("AlbumArtist".equals(includeType)) {
-                        ArtistsQuery albumArtists = new ArtistsQuery();
+                        AlbumArtistsQuery albumArtists = new AlbumArtistsQuery();
                         albumArtists.setUserId(userRepository.getValue().getCurrentUser().getValue().getId().toString());
                         albumArtists.setFields(new ItemFields[]{
                                 ItemFields.PrimaryImageAspectRatio,
@@ -604,6 +580,17 @@ public class BrowseGridFragment extends Fragment implements View.OnKeyListener {
                         albumArtists.setParentId(mParentId.toString());
                         setRowDef(new BrowseRowDef("", albumArtists, CHUNK_SIZE_MINIMUM, new ChangeTriggerType[]{}));
                         return;
+                    } else if ("Artist".equals(includeType)) {
+                        ArtistsQuery artists = new ArtistsQuery();
+                        artists.setUserId(userRepository.getValue().getCurrentUser().getValue().getId().toString());
+                        artists.setFields(new ItemFields[]{
+                                ItemFields.PrimaryImageAspectRatio,
+                                ItemFields.ItemCounts,
+                                ItemFields.ChildCount
+                        });
+                        artists.setParentId(mParentId.toString());
+                        setRowDef(new BrowseRowDef("", artists, CHUNK_SIZE_MINIMUM, new ChangeTriggerType[]{}));
+                        return;
                     }
                     query.setIncludeItemTypes(new String[]{includeType != null ? includeType : "MusicAlbum"});
                     query.setRecursive(true);
@@ -705,9 +692,12 @@ public class BrowseGridFragment extends Fragment implements View.OnKeyListener {
             case LiveTvRecording:
                 mAdapter = new ItemRowAdapter(requireContext(), mRowDef.getRecordingQuery(), chunkSize, mCardPresenter, null);
                 break;
-            case AlbumArtists:
+            case Artists:
                 mAdapter = new ItemRowAdapter(requireContext(), mRowDef.getArtistsQuery(), chunkSize, mCardPresenter, null);
                 break;
+            case AlbumArtists:
+                mAdapter = new ItemRowAdapter(requireContext(), mRowDef.getAlbumArtistsQuery(), chunkSize, mCardPresenter, null);
+                break;
             default:
                 mAdapter = new ItemRowAdapter(requireContext(), mRowDef.getQuery(), chunkSize, mRowDef.getPreferParentThumb(), mRowDef.isStaticHeight(), mCardPresenter, null);
                 break;
@@ -729,16 +719,17 @@ public class BrowseGridFragment extends Fragment implements View.OnKeyListener {
                     updateCounter(mAdapter.getTotalItems() > 0 ? 1 : 0);
                 }
                 mLetterButton.setVisibility(ItemSortBy.SortName.equals(mAdapter.getSortBy()) ? View.VISIBLE : View.GONE);
-                if (mAdapter.getTotalItems() == 0) {
-                    binding.toolBar.requestFocus();
+                if (mAdapter.getItemsLoaded() == 0) {
+                    mGridView.setFocusable(false);
                     mHandler.postDelayed(() -> {
                         if (!getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED))
                             return;
 
                         binding.title.setText(mFolder.getName());
                     }, 500);
-                } else {
-                    if (mGridView != null) mGridView.requestFocus();
+                } else if (mGridView != null) {
+                    mGridView.setFocusable(true);
+                    mGridView.requestFocus();
                 }
             }
         });
@@ -767,7 +758,7 @@ public class BrowseGridFragment extends Fragment implements View.OnKeyListener {
         libraryPreferences.set(LibraryPreferences.Companion.getFilterUnwatchedOnly(), mAdapter.getFilters().isUnwatchedOnly());
         libraryPreferences.set(LibraryPreferences.Companion.getSortBy(), mAdapter.getSortBy());
         libraryPreferences.set(LibraryPreferences.Companion.getSortOrder(), getSortOption(mAdapter.getSortBy()).order);
-        CoroutineUtils.runBlocking((coroutineScope, continuation) -> libraryPreferences.commit(continuation));
+        CoroutineUtils.runOnLifecycle(getLifecycle(), (coroutineScope, continuation) -> libraryPreferences.commit(continuation));
     }
 
     private void addTools() {
@@ -937,32 +928,26 @@ public class BrowseGridFragment extends Fragment implements View.OnKeyListener {
     }
 
     private void refreshCurrentItem() {
-        if (mediaManager.getValue().getCurrentMediaPosition() >= 0) {
-            mCurrentItem = mediaManager.getValue().getCurrentMediaItem();
-
-            if (mGridPresenter instanceof HorizontalGridPresenter)
-                ((HorizontalGridPresenter) mGridPresenter).setPosition(mediaManager.getValue().getCurrentMediaPosition());
-            // Don't do anything for vertical grids as the presenter does not allow setting the position
-
-            mediaManager.getValue().setCurrentMediaPosition(-1); // re-set so it doesn't mess with parent views
-        }
         if (mCurrentItem != null && mCurrentItem.getBaseItemType() != BaseItemKind.PHOTO && mCurrentItem.getBaseItemType() != BaseItemKind.PHOTO_ALBUM
                 && mCurrentItem.getBaseItemType() != BaseItemKind.MUSIC_ARTIST && mCurrentItem.getBaseItemType() != BaseItemKind.MUSIC_ALBUM) {
             Timber.d("Refresh item \"%s\"", mCurrentItem.getFullName(requireContext()));
-            mCurrentItem.refresh(new EmptyLifecycleAwareResponse(getLifecycle()) {
+            BaseRowItem item = mCurrentItem;
+            item.refresh(new LifecycleAwareResponse<BaseItemDto>(getLifecycle()) {
                 @Override
-                public void onResponse() {
+                public void onResponse(BaseItemDto response) {
                     if (!getActive()) return;
 
-                    mAdapter.notifyItemRangeChanged(mAdapter.indexOf(mCurrentItem), 1);
+                    if (response == null) mAdapter.removeAt(mAdapter.indexOf(item), 1);
+                    else mAdapter.notifyItemRangeChanged(mAdapter.indexOf(item), 1);
+
                     //Now - if filtered make sure we still pass
-                    if (mAdapter.getFilters() != null) {
-                        if ((mAdapter.getFilters().isFavoriteOnly() && !mCurrentItem.isFavorite()) || (mAdapter.getFilters().isUnwatchedOnly() && mCurrentItem.isPlayed())) {
-                            //if we are about to remove last item, throw focus to toolbar so framework doesn't crash
-                            if (mAdapter.size() == 1) binding.toolBar.requestFocus();
-                            mAdapter.remove(mCurrentItem);
+                    if (response != null && mAdapter.getFilters() != null) {
+                        if ((mAdapter.getFilters().isFavoriteOnly() && !item.isFavorite()) || (mAdapter.getFilters().isUnwatchedOnly() && item.isPlayed())) {
+                            // if we are about to remove the current item, throw focus to toolbar so framework doesn't crash
+                            binding.toolBar.requestFocus();
+                            mAdapter.remove(item);
                             mAdapter.setTotalItems(mAdapter.getTotalItems() - 1);
-                            updateCounter(mCurrentItem.getIndex());
+                            updateCounter(item.getIndex());
                         }
                     }
                 }
@@ -976,7 +961,7 @@ public class BrowseGridFragment extends Fragment implements View.OnKeyListener {
                                   RowPresenter.ViewHolder rowViewHolder, Row row) {
 
             if (!(item instanceof BaseRowItem)) return;
-            ItemLauncher.launch((BaseRowItem) item, mAdapter, ((BaseRowItem) item).getIndex(), getActivity());
+            ItemLauncher.launch((BaseRowItem) item, mAdapter, ((BaseRowItem) item).getIndex(), requireContext());
         }
     }
 

app/src/main/java/org/jellyfin/androidtv/ui/browsing/BrowseRecordingsFragment.java

@@ -182,8 +182,8 @@ public class BrowseRecordingsFragment extends EnhancedBrowseFragment {
 
         GridButtonPresenter mGridPresenter = new GridButtonPresenter();
         ArrayObjectAdapter gridRowAdapter = new ArrayObjectAdapter(mGridPresenter);
-        gridRowAdapter.add(new GridButton(SCHEDULE, getString(R.string.lbl_schedule), R.drawable.tile_port_time));
-        gridRowAdapter.add(new GridButton(SERIES, getString(R.string.lbl_series_recordings), R.drawable.tile_port_series_timer));
+        gridRowAdapter.add(new GridButton(SCHEDULE, getString(R.string.lbl_schedule)));
+        gridRowAdapter.add(new GridButton(SERIES, getString(R.string.lbl_series_recordings)));
         rowAdapter.add(new ListRow(gridHeader, gridRowAdapter));
     }
 }

app/src/main/java/org/jellyfin/androidtv/ui/browsing/BrowseRowDef.java

@@ -2,6 +2,7 @@ package org.jellyfin.androidtv.ui.browsing;
 
 import org.jellyfin.androidtv.constant.ChangeTriggerType;
 import org.jellyfin.androidtv.constant.QueryType;
+import org.jellyfin.androidtv.data.querying.AlbumArtistsQuery;
 import org.jellyfin.androidtv.data.querying.ViewQuery;
 import org.jellyfin.apiclient.model.livetv.LiveTvChannelQuery;
 import org.jellyfin.apiclient.model.livetv.RecommendedProgramQuery;
@@ -15,6 +16,7 @@ import org.jellyfin.apiclient.model.querying.PersonsQuery;
 import org.jellyfin.apiclient.model.querying.SeasonQuery;
 import org.jellyfin.apiclient.model.querying.SimilarItemsQuery;
 import org.jellyfin.apiclient.model.querying.UpcomingEpisodesQuery;
+import org.jellyfin.sdk.model.api.request.GetResumeItemsRequest;
 
 public class BrowseRowDef {
     private String headerText;
@@ -32,7 +34,9 @@ public class BrowseRowDef {
     private SeriesTimerQuery seriesTimerQuery;
 
     private ArtistsQuery artistsQuery;
+    private AlbumArtistsQuery albumArtistsQuery;
     private SeasonQuery seasonQuery;
+    private GetResumeItemsRequest resumeQuery;
     private QueryType queryType;
 
     private int chunkSize = 0;
@@ -79,9 +83,16 @@ public class BrowseRowDef {
         headerText = header;
         this.artistsQuery = query;
         this.chunkSize = chunkSize;
+        this.queryType = QueryType.Artists;
+        this.changeTriggers = changeTriggers;
+    }
+
+    public BrowseRowDef(String header, AlbumArtistsQuery query, int chunkSize, ChangeTriggerType[] changeTriggers) {
+        headerText = header;
+        this.albumArtistsQuery = query;
+        this.chunkSize = chunkSize;
         this.queryType = QueryType.AlbumArtists;
         this.changeTriggers = changeTriggers;
-
     }
 
     public BrowseRowDef(String header, NextUpQuery query) {
@@ -174,6 +185,16 @@ public class BrowseRowDef {
         this.queryType = QueryType.Views;
     }
 
+    public BrowseRowDef(String header, GetResumeItemsRequest query, int chunkSize, boolean preferParentThumb, boolean staticHeight, ChangeTriggerType[] changeTriggers) {
+        headerText = header;
+        this.resumeQuery = query;
+        this.chunkSize = chunkSize;
+        this.queryType = QueryType.Resume;
+        this.staticHeight = staticHeight;
+        this.preferParentThumb = preferParentThumb;
+        this.changeTriggers = changeTriggers;
+    }
+
     public int getChunkSize() {
         return chunkSize;
     }
@@ -227,9 +248,12 @@ public class BrowseRowDef {
     }
 
     public ArtistsQuery getArtistsQuery() { return artistsQuery; }
+    public AlbumArtistsQuery getAlbumArtistsQuery() { return albumArtistsQuery; }
 
     public SeriesTimerQuery getSeriesTimerQuery() { return seriesTimerQuery; }
 
+    public GetResumeItemsRequest getResumeQuery() { return resumeQuery; }
+
     public ChangeTriggerType[] getChangeTriggers() {
         return changeTriggers;
     }

app/src/main/java/org/jellyfin/androidtv/ui/browsing/BrowseViewFragment.java

@@ -133,6 +133,24 @@ public class BrowseViewFragment extends EnhancedBrowseFragment {
             case CollectionType.TvShows:
                 itemTypeString = "Series";
 
+                //Resume
+                StdItemQuery resumeEpisodes = new StdItemQuery(new ItemFields[]{
+                        ItemFields.PrimaryImageAspectRatio,
+                        ItemFields.Overview,
+                        ItemFields.ChildCount,
+                        ItemFields.MediaSources,
+                        ItemFields.MediaStreams
+                });
+                resumeEpisodes.setIncludeItemTypes(new String[]{"Episode"});
+                resumeEpisodes.setLimit(50);
+                resumeEpisodes.setParentId(mFolder.getId().toString());
+                resumeEpisodes.setRecursive(true);
+                resumeEpisodes.setImageTypeLimit(1);
+                resumeEpisodes.setFilters(new ItemFilter[]{ItemFilter.IsResumable});
+                resumeEpisodes.setSortBy(new String[]{ItemSortBy.DatePlayed});
+                resumeEpisodes.setSortOrder(SortOrder.Descending);
+                mRows.add(new BrowseRowDef(getString(R.string.lbl_continue_watching), resumeEpisodes, 0, new ChangeTriggerType[]{ChangeTriggerType.TvPlayback}));
+
                 //Next up
                 NextUpQuery nextUpQuery = new NextUpQuery();
                 nextUpQuery.setUserId(KoinJavaComponent.<UserRepository>get(UserRepository.class).getCurrentUser().getValue().getId().toString());
@@ -475,27 +493,11 @@ public class BrowseViewFragment extends EnhancedBrowseFragment {
 
             GridButtonPresenter mGridPresenter = new GridButtonPresenter();
             ArrayObjectAdapter gridRowAdapter = new ArrayObjectAdapter(mGridPresenter);
-            gridRowAdapter.add(new GridButton(
-                LiveTvOption.LIVE_TV_GUIDE_OPTION_ID,
-                getString(R.string.lbl_live_tv_guide),
-                R.drawable.tile_port_guide
-            ));
-            gridRowAdapter.add(new GridButton(
-                LiveTvOption.LIVE_TV_RECORDINGS_OPTION_ID,
-                getString(R.string.lbl_recorded_tv),
-                R.drawable.tile_port_record
-            ));
+            gridRowAdapter.add(new GridButton(LiveTvOption.LIVE_TV_GUIDE_OPTION_ID, getString(R.string.lbl_live_tv_guide)));
+            gridRowAdapter.add(new GridButton(LiveTvOption.LIVE_TV_RECORDINGS_OPTION_ID, getString(R.string.lbl_recorded_tv)));
             if (Utils.canManageRecordings(KoinJavaComponent.<UserRepository>get(UserRepository.class).getCurrentUser().getValue())) {
-                gridRowAdapter.add(new GridButton(
-                    LiveTvOption.LIVE_TV_SCHEDULE_OPTION_ID,
-                    getString(R.string.lbl_schedule),
-                    R.drawable.tile_port_time
-                ));
-                gridRowAdapter.add(new GridButton(
-                    LiveTvOption.LIVE_TV_SERIES_OPTION_ID,
-                    getString(R.string.lbl_series),
-                    R.drawable.tile_port_series_timer
-                ));
+                gridRowAdapter.add(new GridButton(LiveTvOption.LIVE_TV_SCHEDULE_OPTION_ID, getString(R.string.lbl_schedule)));
+                gridRowAdapter.add(new GridButton(LiveTvOption.LIVE_TV_SERIES_OPTION_ID, getString(R.string.lbl_series)));
             }
 
             mRowsAdapter.add(new ListRow(gridHeader, gridRowAdapter));

app/src/main/java/org/jellyfin/androidtv/ui/browsing/ByLetterFragment.kt

@@ -15,6 +15,7 @@ class ByLetterFragment : BrowseFolderFragment() {
 		val numbersQuery = StdItemQuery().apply {
 			parentId = folder?.id?.toString()
 			sortBy = arrayOf(ItemSortBy.SortName)
+			includeType?.let { includeItemTypes = arrayOf(it) }
 			nameLessThan = letters.substring(0, 1)
 			recursive = true
 		}

app/src/main/java/org/jellyfin/androidtv/ui/browsing/CollectionFragment.java

@@ -1,52 +1,52 @@
 package org.jellyfin.androidtv.ui.browsing;
 
-import android.os.Bundle;
-
 import org.jellyfin.androidtv.R;
 import org.jellyfin.androidtv.data.querying.StdItemQuery;
-import org.jellyfin.androidtv.util.Utils;
 import org.jellyfin.apiclient.model.querying.ItemFields;
+import org.jellyfin.sdk.model.api.BaseItemKind;
 
 public class CollectionFragment extends EnhancedBrowseFragment {
-
-    @Override
-    public void onActivityCreated(Bundle savedInstanceState) {
-        super.onActivityCreated(savedInstanceState);
-
-    }
-
     @Override
     protected void setupQueries(RowLoader rowLoader) {
-        if (Utils.getSafeValue(mFolder.getChildCount(), 0) > 0) {
-            StdItemQuery movies = new StdItemQuery(new ItemFields[]{
-                    ItemFields.PrimaryImageAspectRatio,
-                    ItemFields.Overview,
-                    ItemFields.ItemCounts,
-                    ItemFields.DisplayPreferencesId,
-                    ItemFields.ChildCount,
-                    ItemFields.MediaStreams,
-                    ItemFields.MediaSources
-            });
-            movies.setParentId(mFolder.getId().toString());
-            movies.setIncludeItemTypes(new String[]{"Movie"});
-            mRows.add(new BrowseRowDef(getString(R.string.lbl_movies), movies, 100));
+        StdItemQuery movies = new StdItemQuery(new ItemFields[]{
+                ItemFields.PrimaryImageAspectRatio,
+                ItemFields.Overview,
+                ItemFields.ItemCounts,
+                ItemFields.DisplayPreferencesId,
+                ItemFields.ChildCount,
+                ItemFields.MediaStreams,
+                ItemFields.MediaSources
+        });
+        movies.setParentId(mFolder.getId().toString());
+        movies.setIncludeItemTypes(new String[]{BaseItemKind.MOVIE.getSerialName()});
+        mRows.add(new BrowseRowDef(getString(R.string.lbl_movies), movies, 100));
 
-            StdItemQuery series = new StdItemQuery();
-            series.setParentId(mFolder.getId().toString());
-            series.setIncludeItemTypes(new String[]{"Series"});
-            mRows.add(new BrowseRowDef(getString(R.string.lbl_tv_series), series, 100));
-
-            StdItemQuery others = new StdItemQuery();
-            others.setParentId(mFolder.getId().toString());
-            others.setExcludeItemTypes(new String[]{"Movie", "Series"});
-            mRows.add(new BrowseRowDef(getString(R.string.lbl_other), others, 100));
-
-
-            rowLoader.loadRows(mRows);
-        }
+        StdItemQuery series = new StdItemQuery(new ItemFields[]{
+                ItemFields.PrimaryImageAspectRatio,
+                ItemFields.Overview,
+                ItemFields.ItemCounts,
+                ItemFields.DisplayPreferencesId,
+                ItemFields.ChildCount,
+                ItemFields.MediaStreams,
+                ItemFields.MediaSources
+        });
+        series.setParentId(mFolder.getId().toString());
+        series.setIncludeItemTypes(new String[]{BaseItemKind.SERIES.getSerialName()});
+        mRows.add(new BrowseRowDef(getString(R.string.lbl_tv_series), series, 100));
 
+        StdItemQuery others = new StdItemQuery(new ItemFields[]{
+                ItemFields.PrimaryImageAspectRatio,
+                ItemFields.Overview,
+                ItemFields.ItemCounts,
+                ItemFields.DisplayPreferencesId,
+                ItemFields.ChildCount,
+                ItemFields.MediaStreams,
+                ItemFields.MediaSources
+        });
+        others.setParentId(mFolder.getId().toString());
+        others.setExcludeItemTypes(new String[]{BaseItemKind.MOVIE.getSerialName(), BaseItemKind.SERIES.getSerialName()});
+        mRows.add(new BrowseRowDef(getString(R.string.lbl_other), others, 100));
 
+        rowLoader.loadRows(mRows);
     }
-
-
 }

app/src/main/java/org/jellyfin/androidtv/ui/browsing/EnhancedBrowseFragment.java

@@ -43,7 +43,6 @@ import org.jellyfin.androidtv.ui.itemhandling.ItemLauncher;
 import org.jellyfin.androidtv.ui.itemhandling.ItemRowAdapter;
 import org.jellyfin.androidtv.ui.navigation.Destinations;
 import org.jellyfin.androidtv.ui.navigation.NavigationRepository;
-import org.jellyfin.androidtv.ui.playback.MediaManager;
 import org.jellyfin.androidtv.ui.presentation.CardPresenter;
 import org.jellyfin.androidtv.ui.presentation.GridButtonPresenter;
 import org.jellyfin.androidtv.ui.presentation.MutableObjectAdapter;
@@ -52,7 +51,7 @@ import org.jellyfin.androidtv.util.CoroutineUtils;
 import org.jellyfin.androidtv.util.InfoLayoutHelper;
 import org.jellyfin.androidtv.util.KeyProcessor;
 import org.jellyfin.androidtv.util.MarkdownRenderer;
-import org.jellyfin.androidtv.util.apiclient.EmptyLifecycleAwareResponse;
+import org.jellyfin.androidtv.util.apiclient.LifecycleAwareResponse;
 import org.jellyfin.androidtv.util.sdk.compat.FakeBaseItem;
 import org.jellyfin.androidtv.util.sdk.compat.JavaCompat;
 import org.jellyfin.sdk.model.api.BaseItemDto;
@@ -80,6 +79,7 @@ public class EnhancedBrowseFragment extends Fragment implements RowLoader, View.
     public static final int FAVSONGS = 9;
     protected static final int SCHEDULE = 10;
     protected static final int SERIES = 11;
+    protected static final int ALBUM_ARTISTS = 12;
     protected BaseItemDto mFolder;
     protected String itemTypeString;
     protected boolean showViews = true;
@@ -97,7 +97,6 @@ public class EnhancedBrowseFragment extends Fragment implements RowLoader, View.
     protected ListRow mCurrentRow;
 
     private Lazy<BackgroundService> backgroundService = inject(BackgroundService.class);
-    private Lazy<MediaManager> mediaManager = inject(MediaManager.class);
     private Lazy<MarkdownRenderer> markdownRenderer = inject(MarkdownRenderer.class);
     private final Lazy<CustomMessageRepository> customMessageRepository = inject(CustomMessageRepository.class);
     private final Lazy<NavigationRepository> navigationRepository = inject(NavigationRepository.class);
@@ -108,7 +107,6 @@ public class EnhancedBrowseFragment extends Fragment implements RowLoader, View.
         favSongsRowItem = new BaseRowItem(FakeBaseItem.INSTANCE.getFAV_SONGS());
 
         mRowsAdapter = new MutableObjectAdapter<Row>(new PositionableListRowPresenter());
-        backgroundService.getValue().attach(requireActivity());
 
         setupViews();
         setupQueries(this);
@@ -190,7 +188,7 @@ public class EnhancedBrowseFragment extends Fragment implements RowLoader, View.
 
         // React to deletion
         DataRefreshService dataRefreshService = KoinJavaComponent.<DataRefreshService>get(DataRefreshService.class);
-        if (mCurrentRow != null && mCurrentItem != null && mCurrentItem.getItemId() != null && mCurrentItem.getItemId().equals(dataRefreshService.getLastDeletedItemId())) {
+        if (mCurrentRow != null && mCurrentItem != null && mCurrentItem.getItemId() != null && mCurrentItem.getBaseItem().getId().equals(dataRefreshService.getLastDeletedItemId())) {
             ((ItemRowAdapter) mCurrentRow.getAdapter()).remove(mCurrentItem);
             dataRefreshService.setLastDeletedItemId(null);
         }
@@ -225,7 +223,7 @@ public class EnhancedBrowseFragment extends Fragment implements RowLoader, View.
         mCardPresenter = new CardPresenter(false, 140);
         ClassPresenterSelector ps = new ClassPresenterSelector();
         ps.addClassPresenter(BaseRowItem.class, mCardPresenter);
-        ps.addClassPresenter(GridButton.class, new GridButtonPresenter(false, 155, 140));
+        ps.addClassPresenter(GridButton.class, new GridButtonPresenter(155, 140));
 
         for (BrowseRowDef def : rows) {
             HeaderItem header = new HeaderItem(def.getHeaderText());
@@ -297,14 +295,15 @@ public class EnhancedBrowseFragment extends Fragment implements RowLoader, View.
 
         switch (itemTypeString) {
             case "Movie":
-                gridRowAdapter.add(new GridButton(SUGGESTED, getString(R.string.lbl_suggested), R.drawable.tile_suggestions));
+                gridRowAdapter.add(new GridButton(SUGGESTED, getString(R.string.lbl_suggested)));
                 addStandardViewButtons(gridRowAdapter);
                 break;
 
             case "MusicAlbum":
-                gridRowAdapter.add(new GridButton(ALBUMS, getString(R.string.lbl_albums), R.drawable.tile_audio));
-                gridRowAdapter.add(new GridButton(ARTISTS, getString(R.string.lbl_artists), R.drawable.tile_artists));
-                gridRowAdapter.add(new GridButton(GENRES, getString(R.string.lbl_genres), R.drawable.tile_genres));
+                gridRowAdapter.add(new GridButton(ALBUMS, getString(R.string.lbl_albums)));
+                gridRowAdapter.add(new GridButton(ALBUM_ARTISTS, getString(R.string.lbl_album_artists)));
+                gridRowAdapter.add(new GridButton(ARTISTS, getString(R.string.lbl_artists)));
+                gridRowAdapter.add(new GridButton(GENRES, getString(R.string.lbl_genres)));
                 break;
 
             default:
@@ -316,11 +315,11 @@ public class EnhancedBrowseFragment extends Fragment implements RowLoader, View.
     }
 
     protected void addStandardViewButtons(ArrayObjectAdapter gridRowAdapter) {
-        gridRowAdapter.add(new GridButton(GRID, getString(R.string.lbl_all_items), R.drawable.tile_port_grid));
-        gridRowAdapter.add(new GridButton(BY_LETTER, getString(R.string.lbl_by_letter), R.drawable.tile_letters));
-        gridRowAdapter.add(new GridButton(GENRES, getString(R.string.lbl_genres), R.drawable.tile_genres));
+        gridRowAdapter.add(new GridButton(GRID, getString(R.string.lbl_all_items)));
+        gridRowAdapter.add(new GridButton(BY_LETTER, getString(R.string.lbl_by_letter)));
+        gridRowAdapter.add(new GridButton(GENRES, getString(R.string.lbl_genres)));
         // Disabled because the screen doesn't behave properly
-        // gridRowAdapter.add(new GridButton(PERSONS, getString(R.string.lbl_performers), R.drawable.tile_actors));
+        // gridRowAdapter.add(new GridButton(PERSONS, getString(R.string.lbl_performers)));
     }
 
     protected void setupEventListeners() {
@@ -339,7 +338,7 @@ public class EnhancedBrowseFragment extends Fragment implements RowLoader, View.
 
     @Override
     public boolean onKey(View v, int keyCode, KeyEvent event) {
-        if (event.getAction() != KeyEvent.ACTION_DOWN) return false;
+        if (event.getAction() != KeyEvent.ACTION_UP) return false;
         return KeyProcessor.HandleKey(keyCode, mCurrentItem, requireActivity());
     }
 
@@ -350,13 +349,15 @@ public class EnhancedBrowseFragment extends Fragment implements RowLoader, View.
                 mCurrentItem.getBaseItemType() != BaseItemKind.MUSIC_ALBUM &&
                 mCurrentItem.getBaseItemType() != BaseItemKind.PLAYLIST
         ) {
-            mCurrentItem.refresh(new EmptyLifecycleAwareResponse(getLifecycle()) {
+            BaseRowItem item = mCurrentItem;
+            item.refresh(new LifecycleAwareResponse<BaseItemDto>(getLifecycle()) {
                 @Override
-                public void onResponse() {
+                public void onResponse(BaseItemDto response) {
                     if (!getActive()) return;
 
                     ItemRowAdapter adapter = (ItemRowAdapter) mCurrentRow.getAdapter();
-                    adapter.notifyItemRangeChanged(adapter.indexOf(mCurrentItem), 1);
+                    if (response == null) adapter.removeAt(adapter.indexOf(item), 1);
+					else adapter.notifyItemRangeChanged(adapter.indexOf(item), 1);
                 }
             });
         }
@@ -377,12 +378,18 @@ public class EnhancedBrowseFragment extends Fragment implements RowLoader, View.
                         navigationRepository.getValue().navigate(Destinations.INSTANCE.libraryBrowser(mFolder, "MusicAlbum"));
                         break;
 
-                    case ARTISTS:
+                    case ALBUM_ARTISTS:
                         mFolder = JavaCompat.copyWithDisplayPreferencesId(mFolder, mFolder.getId() + "AR");
 
                         navigationRepository.getValue().navigate(Destinations.INSTANCE.libraryBrowser(mFolder, "AlbumArtist"));
                         break;
 
+                    case ARTISTS:
+                        mFolder = JavaCompat.copyWithDisplayPreferencesId(mFolder, mFolder.getId() + "AR");
+
+                        navigationRepository.getValue().navigate(Destinations.INSTANCE.libraryBrowser(mFolder, "Artist"));
+                        break;
+
                     case BY_LETTER:
                         navigationRepository.getValue().navigate(Destinations.INSTANCE.libraryByLetter(mFolder, itemTypeString));
                         break;
@@ -430,8 +437,7 @@ public class EnhancedBrowseFragment extends Fragment implements RowLoader, View.
         public void onItemClicked(final Presenter.ViewHolder itemViewHolder, Object item, RowPresenter.ViewHolder rowViewHolder, Row row) {
             if (!(item instanceof BaseRowItem)) return;
 
-            mediaManager.getValue().setCurrentMediaTitle(row.getHeaderItem().getName());
-            ItemLauncher.launch((BaseRowItem) item, (ItemRowAdapter) ((ListRow) row).getAdapter(), ((BaseRowItem) item).getIndex(), getActivity());
+            ItemLauncher.launch((BaseRowItem) item, (ItemRowAdapter) ((ListRow) row).getAdapter(), ((BaseRowItem) item).getIndex(), requireContext());
         }
     }
 

app/src/main/java/org/jellyfin/androidtv/ui/browsing/GenericFolderFragment.java

@@ -51,7 +51,7 @@ public class GenericFolderFragment extends EnhancedBrowseFragment {
                 latest.setFilters(new ItemFilter[]{ItemFilter.IsUnplayed});
                 latest.setSortBy(new String[]{ItemSortBy.DateCreated});
                 latest.setSortOrder(SortOrder.Descending);
-                mRows.add(new BrowseRowDef(getString(R.string.lbl_latest_additions), latest, 0));
+                mRows.add(new BrowseRowDef(getString(R.string.lbl_latest), latest, 0));
 
             }
 

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

@@ -3,30 +3,47 @@ package org.jellyfin.androidtv.ui.browsing
 import android.content.Intent
 import android.os.Bundle
 import android.view.KeyEvent
+import android.view.MotionEvent
 import android.view.View
+import android.view.WindowManager
 import androidx.activity.OnBackPressedCallback
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
 import androidx.fragment.app.commit
 import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.flowWithLifecycle
 import androidx.lifecycle.lifecycleScope
-import androidx.lifecycle.repeatOnLifecycle
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
 import org.jellyfin.androidtv.R
-import org.jellyfin.androidtv.auth.ui.validateAuthentication
-import org.jellyfin.androidtv.data.service.BackgroundService
+import org.jellyfin.androidtv.auth.repository.SessionRepository
+import org.jellyfin.androidtv.auth.repository.UserRepository
+import org.jellyfin.androidtv.databinding.ActivityMainBinding
+import org.jellyfin.androidtv.ui.ScreensaverViewModel
+import org.jellyfin.androidtv.ui.background.AppBackground
 import org.jellyfin.androidtv.ui.navigation.NavigationAction
 import org.jellyfin.androidtv.ui.navigation.NavigationRepository
+import org.jellyfin.androidtv.ui.screensaver.InAppScreensaver
+import org.jellyfin.androidtv.ui.startup.StartupActivity
 import org.jellyfin.androidtv.util.applyTheme
+import org.jellyfin.androidtv.util.isMediaSessionKeyEvent
 import org.koin.android.ext.android.inject
+import org.koin.androidx.viewmodel.ext.android.viewModel
+import timber.log.Timber
 
-class MainActivity : FragmentActivity(R.layout.fragment_content_view) {
+class MainActivity : FragmentActivity() {
 	companion object {
 		private const val FRAGMENT_TAG_CONTENT = "content"
 	}
 
-	private val backgroundService by inject<BackgroundService>()
 	private val navigationRepository by inject<NavigationRepository>()
+	private val sessionRepository by inject<SessionRepository>()
+	private val userRepository by inject<UserRepository>()
+	private val screensaverViewModel by viewModel<ScreensaverViewModel>()
+	private var inTransaction = false
+
+	private lateinit var binding: ActivityMainBinding
 
 	private val backPressedCallback = object : OnBackPressedCallback(false) {
 		override fun handleOnBackPressed() {
@@ -35,30 +52,39 @@ class MainActivity : FragmentActivity(R.layout.fragment_content_view) {
 	}
 
 	override fun onCreate(savedInstanceState: Bundle?) {
+		applyTheme()
+
 		super.onCreate(savedInstanceState)
 
 		if (!validateAuthentication()) return
 
-		applyTheme()
+		screensaverViewModel.keepScreenOn.flowWithLifecycle(lifecycle, Lifecycle.State.RESUMED)
+			.onEach { keepScreenOn ->
+				if (keepScreenOn) window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
+				else window.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
+			}.launchIn(lifecycleScope)
 
-		backgroundService.attach(this)
 		onBackPressedDispatcher.addCallback(this, backPressedCallback)
 
 		supportFragmentManager.addOnBackStackChangedListener {
-			if (supportFragmentManager.backStackEntryCount == 0)
+			if (!inTransaction && supportFragmentManager.backStackEntryCount == 0)
 				navigationRepository.reset()
 		}
 
 		if (savedInstanceState == null && navigationRepository.canGoBack) navigationRepository.reset()
 
-		lifecycleScope.launch {
-			lifecycle.repeatOnLifecycle(Lifecycle.State.RESUMED) {
-				navigationRepository.currentAction.collect { action ->
-					handleNavigationAction(action)
-					backPressedCallback.isEnabled = navigationRepository.canGoBack
-				}
-			}
-		}
+		navigationRepository.currentAction
+			.flowWithLifecycle(lifecycle, Lifecycle.State.RESUMED)
+			.onEach { action ->
+				handleNavigationAction(action)
+				backPressedCallback.isEnabled = navigationRepository.canGoBack
+				screensaverViewModel.notifyInteraction(false)
+			}.launchIn(lifecycleScope)
+
+		binding = ActivityMainBinding.inflate(layoutInflater)
+		binding.background.setContent { AppBackground() }
+		binding.screensaver.setContent { InAppScreensaver() }
+		setContentView(binding.root)
 	}
 
 	override fun onResume() {
@@ -67,24 +93,61 @@ class MainActivity : FragmentActivity(R.layout.fragment_content_view) {
 		if (!validateAuthentication()) return
 
 		applyTheme()
+
+		screensaverViewModel.activityPaused = false
+	}
+
+	private fun validateAuthentication(): Boolean {
+		if (sessionRepository.currentSession.value == null || userRepository.currentUser.value == null) {
+			Timber.w("Activity ${this::class.qualifiedName} started without a session, bouncing to StartupActivity")
+			startActivity(Intent(this, StartupActivity::class.java))
+			finish()
+			return false
+		}
+
+		return true
+	}
+
+	override fun onPause() {
+		super.onPause()
+
+		screensaverViewModel.activityPaused = true
+	}
+
+	override fun onStop() {
+		super.onStop()
+
+		lifecycleScope.launch {
+			Timber.d("MainActivity stopped")
+			sessionRepository.restoreSession(destroyOnly = true)
+		}
 	}
 
 	private fun handleNavigationAction(action: NavigationAction) = when (action) {
-		is NavigationAction.NavigateFragment -> supportFragmentManager.commit {
-			val destination = action.destination
-			val currentFragment = supportFragmentManager.findFragmentByTag(FRAGMENT_TAG_CONTENT)
-			val isSameFragment = currentFragment != null &&
-				destination.fragment.isInstance(currentFragment) &&
-				currentFragment.arguments == destination.arguments
-
-			if (!isSameFragment) {
-				setCustomAnimations(R.anim.fade_in, R.anim.fade_out, R.anim.fade_in, R.anim.fade_out)
-
-				if (currentFragment != null) remove(currentFragment)
-				add(R.id.content_view, destination.fragment.java, destination.arguments, FRAGMENT_TAG_CONTENT)
+		is NavigationAction.NavigateFragment -> {
+			if (action.replace) {
+				// Prevent back stack changed listener from resetting when popping to
+				// the initial destination
+				inTransaction = true
+				supportFragmentManager.popBackStack()
+				inTransaction = false
 			}
 
-			if (action.addToBackStack) addToBackStack(null)
+			supportFragmentManager.commit {
+				val destination = action.destination
+				val currentFragment = supportFragmentManager.findFragmentByTag(FRAGMENT_TAG_CONTENT)
+				val isSameFragment = currentFragment != null &&
+					destination.fragment.isInstance(currentFragment) &&
+					currentFragment.arguments == destination.arguments
+
+				if (!isSameFragment) {
+					setCustomAnimations(R.anim.fade_in, R.anim.fade_out, R.anim.fade_in, R.anim.fade_out)
+
+					replace(R.id.content_view, destination.fragment.java, destination.arguments, FRAGMENT_TAG_CONTENT)
+				}
+
+				if (action.addToBackStack) addToBackStack(null)
+			}
 		}
 
 		is NavigationAction.NavigateActivity -> {
@@ -107,12 +170,63 @@ class MainActivity : FragmentActivity(R.layout.fragment_content_view) {
 		return result
 	}
 
-	private fun onKeyEvent(keyCode: Int, event: KeyEvent?): Boolean = supportFragmentManager.fragments
-		.any { it.onKeyEvent(keyCode, event) }
+	private fun onKeyEvent(keyCode: Int, event: KeyEvent?): Boolean {
+		// Ignore the key event that closes the screensaver
+		if (screensaverViewModel.visible.value) {
+			screensaverViewModel.notifyInteraction(canCancel = event?.action == KeyEvent.ACTION_UP)
+			return true
+		}
+
+		return supportFragmentManager.fragments
+			.any { it.onKeyEvent(keyCode, event) }
+	}
 
 	override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean =
 		onKeyEvent(keyCode, event) || super.onKeyDown(keyCode, event)
 
 	override fun onKeyUp(keyCode: Int, event: KeyEvent?): Boolean =
 		onKeyEvent(keyCode, event) || super.onKeyUp(keyCode, event)
+
+	override fun onKeyLongPress(keyCode: Int, event: KeyEvent?): Boolean =
+		onKeyEvent(keyCode, event) || super.onKeyUp(keyCode, event)
+
+	override fun onUserInteraction() {
+		super.onUserInteraction()
+
+		screensaverViewModel.notifyInteraction(false)
+	}
+
+	@Suppress("RestrictedApi") // False positive
+	override fun dispatchKeyEvent(event: KeyEvent): Boolean {
+		// Ignore the key event that closes the screensaver
+		if (!event.isMediaSessionKeyEvent() && screensaverViewModel.visible.value) {
+			screensaverViewModel.notifyInteraction(canCancel = event.action == KeyEvent.ACTION_UP)
+			return true
+		}
+
+		@Suppress("RestrictedApi") // False positive
+		return super.dispatchKeyEvent(event)
+	}
+
+	@Suppress("RestrictedApi") // False positive
+	override fun dispatchKeyShortcutEvent(event: KeyEvent): Boolean {
+		// Ignore the key event that closes the screensaver
+		if (!event.isMediaSessionKeyEvent() && screensaverViewModel.visible.value) {
+			screensaverViewModel.notifyInteraction(canCancel = event.action == KeyEvent.ACTION_UP)
+			return true
+		}
+
+		@Suppress("RestrictedApi") // False positive
+		return super.dispatchKeyShortcutEvent(event)
+	}
+
+	override fun dispatchTouchEvent(ev: MotionEvent?): Boolean {
+		// Ignore the touch event that closes the screensaver
+		if (screensaverViewModel.visible.value) {
+			screensaverViewModel.notifyInteraction(true)
+			return true
+		}
+
+		return super.dispatchTouchEvent(ev)
+	}
 }