nacabaro/vbhelper
1
0
Fork 0
mirror of https://github.com/nacabaro/vbhelper.git synced 2026-06-05 13:52:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed logout when swapping from screen orientation.

Browse Source
This commit is contained in:
lightheel 2025-11-17 16:52:07 -05:00
parent 67b56b3990
commit d1908d629a
1 changed files with 41 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
app/src/main/java/com/github/nacabaro/vbhelper/screens/BattlesScreen.kt
View File

@ -20,6 +20,7 @@ import androidx.compose.material3.Button
import androidx.compose.runtime.getValue import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember import androidx.compose.runtime.remember
import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.runtime.setValue import androidx.compose.runtime.setValue
import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.layout.ContentScale
import androidx.compose.ui.draw.scale import androidx.compose.ui.draw.scale
@ -1584,7 +1585,8 @@ fun BattlesScreen() {
var isCheckingAuth by remember { mutableStateOf(true) } var isCheckingAuth by remember { mutableStateOf(true) }
var userId by remember { mutableStateOf<Long?>(null) } var userId by remember { mutableStateOf<Long?>(null) }
// Track processed tokens to prevent duplicate API calls // Track processed tokens to prevent duplicate API calls
var processedTokens by remember { mutableStateOf<Set<String>>(emptySet()) } // Use rememberSaveable to persist across configuration changes (screen rotation)
var processedTokens by rememberSaveable { mutableStateOf<Set<String>>(emptySet()) }
var opponentsList by remember { mutableStateOf(ArrayList<APIBattleCharacter>()) } var opponentsList by remember { mutableStateOf(ArrayList<APIBattleCharacter>()) }
@ -1790,6 +1792,16 @@ fun BattlesScreen() {
userId = storedUserId userId = storedUserId
} }
// If we have a stored token, set authenticated state optimistically FIRST (before checking deep links)
// This must happen immediately to prevent UI from showing "Checking authentication"
if (localAuthState && storedToken != null && storedToken.isNotEmpty()) {
// Set authenticated state immediately to prevent redirect on rotation and show UI
isAuthenticated = true
isCheckingAuth = false
userId = storedUserId
println("BATTLESCREEN: Restored authentication state from storage (userId: $storedUserId) - isCheckingAuth set to false")
}
// Only check for token in intent if it's a fresh deep link (ACTION_VIEW intent) // Only check for token in intent if it's a fresh deep link (ACTION_VIEW intent)
// This prevents processing stale tokens from previous sessions // This prevents processing stale tokens from previous sessions
val activity = context as? ComponentActivity val activity = context as? ComponentActivity
@ -1805,9 +1817,10 @@ fun BattlesScreen() {
} }
} }
// If we have a stored token, validate it with the server // If we have a stored token, validate it with the server in the background
if (localAuthState && storedToken != null && storedToken.isNotEmpty()) { if (localAuthState && storedToken != null && storedToken.isNotEmpty()) {
println("BATTLESCREEN: Validating stored token with server...") // State already set above, now validate in background
println("BATTLESCREEN: Validating stored token with server in background...")
RetrofitHelper().authenticate(context, storedToken) { response -> RetrofitHelper().authenticate(context, storedToken) { response ->
// Update UI on main thread // Update UI on main thread
kotlinx.coroutines.CoroutineScope(Dispatchers.Main).launch { kotlinx.coroutines.CoroutineScope(Dispatchers.Main).launch {
@ -1825,17 +1838,31 @@ fun BattlesScreen() {
userId = extractedUserId userId = extractedUserId
} else { } else {
println("BATTLESCREEN: Token validation failed: ${response.message}") println("BATTLESCREEN: Token validation failed: ${response.message}")
// Clear authentication state // Check if it's a critical error that requires re-authentication
kotlinx.coroutines.CoroutineScope(Dispatchers.IO).launch { // (e.g., "Invalid user nonce" means token was already used)
authRepository.logout() val isCriticalError = response.message?.contains("Invalid user nonce") == true ||
response.message?.contains("nonce") == true ||
response.message?.contains("invalid") == true ||
response.message?.contains("expired") == true
if (isCriticalError) {
// Critical error - token is invalid, need to re-authenticate
println("BATTLESCREEN: Critical authentication error, clearing state and redirecting")
kotlinx.coroutines.CoroutineScope(Dispatchers.IO).launch {
authRepository.logout()
}
isAuthenticated = false
isCheckingAuth = false
// Open auth URL
val authUrl = "http://auth.nacatech.es/begin?app=443654920&redirect_uri=vbhelper://auth?token="
val authIntent = Intent(Intent.ACTION_VIEW, Uri.parse(authUrl))
context.startActivity(authIntent)
println("BATTLESCREEN: Opened auth URL after critical validation failure: $authUrl")
} else {
// Non-critical error (e.g., network issue) - keep authenticated state
// This prevents redirect on rotation if validation fails due to network
println("BATTLESCREEN: Non-critical validation error, keeping authenticated state")
} }
isAuthenticated = false
isCheckingAuth = false
// Open auth URL
val authUrl = "http://auth.nacatech.es/begin?app=443654920&redirect_uri=vbhelper://auth?token="
val authIntent = Intent(Intent.ACTION_VIEW, Uri.parse(authUrl))
context.startActivity(authIntent)
println("BATTLESCREEN: Opened auth URL after validation failure: $authUrl")
} }
} }
} }
@ -2067,7 +2094,7 @@ fun BattlesScreen() {
// Only show TopBanner when not in battle mode // Only show TopBanner when not in battle mode
if (currentView != "battle-main" && currentView != "battle-results") { if (currentView != "battle-main" && currentView != "battle-results") {
TopBanner( TopBanner(
text = "Online battles" text = "Online Battles"
) )
} }
} }