diff --git a/app/src/main/java/com/droiddeck/launcher/session/OverlayShown.kt b/app/src/main/java/com/droiddeck/launcher/session/OverlayShown.kt index 22f067d54d..a84a35667e 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/OverlayShown.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/OverlayShown.kt @@ -4,7 +4,7 @@ import java.io.File object OverlayShown { fun check(root: File): Boolean { - val config = File(root, "tmp").listFiles { f -> f.name.startsWith("mangohud.") } + val config = File(root, "tmp").listFiles { f -> f.name.startsWith("mangohud.") || f.name == "droiddeck-mangohud.conf" } ?.maxByOrNull { it.lastModified() } ?: return false return runCatching { !config.readText().contains("no_display") }.getOrDefault(false) } diff --git a/app/src/test/java/com/droiddeck/launcher/session/OverlayShownTest.kt b/app/src/test/java/com/droiddeck/launcher/session/OverlayShownTest.kt new file mode 100644 index 0000000000..75675376ef --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/OverlayShownTest.kt @@ -0,0 +1,41 @@ +package com.droiddeck.launcher.session + +import java.io.File +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Rule +import org.junit.Test +import org.junit.rules.TemporaryFolder + +class OverlayShownTest { + @get:Rule val tmp = TemporaryFolder() + + private fun config(name: String, text: String, modified: Long) = + File(tmp.root, "tmp").apply { mkdirs() }.resolve(name).apply { writeText(text); setLastModified(modified) } + + @Test fun noConfigIsHidden() { + assertFalse(OverlayShown.check(tmp.root)) + } + + @Test fun mangohudConfigFollowsNoDisplay() { + val f = config("mangohud.abcdefgh", "no_display\n", 1_000_000L) + assertFalse(OverlayShown.check(tmp.root)) + f.writeText("preset=3\n") + assertTrue(OverlayShown.check(tmp.root)) + } + + @Test fun steamSessionConfigFollowsNoDisplay() { + val f = config("droiddeck-mangohud.conf", "no_display\n", 1_000_000L) + assertFalse(OverlayShown.check(tmp.root)) + f.writeText("preset=3\n") + assertTrue(OverlayShown.check(tmp.root)) + } + + @Test fun newestConfigWins() { + config("mangohud.abcdefgh", "no_display\n", 1_000_000L) + config("droiddeck-mangohud.conf", "preset=3\n", 2_000_000L) + assertTrue(OverlayShown.check(tmp.root)) + config("mangohud.abcdefgh", "no_display\n", 3_000_000L) + assertFalse(OverlayShown.check(tmp.root)) + } +}