From d012a1f5b62a1fd99951cb596ea6c92988be9fb0 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Thu, 22 Oct 2026 08:05:17 -0400 Subject: [PATCH 01/25] fix: pause Steam Controller BLE reconnects while the session is suspended (#1312) --- .../java/com/droiddeck/launcher/input/SteamControllerBle.kt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/src/main/java/com/droiddeck/launcher/input/SteamControllerBle.kt b/app/src/main/java/com/droiddeck/launcher/input/SteamControllerBle.kt index ee84cffe46..e77b322f2b 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/SteamControllerBle.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/SteamControllerBle.kt @@ -13,6 +13,7 @@ import android.content.Context import android.os.Handler import android.os.HandlerThread import android.util.Log +import com.droiddeck.launcher.session.SessionState import java.nio.ByteBuffer import java.nio.ByteOrder import java.util.ArrayDeque @@ -51,6 +52,10 @@ class SteamControllerBle(private val context: Context) { private fun connect() { if (!running || gatt != null) return + if (SessionState.suspended) { + handler.postDelayed(::connect, RETRY_MS) + return + } val adapter = (context.getSystemService(Context.BLUETOOTH_SERVICE) as? BluetoothManager)?.adapter val bonded = runCatching { adapter?.takeIf(BluetoothAdapter::isEnabled)?.bondedDevices } .onFailure { Log.w(TAG, "paired devices unreadable", it) } From 22f7d5b909a856c684f40d635dc70c00e9f4c8c0 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Thu, 22 Oct 2026 08:17:14 -0400 Subject: [PATCH 02/25] feat: make desktop mode easy to uninstall safely (#1311) --- .../launcher/runtime/DesktopCatalog.kt | 18 ++- .../launcher/runtime/DesktopRemoval.kt | 6 +- .../com/droiddeck/launcher/ui/DesktopPage.kt | 13 +- .../launcher/runtime/DesktopRemovalTest.kt | 122 ++++++++++++++++++ .../launcher/ui/DesktopUninstallTest.kt | 101 +++++++++++++++ docs/desktop-uninstall.md | 13 ++ 6 files changed, 266 insertions(+), 7 deletions(-) create mode 100644 app/src/test/java/com/droiddeck/launcher/runtime/DesktopRemovalTest.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/ui/DesktopUninstallTest.kt create mode 100644 docs/desktop-uninstall.md diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/DesktopCatalog.kt b/app/src/main/java/com/droiddeck/launcher/runtime/DesktopCatalog.kt index 73e6a75e9c..20714b552c 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/DesktopCatalog.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/DesktopCatalog.kt @@ -118,7 +118,8 @@ object DesktopCatalog { fun desktopPresent(context: Context): Boolean { val root = LinuxRuntime.rootDir(context) - return File(root, DesktopRemoval.PENDING).exists() || marker(context, DESKTOP_ID).exists() + return File(root, DesktopRemoval.PENDING).exists() || marker(context, DESKTOP_ID).exists() || + journal(root, DESKTOP_ID).exists() } fun desktopSize(context: Context): Long = DesktopRemoval.installedSize(context) @@ -126,8 +127,21 @@ object DesktopCatalog { fun cleanLegacy(context: Context, listener: LinuxRuntimeInstaller.ProgressListener? = null) = DesktopRemoval.cleanLegacy(context, listener) - fun removeDesktop(context: Context, listener: LinuxRuntimeInstaller.ProgressListener): String? = + fun removeDesktop(context: Context, listener: LinuxRuntimeInstaller.ProgressListener): String? = synchronized(installLock) { DesktopRemoval.remove(context, listener) + } + + internal fun discardDesktopInstall(context: Context) { + val entry = interrupted(context).firstOrNull { it.id == DESKTOP_ID } + val journal = journal(LinuxRuntime.rootDir(context), DESKTOP_ID) + entry?.let { + val download = downloadFile(context, it) + for (file in listOf(download, File(download.path + ".resume.properties"))) { + check(!file.exists() || file.delete()) { "Could not remove desktop download ${file.name}" } + } + } + check(!journal.exists() || journal.delete()) { "Could not clear desktop installation" } + } fun install(context: Context, entry: Entry, listener: LinuxRuntimeInstaller.ProgressListener?): String? = synchronized(installLock) { installLocked(context, entry, listener) diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/DesktopRemoval.kt b/app/src/main/java/com/droiddeck/launcher/runtime/DesktopRemoval.kt index 3d031a85a7..ff244e6ad2 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/DesktopRemoval.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/DesktopRemoval.kt @@ -44,9 +44,10 @@ internal object DesktopRemoval { val root = LinuxRuntime.rootDir(context) val pending = File(root, PENDING) val marker = File(root, ".droiddeck-pkg-${DesktopCatalog.DESKTOP_ID}") - val version = FileUtils.readString(pending)?.trim() ?: FileUtils.readString(marker)?.trim() + val installing = DesktopCatalog.interrupted(root).firstOrNull { it.id == DesktopCatalog.DESKTOP_ID } + val version = FileUtils.readString(pending)?.trim() ?: installing?.version ?: FileUtils.readString(marker)?.trim() val versions = context.assets.open("desktop-removal/versions.txt").bufferedReader().use { it.readLines() } - check(version in versions) { context.getString(R.string.desktop_removal_unknown) } + check(version in versions && (installing == null || installing.version in versions)) { context.getString(R.string.desktop_removal_unknown) } val entries = lines(context, "kde-remove.tsv.gzip").map(DesktopFileRemoval.Entry::parse) val keep = protected(context, root) cleanLegacy(context, listener) @@ -63,6 +64,7 @@ internal object DesktopRemoval { if (!target.delete()) error("Could not remove $path") } } + DesktopCatalog.discardDesktopInstall(context) if (!pending.delete()) error("Could not finish desktop removal") Log.i("DesktopRemoval", "KDE: $result") listener.onProgress(context.getString(R.string.desktop_removed), 100) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/DesktopPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/DesktopPage.kt index e1068a53cb..f6ce824ea8 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/DesktopPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/DesktopPage.kt @@ -52,6 +52,7 @@ import androidx.compose.runtime.key import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.produceState import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberUpdatedState import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment @@ -142,8 +143,13 @@ internal fun DesktopPage(s: FrontEndState, a: FrontEndActions, modifier: Modifie PrimaryButton(open, enabled = !s.busy, main = true, large = true, icon = Icons.Outlined.DesktopWindows, onClick = click) }, beside = { - HeroIconButton(Icons.Outlined.Storefront, stringResource(R.string.flathub_name), FlathubTeal, "desktop:flathub") { at -> openFrom(at, null, "store") } - HeroIconButton(Icons.Filled.Add, stringResource(R.string.user_apps_add), null, "desktop:add") { if (!s.busy) adding = true } + Column(verticalArrangement = Arrangement.spacedBy(10.dp)) { + Row(horizontalArrangement = Arrangement.spacedBy(10.dp)) { + HeroIconButton(Icons.Outlined.Storefront, stringResource(R.string.flathub_name), FlathubTeal, "desktop:flathub") { at -> openFrom(at, null, "store") } + HeroIconButton(Icons.Filled.Add, stringResource(R.string.user_apps_add), null, "desktop:add") { if (!s.busy) adding = true } + } + if (s.desktopPresent) UninstallDesktop(enabled = !s.runtimeActionsBlocked, onUninstall = a.onRemoveDesktop) + } }, rows = { tab -> if (tab == SheetTab.FILES) DesktopFiles(s, a) @@ -366,6 +372,7 @@ private fun DesktopFiles(s: FrontEndState, a: FrontEndActions) { @Composable private fun UninstallDesktop(enabled: Boolean, onUninstall: () -> Unit) { + val canUninstall by rememberUpdatedState(enabled) val colors = MaterialTheme.colorScheme val label = stringResource(R.string.common_uninstall) val title = stringResource(R.string.desktop_uninstall_title) @@ -383,7 +390,7 @@ private fun UninstallDesktop(enabled: Boolean, onUninstall: () -> Unit) { Text(note, fontSize = 13.sp, color = colors.onSurfaceVariant, modifier = Modifier.stepItem(1).padding(start = 4.dp, bottom = 12.dp)) Row(horizontalArrangement = Arrangement.spacedBy(8.dp, Alignment.End), modifier = Modifier.fillMaxWidth().stepItem(2)) { StepChoice(keep, enabled = open, modifier = Modifier.focusRequester(first)) { Steps.fold() } - StepChoice(label, danger = true, enabled = open) { Steps.fold(); onUninstall() } + StepChoice(label, danger = true, enabled = open && canUninstall) { Steps.fold(); onUninstall() } } }) } diff --git a/app/src/test/java/com/droiddeck/launcher/runtime/DesktopRemovalTest.kt b/app/src/test/java/com/droiddeck/launcher/runtime/DesktopRemovalTest.kt new file mode 100644 index 0000000000..250a655354 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/runtime/DesktopRemovalTest.kt @@ -0,0 +1,122 @@ +package com.droiddeck.launcher.runtime + +import android.content.ContextWrapper +import com.droiddeck.launcher.BuildConfig +import java.io.File +import java.nio.file.Files +import java.nio.file.Paths +import java.util.zip.GZIPInputStream +import org.junit.After +import org.junit.Assert.* +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.RuntimeEnvironment + +@RunWith(RobolectricTestRunner::class) +class DesktopRemovalTest { + private val dir = Files.createTempDirectory("desktop-removal").toFile() + private val context = object : ContextWrapper(RuntimeEnvironment.getApplication()) { + override fun getFilesDir() = File(dir, "files").apply { mkdirs() } + override fun getCacheDir() = File(dir, "cache").apply { mkdirs() } + } + private val root = LinuxRuntime.rootDir(context).apply { mkdirs() } + private val marker = File(root, ".droiddeck-pkg-${DesktopCatalog.DESKTOP_ID}") + private val journal = File(root, marker.name + ".installing") + private val pending = File(root, DesktopRemoval.PENDING) + private val listener = LinuxRuntimeInstaller.ProgressListener { _, _ -> } + + @After fun cleanup() { dir.deleteRecursively() } + + @Test fun removesTheDesktopWhileKeepingRuntimeAppsGamesAndSettings() { + val desktop = desktopFiles() + marker.writeText(BuildConfig.DESKTOP_KDE_TAG) + val keep = listOf("root/.local/share/Steam/steamapps/common/game/data", "root/.config/kdeglobals", + "opt/appimages/custom.AppImage", "usr/lib/shared.so", "usr/share/plasma/custom") + .map { file(it, "keep") } + + assertTrue(DesktopCatalog.desktopPresent(context)) + assertNull(DesktopCatalog.removeDesktop(context, listener)) + + assertFalse(Files.exists(desktop.toPath(), java.nio.file.LinkOption.NOFOLLOW_LINKS)) + keep.forEach { assertEquals("keep", it.readText()) } + assertFalse(DesktopCatalog.desktopPresent(context)) + assertFalse(DesktopCatalog.desktopInstalled(context)) + } + + @Test fun interruptedInstallCanBeRemovedWithoutBeingResumedAtTheNextLaunch() { + desktopFiles() + val entry = DesktopCatalog.desktopEntry(context) + journal.writeText(DesktopCatalog.entryJson(entry).toString()) + val download = File(context.cacheDir, "pkg-${entry.id}-${entry.sha256.take(12)}.download").apply { writeText("download") } + val resume = File(download.path + ".resume.properties").apply { writeText("resume") } + val unrelated = file(".droiddeck-pkg-emulators.installing", DesktopCatalog.entryJson(DesktopCatalog.Entry( + "emulators", "Emulators", 1, "1", "tar", "https://example.invalid/emulators", "a".repeat(64), 1L, "", "", "", + )).toString()) + assertTrue(DesktopCatalog.desktopPresent(context)) + + assertNotNull(DesktopCatalog.removeDesktop(context) { _, _ -> error("interrupted") }) + assertTrue(pending.exists()) + assertTrue(journal.exists()) + assertTrue(DesktopCatalog.desktopPresent(context)) + assertNull(DesktopCatalog.removeDesktop(context, listener)) + + assertFalse(journal.exists()) + assertFalse(pending.exists()) + assertFalse(download.exists()) + assertFalse(resume.exists()) + assertFalse(DesktopCatalog.desktopPresent(context)) + assertEquals(listOf("emulators"), DesktopCatalog.interrupted(context).map { it.id }) + assertTrue(unrelated.exists()) + } + + @Test fun refusesUnknownDesktopVersionsAndMissingRuntimeOwnershipBeforeDeletingAnything() { + val desktop = desktopFiles() + marker.writeText("future-desktop") + assertNotNull(DesktopCatalog.removeDesktop(context, listener)) + assertEquals("future-desktop", marker.readText()) + marker.writeText(BuildConfig.DESKTOP_KDE_TAG) + journal.writeText(DesktopCatalog.entryJson(DesktopCatalog.desktopEntry(context)).put("version", "future-desktop").toString()) + assertNotNull(DesktopCatalog.removeDesktop(context, listener)) + assertTrue(journal.exists()) + journal.delete() + File(root, "var/lib/pacman/local/base-1/files").delete() + assertNotNull(DesktopCatalog.removeDesktop(context, listener)) + assertEquals(BuildConfig.DESKTOP_KDE_TAG, marker.readText()) + assertFalse(pending.exists()) + assertTrue(Files.isSymbolicLink(desktop.toPath())) + } + + @Test fun failedDownloadCleanupKeepsTheInstallRecordSoRemovalCanRetry() { + val entry = DesktopCatalog.desktopEntry(context) + val download = File(context.cacheDir, "pkg-${entry.id}-${entry.sha256.take(12)}.download") + for (blocked in listOf(download, File(download.path + ".resume.properties"))) { + desktopFiles() + journal.writeText(DesktopCatalog.entryJson(entry).toString()) + blocked.mkdirs() + val blocker = File(blocked, "blocker").apply { writeText("fixture") } + + assertNotNull(DesktopCatalog.removeDesktop(context, listener)) + assertTrue(journal.exists()) + assertTrue(pending.exists()) + assertTrue(blocker.delete()) + assertNull(DesktopCatalog.removeDesktop(context, listener)) + assertFalse(blocked.exists()) + assertFalse(journal.exists()) + assertFalse(pending.exists()) + } + } + + private fun file(path: String, text: String) = File(root, path).apply { parentFile!!.mkdirs(); writeText(text) } + + private fun desktopFiles(): File { + file("var/lib/pacman/local/base-1/files", "%FILES%\nusr/lib/shared.so\n") + val entry = GZIPInputStream(context.assets.open("desktop-removal/kde-remove.tsv.gzip")).bufferedReader().use { reader -> + reader.lineSequence().map(DesktopFileRemoval.Entry::parse).first { it.kind == "L" && it.path.startsWith("usr/") } + } + return File(root, entry.path).apply { + parentFile!!.mkdirs() + Files.createSymbolicLink(toPath(), Paths.get(entry.identity)) + } + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/ui/DesktopUninstallTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/DesktopUninstallTest.kt new file mode 100644 index 0000000000..3f76cac3ba --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/ui/DesktopUninstallTest.kt @@ -0,0 +1,101 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.runtime.CompositionLocalProvider +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.geometry.Offset +import androidx.compose.ui.test.assertIsDisplayed +import androidx.compose.ui.test.assertIsNotEnabled +import androidx.compose.ui.test.onAllNodesWithText +import androidx.compose.ui.test.onLast +import androidx.compose.ui.test.onNodeWithText +import androidx.compose.ui.test.performClick +import org.junit.After +import org.junit.Assert.assertEquals +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [34], qualifiers = "w1200dp-h752dp-land", application = android.app.Application::class) +class DesktopUninstallTest { + @get:Rule val compose = createRobolectricComposeRule() + private var removals = 0 + private var runtimeBlocked by mutableStateOf(false) + + @After fun closeConfirmation() { Steps.drop() } + + @Test fun uninstallIsAvailableOnTheDesktopPageAndRequiresConfirmation() { + show() + compose.onNodeWithText("Open desktop").assertIsDisplayed() + compose.onNodeWithText("Uninstall").assertIsDisplayed().performClick() + settle() + assertEquals(0, removals) + compose.onNodeWithText("Uninstall the desktop?").assertIsDisplayed() + compose.onAllNodesWithText("Uninstall").onLast().performClick() + assertEquals(1, removals) + } + + @Test fun uninstallIsDisabledWhileRuntimeChangesAreBlocked() { + show(blocked = true) + compose.onNodeWithText("Uninstall").assertIsNotEnabled() + } + + @Test fun aPartialDesktopStillOffersUninstall() { + show(installed = false) + compose.onNodeWithText("Uninstall").assertIsDisplayed() + } + + @Test fun anUninstalledDesktopNoLongerOffersUninstall() { + show(installed = false, present = false) + compose.onNodeWithText("Uninstall").assertDoesNotExist() + } + + @Test fun startingRuntimeWorkWhileConfirmingDisablesUninstall() { + show() + compose.onNodeWithText("Uninstall").performClick() + settle() + compose.runOnIdle { runtimeBlocked = true } + settle() + compose.onAllNodesWithText("Uninstall").onLast().assertIsNotEnabled() + assertEquals(0, removals) + } + + private fun settle() = compose.mainClock.advanceTimeBy(2_000) + + private fun show(installed: Boolean = true, blocked: Boolean = false, present: Boolean = true) { + runtimeBlocked = blocked + compose.mainClock.autoAdvance = false + compose.setContent { + DroidDeckTheme { + CompositionLocalProvider(LocalFrontFocus provides FrontFocus()) { + FocusGlideHost { + Box(Modifier.fillMaxSize()) { + DesktopPage(FrontEndState( + installed = "r9", ready = true, available = null, busy = false, stage = "", percent = -1, + desktopInstalled = installed, desktopPresent = present, runtimeActionsBlocked = runtimeBlocked, + offlineAccount = null, offline = false, frameGenLabel = "", romsDir = null, logsEnabled = false, + steamGames = emptyList(), emulators = emptyList(), running = null, + ), FrontEndActions( + onPlay = {}, onPlayDesktopUi = {}, onSteamGame = {}, onDesktop = {}, onEmulator = {}, onRom = {}, onResume = {}, + onSteamSettings = {}, onDesktopSettings = {}, onInstallPackage = {}, onRemovePackage = {}, + onRuntime = {}, onFrameGenPick = {}, onImportLossless = {}, onProtons = {}, onComponents = {}, + onPerformance = {}, onRoms = {}, onFiles = {}, onLogs = {}, onOffline = {}, + onWirelessAdbPair = { _, _, _, _ -> }, onWirelessAdbApply = { _, _, _, _ -> }, + onSetPhantomProcessLimit = { _, _ -> }, onRemoveDesktop = { removals++ }, + ), Modifier.fillMaxSize(), onSelect = {}) + StepsLayer(Offset.Zero) + } + } + } + } + } + settle() + } +} diff --git a/docs/desktop-uninstall.md b/docs/desktop-uninstall.md new file mode 100644 index 0000000000..dd9c5f6746 --- /dev/null +++ b/docs/desktop-uninstall.md @@ -0,0 +1,13 @@ +# Uninstall desktop mode + +Choose **Uninstall** beside **Open desktop**, then confirm. The same action is available under +**Desktop → Files**. Stop any running session and let other installs finish first. + +Removal keeps Steam, games, added apps, settings, modified files and shared dependencies. It uses +the pinned desktop file inventory and only removes matching files. Unknown desktop versions and +missing runtime package ownership cause removal to fail before deleting files. + +An interrupted desktop install also offers Uninstall. Successful removal clears that desktop +installation's recovery record and cached download so the next guest launch cannot reinstall it +through package recovery. If removal is interrupted, choose Uninstall again to retry. Open desktop +installs the desktop again when needed. From 0444b3eff99e199da0f31d1feee847be65dfce1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Resul=20=C3=96v=C3=BCr?= <92828257+ovurrsl@users.noreply.github.com> Date: Thu, 22 Oct 2026 16:34:17 +0300 Subject: [PATCH 03/25] l10n: Turkish for the Storage page, GPU driver mode and the other untranslated screens (#989) l10n(tr): translate the Storage page, GPU driver mode and other missing strings Adds 213 strings and 9 plurals that were missing from values-tr, so the new Storage page, GPU driver mode UI, SteamGridDB art, downloads source, VR and latency toggles no longer fall back to English on Turkish devices. Co-authored-by: ovurrsl --- app/src/main/res/values-tr/strings.xml | 214 ++++++++++++------------- 1 file changed, 107 insertions(+), 107 deletions(-) diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index a0e60d8c6e..33107674ae 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -605,7 +605,7 @@ Sahte HDR VR SteamVR - SteamVR\'ı başlat + SteamVR\'ye gir SteamVR denetleniyor… Bant giderme Bant giderme gücü @@ -626,9 +626,9 @@ Klavye Gecikme Düşük gecikmeli kumanda - Kumanda 250 Hz yerine 1000 Hz bildirir. Biraz daha fazla CPU. + Kumanda 250 Hz yerine 1000 Hz bildirir. CPU kullanımı biraz artar. Düşük gecikmeli dokunma - Dokunuşlar kare birleştirmeyi atlar; Steam dokunmatik kontrolleri 1000 Hz çalışır. Biraz daha fazla CPU. + Dokunmalar kare gruplamasını atlar; Steam dokunmatik kontrolleri 1000 Hz çalışır. CPU kullanımı biraz artar. PC klavyesi Android İkinci ekran @@ -1285,15 +1285,15 @@ %1$s %2$s sürümüne güncellendi. %1$s %2$s sürümüne güncellendi. Ekran sürücüsü, DroidDeck yeniden başlatıldıktan sonra uygulanır. Sürücü güncellemeleri oturum bitene kadar bekler. - %1$s %2$s, mobil veriyi ve pil tasarrufunu kapattığınızda indirilecek. - %1$s %2$s burada oturum başlatmadı, bu yüzden Otomatik çalışan sürücülerde kalıyor. - %1$s iki kez oturum başlatmadı, bu yüzden Otomatik çalışan sürücülere geri döndü. + %1$s %2$s, mobil veriden ve pil tasarrufundan çıkınca indirilecek. + %1$s %2$s burada oturum başlatamadı, bu yüzden Otomatik, oturum başlatabilen sürücülerde kalıyor. + %1$s iki kez oturum başlatamadı, bu yüzden Otomatik, sorunsuz çalışan önceki sürücülere döndü. %1$s %2$s sürümüne geçildi. %1$s %2$s sürümüne geçildi. Ekran sürücüsü, DroidDeck yeniden başlatıldıktan sonra uygulanır. Kullanılan: %1$s %2$s. Kullanılan: %1$s %2$s. Ekran sürücüsü, DroidDeck yeniden başlatıldıktan sonra uygulanır. - Pakette gelen Quest görüntü sürücüsü ve varsayılan çalışma zamanı kullanılıyor. - Pakette gelen Quest görüntü sürücüsü ve varsayılan çalışma zamanı kullanılıyor. Görüntü sürücüsü DroidDeck yeniden başladıktan sonra geçerli olur. + Pakete dahil Quest ekran sürücüsü ve çalışma zamanı varsayılanı kullanılıyor. + Pakete dahil Quest ekran sürücüsü ve çalışma zamanı varsayılanı kullanılıyor. Ekran sürücüsü DroidDeck yeniden başladıktan sonra uygulanır. Sürücü zip dosyası değil: ne AdrenoTools sürücüsü, ne -Linux Turnip ne de Android + Linux paketi İçe aktarma başarısız oldu: %1$s İçe aktarılan sürücü @@ -1715,7 +1715,7 @@ DroidDeck\'e geri dönmek için dokunun. Kablosuz hata ayıklamayı şimdi kapatabilirsiniz. Kablosuz hata ayıklama kurulumu durdu - İndirme başarısız oldu + İndirme başarısız İndirme boyutu yayınlanan APK ile eşleşmedi ve atıldı - yeniden deneyin İndirme, sağlama toplamıyla eşleşmedi ve atıldı - yeniden deneyin Güncelleme, %2$s değil %1$s Android paketi içindir @@ -1814,7 +1814,7 @@ GitHub\'ın hız sınırına ulaşıldı - daha sonra yeniden deneyin GitHub HTTP %1$d yanıtı verdi - İndirme başarısız oldu + İndirme başarısız Bu sürücü listesi sağlama toplamlarından önceki bir tarihe ait - yenileyip yeniden deneyin Sağlama toplamı uyuşmuyor - indirme atıldı Bir AdrenoTools sürücüsü değil: %1$s @@ -2177,14 +2177,14 @@ SteamGridDB\'de ara… SteamGridDB: %1$s Oyun ara - Diğer sonuçlar - Sonuç yok. - SteamGridDB bir API anahtarı gerektiriyor. Kendinizinkini Kurulum › Başlatıcı bölümüne ekleyin. - SteamGridDB API anahtarını kabul etmedi. Kurulum › Başlatıcı bölümünden denetleyin. - SteamGridDB şu anda istekleri sınırlıyor. Bir dakika sonra yeniden deneyin. - SteamGridDB\'ye ulaşılamadı. Bağlantınızı denetleyin. - SteamGridDB\'de bir sorun oluştu. Daha sonra yeniden deneyin. - SteamGridDB\'de bu oyun için sonuç yok. Aramayı deneyin. + Diğer eşleşmeler + Hiçbir şey bulunamadı. + SteamGridDB bir API anahtarı ister. Kurulum › Başlatıcı bölümüne kendi anahtarınızı ekleyin. + SteamGridDB API anahtarını kabul etmedi. Kurulum › Başlatıcı bölümünden kontrol edin. + SteamGridDB şu anda istekleri sınırlıyor. Bir dakika sonra tekrar deneyin. + SteamGridDB\'ye ulaşılamadı. Bağlantıyı kontrol edin. + SteamGridDB\'de bir sorun oluştu. Daha sonra tekrar deneyin. + SteamGridDB\'de bu oyun için eşleşme yok. Bir arama deneyin. %1$d oyun eklendi %1$d oyun eklendi @@ -2213,44 +2213,44 @@ Çalışma ortamı ve ekran sürücülerini ayrı ayrı %1$s kullanılsın mı? Sürücüler nasıl seçilir - Bu GPU için en iyi eşleşme, her zaman güncel + Bu GPU için en iyi çift, güncel tutulur Eşleşen çift Bir çift seçin; iki sürücüyü birden ayarlar - Serbest eşleştir - Görüntü ve çalışma zamanını ayrı ayrı seçin + Karıştır ve eşleştir + Ekran ve çalışma zamanını ayrı ayrı seçin Çift - Karışık - OTO + Karma + OTOMATİK ÇİFT PAKET - SEÇİLİ + SEÇİLEN GPU\'YA GÖRE VARSAYILAN - Şimdi çiziyor - Yeniden başlatma bekliyor · o zamana kadar %1$s çiziyor - Çalışıyor - Sonraki oturum · bu oturumda %1$s kalır - Ekranı çizer. Sonraki oturumdan itibaren geçerli. + Şu an çiziyor + Yeniden başlatma bekliyor · o zamana kadar %1$s çizer + Şu an çalışıyor + Sonraki oturum · bu oturum %1$s kullanmaya devam eder + Ekranı çizer. Sonraki oturumdan itibaren uygulanır. önceki sürücü - Görüntü sürücüsünü değiştirmek için yeniden başlatın. - Görüntü sürücüsünü değiştirmek için oturumu durdurup DroidDeck\'i yeniden başlatın. + Ekran sürücüsünü değiştirmek için yeniden başlatın. + Çalışan oturumu durdurun, sonra ekran sürücüsünü değiştirmek için DroidDeck\'i yeniden başlatın. Şimdi yeniden başlat Sonra - Otomatik, %1$s için bu çifti seçti - Otomatik, %1$s için yerleşik sürücüleri kullanıyor + Otomatik, %1$s cihazınız için bu çifti seçti + Otomatik, %1$s cihazınız için yerleşik sürücüleri kullanıyor %1$s ailesi için seçildi. Yeni sürümler arka planda kurulur. Bir çift seçin - Bir çift, görüntü sürücüsünü ve çalışma zamanı sürücüsünü birlikte ayarlar. + Bir çift, ekran ve çalışma zamanı sürücülerini birlikte ayarlar. Her sürücüyü seçin - Bir paket iki yuvayı da doldurur. Görüntü değişiklikleri yeniden başlatmadan sonra, çalışma zamanı değişiklikleri sonraki oturumdan itibaren geçerli olur. - Görüntü sürücüsünü değiştir + Bir paket iki yuvayı da doldurur. Ekran değişiklikleri yeniden başlatmadan sonra, çalışma zamanı değişiklikleri sonraki oturumda uygulanır. + Ekran sürücüsünü değiştir Çalışma zamanı sürücüsünü değiştir - OTOMATİK SEÇİMİ - Kurulu + OTOMATİK\'İN SEÇİMİ + Yüklü %1$s + %2$s %1$s · uygulamak için yeniden başlatın %1$s · yeniden başlatma bekliyor - Bu aygıt + Bu cihaz %1$s kaldırılsın mı? Tanılama Oynamaya hazır @@ -2262,11 +2262,11 @@ Görünüm Bu cihaz Kütüphane görselleri - İndirme + İndirmeler Kaynak Otomatik Doğrudan - Ayna + Yansı Özel önek Site Önek @@ -2534,7 +2534,7 @@ Yeterli boş alan yok: %1$s gerekli, yalnızca %2$s boş Yetersiz alan (%1$s boş, %2$s gerekli) Boş alan bilinmiyor - Resim konumu + Görüntü konumu Üst Alt Orta (varsayılan) @@ -2542,71 +2542,71 @@ Depolama ölçülüyor… İlk seferde birkaç saniye sürer. Dahili depolama - %2$s alanın %1$s kadarı kullanılıyor + %2$s içinde %1$s kullanıldı %1$s boş - DroidDeck %1$s yer kaplıyor. Ölçüm: %2$s. + DroidDeck %1$s kullanıyor. %2$s saatinde ölçüldü. yeniden ölçülüyor… Diğer Android uygulamaları - Şimdi boşaltılabilir - Kullanılmayan çalışma zamanları, kalıntılar, eski günlükler + Şimdi güvenle boşaltılabilir + Kullanılmayan çalışma zamanları, artıklar, eski günlükler Temizle… - Temizlemek veya kaldırmak için oturumu durdurun. Boyutlar görünmeye devam eder. + Bir şeyi temizlemek veya kaldırmak için oturumu durdurun. Boyutlar yine de gösterilir. Nereye gidiyor Steam oyunları Oyun verileri Önekler %1$s · atölye %2$s · gölgelendiriciler %3$s - Proton ve çalışma zamanları + Proton & çalışma zamanları %1$s kullanılmıyor - GOG, Epic ve diğer mağazalar - Mağazalar bölümünden kaldırın + GOG, Epic & diğer mağazalar + Bunları Mağazalar\'dan kaldırın Masaüstü uygulamaları Flatpak uygulamaları ve çalışma zamanları - Linux sistemi ve Steam istemcisi - Herhangi bir şeyin çalışması için gerekli + Linux sistemi & Steam istemcisi + Herhangi bir şeyi çalıştırmak için gerekli DroidDeck verileri - Eski oturum günlükleri %1$s · önbellek · sürücüler + Eski oturum günlükleri %1$s · önbellekler · sürücüler Oyunlar Oyun verileri - Proton ve çalışma zamanları + Proton & çalışma zamanları Diğer mağazalar Masaüstü uygulamaları Linux sistemi DroidDeck - Temizlik - Burada hiçbir şey kurulu oyunlara veya süren indirmelere dokunmaz. + Temizle + Burada hiçbir şey yüklü oyunlarınıza veya süren indirmelerinize dokunmaz. Şu anda temizlenecek bir şey yok. - Seçili: %1$s · %2$s → %3$s boş + Seçilen: %1$s · %2$s → %3$s boş Temizleniyor… %1$s boşalt %1$s boşaltıldı. - Kullanılmayan Steam çalışma zamanları ve Proton - Kaldırılmış oyunların kalıntıları - Kayıt içerebilecek kalıntılar + Kullanılmayan Steam çalışma zamanları ve Proton\'lar + Kaldırılan oyunlardan kalan artıklar + Kayıt tutabilecek artıklar Eski oturum günlükleri - Geçerli oturumun günlükleri tutulur - Hiçbir oyun kullanmıyor. Gerekirse Bileşenler bölümünden yeniden yükleyin. - Kurulu oyunların gölgelendirici önbelleği - Oynarken yeniden oluşur. Her oyunun ilk dakikaları yine takılır. + Geçerli oturumun günlükleri korunur + Hiçbir oyun buna ayarlı değil. Gerekirse Bileşenler\'den yeniden yükleyin. + Yüklü oyunların gölgelendirici önbellekleri + Oynadıkça yeniden oluşur. Her oyunun ilk dakikalarında yine takılma olur. Güvenli Kullanılmıyor Takılma - Kayıtları denetleyin + Kayıtları kontrol et Varsayılan Gerekli Kullanılmıyor Depolama - Verileriyle birlikte %1$s + %1$s, verileriyle birlikte En büyük En az oynanan SD kartta Burada oyun yok. - %1$s oynandı + Oynanma: %1$s Hiç oynanmadı Oyun %1$s · veri %2$s - Kaldır - Kaldırma, Steam\'in kaydetmesi için Steam penceresini açar. Bir oyunu SD karta taşımak için Steam › Ayarlar › Depolama yolunu kullanın. + Yüklemeyi kaldır + Yüklemeyi kaldırma, Steam\'in kendi iletişim kutusunu açar; böylece Steam kaydı tutar. Bir oyunu SD karta taşımak için Steam › Ayarlar › Depolama\'yı kullanın. %1$s kaldırılsın mı? - Steam açılır ve onay ister. Bu, oyunun %1$s alanını boşaltır. Kalıntıları temizleyene kadar önek kalır ve Steam Cloud kayıtları hesabınızda kalır. + Steam açılır ve onay ister. Bu, oyunun %1$s alanını boşaltır. Öneki, artıkları temizleyene kadar kalır ve Steam Cloud kayıtları hesabınızda durur. Steam\'i aç %1$s · %2$s kullanılmıyor Kullanılmayanları kaldır · %1$s @@ -2614,30 +2614,30 @@ Kullanılmıyor Kaldır %1$s kaldırılsın mı? - %1$s boşaltır. Bir oyun gerektirirse Steam yeniden indirir. + %1$s boşaltır. Bir oyun isterse Steam yeniden indirir. Linux x86 oyunları için gerekli (FEX) ARM64 Proton\'lar için gerekli - Oyunların istediği VC++ ve DirectX kurulumları + Oyunların istediği VC++ ve DirectX yükleyicileri Linux x86 oyunlarını çalıştırır Steam aracı DroidDeck oyunları bu çalışma zamanı olmadan çalıştırır - DroidDeck\'in çalıştıramadığı Proton x86 - Tüm oyunlar için varsayılan - Hiçbir oyun kullanmıyor - Steam ayarları okunamıyor, bu yüzden tutuluyor + x86 Proton, DroidDeck bunu çalıştıramaz + Her oyun için varsayılan + Hiçbir oyun buna ayarlı değil + Steam\'in ayarları okunamadı, bu yüzden korunuyor Depolama temizliğinin bitmesini bekleyin Yalnızca %1$s boş - Steam\'in güncellemeler ve gölgelendirici önbelleği için alana ihtiyacı var. 10 GB altında oyun güncellemeleri yarıda kalabilir. - %1$s risksiz boşaltılabilir. + Steam\'in güncellemeler ve gölgelendirici önbellekleri için yere ihtiyacı var. 10 GB\'ın altında oyun güncellemeleri yarıda başarısız olabilir. + %1$s güvenle boşaltılabilir. Yer aç Yine de oyna - %d kurulu - %d kurulu + %d yüklü + %d yüklü - %d SD kartta - %d SD kartta + SD kartta %d + SD kartta %d %d araç @@ -2648,15 +2648,15 @@ %d oyunun boş önek klasörleri ve gölgelendirici önbelleği - %d oyunun önekinde hâlâ dosyalar var; yerel kayıtlar da olabilir. Gerekirse önce bir kopya alın. - %d oyunun önekinde hâlâ dosyalar var; yerel kayıtlar da olabilir. Gerekirse önce bir kopya alın. + %d oyunun öneki hâlâ dosya içeriyor, bunlar yerel kayıtları da içerebilir. İsterseniz önce yedekleyin. + %d oyunun önekleri hâlâ dosya içeriyor, bunlar yerel kayıtları da içerebilir. İsterseniz önce yedekleyin. %d oyun %d oyun - DroidDeck varsayılan Proton - DroidDeck Proton 11 seçeneği + DroidDeck\'in varsayılan Proton\'u + DroidDeck\'in Proton 11 seçeneği %d oyun kullanıyor %d oyun kullanıyor @@ -2665,41 +2665,41 @@ Bileşenler Kullanılmayan bileşenler Orijinal %1$s · %2$s - %1$s boşaltır. Yalnızca artık kurulu olmayan bir Proton sürümünü geri yükler. - Denetlenmedi: bir Steam uygulamasının manifest dosyası okunamıyor, bu yüzden kaldırılmış oyunların önekleri okunana kadar kalır. + %1$s boşaltır. Yalnızca artık yüklü olmayan bir Proton sürümünü geri yükler. + Denetlenmedi: bir Steam uygulama manifesti okunamadı, bu yüzden kaldırılan oyunların önekleri manifest okunabilene kadar korunuyor. Tamamlanamadı: %1$s - Paylaşılan %1$s - Kurulu oyunlar + paylaşılan %1$s + Yüklü oyunlar Önek %1$s · gölgelendiriciler %2$s · atölye %3$s - Gölgelendiricileri sil - Kaldırılmış oyunlar + Gölgelendiricileri temizle + Kaldırılan oyunlar Steam uygulaması %1$d - Önekinde hâlâ dosyalar var; yerel kayıtlar da olabilir - Önekini (Wine) ve gölgelendirici önbelleğini siler (%1$s). Gerekli kayıtların önce bir kopyasını alın; Steam Cloud kayıtları hesabınızda kalır. - Tutulanlar - Steam dışı oyunlar ve ortak Steam öneki - Mağazaların veya elle eklenen oyunların önekleri + Öneki hâlâ dosya içeriyor, bunlar yerel kayıtları da içerebilir + Wine önekini ve gölgelendirici önbelleğini (%1$s) siler. Önce istediğiniz kayıtları yedekleyin; Steam Cloud kayıtları hesabınızda durur. + Korunan + Steam dışı oyunlar ve Steam\'in ortak öneki + Mağazalardan veya elle eklenen oyunların önekleri İndirilen paketler - Tutulan orijinaller + Kaydedilen orijinaller İndirilmiş bileşen paketi yok. Bir Proton veya oyun için seçili Hiçbir yerde seçili değil - Kurulu Proton\'ı geri yükler - Artık kurulu olmayan Proton sürümü + Yüklü Proton\'u geri yükler + Artık yüklü olmayan Proton sürümü Kullanımda - Kullanımdaki bileşenler kilitli kalır. Onları Bileşenler bölümünden seçin; burada kaldırdığınız paketler oradan yeniden indirilebilir. + Kullanımdaki bileşenler kilitli kalır. Bileşenler\'den seçin; burada kaldırılan her şey oradan yeniden indirilebilir. %1$s boşaltır. Kendi içe aktardığınız paketler yeniden indirilemez. - Flatpak uygulamaları için %1$s ve bunların paylaştıkları + Flatpak uygulamaları ve paylaştıkları şeyler için %1$s Uygulamalar Kurulu Flatpak uygulaması yok. - Uygulamaların paylaştıkları + Uygulamaların ortak kullandıkları Çalışma zamanları - Uygulamaların üzerinde çalıştığı kitaplıklar; kullanılmayanlar Kullanılmayanları kaldır ile gider + Uygulamaların üzerinde çalıştığı kütüphaneler; kullanılmayanlar Kullanılmayanları kaldır ile gider İndirme deposu - Flatpak object store ve önbelleğe alınmış indirmeler + Flatpak\'in nesne deposu ve önbelleğe alınmış indirmeler Kullanılmayanları kaldır - Kurulu hiçbir uygulamanın istemediği çalışma zamanlarını kaldırır ve Flatpak object store\'u temizler. Kurulu uygulamalar çalışmaya devam eder. - Uygulamayı (%1$s) ve başka kimsenin kullanmadığı çalışma zamanlarını kaldırır. Ev klasöründeki verileri kalır. + Kurulu hiçbir uygulamanın ihtiyaç duymadığı çalışma zamanlarını kaldırır ve Flatpak\'in nesne deposunu temizler. Kurulu uygulamalar çalışmaya devam eder. + Uygulamayı (%1$s) ve başka hiçbir şeyin kullanmadığı çalışma zamanlarını kaldırır. Ev klasörünüzdeki verileri kalır. %d paket %d paket From 4361182b0ea00f35bd1002c3f9f4c3dbe5f6a9d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Resul=20=C3=96v=C3=BCr?= <92828257+ovurrsl@users.noreply.github.com> Date: Thu, 22 Oct 2026 16:35:11 +0300 Subject: [PATCH 04/25] fix(ui): stop touch-blocking dialog and drawer containers from merging descendant semantics (#1145) Co-authored-by: ovurrsl --- .../com/droiddeck/launcher/ui/AddAppDialog.kt | 4 +- .../droiddeck/launcher/ui/SessionLoading.kt | 5 +-- .../droiddeck/launcher/ui/SessionOverlay.kt | 16 ++++--- .../droiddeck/launcher/ui/SettingsWidgets.kt | 7 ++++ .../launcher/ui/StoreAchievementsUi.kt | 4 +- .../launcher/ui/DialogSemanticsTest.kt | 42 +++++++++++++++++++ 6 files changed, 66 insertions(+), 12 deletions(-) create mode 100644 app/src/test/java/com/droiddeck/launcher/ui/DialogSemanticsTest.kt diff --git a/app/src/main/java/com/droiddeck/launcher/ui/AddAppDialog.kt b/app/src/main/java/com/droiddeck/launcher/ui/AddAppDialog.kt index ccd7fd05e3..bee26dd0dc 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/AddAppDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/AddAppDialog.kt @@ -315,7 +315,7 @@ internal fun AppDialog( Box( contentAlignment = Alignment.Center, modifier = Modifier.fillMaxSize().imePadding() - .clickable(interactionSource = remember { MutableInteractionSource() }, indication = null, onClick = close), + .tapOutside(close), ) { AnimatedVisibility( visibleState = shown, @@ -340,7 +340,7 @@ internal fun AppDialog( .clip(Shape16) .background(pal.surfaceVariant.copy(alpha = 0.97f)) .border(1.dp, pal.signal.copy(alpha = 0.22f), Shape16) - .clickable(interactionSource = remember { MutableInteractionSource() }, indication = null) {} + .blockTouches() .controllerBack(back ?: close) .then(modifier) .then(if (scrollable) Modifier.verticalScroll(rememberScrollState()) else Modifier) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SessionLoading.kt b/app/src/main/java/com/droiddeck/launcher/ui/SessionLoading.kt index 38bbb76cf9..4a0adea2d4 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionLoading.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionLoading.kt @@ -221,7 +221,7 @@ fun LoadingOverlay( modifier = Modifier .fillMaxSize() .background(colors.background) - .clickable(interactionSource = remember { MutableInteractionSource() }, indication = null) {}, + .blockTouches(), ) { CapsuleWall(games, driftMs = 65_000, modifier = Modifier.alpha(0.3f)) Box( @@ -350,7 +350,6 @@ private fun CancelHint(onCancel: () -> Unit, modifier: Modifier = Modifier) { fun SessionPausedOverlay(title: String = stringResource(R.string.load_steam_paused), onResume: () -> Unit) { val colors = MaterialTheme.colorScheme val pal = LocalPalette.current - val interactionSource = remember { MutableInteractionSource() } val resumeFocus = remember { FocusRequester() } LaunchedEffect(Unit) { androidx.compose.runtime.withFrameNanos { } @@ -360,7 +359,7 @@ fun SessionPausedOverlay(title: String = stringResource(R.string.load_steam_paus modifier = Modifier .fillMaxSize() .background(pal.background.copy(alpha = 0.94f)) - .clickable(interactionSource = interactionSource, indication = null) {}, + .blockTouches(), contentAlignment = Alignment.Center, ) { Column( diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt index d32e1e3ea4..ef55dd2882 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt @@ -103,6 +103,7 @@ import androidx.compose.animation.slideOutHorizontally import androidx.compose.foundation.LocalIndication import androidx.compose.foundation.border import androidx.compose.foundation.focusable +import androidx.compose.ui.focus.focusProperties import androidx.compose.foundation.hoverable import androidx.compose.foundation.interaction.collectIsFocusedAsState import androidx.compose.foundation.interaction.collectIsHoveredAsState @@ -384,10 +385,15 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont focus.request(first) } } - if (open || veil > 0.01f) Box( - modifier = Modifier.fillMaxSize() - .clickable(interactionSource = remember { MutableInteractionSource() }, indication = null) { host.open = null; a.onClose() }, - ) + if (open || veil > 0.01f) { + val closeLabel = stringResource(R.string.common_close) + Box( + modifier = Modifier.fillMaxSize() + .focusProperties { canFocus = false } + .semantics { contentDescription = closeLabel } + .clickable(interactionSource = remember { MutableInteractionSource() }, indication = null, onClickLabel = closeLabel) { host.open = null; a.onClose() }, + ) + } androidx.compose.foundation.layout.BoxWithConstraints(modifier = Modifier.fillMaxSize().exposeTestTags(), contentAlignment = Alignment.CenterEnd) { val short = maxHeight < 440.dp val sheetWidth = minOf(360.dp, maxWidth * 0.92f) @@ -401,7 +407,7 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont modifier = Modifier .fillMaxSize() .background(pal.background.copy(alpha = 0.97f)) - .clickable(interactionSource = remember { MutableInteractionSource() }, indication = null) {} + .blockTouches() .focusGroup() .controllerBack { if (host.open != null) host.open = null else a.onClose() diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SettingsWidgets.kt b/app/src/main/java/com/droiddeck/launcher/ui/SettingsWidgets.kt index 87fa58ace4..40619ee940 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SettingsWidgets.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SettingsWidgets.kt @@ -34,7 +34,9 @@ import androidx.compose.foundation.Canvas import androidx.compose.foundation.background import androidx.compose.foundation.border import androidx.compose.foundation.clickable +import androidx.compose.foundation.gestures.detectTapGestures import androidx.compose.foundation.hoverable +import androidx.compose.ui.input.pointer.pointerInput import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.interaction.collectIsFocusedAsState import androidx.compose.foundation.interaction.collectIsHoveredAsState @@ -141,6 +143,11 @@ internal fun Modifier.controllerBack(onBack: () -> Unit): Modifier = onPreviewKe } } +internal fun Modifier.blockTouches(): Modifier = pointerInput(Unit) { detectTapGestures { } } + +internal fun Modifier.tapOutside(onTap: () -> Unit): Modifier = + pointerInput(onTap) { detectTapGestures(onTap = { onTap() }) } + internal fun Modifier.bumpers(onPrevious: () -> Unit, onNext: () -> Unit): Modifier = onPreviewKeyEvent { event -> val keyEvent = event.nativeKeyEvent val previous = keyEvent.keyCode == KeyEvent.KEYCODE_BUTTON_L1 diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StoreAchievementsUi.kt b/app/src/main/java/com/droiddeck/launcher/ui/StoreAchievementsUi.kt index e0d5099a74..4f71f68b38 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoreAchievementsUi.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoreAchievementsUi.kt @@ -303,7 +303,7 @@ internal fun SessionAchievementsPanel(label: String, state: AchievementsState, t val slide = remember { MutableTransitionState(false).apply { targetState = true } } BoxWithConstraints( Modifier.fillMaxSize().background(veil) - .clickable(interactionSource = remember { MutableInteractionSource() }, indication = null, onClick = onClose), + .tapOutside(onClose), contentAlignment = Alignment.CenterEnd, ) { val short = maxHeight < 440.dp @@ -312,7 +312,7 @@ internal fun SessionAchievementsPanel(label: String, state: AchievementsState, t (if (floating) Modifier.padding(12.dp).fillMaxHeight().width(minOf(420.dp, maxWidth * 0.92f)).clip(RoundedCornerShape(20.dp)) .background(pal.background).border(1.dp, pal.line2, RoundedCornerShape(20.dp)) else Modifier.fillMaxHeight().width(minOf(420.dp, maxWidth * 0.92f)).background(pal.background.copy(alpha = 0.97f))) - .clickable(interactionSource = remember { MutableInteractionSource() }, indication = null) {} + .blockTouches() .controllerBack(onClose) .then(if (kinds.isEmpty()) Modifier else Modifier.bumpers({ pick = (pick + kinds.size - 1) % kinds.size }, { pick = (pick + 1) % kinds.size })) .padding(if (short) 12.dp else 16.dp), diff --git a/app/src/test/java/com/droiddeck/launcher/ui/DialogSemanticsTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/DialogSemanticsTest.kt new file mode 100644 index 0000000000..c08c0f2341 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/ui/DialogSemanticsTest.kt @@ -0,0 +1,42 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.animation.core.MutableTransitionState +import androidx.compose.material3.Text +import androidx.compose.runtime.remember +import androidx.compose.ui.test.assertHasNoClickAction +import androidx.compose.ui.test.onNodeWithText +import androidx.compose.ui.test.performClick +import org.junit.Assert.assertEquals +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [28]) +class DialogSemanticsTest { + @get:Rule val compose = createRobolectricComposeRule() + + @Test fun dialogTextNodesStaySeparateAndNonClickableInMergedSemanticsTree() { + var closed = 0 + compose.setContent { + DroidDeckTheme { + val shown = remember { MutableTransitionState(true) } + AppDialog(shown = shown, close = { closed++ }, label = "testDialog", wide = false) { + Text("Dialog Title") + Text("Dialog Hint") + Text("Body Copy") + } + } + } + compose.onNodeWithText("Dialog Title").assertExists().assertHasNoClickAction() + compose.onNodeWithText("Dialog Hint").assertExists().assertHasNoClickAction() + compose.onNodeWithText("Body Copy").assertExists().assertHasNoClickAction() + + compose.onNodeWithText("Dialog Title").performClick() + compose.onNodeWithText("Body Copy").performClick() + compose.waitForIdle() + assertEquals(0, closed) + } +} From eb0eecda7ac349ef89f1dcbcc068cae71f65a05c Mon Sep 17 00:00:00 2001 From: kingokksa <47888451+kingokksa@users.noreply.github.com> Date: Thu, 22 Oct 2026 21:37:01 +0800 Subject: [PATCH 05/25] fix: let a connected controller keep the first player slot (#1304) --- .../droiddeck/launcher/input/PadBridge.java | 31 ++++++++++++++----- .../launcher/session/SessionService.kt | 4 ++- 2 files changed, 26 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/input/PadBridge.java b/app/src/main/java/com/droiddeck/launcher/input/PadBridge.java index a626d86002..cfb0978cb8 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/PadBridge.java +++ b/app/src/main/java/com/droiddeck/launcher/input/PadBridge.java @@ -117,6 +117,16 @@ public final class PadBridge { if (changed && !on) resetBuiltin(); } + private static volatile int firstSlot; + + public static void setFirstSlot(int slot) { + firstSlot = slot; + } + + private int firstPlayerSlot() { + return firstSlot; + } + private void resetBuiltin() { routedTouch.clear(); systemGuidePressed = false; @@ -252,7 +262,9 @@ public final class PadBridge { public synchronized void syncConnectedControllers() { for (int deviceId : InputDevice.getDeviceIds()) { InputDevice device = InputDevice.getDevice(deviceId); - if (isFromController(device) && !excluded.test(deviceId)) publish(slotFor(device)); + if (!isFromController(device) || excluded.test(deviceId)) continue; + int slot = slotFor(device); + if (slot >= 0) publish(slot); } } @@ -272,6 +284,7 @@ public final class PadBridge { public synchronized boolean onKeyEvent(KeyEvent event) { if (!isControllerKeyEvent(event) || excluded.test(event.getDeviceId())) return false; int slot = slotFor(event.getDevice()); + if (slot < 0) return false; int side = JoyCon.side(event.getDevice()); if (side >= 0 && partners[slot] != NO_CONTROLLER && JoyCon.isRail(side, event.getScanCode())) return true; PadState pad = stateFor(slot); @@ -320,6 +333,7 @@ public final class PadBridge { if (!isControllerMotionEvent(event) || excluded.test(event.getDeviceId())) return false; if (event.getAction() != MotionEvent.ACTION_MOVE) return false; int slot = slotFor(event.getDevice()); + if (slot < 0) return false; PadState pad = stateFor(slot); noteDevice(event.getDevice(), slot); statAxes++; @@ -534,25 +548,25 @@ public final class PadBridge { if (owners[slot] != NO_CONTROLLER && InputDevice.getDevice(owners[slot]) == null) leave(slot, owners[slot]); } int side = JoyCon.side(device); - for (int slot = 0; side >= 0 && slot < SLOTS; slot++) { + for (int slot = firstPlayerSlot(); side >= 0 && slot < SLOTS; slot++) { if (owners[slot] == NO_CONTROLLER || partners[slot] != NO_CONTROLLER) continue; InputDevice owner = InputDevice.getDevice(owners[slot]); if (JoyCon.side(owner) != 1 - side) continue; partners[slot] = id; slotJoyCons.set(slot * 2 + side, id); slotJoyCons.set(slot * 2 + 1 - side, owner.getId()); - if (slot == 0) releaseBackPaddles(); + if (slot == firstPlayerSlot()) releaseBackPaddles(); stateFor(slot).clear(); Log.i(TAG, "\"" + device.getName() + "\" (id " + id + ") joins \"" + owner.getName() + "\" as player " + (slot + 1)); return slot; } - for (int slot = 0; slot < SLOTS; slot++) { + for (int slot = firstPlayerSlot(); slot < SLOTS; slot++) { if (owners[slot] != NO_CONTROLLER) continue; owners[slot] = id; Log.i(TAG, "\"" + device.getName() + "\" (id " + id + ") is player " + (slot + 1)); return slot; } - return 0; + return -1; } private PadState stateFor(int slot) { @@ -561,7 +575,8 @@ public final class PadBridge { private boolean isPrimary(KeyEvent event) { int id = event.getDevice().getId(); - return owners[0] == id || partners[0] == id; + int first = firstPlayerSlot(); + return owners[first] == id || partners[first] == id; } private void releaseBackPaddles() { @@ -580,7 +595,7 @@ public final class PadBridge { clearJoyCons(slot); if (slotControllers.get(slot) == id) slotControllers.set(slot, owners[slot]); if (activeControllerId == id) activeControllerId = owners[slot]; - if (slot == 0) releaseBackPaddles(); + if (slot == firstPlayerSlot()) releaseBackPaddles(); stateFor(slot).clear(); publish(slot); } @@ -596,8 +611,8 @@ public final class PadBridge { partners[slot] = NO_CONTROLLER; clearJoyCons(slot); slotControllers.set(slot, NO_CONTROLLER); + if (slot == firstPlayerSlot()) releaseBackPaddles(); if (slot == 0) { - releaseBackPaddles(); state.clear(); publish(); return; diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt index c1b0ab86d8..fd9d772701 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt @@ -714,7 +714,9 @@ class SessionService : Service() { private fun addControllerEnvironment(guest: MutableList, fakeInputDir: File, sessionDir: File) { FakeInputWriter.prepareRingSlots(fakeInputDir, 4) val builtinPad = SessionPrefs.builtinPad(this) - val hiddenPad = SessionState.mode == MODE_STEAM && !builtinPad + val hiddenPad = SessionState.mode == MODE_STEAM && !builtinPad && + !com.droiddeck.launcher.input.PadBridge.anyControllerConnected() + com.droiddeck.launcher.input.PadBridge.setFirstSlot(if (hiddenPad) 1 else 0) fakeInputDir.listFiles()?.forEach { file -> val node = Regex("event(\\d+)").matchEntire(file.name)?.groupValues?.get(1)?.toIntOrNull() if (file.name.startsWith(".uinput-") || (node != null && node >= FIRST_VIRTUAL_PAD) || From 9ed658c45cd7de40d88716ca1a27a1657e297ec1 Mon Sep 17 00:00:00 2001 From: kaosjammo Date: Fri, 23 Oct 2026 01:07:56 +1100 Subject: [PATCH 06/25] fix: seed HKCU redist markers in the user registry (#1286) * fix: seed current-user redist markers in user.reg * test: skip permission case when running as root --------- Co-authored-by: Jammo <8018115+kaosjammo@users.noreply.github.com> Co-authored-by: xXJsonDeruloXx --- .../usr/local/bin/droiddeck-seed-redists | 133 +++++++++-------- tools/tests/test_seed_redists.py | 136 +++++++++++++++++- 2 files changed, 212 insertions(+), 57 deletions(-) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-seed-redists b/tools/linuxfs/overlay/usr/local/bin/droiddeck-seed-redists index a13f6b417f..831a0e4cee 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-seed-redists +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-seed-redists @@ -96,14 +96,14 @@ done <<<"$pairs" want+=("vcrt"$'\t'"$VCRT_MAJOR.$VCRT_MINOR.$VCRT_BUILD") printf -v now '%(%s)T' -1 -block_for() { printf '%s\n' "$@" | awk -F'\t' -v now="$now" ' +block_for() { printf '%s\n' "$@" | awk -F'\t' -v now="$now" -v hive="$hive" ' { path = $1 - sub(/^HKEY_LOCAL_MACHINE\\\\/, "", path) + sub(/^HKEY_(LOCAL_MACHINE|CURRENT_USER)\\\\/, "", path) if (path == $1) next printf "\n[%s] %d\n\"%s\"=dword:00000001\n", path, now, $2 - if (substr(path, 1, 10) != "Software\\\\") + if (hive != "HKEY_LOCAL_MACHINE" || substr(path, 1, 10) != "Software\\\\") next printf "\n[%s] %d\n\"%s\"=dword:00000001\n", "Software\\\\Wow6432Node\\\\" substr(path, 11), now, $2 } @@ -115,16 +115,17 @@ block_for() { printf '%s\n' "$@" | awk -F'\t' -v now="$now" ' unseed() { local reg=$1 out shift - out=$(mktemp "${reg%/*}/.system.reg.XXXXXX") || return 1 - if printf '%s\n' "$@" | awk -F'\t' ' + [ -w "$reg" ] || return 1 + out=$(mktemp "${reg%/*}/.${reg##*/}.XXXXXX") || return 1 + if printf '%s\n' "$@" | awk -F'\t' -v hive="$hive" ' NR == FNR { path = $1 - sub(/^HKEY_LOCAL_MACHINE\\\\/, "", path) + sub(/^HKEY_(LOCAL_MACHINE|CURRENT_USER)\\\\/, "", path) if (path == $1) next path = tolower(path) drop["[" path "]" SUBSEP tolower($2)] = 1 - if (substr(path, 1, 10) == "software\\\\") + if (hive == "HKEY_LOCAL_MACHINE" && substr(path, 1, 10) == "software\\\\") drop["[software\\\\wow6432node\\\\" substr(path, 11) "]" SUBSEP tolower($2)] = 1 next } @@ -145,11 +146,11 @@ unseed() { # The ledger lines whose values the registry still holds, in both views where we wrote both. A Proton # update replaces its default_pfx system.reg but not our ledger beside it, and new prefixes copy both. -present() { awk -F'\t' ' +present() { awk -F'\t' -v hive="$hive" ' NR == FNR { path = $1 if (path != "vcrt") { - sub(/^HKEY_LOCAL_MACHINE\\\\/, "", path) + sub(/^HKEY_(LOCAL_MACHINE|CURRENT_USER)\\\\/, "", path) if (path == $1) next } @@ -163,7 +164,7 @@ present() { awk -F'\t' ' key[n, ++need[n]] = "[software\\\\wow6432node\\\\" runtime "]" SUBSEP "installed" } } else { - both = substr(path, 1, 10) == "Software\\\\" + both = hive == "HKEY_LOCAL_MACHINE" && substr(path, 1, 10) == "Software\\\\" path = tolower(path) key[n, ++need[n]] = "[" path "]" SUBSEP tolower($2) if (both) @@ -200,60 +201,80 @@ for reg in "$steam_root"/steamapps/common/Proton*/files/share/default_pfx*/syste done declare -A regid=() if [ ${#regs[@]} -gt 0 ]; then + users=() + for reg in "${regs[@]}"; do users+=("${reg%/*}/user.reg"); done while IFS=$'\t' read -r id name; do regid[$name]=$id - done < <(stat -c $'%i %s %.9Y\t%n' -- "${regs[@]}" 2>/dev/null) + done < <(stat -c $'%i %s %.9Y\t%n' -- "${regs[@]}" "${users[@]}" 2>/dev/null) fi -for reg in "${regs[@]}"; do - seeded=${reg%/*}/.droiddeck-redists - checked=${reg%/*}/.droiddeck-redists-checked - id=${regid[$reg]:-} +for system in "${regs[@]}"; do + user=${system%/*}/user.reg + seeded=${system%/*}/.droiddeck-redists + checked=${system%/*}/.droiddeck-redists-checked + id="${regid[$system]:-}|${regid[$user]:-missing}" prev= [ -f "$checked" ] && read -r prev <"$checked" - legacy=${reg%/*}/.bannerlator-redists + legacy=${system%/*}/.bannerlator-redists if [ -f "$legacy" ] && [ ! -f "$seeded" ]; then mv -f "$legacy" "$seeded" fi - declare -A had=() - if [ -f "$seeded" ]; then - while IFS= read -r line; do [[ $line == *$'\t'* ]] && had[$line]=1; done <"$seeded" - fi - stale=() kept=() - for line in "${!had[@]}"; do - if [ -n "${vulkan[$line]:-}" ]; then stale+=("$line"); else kept+=("$line"); fi - done - if [ ${#stale[@]} -gt 0 ] && unseed "$reg" "${stale[@]}"; then - id= - had=() - for line in "${kept[@]}"; do had[$line]=1; done - printf '%s\n' "${kept[@]}" >"$seeded" - echo "== took Vulkan runtime markers out of $reg" - fi - if [ ${#had[@]} -gt 0 ] && { [ -z "$id" ] || [ "$id" != "$prev" ]; }; then - declare -A held=() - while IFS= read -r line; do [[ $line == *$'\t'* ]] && held[$line]=1; done < <(printf '%s\n' "${!had[@]}" | present "$reg") - if [ ${#held[@]} -lt ${#had[@]} ]; then - echo "== $((${#had[@]} - ${#held[@]})) recorded redist markers are gone from $reg" - had=() - for line in "${!held[@]}"; do had[$line]=1; done - printf '%s\n' "${!had[@]}" >"$seeded" + for reg in "$system" "$user"; do + hive=HKEY_LOCAL_MACHINE + [ "$reg" == "$user" ] && hive=HKEY_CURRENT_USER + declare -A had=() + other=() + if [ -f "$seeded" ]; then + while IFS= read -r line; do + [[ $line == *$'\t'* ]] || continue + if [[ $line == "$hive\\"* ]] || { [ "$reg" == "$system" ] && [[ $line == vcrt$'\t'* ]]; }; then + had[$line]=1 + else + other+=("$line") + fi + done <"$seeded" fi - unset held - fi - missing=() - for line in "${want[@]}"; do [ -n "${had[$line]:-}" ] || missing+=("$line"); done - if [ ${#missing[@]} -eq 0 ]; then - [ -n "$id" ] && [ "$id" != "$prev" ] && printf '%s\n' "$id" >"$checked" - continue - fi - rm -f "$checked" - dated=$(mktemp) || continue - touch -r "$reg" "$dated" - if printf '%s\n' "$(block_for "${missing[@]}")" >>"$reg"; then - printf '%s\n' "${!had[@]}" "${missing[@]}" >"$seeded" - echo "== seeded redist markers into $reg" - fi - touch -r "$dated" "$reg" - rm -f "$dated" + stale=() kept=() + for line in "${!had[@]}"; do + if [ -n "${vulkan[$line]:-}" ]; then stale+=("$line"); else kept+=("$line"); fi + done + if [ ${#stale[@]} -gt 0 ] && unseed "$reg" "${stale[@]}"; then + id= + had=() + for line in "${kept[@]}"; do had[$line]=1; done + printf '%s\n' "${other[@]}" "${kept[@]}" >"$seeded" + echo "== took Vulkan runtime markers out of $reg" + fi + if [ ${#had[@]} -gt 0 ] && { [ -z "$id" ] || [ "$id" != "$prev" ]; }; then + declare -A held=() + while IFS= read -r line; do [[ $line == *$'\t'* ]] && held[$line]=1; done < <([ -f "$reg" ] && printf '%s\n' "${!had[@]}" | present "$reg") + if [ ${#held[@]} -lt ${#had[@]} ]; then + echo "== $((${#had[@]} - ${#held[@]})) recorded redist markers are gone from $reg" + had=() + for line in "${!held[@]}"; do had[$line]=1; done + printf '%s\n' "${other[@]}" "${!had[@]}" >"$seeded" + fi + unset held + fi + missing=() + for line in "${want[@]}"; do + [[ $line == "$hive\\"* ]] || { [ "$reg" == "$system" ] && [[ $line == vcrt$'\t'* ]]; } || continue + [ -n "${had[$line]:-}" ] || missing+=("$line") + done + if [ ${#missing[@]} -eq 0 ]; then + [ -n "$id" ] && [ "$id" != "$prev" ] && printf '%s\n' "$id" >"$checked" + continue + fi + [ -f "$reg" ] && [ -w "$reg" ] || continue + rm -f "$checked" + dated=$(mktemp) || continue + touch -r "$reg" "$dated" + if printf '%s\n' "$(block_for "${missing[@]}")" >>"$reg"; then + printf '%s\n' "${other[@]}" "${!had[@]}" "${missing[@]}" >"$seeded" + id= + echo "== seeded redist markers into $reg" + fi + touch -r "$dated" "$reg" + rm -f "$dated" + done done diff --git a/tools/tests/test_seed_redists.py b/tools/tests/test_seed_redists.py index 27c5d42a96..042ab87d4e 100644 --- a/tools/tests/test_seed_redists.py +++ b/tools/tests/test_seed_redists.py @@ -53,6 +53,8 @@ class SeedRedistsTest(unittest.TestCase): self.reg = self.steam / "steamapps/compatdata/1234/pfx/system.reg" self.reg.parent.mkdir(parents=True) self.reg.write_text("WINE REGISTRY Version 2\n") + self.user = self.reg.with_name("user.reg") + self.user.write_text('WINE REGISTRY Version 2\n\n[Software\\\\Unrelated] 1\n"Keep"="untouched"\n') def game(self, name="Some Game", script=GAME_SCRIPT, library=None): root = Path(library or self.steam) @@ -81,6 +83,93 @@ class SeedRedistsTest(unittest.TestCase): self.run_seed(str(sd)) self.assertIn('"VCRedist2022"=dword:00000001', self.reg.read_text()) + def test_current_user_and_machine_markers_go_to_their_own_registries(self): + self.game(script=GAME_SCRIPT + GAME_SCRIPT.replace("HKEY_LOCAL_MACHINE", "HKEY_CURRENT_USER").replace("VCRedist2022", "UserRedist")) + with self.reg.open("a") as out: + out.write('\n[Software\\\\Unrelated] 1\n"Keep"="machine"\n') + for reg in (self.reg, self.user): + os.utime(reg, ns=(1_000_000_000_123456789, 1_000_000_000_123456789)) + self.run_seed() + system, user = self.reg.read_text(), self.user.read_text() + self.assertEqual(system.count('"VCRedist2022"=dword:00000001'), 2) + self.assertNotIn("UserRedist", system) + self.assertEqual(user.count('"UserRedist"=dword:00000001'), 1) + self.assertNotIn("Wow6432Node", user) + self.assertNotIn("VCRedist2022", user) + self.assertIn('"Keep"="machine"', system) + self.assertIn('"Keep"="untouched"', user) + self.run_seed() + self.assertEqual(system, self.reg.read_text()) + self.assertEqual(user, self.user.read_text()) + for reg in (self.reg, self.user): + self.assertEqual(reg.stat().st_mtime_ns, 1_000_000_000_123456789) + + def test_a_user_marker_with_the_same_machine_path_and_value_is_separate(self): + self.game(script=GAME_SCRIPT + GAME_SCRIPT.replace("HKEY_LOCAL_MACHINE", "HKEY_CURRENT_USER")) + self.run_seed() + system = self.reg.read_text() + self.assertEqual(self.user.read_text().count('"VCRedist2022"=dword:00000001'), 1) + self.user.write_text("WINE REGISTRY Version 2\n") + self.run_seed() + self.assertEqual(self.user.read_text().count('"VCRedist2022"=dword:00000001'), 1) + self.assertEqual(system, self.reg.read_text()) + + def test_a_legacy_user_ledger_entry_is_checked_in_user_reg(self): + self.game(script=GAME_SCRIPT.replace("HKEY_LOCAL_MACHINE", "HKEY_CURRENT_USER")) + self.run_seed() + system = self.reg.read_bytes() + self.user.write_text("WINE REGISTRY Version 2\n") + (self.reg.parent / ".droiddeck-redists-checked").write_text(subprocess.check_output(["stat", "-c", "%i %s %.9Y", str(self.reg)], text=True)) + self.run_seed() + self.assertEqual(self.user.read_text().count('"VCRedist2022"=dword:00000001'), 1) + self.assertEqual(system, self.reg.read_bytes()) + + def test_an_absent_user_registry_is_not_created_or_claimed(self): + self.game(script=GAME_SCRIPT + GAME_SCRIPT.replace("HKEY_LOCAL_MACHINE", "HKEY_CURRENT_USER").replace("VCRedist2022", "UserRedist")) + self.user.unlink() + self.run_seed() + self.assertFalse(self.user.exists()) + self.assertNotIn("UserRedist", (self.reg.parent / ".droiddeck-redists").read_text()) + self.assertEqual(self.reg.read_text().count('"VCRedist2022"=dword:00000001'), 2) + system = self.reg.read_bytes() + self.user.write_text("WINE REGISTRY Version 2\n") + self.run_seed() + self.assertIn('"UserRedist"=dword:00000001', self.user.read_text()) + self.run_seed() + self.user.unlink() + self.run_seed() + self.assertFalse(self.user.exists()) + self.assertNotIn("UserRedist", (self.reg.parent / ".droiddeck-redists").read_text()) + self.assertEqual(system, self.reg.read_bytes()) + + @unittest.skipIf(os.name == "posix" and os.geteuid() == 0, "root can write through read-only mode bits") + def test_an_unwritable_user_registry_does_not_claim_a_missing_marker(self): + self.game(script=GAME_SCRIPT + GAME_SCRIPT.replace("HKEY_LOCAL_MACHINE", "HKEY_CURRENT_USER").replace("VCRedist2022", "UserRedist")) + ledger = self.reg.parent / ".droiddeck-redists" + ledger.write_text("HKEY_CURRENT_USER\\\\Software\\\\Valve\\\\Steam\\\\Apps\\\\CommonRedist\\\\vcredist\\\\2022\tUserRedist\n") + user = self.user.read_bytes() + self.user.chmod(0o444) + try: + self.run_seed() + self.assertEqual(user, self.user.read_bytes()) + self.assertEqual(self.user.stat().st_mode & 0o777, 0o444) + self.assertNotIn("UserRedist", ledger.read_text()) + self.assertEqual(self.reg.read_text().count('"VCRedist2022"=dword:00000001'), 2) + finally: + self.user.chmod(0o644) + + def test_user_markers_in_a_default_prefix_and_another_library_are_seeded(self): + default = self.steam / "steamapps/common/Proton Test/files/share/default_pfx" + default.mkdir(parents=True) + for name in ("system.reg", "user.reg"): + (default / name).write_text("WINE REGISTRY Version 2\n") + sd = self.tmp / "sd" + self.game(library=sd, script=GAME_SCRIPT.replace("HKEY_LOCAL_MACHINE", "HKEY_CURRENT_USER")) + self.run_seed(str(sd)) + self.assertIn('"VCRedist2022"=dword:00000001', (default / "user.reg").read_text()) + self.assertNotIn('"VCRedist2022"', (default / "system.reg").read_text()) + self.assertIn('"VCRedist2022"=dword:00000001', self.user.read_text()) + def test_the_vc_runtime_is_recorded_for_every_architecture_and_view(self): self.run_seed() reg = self.reg.read_text() @@ -156,7 +245,7 @@ class SeedRedistsTest(unittest.TestCase): self.assertIn('"x64 14.99.1.0"=dword:00000001', self.reg.read_text()) def test_an_unchanged_registry_is_not_read_again(self): - self.game() + self.game(script=GAME_SCRIPT + GAME_SCRIPT.replace("HKEY_LOCAL_MACHINE", "HKEY_CURRENT_USER").replace("VCRedist2022", "UserRedist")) self.run_seed() self.run_seed() shim = self.tmp / "bin" @@ -166,9 +255,21 @@ class SeedRedistsTest(unittest.TestCase): (shim / "awk").chmod(0o755) env = dict(os.environ, DROIDDECK_LIBRARIES="", PATH="%s:%s" % (shim, os.environ["PATH"])) once = self.reg.read_text() + user = self.user.read_text() subprocess.run(["bash", str(SCRIPT), str(self.steam)], env=env, capture_output=True, text=True, check=True) self.assertEqual(once, self.reg.read_text()) + self.assertEqual(user, self.user.read_text()) self.assertNotIn(str(self.reg), log.read_text() if log.exists() else "") + self.assertNotIn(str(self.user), log.read_text() if log.exists() else "") + replaced = self.user.with_name("user.reg.new") + replaced.write_text(user.replace('"UserRedist"', '"OtherValue"')) + os.utime(replaced, ns=(self.user.stat().st_atime_ns, self.user.stat().st_mtime_ns)) + self.assertEqual(replaced.stat().st_size, self.user.stat().st_size) + os.replace(replaced, self.user) + subprocess.run(["bash", str(SCRIPT), str(self.steam)], env=env, capture_output=True, text=True, check=True) + self.assertEqual(self.user.read_text().count('"UserRedist"=dword:00000001'), 1) + self.assertIn('"OtherValue"=dword:00000001', self.user.read_text()) + self.assertEqual(once, self.reg.read_text()) replaced = self.reg.with_name("system.reg.new") replaced.write_text("WINE REGISTRY Version 2\n") os.replace(replaced, self.reg) @@ -194,6 +295,39 @@ class SeedRedistsTest(unittest.TestCase): self.assertIn('"RockstarLauncher"=dword:00000001', reg) self.assertNotIn("Vulkan111080", (self.reg.parent / ".droiddeck-redists").read_text()) + def test_a_current_user_vulkan_installer_is_left_to_run(self): + self.game(script=VULKAN_SCRIPT.replace("HKEY_LOCAL_MACHINE", "HKEY_CURRENT_USER")) + self.run_seed() + self.assertIn('"RockstarLauncher"=dword:00000001', self.user.read_text()) + self.assertNotIn("Vulkan111080", self.user.read_text()) + self.assertNotIn("Vulkan111080", self.reg.read_text()) + self.assertNotIn("Vulkan111080", (self.reg.parent / ".droiddeck-redists").read_text()) + + def test_a_current_user_vulkan_marker_comes_out_of_only_its_own_hive(self): + self.game(script=VULKAN_SCRIPT.replace("HKEY_LOCAL_MACHINE", "HKEY_CURRENT_USER")) + self.run_seed() + system = self.reg.read_bytes() + b'\n[Software\\\\Valve\\\\Steam\\\\Apps\\\\1174180] 1\n"Vulkan111080"=dword:00000001\n' + self.reg.write_bytes(system) + with self.user.open("a") as out: + out.write('\n[Software\\\\Valve\\\\Steam\\\\Apps\\\\1174180] 1\n"Other"="keep"\n"Vulkan111080"=dword:00000001\n' + '\n[Software\\\\Wow6432Node\\\\Valve\\\\Steam\\\\Apps\\\\1174180] 1\n"Vulkan111080"=dword:00000001\n' + '\n[Software\\\\Valve\\\\Steam\\\\Apps\\\\22380] 1\n"Vulkan111080"=dword:00000001\n') + with (self.reg.parent / ".droiddeck-redists").open("a") as out: + out.write("HKEY_CURRENT_USER\\\\Software\\\\Valve\\\\Steam\\\\Apps\\\\1174180\tVulkan111080\n") + os.utime(self.user, ns=(1_000_000_000_123456789, 1_000_000_000_123456789)) + self.run_seed() + user = self.user.read_text() + self.assertEqual(user.count('"Vulkan111080"'), 2, "the other path and the unseeded user view stay") + self.assertIn('"Other"="keep"', user) + self.assertEqual(system, self.reg.read_bytes()) + self.assertNotIn("Vulkan111080", (self.reg.parent / ".droiddeck-redists").read_text()) + self.assertEqual(self.user.stat().st_mtime_ns, 1_000_000_000_123456789) + with self.user.open("a") as out: + out.write('\n[Software\\\\Valve\\\\Steam\\\\Apps\\\\1174180] 1\n"Vulkan111080"=dword:00000001\n') + user = self.user.read_bytes() + self.run_seed() + self.assertEqual(user, self.user.read_bytes()) + def test_a_vulkan_marker_an_earlier_seeding_wrote_comes_out_once(self): self.rdr2() marker = "HKEY_LOCAL_MACHINE\\\\Software\\\\Valve\\\\Steam\\\\Apps\\\\1174180\tVulkan111080" From d9328c39df29f98c1859e9588aae5bed414731b7 Mon Sep 17 00:00:00 2001 From: Jordan Y <41272328+coffeemeist3r@users.noreply.github.com> Date: Thu, 22 Oct 2026 09:08:25 -0500 Subject: [PATCH 07/25] fix: Game cores also apply to games started through "Linux x86 (FEX)" (#1294) * Run FEX-tool games on the chosen game cores Performance > Game cores reached only the Proton launchers: games started through "Linux x86 (FEX)" ran on every core, including the slowest cluster. * Test that SteamVR FEX launches keep the game cores --- .../overlay/usr/local/bin/steam-compatibility | 6 ++++-- tools/tests/test_droiddeck_fex.py | 17 +++++++++++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/tools/linuxfs/overlay/usr/local/bin/steam-compatibility b/tools/linuxfs/overlay/usr/local/bin/steam-compatibility index 04ce24149a..41a37a9aa5 100755 --- a/tools/linuxfs/overlay/usr/local/bin/steam-compatibility +++ b/tools/linuxfs/overlay/usr/local/bin/steam-compatibility @@ -466,10 +466,12 @@ verb=$1; shift case $verb in getcompatpath | getnativepath) printf '%s\\n' "$1"; exit 0 ;; esac +""" + BL_GAME_CPUS_SETUP + """ +bl_game_cpus if [ -x /usr/local/bin/droiddeck-steamvr-flat ] && /usr/local/bin/droiddeck-steamvr-flat "$verb"; then - exec /usr/local/bin/droiddeck-steamvr-game /usr/local/bin/droiddeck-fex steam "$verb" "$@" + exec /usr/local/bin/droiddeck-steamvr-game ${BL_TASKSET:-} /usr/local/bin/droiddeck-fex steam "$verb" "$@" fi -exec /usr/local/bin/droiddeck-fex steam "$verb" "$@" +exec ${BL_TASKSET:-} /usr/local/bin/droiddeck-fex steam "$verb" "$@" """ diff --git a/tools/tests/test_droiddeck_fex.py b/tools/tests/test_droiddeck_fex.py index 3bfbabc867..fed546dddc 100644 --- a/tools/tests/test_droiddeck_fex.py +++ b/tools/tests/test_droiddeck_fex.py @@ -6,6 +6,7 @@ import os import runpy import shutil import struct +import subprocess import tempfile import unittest from pathlib import Path @@ -866,6 +867,22 @@ class AppInfoTest(unittest.TestCase): self.assertIn('"from_oslist" "linux"', vdf) self.assertIn('"to_oslist" "linux"', vdf) + def test_the_tool_runs_games_on_the_chosen_cores(self): + with tempfile.TemporaryDirectory() as tmp: + tool, bin_dir = Path(tmp) / "droiddeck-fex", Path(tmp) / "bin" + self.COMPAT["build_fex_tool"](str(tool)) + bin_dir.mkdir() + (bin_dir / "taskset").write_text('#!/bin/sh\necho "taskset $*"\n') + (bin_dir / "taskset").chmod(0o755) + env = dict(os.environ, PATH="%s:%s" % (bin_dir, os.environ.get("PATH", "")), BL_GAME_CPUS="2-7") + run = subprocess.run([str(tool / "droiddeck-fex-tool"), "waitforexitandrun", "/games/a/game"], + env=env, capture_output=True, text=True, timeout=10) + self.assertEqual(run.stdout, + "taskset -c 2-7 /usr/local/bin/droiddeck-fex steam waitforexitandrun /games/a/game\n") + self.assertIn("game cores 2-7", run.stderr) + self.assertIn('exec /usr/local/bin/droiddeck-steamvr-game ${BL_TASKSET:-} ' + '/usr/local/bin/droiddeck-fex steam "$verb" "$@"', self.COMPAT["FEX_LAUNCHER_SH"]) + if __name__ == "__main__": unittest.main() From 87e4b42ed80ecb2ded3f4ab71089f6498801848d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Resul=20=C3=96v=C3=BCr?= <92828257+ovurrsl@users.noreply.github.com> Date: Thu, 22 Oct 2026 17:12:33 +0300 Subject: [PATCH 08/25] fix: third-party GitHub mirrors only serve downloads with a trusted digest (#1057) fix: a third-party GitHub mirror can only serve downloads that carry a trusted digest Downloads without an expected SHA-256 were still sent through gh-proxy, ghfast and other mirrors, and the first answer was accepted, so a mirror could swap an AppImage or a Windows component. Downloader.downloadFile now tries only the original URL when there is no digest. UserApps passes GitHub's own asset digest, and WinComponents passes the snapshot's archive digest, so those large files keep their mirror fallback. Co-authored-by: ovurrsl Co-authored-by: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> --- .../java/com/droiddeck/launcher/core/Downloader.java | 7 ++++++- .../java/com/droiddeck/launcher/runtime/UserApps.kt | 12 ++++++++---- .../com/droiddeck/launcher/session/WinComponents.kt | 4 +++- .../droiddeck/launcher/core/DownloaderResumeTest.kt | 6 ++++++ 4 files changed, 23 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/core/Downloader.java b/app/src/main/java/com/droiddeck/launcher/core/Downloader.java index 2527c57e82..183076188d 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/Downloader.java +++ b/app/src/main/java/com/droiddeck/launcher/core/Downloader.java @@ -54,7 +54,12 @@ public final class Downloader { java.util.function.Consumer progress) { if (expectedSha256 != null && !expectedSha256.matches("(?i)[0-9a-f]{64}")) throw new IllegalArgumentException("Expected SHA-256 must be 64 hex characters"); - return downloadCandidates(url, DownloadSource.INSTANCE.candidates(url), destination, resume, expectedSha256, progress); + return downloadCandidates(url, sources(url, expectedSha256), destination, resume, expectedSha256, progress); + } + + /** A third-party mirror may only serve bytes that can be checked against a digest from a direct source. */ + static List sources(String url, String expectedSha256) { + return expectedSha256 == null ? java.util.Collections.singletonList(url) : DownloadSource.INSTANCE.candidates(url); } // Package-private for the local multi-source HTTP test. diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/UserApps.kt b/app/src/main/java/com/droiddeck/launcher/runtime/UserApps.kt index 3bd000d7d1..b7ca15a18d 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/UserApps.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/UserApps.kt @@ -13,6 +13,7 @@ import com.caverock.androidsvg.SVG import com.droiddeck.launcher.R import com.droiddeck.launcher.core.Downloader import com.droiddeck.launcher.core.FileUtils +import com.droiddeck.launcher.core.Hashes import com.droiddeck.launcher.store.FlathubApi import org.json.JSONArray import org.json.JSONObject @@ -44,7 +45,7 @@ object UserApps { val fex: String = LinuxFex.AUTO, val arch: String? = null, ) - class Release(val tag: String, val published: String, val asset: String, val url: String) + class Release(val tag: String, val published: String, val asset: String, val url: String, val sha256: String? = null) sealed class UpdateCheck { class Current(val tag: String) : UpdateCheck() @@ -318,9 +319,12 @@ object UserApps { val r = releases.getJSONObject(i) if (r.optBoolean("draft")) return@mapNotNull null val assets = r.optJSONArray("assets") ?: return@mapNotNull null - val byName = (0 until assets.length()).associate { j -> assets.getJSONObject(j).let { it.getString("name") to it.getString("browser_download_url") } } + val byName = (0 until assets.length()).associate { j -> assets.getJSONObject(j).let { it.getString("name") to it } } pickAsset(byName.keys.toList())?.let { asset -> - r.optBoolean("prerelease") to Release(r.optString("tag_name", asset), r.optString("published_at"), asset, byName.getValue(asset)) + r.optBoolean("prerelease") to byName.getValue(asset).let { a -> + Release(r.optString("tag_name", asset), r.optString("published_at"), asset, a.getString("browser_download_url"), + Hashes.githubSha256(a.optString("digest"))) + } } } val pick = (candidates.firstOrNull { !it.first } ?: candidates.firstOrNull())?.second @@ -331,7 +335,7 @@ object UserApps { val download = File(context.cacheDir, "github-${release.asset}") try { val label = context.getString(R.string.user_apps_downloading, release.asset) - val ok = Downloader.downloadFile(release.url, download, false) { f -> onProgress(label, if (f < 0) -1 else Math.round(f * 100f)) } + val ok = Downloader.downloadFile(release.url, download, false, release.sha256) { f -> onProgress(label, if (f < 0) -1 else Math.round(f * 100f)) } return if (ok) use(download) else context.getString(R.string.user_apps_download_failed) } finally { download.delete() diff --git a/app/src/main/java/com/droiddeck/launcher/session/WinComponents.kt b/app/src/main/java/com/droiddeck/launcher/session/WinComponents.kt index c79171df26..2c5a1aa0d1 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/WinComponents.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/WinComponents.kt @@ -369,7 +369,9 @@ object WinComponents { val archiveName = archive.optString("name") val url = c.snapshot.substringBeforeLast('/') + "/" + archiveName val file = File(work, "${c.name}.files.tar.xz") - if (!Downloader.downloadFile(url, file, false) { f -> onProgress(Progress(c.name, archiveName, Phase.DOWNLOAD, if (f < 0) -1 else Math.round(f * 100f))) }) { + // The snapshot came straight from github.com, so its digest may vouch for a mirror's copy of the archive. + val sha = archive.optString("sha256").takeIf { it.matches(Regex("(?i)[0-9a-f]{64}")) } + if (!Downloader.downloadFile(url, file, false, sha) { f -> onProgress(Progress(c.name, archiveName, Phase.DOWNLOAD, if (f < 0) -1 else Math.round(f * 100f))) }) { return null to "download failed: $archiveName" } archive.optString("sha256").takeIf { it.length == 64 }?.let { sha -> diff --git a/app/src/test/java/com/droiddeck/launcher/core/DownloaderResumeTest.kt b/app/src/test/java/com/droiddeck/launcher/core/DownloaderResumeTest.kt index a3faef0701..73fd0161c6 100644 --- a/app/src/test/java/com/droiddeck/launcher/core/DownloaderResumeTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/core/DownloaderResumeTest.kt @@ -167,4 +167,10 @@ class DownloaderResumeTest { assertEquals(listOf(catalog), DownloadSource.candidates(catalog)) } + + @Test fun withoutADigestOnlyTheOriginalUrlIsTried() { + val url = "https://github.com/owner/repo/releases/download/v1/app.AppImage" + assertEquals(listOf(url), Downloader.sources(url, null)) + assertEquals(DownloadSource.candidates(url), Downloader.sources(url, "a".repeat(64))) + } } From de8b5568c10e2188b135ff61dba659d5e6fab5d9 Mon Sep 17 00:00:00 2001 From: William Allen Date: Thu, 22 Oct 2026 09:12:57 -0500 Subject: [PATCH 09/25] Fix: Keep Android library names visible in diagnostic logs (#1063) * Preserve Android shared-library names in logs * Restrict library redaction exceptions to loader diagnostics --------- Co-authored-by: xXJsonDeruloXx Co-authored-by: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> --- .../droiddeck/launcher/core/LogRedactor.kt | 49 ++++++++++-- .../launcher/core/LogRedactorTest.kt | 77 +++++++++++++++++++ 2 files changed, 121 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/core/LogRedactor.kt b/app/src/main/java/com/droiddeck/launcher/core/LogRedactor.kt index a667543a69..491101dba2 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/LogRedactor.kt +++ b/app/src/main/java/com/droiddeck/launcher/core/LogRedactor.kt @@ -2,14 +2,51 @@ package com.droiddeck.launcher.core object LogRedactor { private val EMAIL = Regex("[A-Za-z0-9._%+\\-]+@[A-Za-z0-9.\\-]+\\.[A-Za-z]{2,}") + private val HIDL_SHARED_LIBRARY = Regex( + "(?:android\\.(?:hardware|frameworks|hidl|system)|vendor\\.[A-Za-z0-9_]+\\.hardware)" + + "(?:\\.[A-Za-z0-9_]+)+@[0-9]+\\.[0-9]+(?:-[A-Za-z0-9_]+)*\\.so" + ) + private val hidlMatcher = object : ThreadLocal() { + override fun initialValue(): java.util.regex.Matcher = HIDL_SHARED_LIBRARY.toPattern().matcher("") + } + + private fun isHidlLoaderDiagnostic(input: String, match: MatchResult): Boolean { + val matcher = hidlMatcher.get()!! + val isLibrary = try { matcher.reset(match.value).matches() } finally { matcher.reset("") } + if (!isLibrary) return false + val start = match.range.first + val end = match.range.last + 1 + val prefix = "library \"" + val suffix = "\" not found" + val earliestQuote = (start - 4096).coerceAtLeast(0) + var quote = start - 1 + while (quote >= earliestQuote && input[quote] != '"') { + val char = input[quote] + if (!char.isLetterOrDigit() && char !in "/._-") return false + quote-- + } + if (quote < earliestQuote) return false + val pathStart = quote + 1 + if (pathStart < start && (input[start - 1] != '/' || + !(input.regionMatches(pathStart, "/vendor/", 0, 8) || + input.regionMatches(pathStart, "/system/", 0, 8)))) return false + val prefixStart = quote - prefix.length + 1 + val suffixEnd = end + suffix.length + return prefixStart >= 0 && suffixEnd <= input.length && + input.regionMatches(prefixStart, prefix, 0, prefix.length, ignoreCase = true) && + input.regionMatches(end, suffix, 0, suffix.length, ignoreCase = true) && + (prefixStart == 0 || !(input[prefixStart - 1].isLetterOrDigit() || input[prefixStart - 1] == '_')) && + (suffixEnd == input.length || !(input[suffixEnd].isLetterOrDigit() || input[suffixEnd] == '_')) + } + private val JWT_LABELLED = Regex("(?i)(\\bJWT[\\s=:]+)(\\d{8,})") private val JWT_BASE64 = Regex("ey[A-Za-z0-9_\\-]{6,}\\.[A-Za-z0-9_\\-]{6,}\\.[A-Za-z0-9_\\-]{6,}") private val GUID = Regex("\\b[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{12}\\b") private val SECRET_KV = Regex( - "(?i)\\b(access[_-]?token|refresh[_-]?token|auth[_-]?token|authtoken|token|authcode|" + + "(?i)(\\b(?:access[_-]?token|refresh[_-]?token|auth[_-]?token|authtoken|token|authcode|" + "auth[_-]?ticket|ticket|sessionid|steamloginsecure|webapikey|api[_-]?key|" + - "machine[_-]?auth(?:[_-]?token)?|machineauth|password|passwd|pwd|secret)" + - "(\\s*[=:]\\s*|=)([^\\s\"'<>&;,]{4,})" + "machine[_-]?auth(?:[_-]?token)?|machineauth|password|passwd|pwd|secret)[\"']?\\s*[=:]\\s*)" + + "(?:([\"'])((?:\\\\.|(?!\\2)[^\\\\\\r\\n]){4,})\\2|([^\\s\"'<>&;,]{4,}))" ) private val GUARD_CODE = Regex( "(?i)((?:steam\\s*)?guard\\s*code[\\s:=]*|two[\\s-]?factor[\\s:=]*|2fa[\\s:=]*)([A-Za-z0-9]{5})" @@ -291,7 +328,7 @@ object LogRedactor { if (out.has("jwt")) out.set(JWT_LABELLED.replace(out.text) { "${it.groupValues[1]}" }) if ("ey" in out.text) out.set(JWT_BASE64.replace(out.text, "")) if (out.has("token", "auth", "ticket", "sessionid", "steamloginsecure", "api", "machine", "pass", "pwd", "secret")) { - out.set(SECRET_KV.replace(out.text) { "${it.groupValues[1]}${it.groupValues[2]}" }) + out.set(SECRET_KV.replace(out.text) { "${it.groupValues[1]}${it.groupValues[2]}${it.groupValues[2]}" }) } if (out.has("guard", "factor", "2fa")) out.set(GUARD_CODE.replace(out.text) { "${it.groupValues[1]}" }) if (out.hasRun(32, ::isHex)) out.set(WEBAPI_KEY.replace(out.text, "")) @@ -309,7 +346,9 @@ object LogRedactor { } if (out.has("login")) out.set(LOGIN_KV.replace(out.text) { "${it.groupValues[1]}${it.groupValues[2]}${quoted(it.groupValues[3])}" }) for (r in accounts) if (r.needs == null || out.has(r.needs)) out.set(r.regex.replace(out.text, "")) - if ('@' in out.text) out.set(EMAIL.replace(out.text, "")) + if ('@' in out.text) out.set(EMAIL.replace(out.text) { m -> + m.value.takeIf { isHidlLoaderDiagnostic(out.text, m) } ?: "" + }) if (out.has("jwt", "token", "ticket", "sessionid", "steamloginsecure", "machineauth")) { out.set(RESIDUAL.replace(out.text) { "${it.groupValues[1]}=" }) } diff --git a/app/src/test/java/com/droiddeck/launcher/core/LogRedactorTest.kt b/app/src/test/java/com/droiddeck/launcher/core/LogRedactorTest.kt index ddeb3ac1fa..a67093e935 100644 --- a/app/src/test/java/com/droiddeck/launcher/core/LogRedactorTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/core/LogRedactorTest.kt @@ -37,6 +37,83 @@ class LogRedactorTest { assertEquals("login ok", LogRedactor.redact("login someone@example.com ok")) } + @Test fun onlyLoaderDiagnosticsKeepHidlSharedLibraryNames() { + val library = "android.hardware.graphics.mapper@4.0.so" + val line = "dlopen failed: library \"$library\" not found" + val pathLine = "dlopen failed: library \"/vendor/lib64/hw/$library\" not found" + + assertEquals(line, LogRedactor.redact(line)) + assertEquals(line, LogRedactor.redactForShare(line)) + assertEquals(pathLine, LogRedactor.redact(pathLine)) + assertEquals(pathLine, LogRedactor.redactForShare(pathLine)) + } + + @Test fun privacyRulesOverrideTheHidlSharedLibraryException() { + val library = "android.hardware.graphics.mapper@4.0.so" + assertEquals("token=", LogRedactor.redact("token=$library")) + assertEquals("username=", LogRedactor.redact("username=$library")) + assertEquals("{\"password\":\"\"}", LogRedactor.redact("{\"password\":\"$library\"}")) + assertEquals("{\"password\":\"\"}", LogRedactor.redactForShare("{\"password\":\"$library\"}")) + assertEquals("{\"password\":\"\"}", LogRedactor.redact("{\"password\":\"don't-use-$library\"}")) + assertEquals("{\"password\":\"\"}", LogRedactor.redactForShare("{\"password\":\"don't-use-$library\"}")) + + val mixed = "dlopen failed: library \"$library\" not found; token=abcdef123456; contact=alice!$library; {\"password\":\"library \\\"$library\\\" not found\"}" + val expected = "dlopen failed: library \"$library\" not found; token=; contact=alice!; {\"password\":\"\"}" + assertEquals(expected, LogRedactor.redact(mixed)) + assertEquals(expected, LogRedactor.redactForShare(mixed)) + + val root = java.nio.file.Files.createTempDirectory("hidl-redactor").toFile() + val users = java.io.File(root, "loginusers.vdf") + users.writeText("\"AccountName\" \"$library\"") + try { + LogRedactor.learnAccounts(users) + assertEquals("", LogRedactor.redact(library)) + } finally { + LogRedactor.learnAccounts() + root.deleteRecursively() + } + } + + @Test fun hidlSharedLibraryNamesAreRedactedOutsideLoaderDiagnostics() { + val library = "android.hardware.graphics.mapper@4.0.so" + + assertEquals("", LogRedactor.redact(library)) + assertEquals("", LogRedactor.redactForShare(library)) + assertEquals("/vendor/lib64/hw/", LogRedactor.redact("/vendor/lib64/hw/$library")) + for (punctuation in listOf("!", "#", "~", "/", "=")) { + val expected = "contact=alice$punctuation" + assertEquals(expected, LogRedactor.redact("contact=alice$punctuation$library")) + assertEquals(expected, LogRedactor.redactForShare("contact=alice$punctuation$library")) + } + assertEquals("", LogRedactor.redact("$library.evil")) + assertEquals("", LogRedactor.redact("someone@company.so")) + assertEquals("", LogRedactor.redact("not$library")) + assertEquals("_debug", LogRedactor.redact("${library}_debug")) + assertEquals(".1", LogRedactor.redact("${library}.1")) + assertEquals("@attacker", LogRedactor.redact("${library}@attacker")) + assertEquals("", LogRedactor.redact("android.hardware.graphics.mapper@4.0.software")) + assertEquals("", LogRedactor.redact("android.hardware.graphics.mapper@4.0.so.evil")) + } + + @Test fun loaderContextRequiresExactWordsAndABoundedAndroidPath() { + val library = "android.hardware.graphics.mapper@4.0.so" + val valid = "library \"/system/lib64/$library\" not found: needed by app" + assertEquals(valid, LogRedactor.redact(valid)) + assertEquals(valid, LogRedactor.redactForShare(valid)) + for (line in listOf( + "not_library \"$library\" not found", + "library \"$library\" not found_suffix", + "library \"/home/user/$library\" not found", + "library \"relative/$library\" not found", + "library \"/vendor/invalid!/$library\" not found", + "library \"/vendor/" + "a/".repeat(2050) + "$library\" not found", + )) { + val expected = line.replace(library, "") + assertEquals(expected, LogRedactor.redact(line)) + assertEquals(expected, LogRedactor.redactForShare(line)) + } + } + @Test fun clockTimeIsNotAnAddress() { val line = "[2026-09-27 10:03:05] Startup" assertEquals(line, LogRedactor.redact(line)) From 0577a22459cdc6583404c12cde8b76d2e54c6177 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Thu, 22 Oct 2026 10:16:25 -0400 Subject: [PATCH 10/25] fix: keep Steam shortcuts out of desktop controls (#1318) * Enable existing second-screen controls in desktop sessions * Keep controller drawer navigation consistent in desktop sessions * Cover desktop and Steam second-screen controls with regression tests * fix: hide Steam shortcuts in desktop controls --------- Co-authored-by: Delete228 <31237303+Delete228@users.noreply.github.com> --- .../com/droiddeck/launcher/SessionActivity.kt | 2 +- .../launcher/ui/DeckControlsPanel.kt | 16 +- .../launcher/ui/SecondScreenPresentation.kt | 22 +-- .../droiddeck/launcher/ui/SessionOverlay.kt | 2 +- .../launcher/ui/SessionSecondScreenTest.kt | 158 ++++++++++++++++++ 5 files changed, 183 insertions(+), 17 deletions(-) create mode 100644 app/src/test/java/com/droiddeck/launcher/ui/SessionSecondScreenTest.kt diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index e7c3385d30..f43a272869 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -2012,7 +2012,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { if (drawerOpen) { if (fromController && (event.keyCode == KeyEvent.KEYCODE_BUTTON_L1 || event.keyCode == KeyEvent.KEYCODE_BUTTON_R1)) { if (event.action == KeyEvent.ACTION_DOWN && event.repeatCount == 0) { - drawerPage = sessionDrawerPages(SessionState.mode == SessionService.MODE_STEAM && secondScreenDisplays.isNotEmpty(), glasses.present) + drawerPage = sessionDrawerPages(secondScreenDisplays.isNotEmpty(), glasses.present) .step(drawerPage, if (event.keyCode == KeyEvent.KEYCODE_BUTTON_R1) 1 else -1) releaseDrawerDirection() } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/DeckControlsPanel.kt b/app/src/main/java/com/droiddeck/launcher/ui/DeckControlsPanel.kt index c34d1a9710..0a603d5a54 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/DeckControlsPanel.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/DeckControlsPanel.kt @@ -23,7 +23,9 @@ import android.widget.TextView import com.droiddeck.launcher.input.DeckControls import com.droiddeck.launcher.input.PadBridge import com.droiddeck.launcher.input.PadState +import com.droiddeck.launcher.session.SessionService import com.droiddeck.launcher.session.SessionPrefs +import com.droiddeck.launcher.session.SessionState import kotlin.math.atan2 import kotlin.math.hypot import kotlin.math.min @@ -85,9 +87,11 @@ class DeckControlsPanel( addView(tabs, FrameLayout.LayoutParams(FrameLayout.LayoutParams.WRAP_CONTENT, dp(44))) } addView(centre, LayoutParams(0, LayoutParams.MATCH_PARENT, 1f)) - addView(roundButton("STEAM", context.getString(R.string.deck_open_steam_menu), onSteamMenu, wide = true)) - addView(space(dp(8))) - addView(roundButton("•••", context.getString(R.string.drawer_open_qam), onQam, wide = true)) + if (SessionState.mode == SessionService.MODE_STEAM) { + addView(roundButton("STEAM", context.getString(R.string.deck_open_steam_menu), onSteamMenu, wide = true)) + addView(space(dp(8))) + addView(roundButton("•••", context.getString(R.string.drawer_open_qam), onQam, wide = true)) + } } private fun select(tab: Tab) { @@ -177,8 +181,10 @@ class DeckControlsPanel( place(pill("RB") { st, d -> st.press(PadState.RB, d) }, GamepadGeometry.Slot.RIGHT_INNER_SHOULDER) place(pill("RT") { st, d -> st.rightTrigger = if (d) 1f else 0f }, GamepadGeometry.Slot.RIGHT_OUTER_SHOULDER) place(pill("VIEW") { st, d -> st.press(PadState.SELECT, d) }, GamepadGeometry.Slot.VIEW) - place(centreTap("STEAM", context.getString(R.string.deck_open_steam_menu), onSteamMenu), GamepadGeometry.Slot.STEAM) - place(centreTap("\u2022\u2022\u2022", context.getString(R.string.drawer_open_qam), onQam), GamepadGeometry.Slot.QAM) + if (SessionState.mode == SessionService.MODE_STEAM) { + place(centreTap("STEAM", context.getString(R.string.deck_open_steam_menu), onSteamMenu), GamepadGeometry.Slot.STEAM) + place(centreTap("\u2022\u2022\u2022", context.getString(R.string.drawer_open_qam), onQam), GamepadGeometry.Slot.QAM) + } place(pill("MENU") { st, d -> st.press(PadState.START, d) }, GamepadGeometry.Slot.MENU) place(centreTap("\u25a6 " + context.getString(R.string.deck_panels), context.getString(R.string.deck_more_controls)) { select(Tab.BOTH) }, GamepadGeometry.Slot.PANELS) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SecondScreenPresentation.kt b/app/src/main/java/com/droiddeck/launcher/ui/SecondScreenPresentation.kt index df972e00f4..04809ea5c2 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SecondScreenPresentation.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SecondScreenPresentation.kt @@ -157,16 +157,18 @@ class SecondScreenPresentation( } } controls.addView(keyboardButton) - controls.addView(Button(context).apply { - text = "STEAM" - contentDescription = context.getString(R.string.deck_open_steam_menu) - setOnClickListener { onSteamMenu() } - }) - controls.addView(Button(context).apply { - text = "…" - contentDescription = context.getString(R.string.drawer_open_qam) - setOnClickListener { onQam() } - }) + if (SessionState.mode == SessionService.MODE_STEAM) { + controls.addView(Button(context).apply { + text = "STEAM" + contentDescription = context.getString(R.string.deck_open_steam_menu) + setOnClickListener { onSteamMenu() } + }) + controls.addView(Button(context).apply { + text = "…" + contentDescription = context.getString(R.string.drawer_open_qam) + setOnClickListener { onQam() } + }) + } panel.addView(controls, FrameLayout.LayoutParams(-1, -2, Gravity.TOP)) root.addView(panel, weightParams()) val host = KeyboardHost(context) { sessionActivity.dispatchKeyEvent(it) } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt index ef55dd2882..962cdef820 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt @@ -313,7 +313,7 @@ class DrawerActions( @OptIn(ExperimentalComposeUiApi::class) @Composable internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, controllerActive: Boolean, onPageChange: (SessionDrawerPage) -> Unit, a: DrawerActions) { - val pages = sessionDrawerPages(a.steam && a.secondScreenDisplays.isNotEmpty(), a.glassesPresent) + val pages = sessionDrawerPages(a.secondScreenDisplays.isNotEmpty(), a.glassesPresent) val page = requestedPage.takeIf { it in pages } ?: SessionDrawerPage.CONTROLLER LaunchedEffect(requestedPage, pages) { if (page != requestedPage) onPageChange(page) } val colors = MaterialTheme.colorScheme diff --git a/app/src/test/java/com/droiddeck/launcher/ui/SessionSecondScreenTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/SessionSecondScreenTest.kt new file mode 100644 index 0000000000..04d3f5632b --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/ui/SessionSecondScreenTest.kt @@ -0,0 +1,158 @@ +package com.droiddeck.launcher.ui + +import android.hardware.display.DisplayManager +import android.hardware.input.InputManager +import android.view.Display +import android.view.InputDevice +import android.view.KeyEvent +import android.view.View +import android.view.ViewGroup +import android.widget.Button +import androidx.compose.ui.test.* +import androidx.compose.runtime.MutableState +import com.droiddeck.launcher.R +import com.droiddeck.launcher.SessionActivity +import com.droiddeck.launcher.gpu.FrameGen +import com.droiddeck.launcher.gpu.Lossless +import com.droiddeck.launcher.input.SecondScreenDisplay +import com.droiddeck.launcher.input.SecondScreenMode +import com.droiddeck.launcher.input.PadBridgeRoutingTest +import com.droiddeck.launcher.session.SessionService +import com.droiddeck.launcher.session.SessionState +import org.junit.After +import org.junit.Assert.assertEquals +import org.junit.Assert.assertTrue +import org.junit.Before +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.Robolectric +import org.robolectric.RobolectricTestRunner +import org.robolectric.RuntimeEnvironment +import org.robolectric.Shadows.shadowOf +import org.robolectric.annotation.Config +import org.robolectric.annotation.GraphicsMode +import org.robolectric.shadows.InputDeviceBuilder +import org.robolectric.util.ReflectionHelpers + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [28], qualifiers = "w800dp-h600dp") +@GraphicsMode(GraphicsMode.Mode.NATIVE) +class SessionSecondScreenTest { + @get:Rule val compose = createRobolectricComposeRule() + private val context get() = RuntimeEnvironment.getApplication() + private var previousMode = "" + private var previousDeckPad = false + + @Before fun setUp() { + previousMode = SessionState.mode + previousDeckPad = SessionState.deckPad + SessionState.deckPad = false + } + + @After fun tearDown() { + SessionState.mode = previousMode + SessionState.deckPad = previousDeckPad + } + + @Test fun desktopMenuOffersTheExistingTrackpadAndTerminal() = checkModes(steam = false) + + @Test fun steamMenuKeepsTheExistingTrackpadAndTerminal() = checkModes(steam = true) + + @Test fun desktopWithoutASecondDisplayFallsBackToController() { + SessionState.mode = SessionService.MODE_DESKTOP + var page = SessionDrawerPage.SECOND_SCREEN + compose.setContent { + DroidDeckTheme { + SessionDrawer(true, page, false, { page = it }, actions(false, emptyList())) + } + } + compose.runOnIdle { assertEquals(SessionDrawerPage.CONTROLLER, page) } + compose.onNodeWithText(context.getString(R.string.second_mode_keyboard_trackpad)).assertDoesNotExist() + } + + @Test fun desktopTrackpadOmitsSteamShortcuts() = checkShortcuts(steam = false) + + @Test fun steamTrackpadKeepsWorkingSteamShortcuts() = checkShortcuts(steam = true) + + @Test + @Config(sdk = [34], shadows = [PadBridgeRoutingTest.RegisteredKeyEvent::class]) + fun controllerBumpersReachTheSecondScreenInBothSessionModes() { + val device = InputDeviceBuilder.newBuilder().setId(42).setName("Second screen test pad") + .setDescriptor("second-screen-pad").setExternal(true).setSources(InputDevice.SOURCE_GAMEPAD).build() + shadowOf(context.getSystemService(InputManager::class.java)).addInputDevice(device) + for (mode in listOf(SessionService.MODE_DESKTOP, SessionService.MODE_STEAM)) { + SessionState.mode = mode + val activity = Robolectric.buildActivity(SessionActivity::class.java).get() + fun state(name: String): MutableState = ReflectionHelpers.getField(activity, "$name\$delegate") + state("drawerOpen").value = true + state("drawerControllerActive").value = true + state>("secondScreenDisplays").value = listOf(SecondScreenDisplay(1, "Bottom screen")) + for ((button, page) in listOf(KeyEvent.KEYCODE_BUTTON_R1 to SessionDrawerPage.SECOND_SCREEN, + KeyEvent.KEYCODE_BUTTON_L1 to SessionDrawerPage.CONTROLLER)) { + assertTrue(activity.dispatchKeyEvent(KeyEvent(0L, 0L, KeyEvent.ACTION_DOWN, button, 0, 0, + device.id, 0, 0, InputDevice.SOURCE_GAMEPAD))) + assertEquals(page, state("drawerPage").value) + } + } + } + + private fun checkModes(steam: Boolean) { + SessionState.mode = if (steam) SessionService.MODE_STEAM else SessionService.MODE_DESKTOP + val selected = mutableListOf() + val displays = listOf(SecondScreenDisplay(1, "Bottom screen")) + compose.setContent { + DroidDeckTheme { + SessionDrawer(true, SessionDrawerPage.SECOND_SCREEN, false, {}, actions(steam, displays) { selected += it }) + } + } + for (mode in listOf(SecondScreenMode.KEYBOARD_TRACKPAD, SecondScreenMode.TERMINAL)) { + compose.onNodeWithText(context.getString(mode.label)).performScrollTo().assertIsDisplayed().performClick() + } + compose.onNodeWithText(context.getString(SecondScreenMode.DECK_CONTROLS.label)).assertDoesNotExist() + assertEquals(listOf(SecondScreenMode.KEYBOARD_TRACKPAD, SecondScreenMode.TERMINAL), selected) + } + + private fun checkShortcuts(steam: Boolean) { + SessionState.mode = if (steam) SessionService.MODE_STEAM else SessionService.MODE_DESKTOP + val activity = Robolectric.buildActivity(SessionActivity::class.java).get() + val display = activity.getSystemService(DisplayManager::class.java).getDisplay(Display.DEFAULT_DISPLAY) + var menus = 0 + var qams = 0 + val panel = SecondScreenPresentation(activity, display, { _, _, _, _ -> }, { _, _ -> }, {}, + { menus++ }, { qams++ }, {}) + try { + panel.create() + panel.showMode(SecondScreenMode.KEYBOARD_TRACKPAD) + val buttons = descendants(panel.window!!.decorView).filterIsInstance