From 542bbf89c34102fbc6f3592b5a3e36829f4ac63e Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Fri, 6 Nov 2026 15:31:09 -0500 Subject: [PATCH] fix: launch Battle.net and store games from any game page tab (#2185) * fix(library): Keep one Play request per game and show Starting while it prepares * Track launch preparation per game * Keep each game preparing until its own worker finishes * Drop store lookups that finish after the activity ends --- .../droiddeck/launcher/FrontEndActivity.kt | 40 +++++++++++++++---- .../launcher/frontend/AutoComponents.kt | 4 +- .../droiddeck/launcher/frontend/Library.kt | 1 + .../droiddeck/launcher/ui/FrontEndScreen.kt | 2 + .../com/droiddeck/launcher/ui/GameDetail.kt | 6 ++- .../droiddeck/launcher/ui/StoresDownloads.kt | 4 +- .../com/droiddeck/launcher/ui/StoresPage.kt | 15 +------ 7 files changed, 46 insertions(+), 26 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index 13a96efc15..748048d335 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -207,6 +207,7 @@ class FrontEndActivity : ComponentActivity() { private var gameStoresSpeedTier by mutableStateOf("fast") private var navRequest by mutableStateOf(null) private val gameLaunchRequest = java.util.concurrent.atomic.AtomicLong() + private var preparingGames by mutableStateOf(emptySet()) private var storesShowMature by mutableStateOf(false) private var storesSort by mutableStateOf(SessionPrefs.STORES_SORTS.first()) private var storesView by mutableStateOf(SessionPrefs.DEFAULT_STORES_VIEW) @@ -1143,6 +1144,7 @@ class FrontEndActivity : ComponentActivity() { installed = installed, ready = ready, available = available?.version, removalPending = removalPending, runtimeActionsBlocked = runtimeChangesBlocked(), vkBridge = vkBridge, venus = venus, venusHostVulkan = venusHostVulkan, vkBridgeSafe = vkBridgeSafe, bridgeProtonDxvk = bridgeProtonDxvk, adreno = adrenoGpu, shortcutPicker = shortcutPicker, + preparingGames = preparingGames, shortcutLibraryScanning = shortcutLibraryScanning, gameSyncFolder = gameSyncFolder, busy = busy, stage = stage, percent = percent, @@ -1221,14 +1223,26 @@ class FrontEndActivity : ComponentActivity() { }, onSteamGame = { g -> if (shortcutPicker) chooseGameShortcut(g) - else { - val request = gameLaunchRequest.incrementAndGet() - com.droiddeck.launcher.frontend.AutoComponents.beforeLaunch(this, g) { - if (request != gameLaunchRequest.get() || isFinishing || isDestroyed) return@beforeLaunch - com.droiddeck.launcher.stores.StoreLaunch.prepare(this, g) { - if (request == gameLaunchRequest.get() && !isFinishing && !isDestroyed) launchGame(g) + else if (g.launchKey !in preparingGames) { + preparingGames = preparingGames + g.launchKey + prepareAndLaunch(g, g.launchKey) + } + }, + onStoreGame = { store, id -> + val key = "${store.id}:$id" + if (key !in preparingGames) { + preparingGames = preparingGames + key + val app = applicationContext + Thread({ + val g = runCatching { com.droiddeck.launcher.stores.StoreLaunch.installedGame(app, store, id) }.getOrNull() + runOnUiThread { + if (g != null && !isFinishing && !isDestroyed) prepareAndLaunch(g, key) + else { + preparingGames = preparingGames - key + if (g == null && !isFinishing && !isDestroyed) android.widget.Toast.makeText(this, R.string.stores_launch_not_registered, android.widget.Toast.LENGTH_LONG).show() + } } - } + }, "store-play").start() } }, onEpicLauncher = { openEpicLauncher() }, @@ -1955,6 +1969,18 @@ class FrontEndActivity : ComponentActivity() { if (Build.VERSION.SDK_INT >= 33) state.getParcelable(key, Intent::class.java) else @Suppress("DEPRECATION") state.getParcelable(key) + private fun prepareAndLaunch(g: Library.SteamGame, key: String) { + val request = gameLaunchRequest.incrementAndGet() + val done = { preparingGames = preparingGames - key } + com.droiddeck.launcher.frontend.AutoComponents.beforeLaunch(this, g, onBlocked = done) { + if (request != gameLaunchRequest.get() || isFinishing || isDestroyed) { done(); return@beforeLaunch } + com.droiddeck.launcher.stores.StoreLaunch.prepare(this, g) { + done() + if (request == gameLaunchRequest.get() && !isFinishing && !isDestroyed) launchGame(g) + } + } + } + override fun onDestroy() { gameLaunchRequest.incrementAndGet() cancelCompatLaunch() diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/AutoComponents.kt b/app/src/main/java/com/droiddeck/launcher/frontend/AutoComponents.kt index 1359ecf953..d6fe58ad7f 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/AutoComponents.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/AutoComponents.kt @@ -475,15 +475,15 @@ object AutoComponents { return true } - fun beforeLaunch(context: Context, game: Library.SteamGame, onReady: () -> Unit) { + fun beforeLaunch(context: Context, game: Library.SteamGame, onBlocked: () -> Unit = {}, onReady: () -> Unit) { val app = context.applicationContext Thread({ val ready = runCatching { prepareLaunch(app, game) }.getOrElse { Log.w(TAG, "${game.name}: launch repair discovery failed: ${it.javaClass.simpleName}: ${it.message}") false } + Handler(Looper.getMainLooper()).post(if (ready) onReady else onBlocked) queueGame(app, game, asked = false) - if (ready) Handler(Looper.getMainLooper()).post(onReady) }, "auto-components-launch").apply { isDaemon = true; start() } } diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt b/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt index 723181f080..ef7ec06a10 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt @@ -23,6 +23,7 @@ object Library { SteamGame(appId, name, art, library, gameId, hero, lastPlayed, gameFiles, protonPrefix, icon, source, storeId, logo) val gameIdString: String get() = java.lang.Long.toUnsignedString(gameId) + val launchKey: String get() = if (storeId != null) "$source:$storeId" else gameIdString val profileKey: String get() = when { source == com.droiddeck.launcher.stores.Store.BATTLENET.id -> com.droiddeck.launcher.runtime.BattleNet.APP_ID.toString() library == ADDED -> java.lang.Integer.toUnsignedString(appId) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt index fda8c6fedb..f4900797ae 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt @@ -122,6 +122,7 @@ class FrontEndState( val frameGen: FrameGen.Mode = FrameGen.Mode.OFF, val lossless: Lossless.State = Lossless.State.NONE, val shortcutPicker: Boolean = false, + val preparingGames: Set = emptySet(), val shortcutLibraryScanning: Boolean = false, val gameSyncFolder: String? = null, val pageKey: String? = null, @@ -188,6 +189,7 @@ class FrontEndActions( val onPlayDesktopUi: () -> Unit, val onSteamUrl: (String) -> Unit = {}, val onSteamGame: (Library.SteamGame) -> Unit, + val onStoreGame: (com.droiddeck.launcher.stores.Store, String) -> Unit = { _, _ -> }, val onGameShortcut: (Library.SteamGame) -> Unit = {}, val onExportGameFile: (Library.SteamGame) -> Unit = {}, val onSyncGameFiles: () -> Unit = {}, diff --git a/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt b/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt index e1e027d78f..390295f696 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt @@ -408,11 +408,13 @@ internal fun GameActions( !cloud && (game != null || installed != null) -> { val gone = storeKey?.let { StoresState.uninstalling[it] } val xboxBusy = store == Store.XBOX && id != null && XboxContent.busy(id) + val preparing = (game?.launchKey ?: storeKey)?.let { it in s.preparingGames } == true PrimaryButton( - stringResource(R.string.stores_play), enabled = !s.busy && gone == null && download == null && !xboxBusy && (store != Store.GOG || installed?.sidecar?.isInstalled != false), + stringResource(if (preparing) R.string.store_starting else R.string.stores_play), + enabled = !s.busy && !preparing && gone == null && download == null && !xboxBusy && (store != Store.GOG || installed?.sidecar?.isInstalled != false), main = true, icon = Icons.Filled.PlayArrow, modifier = leadOn, ) { - if (game != null) a.onSteamGame(game) else if (store != null && id != null) launchStoreGame(ctx, store, id, s, a) + if (game != null) a.onSteamGame(game) else if (store != null && id != null) launchStoreGame(store, id, s, a) } if (game != null) { if (compactMenu) GameMoreMenu(game, a) else { diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StoresDownloads.kt b/app/src/main/java/com/droiddeck/launcher/ui/StoresDownloads.kt index e4b70af9fe..8988e16a17 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoresDownloads.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoresDownloads.kt @@ -221,7 +221,7 @@ private fun FinishedRow(d: DownloadEntry, s: FrontEndState, a: FrontEndActions, ArtStrip(d.cover, d.name) { StripLabel(d.name, d.store.id, stringResource(if (d.state == DownloadState.INSTALLED) R.string.stores_installed_chip else R.string.stores_dl_cancelled), Color.White.copy(alpha = 0.72f)) if (d.state == DownloadState.INSTALLED) Box(Modifier.bloomIn(bloom, GATHER_HOLD_MS + 150)) { - RoundAction(Icons.Filled.PlayArrow, stringResource(R.string.stores_play), primary = true) { if (d.key == EpicClient.DOWNLOAD_KEY) a.onEpicLauncher() else if (d.key == com.droiddeck.launcher.stores.battlenet.BattleNetClient.DOWNLOAD_KEY) a.onBattleNet() else launchStoreGame(ctx, d.store, d.id, s, a) } + RoundAction(Icons.Filled.PlayArrow, stringResource(R.string.stores_play), primary = true) { if (d.key == EpicClient.DOWNLOAD_KEY) a.onEpicLauncher() else if (d.key == com.droiddeck.launcher.stores.battlenet.BattleNetClient.DOWNLOAD_KEY) a.onBattleNet() else launchStoreGame(d.store, d.id, s, a) } } } } @@ -374,7 +374,7 @@ private fun DownloadCard(d: DownloadEntry, s: FrontEndState, a: FrontEndActions) CancelAction { DownloadQueue.clear(ctx, d.key) } } DownloadState.INSTALLED -> Box(Modifier.bloomIn(true, 420)) { - RoundAction(Icons.Filled.PlayArrow, stringResource(R.string.stores_play), primary = true) { if (d.key == EpicClient.DOWNLOAD_KEY) a.onEpicLauncher() else if (d.key == com.droiddeck.launcher.stores.battlenet.BattleNetClient.DOWNLOAD_KEY) a.onBattleNet() else launchStoreGame(ctx, d.store, d.id, s, a) } + RoundAction(Icons.Filled.PlayArrow, stringResource(R.string.stores_play), primary = true) { if (d.key == EpicClient.DOWNLOAD_KEY) a.onEpicLauncher() else if (d.key == com.droiddeck.launcher.stores.battlenet.BattleNetClient.DOWNLOAD_KEY) a.onBattleNet() else launchStoreGame(d.store, d.id, s, a) } } DownloadState.CANCELLED -> {} } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt index f9e2ed798f..c5f31f5d32 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt @@ -1430,18 +1430,7 @@ internal fun openUrl(ctx: android.content.Context, url: String) { runCatching { ctx.startActivity(android.content.Intent(android.content.Intent.ACTION_VIEW, android.net.Uri.parse(url)).addFlags(android.content.Intent.FLAG_ACTIVITY_NEW_TASK)) } } -internal fun launchStoreGame(ctx: android.content.Context, store: Store, id: String, s: FrontEndState, a: FrontEndActions) { +internal fun launchStoreGame(store: Store, id: String, s: FrontEndState, a: FrontEndActions) { val game = s.steamGames.firstOrNull { it.source == store.id && it.storeId == id } - if (game != null) { - a.onSteamGame(game) - return - } - val app = ctx.applicationContext - Thread({ - val installed = runCatching { com.droiddeck.launcher.stores.StoreLaunch.installedGame(app, store, id) }.getOrNull() - StoresState.post { - if (installed == null) android.widget.Toast.makeText(ctx, R.string.stores_launch_not_registered, android.widget.Toast.LENGTH_LONG).show() - else a.onSteamGame(installed) - } - }, "store-play").start() + if (game != null) a.onSteamGame(game) else a.onStoreGame(store, id) }