Fix and Enhance Real Steam Client Functionality With Focus on Reducing Black Screens

.gitmodules

@@ -4,3 +4,4 @@
 [submodule "app/src/main/cpp/lsfg-vk-android"]
 	path = app/src/main/cpp/lsfg-vk-android
 	url = https://github.com/GameNative/lsfg-vk-android.git
+	ignore = dirty

app/src/main/assets/box86_64/lightsteam.box64rc

@@ -1,5 +1,5 @@
 [steam.exe]
-BOX64_ENV=WINEARGS=-silent -no-browser -noreactlogin -no-dwrite -no-cef-sandbox -nooverlay -nobigpicture -nofriendsui -noshaders -novid -noverifyfiles -nointro -skipstreamingdrivers -norepairfiles -nohltv -nofasthtml -nocrashmonitor -no-shared-textures -disablehighdpi -cef-single-process -cef-in-process-gpu -single_core -cef-disable-d3d11 -cef-disable-sandbox -disable-winh264 -vrdisable -cef-disable-breakpad -cef-disable-gpu -cef-disable-hang-timeouts -cef-disable-seccomp-sandbox -cef-disable-extensions -cef-disable-remote-fonts -cef-enable-media-stream -cef-disable-accelerated-video-decode
+BOX64_ENV=WINEARGS=-no-browser -noreactlogin -no-dwrite -no-cef-sandbox -nooverlay -nobigpicture -nofriendsui -noshaders -novid -noverifyfiles -nointro -skipstreamingdrivers -norepairfiles -nohltv -nofasthtml -nocrashmonitor -no-shared-textures -disablehighdpi -cef-single-process -cef-in-process-gpu -single_core -cef-disable-d3d11 -cef-disable-sandbox -disable-winh264 -vrdisable -cef-disable-breakpad -cef-disable-gpu -cef-disable-hang-timeouts -cef-disable-seccomp-sandbox -cef-disable-extensions -cef-disable-remote-fonts -cef-enable-media-stream -cef-disable-accelerated-video-decode
 BOX64_ENV1=WINEDLLOVERRIDES=gameoverlayui,gameoverlayui64.exe=d
 
 [steamwebhelper.exe]

app/src/main/assets/box86_64/ultralightsteam.box64rc

@@ -1,5 +1,5 @@
 [steam.exe]
-BOX64_ENV=WINEARGS=-no-browser -noreactlogin -silent -no-dwrite -no-cef-sandbox -nooverlay -nofriendsui -nobigpicture -noshaders -novid -noverifyfiles -nointro -skipstreamingdrivers -norepairfiles -nohltv -nofasthtml -nocrashmonitor -no-shared-textures -disablehighdpi -cef-single-process -cef-in-process-gpu -single_core -cef-disable-d3d11 -cef-disable-sandbox -disable-winh264 -vrdisable -cef-disable-breakpad -cef-disable-gpu -cef-disable-hang-timeouts -cef-disable-seccomp-sandbox -cef-disable-gpu-compositing -cef-disable-extensions -cef-disable-remote-fonts -cef-enable-media-stream -cef-disable-accelerated-video-decode
+BOX64_ENV=WINEARGS=-no-browser -noreactlogin -no-dwrite -no-cef-sandbox -nooverlay -nofriendsui -nobigpicture -noshaders -novid -noverifyfiles -nointro -skipstreamingdrivers -norepairfiles -nohltv -nofasthtml -nocrashmonitor -no-shared-textures -disablehighdpi -cef-single-process -cef-in-process-gpu -single_core -cef-disable-d3d11 -cef-disable-sandbox -disable-winh264 -vrdisable -cef-disable-breakpad -cef-disable-gpu -cef-disable-hang-timeouts -cef-disable-seccomp-sandbox -cef-disable-gpu-compositing -cef-disable-extensions -cef-disable-remote-fonts -cef-enable-media-stream -cef-disable-accelerated-video-decode
 BOX64_ENV1=WINEDLLOVERRIDES=gameoverlayui,gameoverlayui64.exe=d
 
 [steamwebhelper.exe]

app/src/main/java/app/gamenative/PluviaApp.kt

@@ -13,6 +13,7 @@ import app.gamenative.service.DownloadService
 import app.gamenative.service.SteamService
 import app.gamenative.utils.ContainerMigrator
 import app.gamenative.utils.IntentLaunchManager
+import app.gamenative.utils.LudusaviRegistry
 import app.gamenative.utils.PlayIntegrity
 import java.io.File
 import javax.inject.Inject
@@ -89,6 +90,15 @@ class PluviaApp : SplitCompatApplication() {
             )
         }
 
+        // Prime the Ludusavi save-path registry in the background. The loader itself
+        // checks cache freshness (7-day TTL) and only hits the network when stale — so
+        // the SDK Cloud Save Bridge "Use Recommended" button and the launch-time prompt
+        // are both instant for users once the cache is populated.
+        appScope.launch {
+            runCatching { LudusaviRegistry.primeCache(applicationContext) }
+                .onFailure { Timber.w(it, "Background Ludusavi registry refresh failed") }
+        }
+
         // Clear any stale temporary config overrides from previous app sessions
         try {
             IntentLaunchManager.clearAllTemporaryOverrides()

app/src/main/java/app/gamenative/PrefManager.kt

@@ -468,6 +468,13 @@ object PrefManager {
             setPref(LAUNCH_REAL_STEAM, value)
         }
 
+    private val DISABLE_STEAM_OVERLAY = booleanPreferencesKey("disable_steam_overlay")
+    var disableSteamOverlay: Boolean
+        get() = getPref(DISABLE_STEAM_OVERLAY, true)
+        set(value) {
+            setPref(DISABLE_STEAM_OVERLAY, value)
+        }
+
     private val LAUNCH_BIONIC_STEAM = booleanPreferencesKey("launch_bionic_steam")
     var launchBionicSteam: Boolean
         get() = getPref(LAUNCH_BIONIC_STEAM, false)

app/src/main/java/app/gamenative/ui/PluviaMain.kt

@@ -91,12 +91,12 @@ import app.gamenative.ui.theme.PluviaTheme
 import app.gamenative.ui.util.SnackbarManager
 import app.gamenative.utils.BestConfigService
 import app.gamenative.utils.ContainerUtils
+import app.gamenative.utils.SteamUtils
 import app.gamenative.utils.PlatformAuthUtils
 import app.gamenative.utils.CustomGameScanner
 import app.gamenative.utils.ManifestInstaller
 import app.gamenative.utils.GameFeedbackUtils
 import app.gamenative.utils.IntentLaunchManager
-import app.gamenative.utils.SteamUtils
 import app.gamenative.utils.UpdateChecker
 import app.gamenative.utils.UpdateInfo
 import app.gamenative.utils.UpdateInstaller
@@ -796,6 +796,66 @@ fun PluviaMain(
             }
         }
 
+        DialogType.SDK_CLOUD_BRIDGE_SUGGESTION -> {
+            val relaunch = { suppressPrompt: Boolean ->
+                preLaunchApp(
+                    context = context,
+                    appId = state.launchedAppId,
+                    // Always suppress for the current relaunch so the dialog doesn't immediately
+                    // resurface and loop; persistence (sdkCloudSaveSubdir / sdkCloudBridgePromptDismissed)
+                    // is what gates future launches.
+                    skipBridgePrompt = suppressPrompt,
+                    setLoadingDialogVisible = viewModel::setLoadingDialogVisible,
+                    setLoadingProgress = viewModel::setLoadingDialogProgress,
+                    setLoadingMessage = viewModel::setLoadingDialogMessage,
+                    setMessageDialogState = setMessageDialogState,
+                    onSuccess = viewModel::launchApp,
+                    isOffline = viewModel.isOffline.value,
+                )
+            }
+            onConfirmClick = {
+                // Enable: write Ludusavi's suggested subdir, then continue the launch.
+                msgDialogState = MessageDialogState(false)
+                CoroutineScope(Dispatchers.IO).launch {
+                    val gameId = ContainerUtils.extractGameIdFromContainerId(state.launchedAppId)
+                    val rec = runCatching {
+                        SteamUtils.getRecommendedSdkCloudSaveSubdirAsync(context, gameId)
+                    }.getOrNull()
+                    if (rec != null) {
+                        runCatching {
+                            val container = ContainerUtils.getContainer(context, state.launchedAppId)
+                            container.sdkCloudSaveSubdir = rec.subdir
+                            container.saveData()
+                        }.onFailure { Timber.w(it, "Failed to persist sdkCloudSaveSubdir=${rec.subdir}") }
+                    }
+                    withContext(Dispatchers.Main) { relaunch(true) }
+                }
+            }
+            onDismissClick = {
+                // Skip this time — continue launch without setting the field. Always suppress
+                // for the current relaunch so the dialog doesn't reappear; since nothing was
+                // persisted, future launches will still re-prompt.
+                msgDialogState = MessageDialogState(false)
+                relaunch(true)
+            }
+            onActionClick = {
+                // Don't ask again for this game.
+                msgDialogState = MessageDialogState(false)
+                CoroutineScope(Dispatchers.IO).launch {
+                    runCatching {
+                        val container = ContainerUtils.getContainer(context, state.launchedAppId)
+                        container.putExtra("sdkCloudBridgePromptDismissed", "1")
+                        container.saveData()
+                    }.onFailure { Timber.w(it, "Failed to persist sdkCloudBridgePromptDismissed") }
+                    withContext(Dispatchers.Main) { relaunch(true) }
+                }
+            }
+            onDismissRequest = {
+                msgDialogState = MessageDialogState(false)
+                relaunch(true)
+            }
+        }
+
         DialogType.SYNC_CONFLICT -> {
             onConfirmClick = {
                 preLaunchApp(
@@ -1525,6 +1585,7 @@ fun preLaunchApp(
     preferredSave: SaveLocation = SaveLocation.None,
     useTemporaryOverride: Boolean = false,
     skipCloudSync: Boolean = false,
+    skipBridgePrompt: Boolean = false,
     setLoadingDialogVisible: (Boolean) -> Unit,
     setLoadingProgress: (Float) -> Unit,
     setLoadingMessage: (String) -> Unit,
@@ -1581,6 +1642,52 @@ fun preLaunchApp(
             return@launch
         }
 
+        // First-launch suggestion for Pattern B SDK-cloud games (e.g. Dead Cells).
+        // Fires only when real-Steam is on, the subdir is blank, the user hasn't dismissed,
+        // Ludusavi knows this game, AND it has no Auto-Cloud saveFilePatterns in PICS UFS.
+        // That intersection is a reliable Pattern B signal and keeps false positives low.
+        //
+        // Skip the prompt for non-game launches (Open Container / temporary override / explicit
+        // skipCloudSync) and for re-entries from conflict resolution (preferredSave set, or
+        // ignorePendingOperations true). The post-prompt `relaunch` lambda doesn't carry those
+        // flags forward, so firing the prompt for them would silently drop the user's
+        // conflict-resolution choice.
+        if (!skipBridgePrompt &&
+            !bootToContainer &&
+            !useTemporaryOverride &&
+            !skipCloudSync &&
+            !ignorePendingOperations &&
+            preferredSave == SaveLocation.None &&
+            gameSource == GameSource.STEAM &&
+            (container.isLaunchRealSteam || container.isLaunchBionicSteam) &&
+            container.sdkCloudSaveSubdir.isBlank() &&
+            container.getExtra("sdkCloudBridgePromptDismissed", "") != "1"
+        ) {
+            val rec = runCatching {
+                SteamUtils.shouldSuggestSdkCloudBridge(context, gameId)
+            }.getOrNull()
+            if (rec != null) {
+                Timber.i("Pattern B bridge prompt for appId=$gameId (\"${rec.name}\" -> \"${rec.subdir}\")")
+                setLoadingDialogVisible(false)
+                setMessageDialogState(
+                    MessageDialogState(
+                        visible = true,
+                        type = DialogType.SDK_CLOUD_BRIDGE_SUGGESTION,
+                        title = context.getString(R.string.sdk_cloud_bridge_prompt_title),
+                        message = context.getString(
+                            R.string.sdk_cloud_bridge_prompt_message,
+                            rec.name.ifEmpty { gameId.toString() },
+                            rec.subdir,
+                        ),
+                        confirmBtnText = context.getString(R.string.sdk_cloud_bridge_prompt_enable),
+                        dismissBtnText = context.getString(R.string.sdk_cloud_bridge_prompt_skip),
+                        actionBtnText = context.getString(R.string.sdk_cloud_bridge_prompt_dont_ask),
+                    ),
+                )
+                return@launch
+            }
+        }
+
         // When "Open container" is used we boot to desktop/file manager only — skip executable check
         if (!bootToContainer) {
             // Verify we have a launch executable for all platforms before proceeding (fail fast, avoid black screen)
@@ -2032,6 +2139,7 @@ fun preLaunchApp(
             preferredSave = preferredSave,
             parentScope = this,
             isOffline = isOffline,
+            isLaunchRealSteam = container.isLaunchRealSteam,
             onProgress = { message, progress ->
                 setLoadingMessage(message)
                 setLoadingProgress(if (progress < 0) -1f else progress)

app/src/main/java/app/gamenative/ui/component/dialog/ContainerConfigDialog.kt

@@ -143,6 +143,7 @@ fun ContainerConfigDialog(
     default: Boolean = false,
     title: String,
     initialConfig: ContainerData = ContainerData(),
+    appId: Int? = null,
     onDismissRequest: () -> Unit,
     onSave: (ContainerData) -> Unit,
 ) {
@@ -1070,6 +1071,7 @@ fun ContainerConfigDialog(
             applyScreenSizeToConfig = applyScreenSizeToConfig,
             vkd3dForcedVersion = { vkd3dForcedVersion() },
             currentDxvkContext = { currentDxvkContext() },
+            appId = appId,
         )
 
         LoadingDialog(

app/src/main/java/app/gamenative/ui/component/dialog/ContainerConfigState.kt

@@ -136,4 +136,7 @@ class ContainerConfigState(
     val applyScreenSizeToConfig: () -> Unit,
     val vkd3dForcedVersion: () -> String,
     val currentDxvkContext: () -> ManifestComponentHelper.DxvkContext,
+    /** Steam appId for this container, or null if not a Steam container. Used by
+     *  per-game UI like the SDK-cloud save subdir detect button. */
+    val appId: Int? = null,
 )