From 2e3525d89adc88c742658942fad422ad513ba0f6 Mon Sep 17 00:00:00 2001
From: Niels van Velzen <git@ndat.nl>
Date: Sun, 24 Oct 2021 13:59:05 +0200
Subject: [PATCH] Backport minimal core changes for new playback module

- Update kotlinx.coroutines to fix binary incompatibility
- Add kotlinx.coroutines guava module for playback module MediaSessions
- Add androidx.media2 session module for playback module MediaSessions
- Fix formatting in PlaybackForwardingActivity
- Fix typo in DeveloperPreferencesScreen
---
 .../playback/rewrite/PlaybackForwardingActivity.kt   | 12 ++++++------
 .../preference/screen/DeveloperPreferencesScreen.kt  |  2 +-
 gradle/libs.versions.toml                            |  5 ++++-
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/org/jellyfin/androidtv/ui/playback/rewrite/PlaybackForwardingActivity.kt b/app/src/main/java/org/jellyfin/androidtv/ui/playback/rewrite/PlaybackForwardingActivity.kt
index aa99ebe333..bdff54e4df 100644
--- a/app/src/main/java/org/jellyfin/androidtv/ui/playback/rewrite/PlaybackForwardingActivity.kt
+++ b/app/src/main/java/org/jellyfin/androidtv/ui/playback/rewrite/PlaybackForwardingActivity.kt
@@ -31,9 +31,9 @@ class PlaybackForwardingActivity : FragmentActivity() {
 
 		if (itemId == null) {
 			Toast.makeText(
-					this,
-					"Could not find item to play (itemId=null)",
-					Toast.LENGTH_LONG
+				this,
+				"Could not find item to play (itemId=null)",
+				Toast.LENGTH_LONG
 			).show()
 			finishAfterTransition()
 			return
@@ -45,9 +45,9 @@ class PlaybackForwardingActivity : FragmentActivity() {
 
 			// Log info
 			Toast.makeText(
-					this@PlaybackForwardingActivity,
-					"Found item of type ${item.type} - ${item.name} (${item.id}",
-					Toast.LENGTH_LONG
+				this@PlaybackForwardingActivity,
+				"Found item of type ${item.type} - ${item.name} (${item.id}",
+				Toast.LENGTH_LONG
 			).show()
 			Timber.i(item.toString())
 
diff --git a/app/src/main/java/org/jellyfin/androidtv/ui/preference/screen/DeveloperPreferencesScreen.kt b/app/src/main/java/org/jellyfin/androidtv/ui/preference/screen/DeveloperPreferencesScreen.kt
index 63eeb1b559..50bc54835d 100644
--- a/app/src/main/java/org/jellyfin/androidtv/ui/preference/screen/DeveloperPreferencesScreen.kt
+++ b/app/src/main/java/org/jellyfin/androidtv/ui/preference/screen/DeveloperPreferencesScreen.kt
@@ -23,7 +23,7 @@ class DeveloperPreferencesScreen : OptionsFragment() {
 				bind(userPreferences, UserPreferences.debuggingEnabled)
 			}
 
-			// Only show in debug mode
+			// Only show in development mode
 			if (BuildConfig.DEVELOPMENT) {
 				checkbox {
 					setTitle(R.string.enable_playback_module_title)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index adf5e6dd91..e921c981af 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-kotlinx-coroutines = "1.4.3"
+kotlinx-coroutines = "1.5.2"
 kotlinx-serialization = "1.1.0"
 androidx-leanback = "1.1.0-beta01"
 androidx-lifecycle = "2.3.1"
@@ -7,6 +7,7 @@ koin = "3.1.2"
 glide = "4.12.0"
 acra = "5.8.4"
 aboutlibraries = "8.9.3"
+androidx-media2 = "1.2.0"
 
 [libraries]
 # Jellyfin apiclient
@@ -16,6 +17,7 @@ jellyfin-sdk = { module = "org.jellyfin.sdk:jellyfin-core", version = "1.1.0" }
 
 # Kotlin
 kotlinx-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "kotlinx-coroutines" }
+kotlinx-coroutines-guava = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-guava", version.ref = "kotlinx-coroutines" }
 kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinx-serialization" }
 
 # Android(x)
@@ -37,6 +39,7 @@ androidx-lifecycle-service = { module = "androidx.lifecycle:lifecycle-service",
 androidx-lifecycle-process = { module = "androidx.lifecycle:lifecycle-process", version.ref = "androidx-lifecycle" }
 androidx-window = { module = "androidx.window:window", version = "1.0.0-alpha09" }
 androidx-cardview = { module = "androidx.cardview:cardview", version = "1.0.0" }
+androidx-media2-session = { module = "androidx.media2:media2-session", version = "androidx-media2"}
 
 # Dependency Injection
 koin-android-core = { module = "io.insert-koin:koin-android", version.ref = "koin" }