Fixes #253 external player state management by saving and restoring playback data

Author: RadicalMuffinMan

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

@@ -156,6 +156,10 @@ class MainActivity : FragmentActivity() {
 	override fun onResume() {
 		super.onResume()
 
+		// Skip auth check while session is still restoring — onCreate handles it once READY.
+		// Prevents false bounce to StartupActivity when returning from external player after process death.
+		if (sessionRepository.state.value != SessionRepositoryState.READY) return
+
 		if (!validateAuthentication()) return
 
 		applyTheme()

app/src/main/java/org/jellyfin/androidtv/ui/playback/ExternalPlayerActivity.kt

@@ -35,6 +35,7 @@ import org.koin.android.ext.android.inject
 import timber.log.Timber
 import java.io.File
 import java.time.Instant
+import java.util.UUID
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.milliseconds
 
@@ -70,6 +71,10 @@ class ExternalPlayerActivity : FragmentActivity() {
 
 		// The extra keys used by various video players to read the end position
 		private val resultPositionExtras = arrayOf(API_MX_RESULT_POSITION, API_VLC_RESULT_POSITION)
+
+		private const val STATE_ITEM_ID = "state_item_id"
+		private const val STATE_MEDIA_SOURCE_ID = "state_media_source_id"
+		private const val STATE_RUNTIME_TICKS = "state_runtime_ticks"
 	}
 
 	private val videoQueueManager by inject<VideoQueueManager>()
@@ -96,13 +101,37 @@ class ExternalPlayerActivity : FragmentActivity() {
 
 	private var currentItem: Pair<BaseItemDto, MediaSourceInfo>? = null
 
+	private var savedItemId: UUID? = null
+	private var savedMediaSourceId: String? = null
+	private var savedRuntimeTicks: Long? = null
+
 	override fun onCreate(savedInstanceState: Bundle?) {
 		super.onCreate(savedInstanceState)
 
+		if (savedInstanceState != null) {
+			savedItemId = savedInstanceState.getString(STATE_ITEM_ID)?.toUUIDOrNull()
+			savedMediaSourceId = savedInstanceState.getString(STATE_MEDIA_SOURCE_ID)
+			savedRuntimeTicks = if (savedInstanceState.containsKey(STATE_RUNTIME_TICKS))
+				savedInstanceState.getLong(STATE_RUNTIME_TICKS) else null
+			Timber.i("Restored external player state: itemId=$savedItemId")
+			return
+		}
+
 		val position = intent.getLongExtra(EXTRA_POSITION, 0).milliseconds
 		playNext(position)
 	}
 
+	override fun onSaveInstanceState(outState: Bundle) {
+		super.onSaveInstanceState(outState)
+
+		val (item, mediaSource) = currentItem ?: return
+		outState.putString(STATE_ITEM_ID, item.id.toString())
+		outState.putString(STATE_MEDIA_SOURCE_ID, mediaSource.id)
+		(mediaSource.runTimeTicks ?: item.runTimeTicks)?.let { ticks ->
+			outState.putLong(STATE_RUNTIME_TICKS, ticks)
+		}
+	}
+
 	private fun playNext(position: Duration = Duration.ZERO) {
 		val currentPosition = videoQueueManager.getCurrentMediaPosition()
 		val item = videoQueueManager.getCurrentVideoQueue().getOrNull(currentPosition) ?: return finish()
@@ -184,6 +213,9 @@ class ExternalPlayerActivity : FragmentActivity() {
 
 		try {
 			currentItem = item to mediaSource
+			savedItemId = item.id
+			savedMediaSourceId = mediaSource.id
+			savedRuntimeTicks = mediaSource.runTimeTicks ?: item.runTimeTicks
 			playVideoLauncher.launch(playIntent)
 		} catch (_: ActivityNotFoundException) {
 			Toast.makeText(this, R.string.no_player_message, Toast.LENGTH_LONG).show()
@@ -193,13 +225,6 @@ class ExternalPlayerActivity : FragmentActivity() {
 
 
 	private fun onItemFinished(result: Intent?) {
-		if (currentItem == null) {
-			Toast.makeText(this@ExternalPlayerActivity, R.string.video_error_unknown_error, Toast.LENGTH_LONG).show()
-			finish()
-			return
-		}
-
-		val (item, mediaSource) = currentItem!!
 		val extras = result?.extras ?: Bundle.EMPTY
 
 		val endPosition = resultPositionExtras.firstNotNullOfOrNull { key ->
@@ -208,16 +233,27 @@ class ExternalPlayerActivity : FragmentActivity() {
 			else null
 		}
 
-		val runtime = (mediaSource.runTimeTicks ?: item.runTimeTicks)?.ticks
-		val shouldPlayNext = runtime != null && endPosition != null && endPosition >= (runtime * 0.9)
+		val itemId = currentItem?.first?.id ?: savedItemId
+		val mediaSourceId = currentItem?.second?.id ?: savedMediaSourceId
+		val runtimeTicks = currentItem?.second?.runTimeTicks ?: currentItem?.first?.runTimeTicks ?: savedRuntimeTicks
+
+		if (itemId == null || mediaSourceId == null) {
+			Timber.w("Cannot report playback stop: no item data available")
+			Toast.makeText(this@ExternalPlayerActivity, R.string.video_error_unknown_error, Toast.LENGTH_LONG).show()
+			finish()
+			return
+		}
+
+		val runtime = runtimeTicks?.ticks
+		val shouldPlayNext = currentItem != null && runtime != null && endPosition != null && endPosition >= (runtime * 0.9)
 
 		lifecycleScope.launch {
 			runCatching {
 				withContext(Dispatchers.IO) {
 					api.playStateApi.reportPlaybackStopped(
 						PlaybackStopInfo(
-							itemId = item.id,
-							mediaSourceId = mediaSource.id,
+							itemId = itemId,
+							mediaSourceId = mediaSourceId,
 							positionTicks = endPosition?.inWholeTicks,
 							failed = false,
 						)
@@ -228,10 +264,11 @@ class ExternalPlayerActivity : FragmentActivity() {
 				Toast.makeText(this@ExternalPlayerActivity, R.string.video_error_unknown_error, Toast.LENGTH_LONG).show()
 			}
 
-			dataRefreshService.lastPlayback = Instant.now()
-			when (item.type) {
-				BaseItemKind.MOVIE -> dataRefreshService.lastMoviePlayback = Instant.now()
-				BaseItemKind.EPISODE -> dataRefreshService.lastTvPlayback = Instant.now()
+			val now = Instant.now()
+			dataRefreshService.lastPlayback = now
+			when (currentItem?.first?.type) {
+				BaseItemKind.MOVIE -> dataRefreshService.lastMoviePlayback = now
+				BaseItemKind.EPISODE -> dataRefreshService.lastTvPlayback = now
 				else -> Unit
 			}