Fix system screensaver starting during video playback

jellyfin · Dec 10, 2023 · d9eb849 · d9eb849
1 parent 67581d1
commit d9eb849
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 6 deletions.
diff --git a/app/src/main/java/org/jellyfin/androidtv/ui/ScreensaverViewModel.kt b/app/src/main/java/org/jellyfin/androidtv/ui/ScreensaverViewModel.kt
@@ -18,11 +18,20 @@ class ScreensaverViewModel(
 ) : ViewModel() {
 	private var timer: Job? = null
 	private var locks = 0
-	val enabled get() = userPreferences[UserPreferences.screensaverInAppEnabled]
+
+	// 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
@@ -38,17 +47,20 @@ class ScreensaverViewModel(
 		timer?.cancel()
 
 		// Hide when interacted with allowed cancelation or when disabled
-		if (_visible.value && (canCancel || !enabled || activityPaused)) {
+		if (_visible.value && (canCancel || !inAppEnabled || activityPaused)) {
 			_visible.value = false
 		}
 
 		// Create new timer to show screensaver when enabled
-		if (enabled && !activityPaused && locks == 0) {
+		if (inAppEnabled && !activityPaused && locks == 0) {
 			timer = viewModelScope.launch {
 				delay(timeout)
 				_visible.value = true
 			}
 		}
+
+		// Update KEEP_SCREEN_ON flag value
+		_keepScreenOn.value = inAppEnabled || locks > 0
 	}
 
 	/**

diff --git a/app/src/main/java/org/jellyfin/androidtv/ui/browsing/MainActivity.kt b/app/src/main/java/org/jellyfin/androidtv/ui/browsing/MainActivity.kt
@@ -56,6 +56,12 @@ class MainActivity : FragmentActivity() {
 
 		if (!validateAuthentication()) return
 
+		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)
+
 		onBackPressedDispatcher.addCallback(this, backPressedCallback)
 
 		supportFragmentManager.addOnBackStackChangedListener {
@@ -87,9 +93,6 @@ class MainActivity : FragmentActivity() {
 		applyTheme()
 
 		screensaverViewModel.activityPaused = false
-
-		if (screensaverViewModel.enabled) window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
-		else window.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
 	}
 
 	private fun validateAuthentication(): Boolean {