From cecd1ffe9512b8647ea50223f0015624658134e8 Mon Sep 17 00:00:00 2001
From: max <max@mustermann.de>
Date: Fri, 28 Aug 2026 22:41:03 +0200
Subject: [PATCH] Move restoreQuality handling before the started check so it
 runs on first bind

---
 .../xtra/ui/player/ExoPlayerFragment.kt          | 16 ++++++++--------
 .../xtra/ui/player/MediaPlayerFragment.kt        | 16 ++++++++--------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/com/github/andreyasadchy/xtra/ui/player/ExoPlayerFragment.kt b/app/src/main/java/com/github/andreyasadchy/xtra/ui/player/ExoPlayerFragment.kt
index ba77e6f17..0fb22b41d 100644
--- a/app/src/main/java/com/github/andreyasadchy/xtra/ui/player/ExoPlayerFragment.kt
+++ b/app/src/main/java/com/github/andreyasadchy/xtra/ui/player/ExoPlayerFragment.kt
@@ -167,6 +167,10 @@ class ExoPlayerFragment : PlayerFragment() {
         val serviceListener = object : ExoPlayerService.Listener {
             override fun started() {
                 if (view != null) {
+                    if (playbackService?.restoreQuality == true) {
+                        playbackService?.restoreQuality = false
+                        changeQuality(playbackService?.previousQuality)
+                    }
                     if (!started) {
                         if (isInitialized || !enableNetworkCheck) {
                             started = true
@@ -174,10 +178,6 @@ class ExoPlayerFragment : PlayerFragment() {
                         }
                     } else {
                         chatFragment?.startReplayChatLoad()
-                        if (playbackService?.restoreQuality == true) {
-                            playbackService?.restoreQuality = false
-                            changeQuality(playbackService?.previousQuality)
-                        }
                     }
                 }
             }
@@ -280,6 +280,10 @@ class ExoPlayerFragment : PlayerFragment() {
                         }
                     }
                     if (playbackService?.started == true) {
+                        if (playbackService?.restoreQuality == true) {
+                            playbackService?.restoreQuality = false
+                            changeQuality(playbackService?.previousQuality)
+                        }
                         if (!started) {
                             if (isInitialized || !enableNetworkCheck) {
                                 started = true
@@ -287,10 +291,6 @@ class ExoPlayerFragment : PlayerFragment() {
                             }
                         } else {
                             chatFragment?.startReplayChatLoad()
-                            if (playbackService?.restoreQuality == true) {
-                                playbackService?.restoreQuality = false
-                                changeQuality(playbackService?.previousQuality)
-                            }
                         }
                     }
                     playbackService?.player?.let { player ->
diff --git a/app/src/main/java/com/github/andreyasadchy/xtra/ui/player/MediaPlayerFragment.kt b/app/src/main/java/com/github/andreyasadchy/xtra/ui/player/MediaPlayerFragment.kt
index 994f1d254..00b80b746 100644
--- a/app/src/main/java/com/github/andreyasadchy/xtra/ui/player/MediaPlayerFragment.kt
+++ b/app/src/main/java/com/github/andreyasadchy/xtra/ui/player/MediaPlayerFragment.kt
@@ -83,6 +83,10 @@ class MediaPlayerFragment : PlayerFragment() {
         val serviceListener = object : MediaPlayerService.Listener {
             override fun started() {
                 if (view != null) {
+                    if (playbackService?.restoreQuality == true) {
+                        playbackService?.restoreQuality = false
+                        changeQuality(playbackService?.previousQuality)
+                    }
                     if (!started) {
                         if (isInitialized || !enableNetworkCheck) {
                             started = true
@@ -90,10 +94,6 @@ class MediaPlayerFragment : PlayerFragment() {
                         }
                     } else {
                         chatFragment?.startReplayChatLoad()
-                        if (playbackService?.restoreQuality == true) {
-                            playbackService?.restoreQuality = false
-                            changeQuality(playbackService?.previousQuality)
-                        }
                     }
                 }
             }
@@ -225,6 +225,10 @@ class MediaPlayerFragment : PlayerFragment() {
                         }
                     }
                     if (playbackService?.started == true) {
+                        if (playbackService?.restoreQuality == true) {
+                            playbackService?.restoreQuality = false
+                            changeQuality(playbackService?.previousQuality)
+                        }
                         if (!started) {
                             if (isInitialized || !enableNetworkCheck) {
                                 started = true
@@ -232,10 +236,6 @@ class MediaPlayerFragment : PlayerFragment() {
                             }
                         } else {
                             chatFragment?.startReplayChatLoad()
-                            if (playbackService?.restoreQuality == true) {
-                                playbackService?.restoreQuality = false
-                                changeQuality(playbackService?.previousQuality)
-                            }
                         }
                     }
                     playbackService?.player?.let { player ->