chore: applied patch, correcting default path and current endpoint issues caused by snapshot version mismatch

Author: Jarod Kurland (Glacier)

app/src/main/java/com/OxGames/Pluvia/enums/PathType.kt

@@ -8,6 +8,7 @@ import timber.log.Timber
 
 enum class PathType {
     GameInstall,
+    SteamUserData,
     WinMyDocuments,
     WinAppDataLocal,
     WinAppDataLocalLow,
@@ -27,9 +28,14 @@ enum class PathType {
      * [com.winlator.container.ContainerManager.activateContainer] on the proper
      * [com.winlator.container.Container] beforehand.
      */
-    fun toAbsPath(context: Context, appId: Int): String {
+    fun toAbsPath(context: Context, appId: Int, accountId: Long): String {
         val path = when (this) {
             GameInstall -> SteamService.getAppDirPath(appId)
+            SteamUserData -> Paths.get(
+                ImageFs.find(context).rootDir.absolutePath,
+                ImageFs.WINEPREFIX,
+                "/drive_c/Program Files (x86)/Steam/userdata/${accountId}/${appId}/remote",
+            ).toString()
             WinMyDocuments -> Paths.get(
                 ImageFs.find(context).rootDir.absolutePath,
                 ImageFs.WINEPREFIX,
@@ -76,6 +82,7 @@ enum class PathType {
     val isWindows: Boolean
         get() = when (this) {
             GameInstall,
+            SteamUserData,
             WinMyDocuments,
             WinAppDataLocal,
             WinAppDataLocalLow,
@@ -86,13 +93,16 @@ enum class PathType {
         }
 
     companion object {
-        val DEFAULT = PathType.GameInstall
+        val DEFAULT = SteamUserData
 
         fun from(keyValue: String?): PathType {
             return when (keyValue?.lowercase()) {
                 "%${GameInstall.name.lowercase()}%",
                 GameInstall.name.lowercase(),
                 -> GameInstall
+                "%${SteamUserData.name.lowercase()}%",
+                SteamUserData.name.lowercase(),
+                -> SteamUserData
                 "%${WinMyDocuments.name.lowercase()}%",
                 WinMyDocuments.name.lowercase(),
                 -> WinMyDocuments

app/src/main/java/com/OxGames/Pluvia/service/SteamAutoCloud.kt

@@ -88,12 +88,6 @@ object SteamAutoCloud {
             fileList.pathPrefixes.map { prefix ->
                 var modified = prefix
 
-                val prefixContainsNoPlaceholder = findPlaceholderWithin(prefix).none()
-
-                if (prefixContainsNoPlaceholder) {
-                    modified = Paths.get(PathType.DEFAULT.name, prefix).pathString
-                }
-
                 pathTypePairs.forEach {
                     modified = modified.replace(it.first, it.second)
                 }
@@ -106,7 +100,7 @@ object SteamAutoCloud {
             if (file.pathPrefixIndex < fileList.pathPrefixes.size) {
                 Paths.get(fileList.pathPrefixes[file.pathPrefixIndex]).pathString
             } else {
-                Paths.get("%${PathType.DEFAULT.name}%").pathString
+                ""
             }
         }
 
@@ -120,7 +114,7 @@ object SteamAutoCloud {
             if (file.pathPrefixIndex < fileList.pathPrefixes.size) {
                 Paths.get(convertedPrefixes[file.pathPrefixIndex], file.filename)
             } else {
-                Paths.get(getAppDirPath(appInfo.id), file.filename)
+                Paths.get(prefixToPath(PathType.DEFAULT.name), file.filename)
             }
         }
 

app/src/main/java/com/OxGames/Pluvia/service/SteamService.kt

@@ -1155,7 +1155,7 @@ class SteamService : Service(), IChallengeUrlChanged {
                 Timber.w("Failed to connect to Steam, marking endpoint bad and force disconnecting")
 
                 try {
-                    steamClient!!.servers.tryMark(steamClient!!.currentEndPoint, PROTOCOL_TYPES, ServerQuality.BAD)
+                    steamClient!!.servers.tryMark(steamClient!!.currentEndpoint, PROTOCOL_TYPES, ServerQuality.BAD)
                 } catch (e: Exception) {
                     Timber.e(e, "Failed to mark endpoint as bad:")
                 }

app/src/main/java/com/OxGames/Pluvia/ui/MainViewModel.kt

@@ -198,7 +198,7 @@ class MainViewModel @Inject constructor(
         viewModelScope.launch {
             SteamService.notifyRunningProcesses()
             SteamService.closeApp(appId) { prefix ->
-                PathType.from(prefix).toAbsPath(context, appId)
+                PathType.from(prefix).toAbsPath(context, appId, SteamService.userSteamId!!.accountID)
             }.await()
         }
     }

app/src/main/java/com/OxGames/Pluvia/ui/PluviaMain.kt

@@ -514,7 +514,7 @@ fun preLaunchApp(
 
         // sync save files and check no pending remote operations are running
         val prefixToPath: (String) -> String = { prefix ->
-            PathType.from(prefix).toAbsPath(context, appId)
+            PathType.from(prefix).toAbsPath(context, appId, SteamService.userSteamId!!.accountID)
         }
         val postSyncInfo = SteamService.beginLaunchApp(
             appId = appId,