Battlescreen login loop fix

This commit is contained in:
Taveon Nelson 2026-05-18 05:46:40 -05:00
parent 9aa62f0d81
commit 431be5faea
2 changed files with 4 additions and 17 deletions

View File

@ -23,9 +23,6 @@ import com.github.nacabaro.vbhelper.screens.cardScreen.CardScreenControllerImpl
import com.github.nacabaro.vbhelper.screens.spriteViewer.SpriteViewerControllerImpl import com.github.nacabaro.vbhelper.screens.spriteViewer.SpriteViewerControllerImpl
import com.github.nacabaro.vbhelper.screens.storageScreen.StorageScreenControllerImpl import com.github.nacabaro.vbhelper.screens.storageScreen.StorageScreenControllerImpl
import com.github.nacabaro.vbhelper.ui.theme.VBHelperTheme import com.github.nacabaro.vbhelper.ui.theme.VBHelperTheme
import androidx.lifecycle.lifecycleScope
import kotlinx.coroutines.launch
import kotlinx.coroutines.Dispatchers
class MainActivity : ComponentActivity() { class MainActivity : ComponentActivity() {
@ -119,19 +116,9 @@ class MainActivity : ComponentActivity() {
val hasAuthToken = !token.isNullOrEmpty() val hasAuthToken = !token.isNullOrEmpty()
if (isAppAuthCallback || isLocalhostAuthCallback || hasAuthToken) { if (isAppAuthCallback || isLocalhostAuthCallback || hasAuthToken) {
if (!token.isNullOrEmpty()) { // BattlesScreen consumes the callback intent and exchanges the single-use token
val application = applicationContext as VBHelper // for a durable session token. Writing partial auth state here can clear an
val authRepository = com.github.nacabaro.vbhelper.battle.BattleAuthContainer(this).authRepository // already-valid session token and cause the browser login loop to restart.
val userId = data.getQueryParameter("userId")?.toLongOrNull()
lifecycleScope.launch(Dispatchers.IO) {
authRepository.setAuthenticated(
isAuthenticated = true,
nacatechToken = token,
userId = userId
)
}
}
return NavigationItems.Battles.route return NavigationItems.Battles.route
} }
} }

File diff suppressed because one or more lines are too long