From 384eb7821582cd2c399eab4b8b4b465b11122987 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Wed, 18 Nov 2026 00:47:12 -0500 Subject: [PATCH] fix: set aside an unreadable game environment file (#2808) fix: set aside an unreadable game environment file instead of failing every session --- .../launcher/session/GameEnvironmentStore.kt | 13 ++++++++++++- .../launcher/session/GameEnvironmentStoreTest.kt | 15 +++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/droiddeck/launcher/session/GameEnvironmentStore.kt b/app/src/main/java/com/droiddeck/launcher/session/GameEnvironmentStore.kt index e00b1912fa..d4bdce833e 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/GameEnvironmentStore.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/GameEnvironmentStore.kt @@ -2,6 +2,7 @@ package com.droiddeck.launcher.session import android.content.Context import android.util.AtomicFile +import android.util.Log import com.droiddeck.launcher.core.GameEnvironment import com.droiddeck.launcher.core.TextureFiltering import com.droiddeck.launcher.runtime.LinuxRuntime @@ -9,6 +10,7 @@ import org.json.JSONObject import java.io.File object GameEnvironmentStore { + private const val TAG = "GameEnvironmentStore" private const val SETTINGS = "game-environment.json" private const val GUEST_FILE = "root/.config/droiddeck/game-environment.json" const val DXVK_CONFIG = "dxvkConfig" @@ -19,7 +21,16 @@ object GameEnvironmentStore { fun read(context: Context): GameEnvironment.Config { val file = AtomicFile(File(context.filesDir, SETTINGS)) val bytes = try { file.readFully() } catch (_: java.io.FileNotFoundException) { return GameEnvironment.Config() } - return decode(JSONObject(bytes.toString(Charsets.UTF_8))) + return try { + decode(JSONObject(bytes.toString(Charsets.UTF_8))) + } catch (error: Exception) { + if (error !is org.json.JSONException && error !is IllegalArgumentException) throw error + val aside = File(context.filesDir, "$SETTINGS.unreadable") + Log.w(TAG, "game environment settings are unreadable, set aside as ${aside.name}", error) + aside.delete() + file.baseFile.renameTo(aside) + GameEnvironment.Config() + } } fun decode(json: JSONObject): GameEnvironment.Config { diff --git a/app/src/test/java/com/droiddeck/launcher/session/GameEnvironmentStoreTest.kt b/app/src/test/java/com/droiddeck/launcher/session/GameEnvironmentStoreTest.kt index 3cae943151..273d91d1d9 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/GameEnvironmentStoreTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/GameEnvironmentStoreTest.kt @@ -323,4 +323,19 @@ class GameEnvironmentStoreTest { assertEquals(mapOf("DD_SYNC" to "1", "DXVK_HUD" to "fps"), config.shared) assertEquals(mapOf("DD_FSYNC_FIRST" to "1", "DD_SYNC_FALLBACK" to "1"), config.games["440"]) } + + @Test fun unreadableSettingsAreSetAsideAndSessionsStillStart() { + val settings = File(context.filesDir, "game-environment.json") + val aside = File(context.filesDir, "game-environment.json.unreadable") + aside.delete() + for (broken in listOf("", """{"version":1,"shared":{"bad name":"1"}}""")) { + settings.writeText(broken) + assertEquals(GameEnvironment.Config(), GameEnvironmentStore.read(context)) + assertFalse(settings.exists()) + assertEquals(broken, aside.readText()) + } + GameEnvironmentStore.publish(context) + assertEquals(1, JSONObject(guest.readText()).getInt("version")) + aside.delete() + } }