diff --git a/app/src/main/java/com/droiddeck/launcher/MainActivity.kt b/app/src/main/java/com/droiddeck/launcher/MainActivity.kt index 6c659c6b48..4c8b16e9f2 100644 --- a/app/src/main/java/com/droiddeck/launcher/MainActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/MainActivity.kt @@ -208,6 +208,7 @@ class MainActivity : ComponentActivity() { private var customResolution by mutableStateOf?>(null) private var fexPreset by mutableStateOf("") private var steamChannel by mutableStateOf("publicbeta") + private var runSteamAtStartup by mutableStateOf(false) private var theme by mutableStateOf("graphite") private var shapeMode by mutableStateOf(SessionPrefs.SHAPE_AUTO) private var hdrOn by mutableStateOf(false) @@ -313,7 +314,7 @@ class MainActivity : ComponentActivity() { launcherFullscreen = launcherFullscreen, ), FrontEndActions( - onPlay = { startSession(Intent(this, SessionActivity::class.java), steamSession = true) }, + onPlay = { startSteamSession() }, // Steam's desktop client as a window on the desktop: under gamescope the // client puts itself into Big Picture whatever it is started with. onPlayDesktopUi = { @@ -479,6 +480,8 @@ class MainActivity : ComponentActivity() { } } + if (savedInstanceState == null) ui.post { startSteamAtStartupIfEnabled() } + // The session's logs land in Downloads so a failed run can be handed over as a folder // rather than dug out of app-private storage. targetSdk 28 means the old permission still // grants exactly that. @@ -501,6 +504,20 @@ class MainActivity : ComponentActivity() { }, "finish-abandoned").start() } + override fun onNewIntent(intent: Intent) { + super.onNewIntent(intent) + setIntent(intent) + startSteamAtStartupIfEnabled() + } + + private fun startSteamAtStartupIfEnabled() { + if (SessionPrefs.runSteamAtStartup(this) && !isFinishing && !isDestroyed) startSteamSession() + } + + private fun startSteamSession() { + startSession(Intent(this, SessionActivity::class.java), steamSession = true) + } + override fun onWindowFocusChanged(hasFocus: Boolean) { super.onWindowFocusChanged(hasFocus) if (hasFocus) applyLauncherFullscreen() @@ -889,6 +906,7 @@ class MainActivity : ComponentActivity() { storageOptions = storageOptions, fexPreset = if (mode == SessionService.MODE_STEAM) fexPreset else null, steamChannel = if (mode == SessionService.MODE_STEAM) steamChannel else null, + runSteamAtStartup = mode == SessionService.MODE_STEAM && runSteamAtStartup, addedGamesDirs = if (mode == SessionService.MODE_STEAM) addedGamesDirs else null, addedGames = if (mode == SessionService.MODE_STEAM) addedGames else emptyList(), addedGamesArt = addedGamesArt, @@ -939,6 +957,10 @@ class MainActivity : ComponentActivity() { }, onFexPreset = { id -> SessionPrefs.setFexPreset(this, id); fexPreset = id }, onSteamChannel = { id -> SessionPrefs.setSteamChannel(this, id); steamChannel = id }, + onRunSteamAtStartup = { on -> + SessionPrefs.setRunSteamAtStartup(this, on) + runSteamAtStartup = on + }, onPickAddedGamesDir = { pickAddedGamesDir.launch(InAppFilePicker.buildDirIntent(this, "Choose a folder of your own games", addedGamesDirs.lastOrNull())) }, onAddedGamesArt = { on -> SessionPrefs.setAddedGamesArt(this, on); addedGamesArt = on; if (on) refreshAddedGames() }, onForgetAddedGamesDir = { dir -> SessionPrefs.setAddedGamesDirs(this, addedGamesDirs - dir); addedGamesDirs = SessionPrefs.addedGamesDirs(this); refreshAddedGames(); refresh() }, @@ -1017,6 +1039,7 @@ class MainActivity : ComponentActivity() { customResolution = SessionPrefs.customResolution(this, mode) fexPreset = SessionPrefs.fexPreset(this) steamChannel = SessionPrefs.steamChannel(this) + runSteamAtStartup = SessionPrefs.runSteamAtStartup(this) addedGamesDirs = SessionPrefs.addedGamesDirs(this) refreshAddedGames() shapeMode = SessionPrefs.shapeMode(this) diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt index 603ddb80c6..13e680c886 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -313,6 +313,13 @@ object SessionPrefs { prefs(context).edit().putString("steamChannel", id).apply() } + /** Whether opening DroidDeck starts a Steam session instead of showing the front end. */ + fun runSteamAtStartup(context: Context): Boolean = prefs(context).getBoolean("runSteamAtStartup", false) + + fun setRunSteamAtStartup(context: Context, on: Boolean) { + prefs(context).edit().putBoolean("runSteamAtStartup", on).apply() + } + /** * The folders of the user's own Windows games (one game per subfolder), any number of them * from anywhere on the device. The single folder an earlier build kept is carried in. diff --git a/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt b/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt index b0508b9c72..2bdea340f7 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt @@ -66,6 +66,8 @@ class ModeSettings( val forceFullscreen: Boolean? = null, /** Steam only: the client branch forced on the command line. */ val steamChannel: String? = null, + /** Steam only: start a Steam session when DroidDeck opens. */ + val runSteamAtStartup: Boolean = false, /** Steam only: the user's chosen Games folders; null outside Steam. */ val addedGamesDirs: List? = null, val addedGames: List = emptyList(), @@ -119,6 +121,7 @@ class ModeSettingsActions( val onFexPreset: (String) -> Unit = {}, val onForceFullscreen: (Boolean) -> Unit = {}, val onSteamChannel: (String) -> Unit = {}, + val onRunSteamAtStartup: (Boolean) -> Unit = {}, val onPickAddedGamesDir: () -> Unit = {}, val onForgetAddedGamesDir: (path: String) -> Unit = {}, val onAddedGamesArt: (Boolean) -> Unit = {}, @@ -273,6 +276,13 @@ fun ModeSettingsPage(s: ModeSettings, a: ModeSettingsActions) { onPick = a.onSuspendPolicy, ) } + if (steam) SettingsGroup("Startup") { + ToggleRow( + host, "steam-startup", "Run Steam when DroidDeck starts", + "Open the Steam session when you launch DroidDeck.", + s.runSteamAtStartup, onChange = a.onRunSteamAtStartup, + ) + } if (steam) SettingsGroup("Decky") { val updateAvailable = s.deckyInstalled != null && s.deckyLatestRelease != null && s.deckyInstalled != s.deckyLatestRelease.tag diff --git a/tools/build_local.sh b/tools/build_local.sh index ecadeb36e5..09040662f7 100755 --- a/tools/build_local.sh +++ b/tools/build_local.sh @@ -290,7 +290,7 @@ rm -f "${apk}.aligned" "${apk}.idsig" signature_output=$("${build_tools}/apksigner" verify --min-sdk-version 21 --verbose --print-certs "${apk}") printf '%s\n' "${signature_output}" -if ! unzip -l "${apk}" | grep -qE 'META-INF/.*\.(SF|RSA|DSA)$'; then +if ! unzip -l "${apk}" | grep -E 'META-INF/.*\.(SF|RSA|DSA)$' >/dev/null; then echo "APK signature check failed: JAR signature files are missing." >&2 exit 1 fi