diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 653c2e4479..fd33cca6ab 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -503,6 +503,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde private var upscaler by mutableStateOf(0) private var upscaleSharpness by mutableStateOf(75) private var effects by mutableStateOf(ScreenEffects.OFF) + private var observedScreenEffectsProfileId by mutableStateOf(null) private var cardboard by mutableStateOf(Cardboard.OFF) private var headTracker: HeadTracker? = null private var steamVrStatus by mutableStateOf(null) @@ -548,6 +549,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde private val screenEffectsProfilePrefListener = android.content.SharedPreferences.OnSharedPreferenceChangeListener { _, key -> if (key == SessionPrefs.SCREEN_EFFECTS_ACTIVE_PROFILE_KEY) uiHandler.post { val profileId = SessionPrefs.activeScreenEffectsProfileId(this@SessionActivity) + observedScreenEffectsProfileId = profileId effects = SessionPrefs.screenEffects(this@SessionActivity, profileId) effects.push(upscaler) } @@ -1986,13 +1988,19 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde } private fun currentScreenEffectsProfileId(): String? { - if (SessionState.running) return SessionPrefs.activeScreenEffectsProfileId(this) + if (SessionState.running) { + return observedScreenEffectsProfileId + ?: SessionPrefs.activeScreenEffectsProfileId(this) + } val mode = intent.getStringExtra(SessionService.EXTRA_MODE) ?: SessionService.MODE_STEAM - val gameId = intent.getStringExtra(SessionService.EXTRA_GAME_ID) + val explicitGameId = intent.getStringExtra(SessionService.EXTRA_GAME_ID) ?.trim() - ?.takeIf { it.isNotEmpty() } - ?: intent.getStringExtra(SessionService.EXTRA_STEAM_URL) - ?.let { Regex("""(?:run|rungameid|launch)/(\d+)""", RegexOption.IGNORE_CASE).find(it)?.groupValues?.get(1) } + ?.takeIf(com.droiddeck.launcher.frontend.GameLaunchLink::validId) + val steamUrlGameId = intent.getStringExtra(SessionService.EXTRA_STEAM_URL) + ?.takeIf { it.startsWith("steam://rungameid/") } + ?.removePrefix("steam://rungameid/") + ?.takeIf(com.droiddeck.launcher.frontend.GameLaunchLink::validId) + val gameId = explicitGameId ?: steamUrlGameId return SessionPrefs.screenEffectsProfileId( mode, @@ -5060,6 +5068,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde if (!pipUi) sessionClipboard.start() updatePadMotion() ControllerPrefs.prefs(this).registerOnSharedPreferenceChangeListener(shortcutPrefListener) + observedScreenEffectsProfileId = SessionPrefs.activeScreenEffectsProfileId(this) readPrefs() refreshInputProfile() refreshControls()