bump version to 1.7.3; enhance login handling with success flag; improve authentication checks in MusicService

Author: sphildreth

src/app/build.gradle.kts

@@ -16,7 +16,7 @@ android {
         minSdk = 21
         targetSdk = 35
         versionCode = 11
-        versionName = "1.7.2"
+        versionName = "1.7.3"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {

src/app/src/main/java/com/melodee/autoplayer/presentation/ui/MainActivity.kt

@@ -27,6 +27,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.core.content.ContextCompat
@@ -249,30 +250,31 @@ fun MainScreen(
         }
     }
 
-    // Handle navigation based on authentication state changes
+    // Handle navigation when user becomes unauthenticated (e.g., logout or session expiry)
     LaunchedEffect(isAuthenticated) {
         val currentRoute = navController.currentDestination?.route
+        Log.d("MainActivity", "LaunchedEffect(isAuthenticated): isAuthenticated=$isAuthenticated, currentRoute=$currentRoute")
 
-        if (isAuthenticated && currentRoute == "login") {
-            Log.d("MainActivity", "User became authenticated, navigating to home")
-            navController.navigate("home") {
-                popUpTo("login") { inclusive = true }
-            }
-        } else if (!isAuthenticated && currentRoute != "login") {
+        // Only handle logout case - login navigation is handled directly in onLoginSuccess callback
+        if (!isAuthenticated && currentRoute != null && currentRoute != "login") {
             Log.d("MainActivity", "User became unauthenticated, navigating to login")
             navController.navigate("login") {
                 popUpTo(0) { inclusive = true }
             }
         }
     }
 
-    // Determine start destination based on authentication state
-    val startDestination = if (isAuthenticated) {
-        Log.d("MainActivity", "User is authenticated, starting with home screen")
-        "home"
-    } else {
-        Log.d("MainActivity", "User not authenticated, starting with login screen") 
-        "login"
+    // Determine start destination based on INITIAL authentication state only
+    // Using rememberSaveable ensures this is only computed once and survives recomposition
+    // Navigation after login is handled by LaunchedEffect(isAuthenticated) above
+    val startDestination = rememberSaveable {
+        if (authenticationManager.isAuthenticated.value) {
+            Log.d("MainActivity", "User is authenticated, starting with home screen")
+            "home"
+        } else {
+            Log.d("MainActivity", "User not authenticated, starting with login screen") 
+            "login"
+        }
     }
 
     // Set up ViewModels when user is authenticated
@@ -547,8 +549,11 @@ fun MainScreen(
                         // Reinitialize scrobble manager with user information
                         onLoginSuccess(authResponse)
 
-                        // Don't manually navigate here - let LaunchedEffect(isAuthenticated) handle it
-                        // This prevents double navigation which can cause the app to minimize
+                        // Navigate to home screen after successful login
+                        Log.d("MainActivity", "Login successful, navigating to home")
+                        navController.navigate("home") {
+                            popUpTo("login") { inclusive = true }
+                        }
                     }
                 )
             }

src/app/src/main/java/com/melodee/autoplayer/presentation/ui/login/LoginScreen.kt

@@ -34,6 +34,7 @@ fun LoginScreen(
     var emailOrUsername by remember { mutableStateOf("") }
     var password by remember { mutableStateOf("") }
     var serverUrl by remember { mutableStateOf(viewModel.serverUrl) }
+    var hasHandledSuccess by remember { mutableStateOf(false) }
 
     val loginState by viewModel.loginState.collectAsStateWithLifecycle()
     val isLoading by viewModel.isLoading.collectAsStateWithLifecycle()
@@ -53,11 +54,14 @@ fun LoginScreen(
     // Function to handle login
     val handleLogin = {
         keyboardController?.hide()
+        hasHandledSuccess = false  // Reset flag for new login attempt
         viewModel.login(emailOrUsername, password, serverUrl)
     }
 
+    // Handle login success only once per successful login
     LaunchedEffect(loginState) {
-        if (loginState is LoginState.Success) {
+        if (loginState is LoginState.Success && !hasHandledSuccess) {
+            hasHandledSuccess = true
             onLoginSuccess((loginState as LoginState.Success).response)
         }
     }

src/app/src/main/java/com/melodee/autoplayer/service/MusicService.kt

@@ -313,8 +313,7 @@ class MusicService : MediaBrowserServiceCompat() {
 
     private fun loadPlaylists(result: Result<List<MediaBrowserCompat.MediaItem>>) {
         // Check authentication first
-        val authToken = NetworkModule.getAuthToken()
-        if (authToken.isNullOrEmpty()) {
+        if (!ensureAuthentication()) {
             Log.w("MusicService", "No auth token available for playlists")
             val errorItems = listOf(
                 MediaBrowserCompat.MediaItem(
@@ -454,8 +453,7 @@ class MusicService : MediaBrowserServiceCompat() {
 
     private fun loadPlaylistSongs(playlistId: String, result: Result<List<MediaBrowserCompat.MediaItem>>) {
         // Check authentication first
-        val authToken = NetworkModule.getAuthToken()
-        if (authToken.isNullOrEmpty()) {
+        if (!ensureAuthentication()) {
             Log.w("MusicService", "No auth token available for playlist songs")
             val errorItems = listOf(
                 MediaBrowserCompat.MediaItem(
@@ -698,10 +696,10 @@ class MusicService : MediaBrowserServiceCompat() {
                 Log.d("MusicService", "Starting API search for: '$query'")
 
                 // Check if we have authentication
-                val authToken = NetworkModule.getAuthToken()
-                Log.d("MusicService", "Auth token available: ${!authToken.isNullOrEmpty()}")
+                val isAuthenticated = ensureAuthentication()
+                Log.d("MusicService", "Auth token available: $isAuthenticated")
 
-                if (authToken.isNullOrEmpty()) {
+                if (!isAuthenticated) {
                     Log.w("MusicService", "No auth token available for search")
                     return@withContext listOf(
                         MediaBrowserCompat.MediaItem(
@@ -2372,6 +2370,24 @@ class MusicService : MediaBrowserServiceCompat() {
         return isFullyAuthenticated
     }
 
+    private fun ensureAuthentication(): Boolean {
+        // Fast path: if NetworkModule has token, we are good
+        if (NetworkModule.isAuthenticated()) {
+            return true
+        }
+        
+        Log.w("MusicService", "NetworkModule not authenticated, attempting to restore from storage")
+        
+        // Try to restore from persistent storage
+        if (authenticationManager.restoreAuthenticationFromStorage()) {
+            Log.i("MusicService", "Authentication restored from storage")
+            return true
+        }
+        
+        Log.w("MusicService", "Failed to restore authentication")
+        return false
+    }
+
     private fun handlePlaybackFailure(song: Song, error: Exception) {
         Log.e("MusicService", "=== PLAYBACK FAILURE HANDLER ===")
         Log.e("MusicService", "Failed song: ${song.title}")