From 314956732810af6118a8a9ae0560aaf03a79edb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Resul=20=C3=96v=C3=BCr?= <92828257+ovurrsl@users.noreply.github.com> Date: Wed, 21 Oct 2026 03:05:05 +0300 Subject: [PATCH 01/44] fix: cancelling a paste stops the copy and keeps a move's source (#1029) --- .../launcher/files/FileManagerScreen.kt | 7 +- .../com/droiddeck/launcher/files/FileOps.kt | 66 ++++++- .../launcher/files/FileOpsCopyTest.kt | 172 ++++++++++++++++++ 3 files changed, 234 insertions(+), 11 deletions(-) create mode 100644 app/src/test/java/com/droiddeck/launcher/files/FileOpsCopyTest.kt diff --git a/app/src/main/java/com/droiddeck/launcher/files/FileManagerScreen.kt b/app/src/main/java/com/droiddeck/launcher/files/FileManagerScreen.kt index 03b4aa2771..97fe393e48 100644 --- a/app/src/main/java/com/droiddeck/launcher/files/FileManagerScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/files/FileManagerScreen.kt @@ -90,6 +90,7 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import com.droiddeck.launcher.session.SessionPrefs import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.ensureActive import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import java.io.File @@ -268,6 +269,7 @@ fun FileManagerScreen( operationDeterminate = true operationLabel = context.getString(if (cut) R.string.fm_op_moving else R.string.fm_op_copying) isOperationRunning = true + val job = coroutineContext[kotlinx.coroutines.Job] var applyToAll: ConflictChoice? = null var failed = 0 @@ -303,6 +305,7 @@ fun FileManagerScreen( } var lastPct = -1 val onProgress = FileOps.ProgressCallback { copied, total -> + job?.ensureActive() val pct = if (total > 0) ((copied * 100) / total).toInt() else 100 if (pct != lastPct) { lastPct = pct @@ -311,8 +314,8 @@ fun FileManagerScreen( } val target = dst val ok = withContext(Dispatchers.IO) { - if (cut) FileOps.moveWithProgress(src, target, onProgress) - else FileOps.copyWithProgress(src, target, onProgress) + if (cut) FileOps.moveWithProgress(src, target, onProgress) { job?.isActive == false } + else FileOps.copyWithProgress(src, target, onProgress) { job?.isActive == false } } if (ok) done++ else failed++ } diff --git a/app/src/main/java/com/droiddeck/launcher/files/FileOps.kt b/app/src/main/java/com/droiddeck/launcher/files/FileOps.kt index 04b83abaa2..9007e6d891 100644 --- a/app/src/main/java/com/droiddeck/launcher/files/FileOps.kt +++ b/app/src/main/java/com/droiddeck/launcher/files/FileOps.kt @@ -45,22 +45,25 @@ object FileOps { return f.length() } - fun moveWithProgress(src: File, dst: File, progress: ProgressCallback?): Boolean { + fun moveWithProgress(src: File, dst: File, progress: ProgressCallback?, isCancelled: () -> Boolean = { false }): Boolean { if (sameFile(src, dst)) return true + if (isCancelled()) return false if (!dst.exists() && src.renameTo(dst)) { progress?.onProgress(1, 1) return true } - if (!copyWithProgress(src, dst, progress)) return false + if (!copyWithProgress(src, dst, progress, isCancelled)) return false + if (isCancelled()) return false return delete(src) } - fun copyWithProgress(src: File, dst: File, progress: ProgressCallback?): Boolean { + fun copyWithProgress(src: File, dst: File, progress: ProgressCallback?, isCancelled: () -> Boolean = { false }): Boolean { val total = maxOf(totalSize(src), 1L) - return copyWithProgress(src, dst, longArrayOf(0), total, progress) + return copyWithProgress(src, dst, longArrayOf(0), total, progress, isCancelled) } - private fun copyWithProgress(src: File, dst: File, done: LongArray, total: Long, progress: ProgressCallback?): Boolean { + private fun copyWithProgress(src: File, dst: File, done: LongArray, total: Long, progress: ProgressCallback?, isCancelled: () -> Boolean): Boolean { + if (isCancelled()) throw java.util.concurrent.CancellationException("Copy cancelled: $src") if (isSymlink(src)) return true if (sameFile(src, dst)) return true if (src.isDirectory && isWithin(dst, src)) { @@ -71,7 +74,7 @@ object FileOps { if (!dst.exists() && !dst.mkdirs()) return false var allOk = true src.list()?.forEach { name -> - if (!copyWithProgress(File(src, name), File(dst, name), done, total, progress)) { + if (!copyWithProgress(File(src, name), File(dst, name), done, total, progress, isCancelled)) { Log.e(TAG, "Failed to copy: ${File(src, name)}") allOk = false } @@ -81,13 +84,41 @@ object FileOps { val parent = dst.parentFile if (!src.exists() || (parent != null && !parent.exists() && !parent.mkdirs())) return false val chunk = 4L * 1024 * 1024 + var staging: File? = null + var created = false + var output: java.nio.channels.FileChannel? = null try { + output = try { + java.nio.channels.FileChannel.open(dst.toPath(), java.nio.file.StandardOpenOption.WRITE, java.nio.file.StandardOpenOption.CREATE_NEW) + .also { created = true } + } catch (e: java.nio.file.FileAlreadyExistsException) { + null + } + val target = if (!created && isSymlink(dst)) dst.canonicalFile else dst + var permissions: Set? = null + if (output == null) { + if (isSymlink(target) || target.parentFile?.isDirectory != true) { + throw IOException("Destination symlink target is not a writable directory entry: $dst") + } + if (target.isDirectory) throw IOException("Destination is a directory: $target") + permissions = try { + Files.getPosixFilePermissions(target.toPath()) + } catch (e: java.nio.file.NoSuchFileException) { + null + } catch (e: UnsupportedOperationException) { + null + } + if (target.exists() && !target.canWrite()) throw IOException("Destination is not writable: $target") + val directory = Files.createTempDirectory(checkNotNull(target.absoluteFile.parentFile).toPath(), ".droiddeck-copy-") + staging = directory.toFile() + output = FileOutputStream(File(staging, "file")).channel + } FileInputStream(src).channel.use { input -> - FileOutputStream(dst).channel.use { output -> + checkNotNull(output).use { channel -> val size = input.size() var position = 0L while (position < size) { - val transferred = input.transferTo(position, minOf(chunk, size - position), output) + val transferred = input.transferTo(position, minOf(chunk, size - position), channel) if (transferred <= 0) break position += transferred done[0] += transferred @@ -96,11 +127,28 @@ object FileOps { if (position < size) throw IOException("Incomplete copy: $position/$size bytes") } } + staging?.let { directory -> + val copied = File(directory, "file").toPath() + if (permissions != null && Files.getPosixFilePermissions(copied) != permissions) { + Files.setPosixFilePermissions(copied, permissions) + } + if (isCancelled()) throw java.util.concurrent.CancellationException("Copy cancelled: $src") + Files.move(copied, target.toPath(), java.nio.file.StandardCopyOption.ATOMIC_MOVE) + } return true + } catch (e: java.util.concurrent.CancellationException) { + if (created) dst.delete() + throw e } catch (e: IOException) { Log.e(TAG, "Failed to copy file: $src to $dst", e) - dst.delete() + if (created) dst.delete() return false + } finally { + output?.close() + staging?.let { directory -> + File(directory, "file").delete() + directory.delete() + } } } diff --git a/app/src/test/java/com/droiddeck/launcher/files/FileOpsCopyTest.kt b/app/src/test/java/com/droiddeck/launcher/files/FileOpsCopyTest.kt new file mode 100644 index 0000000000..ac13ac7814 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/files/FileOpsCopyTest.kt @@ -0,0 +1,172 @@ +package com.droiddeck.launcher.files + +import java.io.File +import java.util.concurrent.CancellationException +import java.nio.file.Files +import java.nio.file.attribute.PosixFilePermissions +import org.junit.Assume.assumeTrue +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertThrows +import org.junit.Assert.assertTrue +import org.junit.Rule +import org.junit.Test +import org.junit.rules.TemporaryFolder +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner + +@RunWith(RobolectricTestRunner::class) +class FileOpsCopyTest { + @get:Rule val tmp = TemporaryFolder() + + @Test fun cancellingAnOverwritePreservesTheDestinationAndSource() { + val src = tmp.newFile("source").apply { writeText("replacement") } + val dst = tmp.newFile("dest").apply { writeText("original user data") } + assertThrows(CancellationException::class.java) { + FileOps.copyWithProgress(src, dst, { _, _ -> throw CancellationException("cancel") }) + } + assertTrue("original destination was removed", dst.exists()) + assertEquals("original user data", dst.readText()) + assertEquals("replacement", src.readText()) + assertEquals(setOf("source", "dest"), tmp.root.list()!!.toSet()) + } + + @Test fun cancellingANewCopyLeavesNoPartialDestination() { + val src = tmp.newFile("source").apply { writeText("replacement") } + val dst = File(tmp.root, "dest") + assertThrows(CancellationException::class.java) { + FileOps.copyWithProgress(src, dst, { _, _ -> throw CancellationException("cancel") }) + } + assertFalse(dst.exists()) + assertEquals("replacement", src.readText()) + assertEquals(setOf("source"), tmp.root.list()!!.toSet()) + } + + @Test fun cancellingAMoveFallbackPreservesBothFiles() { + val src = tmp.newFile("source").apply { writeText("replacement") } + val dst = tmp.newFile("dest").apply { writeText("original user data") } + assertThrows(CancellationException::class.java) { + FileOps.moveWithProgress(src, dst, { _, _ -> throw CancellationException("cancel") }) + } + assertTrue("original destination was removed", dst.exists()) + assertEquals("original user data", dst.readText()) + assertEquals("replacement", src.readText()) + } + + @Test fun cancellingStopsATreeOfEmptyFiles() { + val src = tmp.newFolder("source") + for (name in listOf("a", "b", "c")) File(src, name).createNewFile() + val dst = File(tmp.root, "dest") + var checks = 0 + assertThrows(CancellationException::class.java) { + FileOps.copyWithProgress(src, dst, null) { checks++ > 1 } + } + assertEquals(1, dst.list()!!.size) + assertEquals(3, src.list()!!.size) + } + + @Test fun cancellingStopsATreeOfEmptyFolders() { + val src = tmp.newFolder("source") + for (name in listOf("a", "b", "c")) File(src, name).mkdir() + val dst = File(tmp.root, "dest") + var checks = 0 + assertThrows(CancellationException::class.java) { + FileOps.copyWithProgress(src, dst, null) { checks++ > 1 } + } + assertEquals(1, dst.list()!!.size) + } + + @Test fun aCompletedCopyReplacesTheDestination() { + val src = tmp.newFile("source").apply { writeText("replacement") } + val dst = tmp.newFile("dest").apply { writeText("original user data") } + assertTrue(FileOps.copyWithProgress(src, dst, null)) + assertEquals("replacement", dst.readText()) + assertEquals("replacement", src.readText()) + assertEquals(setOf("source", "dest"), tmp.root.list()!!.toSet()) + } + + @Test fun aLongDestinationNameDoesNotOverflowTheStagingName() { + val src = tmp.newFile("source").apply { writeText("replacement") } + val dst = File(tmp.root, "d".repeat(240)) + assertTrue(FileOps.copyWithProgress(src, dst, null)) + assertEquals("replacement", dst.readText()) + } + + @Test fun anOverwritePreservesTheTargetsExecutablePermissions() { + assumeTrue(Files.getFileStore(tmp.root.toPath()).supportsFileAttributeView("posix")) + val src = tmp.newFile("source").apply { writeText("replacement") } + val dst = tmp.newFile("dest").apply { writeText("original") } + val permissions = PosixFilePermissions.fromString("rwxr-x---") + Files.setPosixFilePermissions(dst.toPath(), permissions) + assertTrue(FileOps.copyWithProgress(src, dst, null)) + assertEquals("replacement", dst.readText()) + assertEquals(permissions, Files.getPosixFilePermissions(dst.toPath())) + } + + @Test fun aMoveFallbackPreservesTheTargetsExecutablePermissions() { + assumeTrue(Files.getFileStore(tmp.root.toPath()).supportsFileAttributeView("posix")) + val src = tmp.newFile("source").apply { writeText("replacement") } + val dst = tmp.newFile("dest").apply { writeText("original") } + val permissions = PosixFilePermissions.fromString("rwxr-x---") + Files.setPosixFilePermissions(dst.toPath(), permissions) + assertTrue(FileOps.moveWithProgress(src, dst, null)) + assertFalse(src.exists()) + assertEquals("replacement", dst.readText()) + assertEquals(permissions, Files.getPosixFilePermissions(dst.toPath())) + } + + @Test fun anOverwriteStillRefusesAReadOnlyDestination() { + assumeTrue(Files.getFileStore(tmp.root.toPath()).supportsFileAttributeView("posix")) + val src = tmp.newFile("source").apply { writeText("replacement") } + val dst = tmp.newFile("dest").apply { writeText("original") } + Files.setPosixFilePermissions(dst.toPath(), PosixFilePermissions.fromString("r--r--r--")) + try { + assertFalse(FileOps.copyWithProgress(src, dst, null)) + assertEquals("original", dst.readText()) + assertEquals("replacement", src.readText()) + } finally { + dst.setWritable(true) + } + } + + @Test fun anEmptyFileCanReplaceAnExistingFile() { + val src = tmp.newFile("source") + val dst = tmp.newFile("dest").apply { writeText("original user data") } + var callbacks = 0 + assertTrue(FileOps.copyWithProgress(src, dst, { _, _ -> callbacks++ })) + assertEquals(0, callbacks) + assertEquals(0L, dst.length()) + assertTrue(src.exists()) + } + + @Test fun aFailedPublicationPreservesTheDestinationAndCleansStaging() { + val src = tmp.newFile("source").apply { writeText("replacement") } + val dst = tmp.newFolder("dest") + File(dst, "keep").writeText("original user data") + assertFalse(FileOps.copyWithProgress(src, dst, null)) + assertEquals("original user data", File(dst, "keep").readText()) + assertEquals("replacement", src.readText()) + assertEquals(setOf("source", "dest"), tmp.root.list()!!.toSet()) + } + + @Test fun aSuccessfulMoveFallbackDeletesTheSourceOnlyAfterCopying() { + val src = tmp.newFile("source").apply { writeText("replacement") } + val dst = tmp.newFile("dest").apply { writeText("original user data") } + assertTrue(FileOps.moveWithProgress(src, dst, null)) + assertFalse(src.exists()) + assertEquals("replacement", dst.readText()) + assertEquals(setOf("dest"), tmp.root.list()!!.toSet()) + } + + @Test fun overwritingThroughASymlinkKeepsTheLinkAndUpdatesItsTarget() { + assumeTrue(Files.getFileStore(tmp.root.toPath()).supportsFileAttributeView("posix")) + val src = tmp.newFile("source").apply { writeText("replacement") } + val realTarget = tmp.newFile("real-target").apply { writeText("original user data") } + val link = File(tmp.root, "dest-link") + Files.createSymbolicLink(link.toPath(), realTarget.toPath()) + + assertTrue(FileOps.copyWithProgress(src, link, null)) + assertTrue("destination symlink was replaced instead of written through", Files.isSymbolicLink(link.toPath())) + assertEquals("replacement", realTarget.readText()) + } +} From 25938cc249293e688298cc2f15021bfd90721e35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Resul=20=C3=96v=C3=BCr?= <92828257+ovurrsl@users.noreply.github.com> Date: Wed, 21 Oct 2026 06:24:25 +0300 Subject: [PATCH 02/44] fix: file manager copy/move keeps symlinks (#1027) --- .../launcher/files/FileManagerScreen.kt | 6 +- .../com/droiddeck/launcher/files/FileOps.kt | 28 +++++- .../launcher/files/FileOpsLinksTest.kt | 85 +++++++++++++++++++ 3 files changed, 115 insertions(+), 4 deletions(-) create mode 100644 app/src/test/java/com/droiddeck/launcher/files/FileOpsLinksTest.kt diff --git a/app/src/main/java/com/droiddeck/launcher/files/FileManagerScreen.kt b/app/src/main/java/com/droiddeck/launcher/files/FileManagerScreen.kt index 97fe393e48..0843057f75 100644 --- a/app/src/main/java/com/droiddeck/launcher/files/FileManagerScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/files/FileManagerScreen.kt @@ -228,7 +228,7 @@ fun FileManagerScreen( fun uniqueDestination(dir: File, name: String): File { var candidate = File(dir, name) - if (!candidate.exists()) return candidate + if (!java.nio.file.Files.exists(candidate.toPath(), java.nio.file.LinkOption.NOFOLLOW_LINKS)) return candidate val dot = name.lastIndexOf('.') val base = if (dot > 0) name.substring(0, dot) else name val ext = if (dot > 0) name.substring(dot) else "" @@ -236,7 +236,7 @@ fun FileManagerScreen( do { candidate = File(dir, "$base ($i)$ext") i++ - } while (candidate.exists()) + } while (java.nio.file.Files.exists(candidate.toPath(), java.nio.file.LinkOption.NOFOLLOW_LINKS)) return candidate } @@ -287,7 +287,7 @@ fun FileManagerScreen( } var dst = File(dstDir, src.name) - if (dst.exists()) { + if (java.nio.file.Files.exists(dst.toPath(), java.nio.file.LinkOption.NOFOLLOW_LINKS)) { val choice = applyToAll ?: askConflict(src)?.also { if (conflictApplyToAll) applyToAll = it } ?: run { skipped++; null } ?: continue diff --git a/app/src/main/java/com/droiddeck/launcher/files/FileOps.kt b/app/src/main/java/com/droiddeck/launcher/files/FileOps.kt index 9007e6d891..29df5ff6d6 100644 --- a/app/src/main/java/com/droiddeck/launcher/files/FileOps.kt +++ b/app/src/main/java/com/droiddeck/launcher/files/FileOps.kt @@ -64,7 +64,7 @@ object FileOps { private fun copyWithProgress(src: File, dst: File, done: LongArray, total: Long, progress: ProgressCallback?, isCancelled: () -> Boolean): Boolean { if (isCancelled()) throw java.util.concurrent.CancellationException("Copy cancelled: $src") - if (isSymlink(src)) return true + if (isSymlink(src)) return copyLink(src, dst) if (sameFile(src, dst)) return true if (src.isDirectory && isWithin(dst, src)) { Log.e(TAG, "Refusing to copy directory into itself: $src -> $dst") @@ -152,6 +152,32 @@ object FileOps { } } + private fun copyLink(src: File, dst: File): Boolean { + if (src.absoluteFile == dst.absoluteFile) return true + return try { + val target = Files.readSymbolicLink(src.toPath()) + val parent = dst.parentFile + if (parent != null && !parent.exists() && !parent.mkdirs()) return false + try { + Files.createSymbolicLink(dst.toPath(), target) + } catch (e: java.nio.file.FileAlreadyExistsException) { + val staging = Files.createTempDirectory(checkNotNull(dst.absoluteFile.parentFile).toPath(), ".droiddeck-link-") + val tmp = staging.resolve("link") + try { + Files.createSymbolicLink(tmp, target) + Files.move(tmp, dst.toPath(), java.nio.file.StandardCopyOption.ATOMIC_MOVE) + } finally { + Files.deleteIfExists(tmp) + Files.deleteIfExists(staging) + } + } + true + } catch (e: Exception) { + Log.e(TAG, "Failed to copy link: $src to $dst", e) + false + } + } + private fun sameFile(a: File, b: File): Boolean = try { a.canonicalPath == b.canonicalPath } catch (e: IOException) { a.absolutePath == b.absolutePath } diff --git a/app/src/test/java/com/droiddeck/launcher/files/FileOpsLinksTest.kt b/app/src/test/java/com/droiddeck/launcher/files/FileOpsLinksTest.kt new file mode 100644 index 0000000000..03ad97a190 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/files/FileOpsLinksTest.kt @@ -0,0 +1,85 @@ +package com.droiddeck.launcher.files + +import java.io.File +import java.nio.file.Files +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Assume.assumeTrue +import org.junit.Rule +import org.junit.Test +import org.junit.rules.TemporaryFolder +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner + +@RunWith(RobolectricTestRunner::class) +class FileOpsLinksTest { + @get:Rule val tmp = TemporaryFolder() + + private fun link(at: File, target: String): Boolean = + runCatching { Files.createSymbolicLink(at.toPath(), File(target).toPath()) }.isSuccess + + @Test fun aMovedFolderKeepsItsLinks() { + val src = tmp.newFolder("game") + File(src, "data.bin").writeText("x") + assumeTrue("symlinks unavailable here", link(File(src, "lib.so"), "data.bin")) + val dst = File(tmp.root, "other/game") + File(dst, "keep").mkdirs() + assertTrue(FileOps.moveWithProgress(src, dst, null)) + assertFalse(src.exists()) + assertTrue(Files.isSymbolicLink(File(dst, "lib.so").toPath())) + assertEquals("data.bin", Files.readSymbolicLink(File(dst, "lib.so").toPath()).toString()) + } + + @Test fun aCopiedLinkPointsWhereTheOriginalDoes() { + val src = tmp.newFolder("a") + assumeTrue("symlinks unavailable here", link(File(src, "l"), "/nowhere/target")) + val dst = File(tmp.root, "b") + assertTrue(FileOps.copyWithProgress(src, dst, null)) + assertTrue(Files.isSymbolicLink(File(src, "l").toPath())) + assertTrue(Files.isSymbolicLink(File(dst, "l").toPath())) + } + + @Test fun copyingALinkPreservesAnUnrelatedStagingName() { + val src = File(tmp.root, "source") + assumeTrue("symlinks unavailable here", link(src, "missing-target")) + val dst = File(tmp.root, "dest") + dst.writeText("old destination") + val sibling = File(tmp.root, ".dest.link-tmp") + sibling.writeText("unrelated user data") + + assertTrue(FileOps.copyWithProgress(src, dst, null)) + assertEquals("unrelated user data", sibling.readText()) + assertEquals("missing-target", Files.readSymbolicLink(dst.toPath()).toString()) + assertEquals(setOf("source", "dest", ".dest.link-tmp"), tmp.root.list()!!.toSet()) + } + + @Test fun anUnrelatedStagingDirectoryDoesNotPreventCopyingALink() { + val src = File(tmp.root, "source") + assumeTrue("symlinks unavailable here", link(src, "missing-target")) + val sibling = tmp.newFolder(".dest.link-tmp") + File(sibling, "keep").writeText("unrelated user data") + + assertTrue(FileOps.copyWithProgress(src, File(tmp.root, "dest"), null)) + assertEquals("unrelated user data", File(sibling, "keep").readText()) + } + + @Test fun aLongDestinationNameDoesNotOverflowTheStagingName() { + val src = File(tmp.root, "source") + assumeTrue("symlinks unavailable here", link(src, "missing-target")) + val dst = File(tmp.root, "d".repeat(240)) + assertTrue(FileOps.copyWithProgress(src, dst, null)) + assertEquals("missing-target", Files.readSymbolicLink(dst.toPath()).toString()) + } + + @Test fun aLinkThatCannotReplaceTheDestinationLeavesItAlone() { + val src = tmp.newFolder("c") + assumeTrue("symlinks unavailable here", link(File(src, "l"), "x")) + val dst = File(tmp.root, "d") + File(dst, "l").mkdirs() + File(dst, "l/keep.txt").writeText("kept") + assertFalse(FileOps.copyWithProgress(File(src, "l"), File(dst, "l"), null)) + assertEquals("kept", File(dst, "l/keep.txt").readText()) + assertFalse(File(dst, ".l.link-tmp").exists()) + } +} From 705da08a0e052b25c71bc4e12f10e3335f9acb44 Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Tue, 20 Oct 2026 23:24:29 -0400 Subject: [PATCH 03/44] fix: game files keep the full game name instead of cutting it at 40 characters (#1230) --- .../droiddeck/launcher/frontend/GameFiles.kt | 12 ++++++++++-- .../launcher/frontend/GameFilesTest.kt | 17 +++++++++++++++++ 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/GameFiles.kt b/app/src/main/java/com/droiddeck/launcher/frontend/GameFiles.kt index 8e0b55def2..63b5f6b4dc 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/GameFiles.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/GameFiles.kt @@ -14,6 +14,7 @@ import java.io.InputStream object GameFiles { const val EXTENSION = "steam" private const val MAX_BYTES = 128 + private const val MAX_NAME_BYTES = 200 private const val INVENTORY = ".droiddeck-sync.json" private const val FORMAT = "droiddeck-game-files-v1" @@ -50,8 +51,15 @@ object GameFiles { fun filename(game: Library.SteamGame, disambiguate: Boolean = false): String { val sanitized = game.name.replace(Regex("[\\p{Cntrl}\\\\/:*?\"<>|]"), "_") .trim().trim('.').ifBlank { "Game" } - val points = sanitized.codePoints().limit(40).toArray() - val title = String(points, 0, points.size) + val points = sanitized.codePoints().toArray() + var end = 0 + var bytes = 0 + while (end < points.size) { + bytes += String(points, end, 1).toByteArray().size + if (bytes > MAX_NAME_BYTES) break + end++ + } + val title = String(points, 0, end).trimEnd { it.isWhitespace() || it == '.' }.ifBlank { "Game" } val suffix = if (disambiguate) " (${game.gameIdString})" else "" return "$title$suffix.$EXTENSION" } diff --git a/app/src/test/java/com/droiddeck/launcher/frontend/GameFilesTest.kt b/app/src/test/java/com/droiddeck/launcher/frontend/GameFilesTest.kt index d37689e295..bcae5c8fec 100644 --- a/app/src/test/java/com/droiddeck/launcher/frontend/GameFilesTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/frontend/GameFilesTest.kt @@ -132,6 +132,23 @@ class GameFilesTest { } } + @Test fun longTitlesKeepTheirEndingAndStayApart() { + val folder = tmp.newFolder() + val first = game("32370", "STAR WARS™ Knights of the Old Republic™") + val second = game("208580", "STAR WARS™ Knights of the Old Republic™ II - The Sith Lords™") + assertEquals("STAR WARS™ Knights of the Old Republic™ II - The Sith Lords™.steam", GameFiles.filename(second)) + GameFiles.sync(app, folder, listOf(first, second)) + GameFiles.sync(app, folder, listOf(first, second)) + assertEquals("32370", File(folder, "STAR WARS™ Knights of the Old Republic™.steam").readText()) + assertEquals("208580", File(folder, "STAR WARS™ Knights of the Old Republic™ II - The Sith Lords™.steam").readText()) + assertEquals(2, folder.listFiles()!!.count { it.extension == GameFiles.EXTENSION }) + assertEquals("a".repeat(200) + ".steam", GameFiles.filename(game(name = "a".repeat(300)))) + assertEquals("a".repeat(199) + ".steam", GameFiles.filename(game(name = "a".repeat(199) + " b"))) + assertEquals("Game.steam", GameFiles.filename(game(name = " . "))) + assertEquals("Game.steam", GameFiles.filename(game(name = "Game . ."))) + assertEquals("a".repeat(197) + ".steam", GameFiles.filename(game(name = "a".repeat(197) + " . b"))) + } + @Test fun refusesSymlinksLeavingTheExportFolder() { val folder = tmp.newFolder() val outside = tmp.newFile() From 152b9619408a426f500ed980f6eb93f82693a458 Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Wed, 21 Oct 2026 00:44:40 -0400 Subject: [PATCH 04/44] fix: GOG sign-in starts without the previous account's web session (#1235) --- .../droiddeck/launcher/stores/LoginFlows.kt | 8 +++++ .../launcher/stores/StoreLoginActivity.kt | 12 ++++++- .../droiddeck/launcher/stores/WebCookies.kt | 34 +++++++++++++++++++ .../launcher/stores/epic/EpicClient.kt | 22 +++--------- .../droiddeck/launcher/stores/gog/GogAuth.kt | 2 ++ .../launcher/stores/WebCookiesTest.kt | 18 ++++++++++ 6 files changed, 78 insertions(+), 18 deletions(-) create mode 100644 app/src/main/java/com/droiddeck/launcher/stores/WebCookies.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/stores/WebCookiesTest.kt diff --git a/app/src/main/java/com/droiddeck/launcher/stores/LoginFlows.kt b/app/src/main/java/com/droiddeck/launcher/stores/LoginFlows.kt index be1b29ed05..bf9d5f6dc9 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/LoginFlows.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/LoginFlows.kt @@ -23,6 +23,14 @@ internal object LoginFlows { override val userAgent: String get() = GogAuth.GALAXY_UA override fun isRedirect(url: String): Boolean = url.startsWith(GogAuth.REDIRECT_PREFIX) + override fun forgetSignIn(done: () -> Unit) { + runCatching { WebCookies.expire(GogAuth.SIGN_IN_URLS, GogAuth.COOKIE_DOMAIN, listOf("/")) { done() } } + .onFailure { + Log.w(TAG, "gog: could not clear the previous web sign-in: ${it.javaClass.simpleName}") + done() + } + } + override fun finish(activity: StoreLoginActivity, view: WebView, url: String): String? { val fragment = Uri.parse(url).fragment ?: return activity.getString(com.droiddeck.launcher.R.string.stores_login_error_verification) val frag = Uri.parse("x://x?$fragment") diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoreLoginActivity.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoreLoginActivity.kt index 2416358432..1951ffd470 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoreLoginActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreLoginActivity.kt @@ -38,6 +38,7 @@ class StoreLoginActivity : ComponentActivity() { const val EXTRA_STORE = "store" const val EXTRA_CLIENT_URL = "client_url" private const val KEY_STATE = "oauth_state" + private const val KEY_SIGN_IN_CLEARED = "sign_in_cleared" @Volatile internal var floodColor: Int? = null internal const val CHROME_UA = "Mozilla/5.0 (Linux; Android 14; SM-S918B) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/127.0.6533.103 Mobile Safari/537.36" @@ -54,6 +55,7 @@ class StoreLoginActivity : ComponentActivity() { fun isRedirect(url: String): Boolean fun finish(activity: StoreLoginActivity, view: WebView, url: String): String? val readsPage: Boolean get() = false + fun forgetSignIn(done: () -> Unit) = done() } private var store: Store? = null @@ -74,6 +76,7 @@ class StoreLoginActivity : ComponentActivity() { private var oauthState: String? = null private val captured = AtomicBoolean(false) private var flooded = false + private var signInCleared = false private fun dp(value: Int): Int = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, value.toFloat(), resources.displayMetrics).toInt() @@ -109,7 +112,13 @@ class StoreLoginActivity : ComponentActivity() { } } }) - webView.loadUrl(flow!!.startUrl) + val start = flow!!.startUrl + signInCleared = savedInstanceState?.getBoolean(KEY_SIGN_IN_CLEARED) == true + if (signInCleared) webView.loadUrl(start) + else flow!!.forgetSignIn { + signInCleared = true + if (!isDestroyed) webView.loadUrl(start) + } } private fun newFlow(state: String): Flow? { @@ -330,6 +339,7 @@ class StoreLoginActivity : ComponentActivity() { override fun onSaveInstanceState(outState: Bundle) { super.onSaveInstanceState(outState) oauthState?.let { outState.putString(KEY_STATE, it) } + outState.putBoolean(KEY_SIGN_IN_CLEARED, signInCleared) } override fun onStart() { diff --git a/app/src/main/java/com/droiddeck/launcher/stores/WebCookies.kt b/app/src/main/java/com/droiddeck/launcher/stores/WebCookies.kt new file mode 100644 index 0000000000..b44a274c50 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/WebCookies.kt @@ -0,0 +1,34 @@ +package com.droiddeck.launcher.stores + +import android.net.Uri +import android.webkit.CookieManager + +internal object WebCookies { + fun expired(header: String?, domain: String, paths: List, host: String? = null): List { + val domains = listOfNotNull(domain, host?.takeIf { it.endsWith(domain) }) + return header.orEmpty().split(';').map { it.substringBefore('=').trim() }.filter { it.isNotEmpty() }.distinct() + .flatMap { name -> + paths.flatMap { path -> + listOf("$name=; Max-Age=0; Path=$path; Secure") + domains.map { "$name=; Max-Age=0; Path=$path; Secure; Domain=$it" } + } + } + } + + fun expire(urls: List, domain: String, paths: List, done: (Int) -> Unit) { + val cookies = CookieManager.getInstance() + val lines = urls.flatMap { url -> expired(cookies.getCookie(url), domain, paths, Uri.parse(url).host).map { url to it } } + if (lines.isEmpty()) { + done(0) + return + } + var left = lines.size + for ((url, line) in lines) { + cookies.setCookie(url, line) { + if (--left == 0) { + cookies.flush() + done(lines.size) + } + } + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/epic/EpicClient.kt b/app/src/main/java/com/droiddeck/launcher/stores/epic/EpicClient.kt index a1bad46229..1f8a6ba9d0 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/epic/EpicClient.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/epic/EpicClient.kt @@ -21,6 +21,7 @@ import com.droiddeck.launcher.stores.StoreInstallRoot import com.droiddeck.launcher.stores.StoreLog import com.droiddeck.launcher.stores.StoreLoginActivity import com.droiddeck.launcher.stores.StoresState +import com.droiddeck.launcher.stores.WebCookies import com.droiddeck.launcher.stores.download.DownloadEntry import com.droiddeck.launcher.stores.download.DownloadQueue import com.droiddeck.launcher.stores.SteamLiveShortcuts @@ -108,28 +109,15 @@ object EpicClient { fun forgetWebSignIn() { android.os.Handler(android.os.Looper.getMainLooper()).post { runCatching { - val cookies = android.webkit.CookieManager.getInstance() - var cleared = 0 - for (url in COOKIE_URLS) { - val lines = expiredCookies(cookies.getCookie(url), Uri.parse(url).host) - for (line in lines) cookies.setCookie(url, line) - cleared += lines.size + WebCookies.expire(COOKIE_URLS, COOKIE_DOMAIN, COOKIE_PATHS) { cleared -> + Log.i(TAG, "cleared the Epic web sign-in ($cleared cookie lines)") } - cookies.flush() - Log.i(TAG, "cleared the Epic web sign-in ($cleared cookie lines)") }.onFailure { Log.w(TAG, "could not clear the Epic web sign-in: ${it.javaClass.simpleName}") } } } - internal fun expiredCookies(header: String?, host: String? = null): List { - val domains = listOfNotNull(COOKIE_DOMAIN, host?.takeIf { it.endsWith(COOKIE_DOMAIN) }) - return header.orEmpty().split(';').map { it.substringBefore('=').trim() }.filter { it.isNotEmpty() }.distinct() - .flatMap { name -> - COOKIE_PATHS.flatMap { path -> - listOf("$name=; Max-Age=0; Path=$path; Secure") + domains.map { "$name=; Max-Age=0; Path=$path; Secure; Domain=$it" } - } - } - } + internal fun expiredCookies(header: String?, host: String? = null): List = + WebCookies.expired(header, COOKIE_DOMAIN, COOKIE_PATHS, host) fun read(context: Context): Status { val app = context.applicationContext diff --git a/app/src/main/java/com/droiddeck/launcher/stores/gog/GogAuth.kt b/app/src/main/java/com/droiddeck/launcher/stores/gog/GogAuth.kt index 2de0880bd1..8e58fab033 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/gog/GogAuth.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/gog/GogAuth.kt @@ -20,6 +20,8 @@ object GogAuth { "&redirect_uri=https%3A%2F%2Fembed.gog.com%2Fon_login_success%3Forigin%3Dclient&response_type=token&layout=client2" const val REDIRECT_PREFIX = "https://embed.gog.com/on_login_success" const val GALAXY_UA = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) GOG Galaxy/2.0" + const val COOKIE_DOMAIN = ".gog.com" + val SIGN_IN_URLS = listOf("https://login.gog.com/", "https://auth.gog.com/") fun authUrl(state: String): String = "$AUTH_URL&state=${Uri.encode(state)}" diff --git a/app/src/test/java/com/droiddeck/launcher/stores/WebCookiesTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/WebCookiesTest.kt new file mode 100644 index 0000000000..ec8c63d100 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/stores/WebCookiesTest.kt @@ -0,0 +1,18 @@ +package com.droiddeck.launcher.stores + +import com.droiddeck.launcher.stores.gog.GogAuth +import org.junit.Assert.assertEquals +import org.junit.Assert.assertTrue +import org.junit.Test + +class WebCookiesTest { + @Test fun gogLoginCookiesAreExpiredOnTheLoginHostAndTheDomain() { + val lines = WebCookies.expired("galaxy-login-s=a; galaxy-login-tsa=b; galaxy-login-al=c", GogAuth.COOKIE_DOMAIN, listOf("/"), "login.gog.com") + assertEquals(9, lines.size) + assertTrue(lines.contains("galaxy-login-al=; Max-Age=0; Path=/; Secure")) + assertTrue(lines.contains("galaxy-login-al=; Max-Age=0; Path=/; Secure; Domain=.gog.com")) + assertTrue(lines.contains("galaxy-login-al=; Max-Age=0; Path=/; Secure; Domain=login.gog.com")) + assertTrue(lines.none { it.startsWith("galaxy-login-al=c") }) + assertEquals(emptyList(), WebCookies.expired(null, GogAuth.COOKIE_DOMAIN, listOf("/"), "login.gog.com")) + } +} From abeaf7ccb6fab9aa5ada90d29e83992643db6d11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Resul=20=C3=96v=C3=BCr?= <92828257+ovurrsl@users.noreply.github.com> Date: Wed, 21 Oct 2026 07:56:05 +0300 Subject: [PATCH 05/44] fix: a failed Steam client download ends the session with a message instead of silently (#997) --- .../com/droiddeck/launcher/SessionActivity.kt | 17 ++-- .../session/SteamClientSetupFailure.kt | 28 +++++++ app/src/main/res/values-ar/strings.xml | 2 + app/src/main/res/values-b+es+419/strings.xml | 2 + app/src/main/res/values-bg/strings.xml | 2 + app/src/main/res/values-cs/strings.xml | 2 + app/src/main/res/values-da/strings.xml | 2 + app/src/main/res/values-de/strings.xml | 2 + app/src/main/res/values-el/strings.xml | 2 + app/src/main/res/values-es/strings.xml | 2 + app/src/main/res/values-fi/strings.xml | 2 + app/src/main/res/values-fr/strings.xml | 2 + app/src/main/res/values-hi/strings.xml | 2 + app/src/main/res/values-hu/strings.xml | 2 + app/src/main/res/values-in/strings.xml | 2 + app/src/main/res/values-it/strings.xml | 2 + app/src/main/res/values-ja/strings.xml | 2 + app/src/main/res/values-ko/strings.xml | 2 + app/src/main/res/values-ms/strings.xml | 2 + app/src/main/res/values-nb/strings.xml | 2 + app/src/main/res/values-nl/strings.xml | 2 + app/src/main/res/values-pl/strings.xml | 2 + app/src/main/res/values-pt-rPT/strings.xml | 2 + app/src/main/res/values-pt/strings.xml | 2 + app/src/main/res/values-ro/strings.xml | 2 + app/src/main/res/values-ru/strings.xml | 2 + app/src/main/res/values-sv/strings.xml | 2 + app/src/main/res/values-th/strings.xml | 2 + app/src/main/res/values-tr/strings.xml | 2 + app/src/main/res/values-uk/strings.xml | 2 + app/src/main/res/values-vi/strings.xml | 2 + app/src/main/res/values-zh-rCN/strings.xml | 2 + app/src/main/res/values-zh-rHK/strings.xml | 2 + app/src/main/res/values-zh-rTW/strings.xml | 2 + app/src/main/res/values/strings.xml | 2 + .../session/SteamClientSetupFailureTest.kt | 72 ++++++++++++++++ .../overlay/usr/local/bin/droiddeck-session | 11 ++- .../tests/test_steam_client_setup_failure.py | 82 +++++++++++++++++++ 38 files changed, 267 insertions(+), 9 deletions(-) create mode 100644 app/src/main/java/com/droiddeck/launcher/session/SteamClientSetupFailure.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/session/SteamClientSetupFailureTest.kt create mode 100644 tools/tests/test_steam_client_setup_failure.py diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 0e95a2635a..8bddc2a0cb 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -1879,17 +1879,22 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { var enosys = 0 var fexMissing = false val size = log.length() - java.io.RandomAccessFile(log, "r").use { f -> + val text = java.io.RandomAccessFile(log, "r").use { f -> val start = maxOf(0L, size - 512L * 1024) f.seek(start) val bytes = ByteArray((size - start).toInt()) f.readFully(bytes) - String(bytes, Charsets.ISO_8859_1).lineSequence().forEach { line -> - if (line.contains("Function not implemented")) enosys++ - if (line.contains(FEX_MISSING)) fexMissing = true - } + String(bytes, Charsets.ISO_8859_1) } - if (fexMissing) { + text.lineSequence().forEach { line -> + if (line.contains("Function not implemented")) enosys++ + if (line.contains(FEX_MISSING)) fexMissing = true + } + val steamSetup = com.droiddeck.launcher.session.SteamClientSetupFailure.find(text.lineSequence()) + if (steamSetup != null) { + val message = getString(if (steamSetup.download) R.string.session_end_steam_download else R.string.session_end_steam_setup) + EndHint(listOfNotNull(message, steamSetup.curlError).joinToString("\n")) + } else if (fexMissing) { val what = com.droiddeck.launcher.frontend.Library.nameForProgram(SessionState.program) ?: getString(R.string.session_end_program) EndHint(getString(R.string.session_end_fex_missing, what), evenOnSuccess = true) } else if (enosys >= 8) { diff --git a/app/src/main/java/com/droiddeck/launcher/session/SteamClientSetupFailure.kt b/app/src/main/java/com/droiddeck/launcher/session/SteamClientSetupFailure.kt new file mode 100644 index 0000000000..c0a53ca7a2 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/session/SteamClientSetupFailure.kt @@ -0,0 +1,28 @@ +package com.droiddeck.launcher.session + +class SteamClientSetupFailure(val curlError: String?) { + val download get() = curlError != null + + companion object { + const val MARKER = "== steam: the Steam client could not be set up" + private const val STEP = "checking the Steam client" + private const val X64_STEP = "checking the x86-64 Steam client" + private val CURL_ERROR = Regex("""curl: \(\d+\).*""") + + fun find(lines: Sequence): SteamClientSetupFailure? { + var curlError: String? = null + var found: SteamClientSetupFailure? = null + lines.forEach { line -> + when { + line.contains(STEP) || line.contains(X64_STEP) -> { + curlError = null + found = null + } + line.contains(MARKER) -> found = SteamClientSetupFailure(curlError) + else -> CURL_ERROR.find(line)?.let { curlError = it.value.trim() } + } + } + return found + } + } +} diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 27109fd066..c8fd949fbe 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -176,6 +176,8 @@ %1$s عبر FEX هذا البرنامج مبني لأجهزة كمبيوتر %1$s ويعمل عبر FEX، الذي لم يتم إعداده بعد. افتح Steam مرة واحدة أثناء تسجيل الدخول: سيجعله DroidDeck يُنزّل FEX وSteam Linux Runtime اللازمة، ثم يُفتح هذا البرنامج. هذا البرنامج + تعذّر تنزيل عميل Steam. قد تكون شبكتك أو VPN تحظر خوادم Steam؛ تحقّق من الاتصال وحاول مرة أخرى. + تعذّر إعداد عميل Steam. تحقّق من الاتصال والمساحة الفارغة، ثم حاول مرة أخرى. %1$s مبني لأجهزة كمبيوتر x86 ويعمل عبر FEX، الذي لم يتم تثبيته بعد. شغّل Steam مرة واحدة أثناء تسجيل الدخول ودعه يُنزّل FEX وSteam Linux Runtime، ثم شغّل هذا البرنامج مجددًا. معرّف تطبيق على Flathub أو صفحته على Flathub. يُعَدّ Flatpak أولًا إن لم يكن مُعدًّا بعد. الملف diff --git a/app/src/main/res/values-b+es+419/strings.xml b/app/src/main/res/values-b+es+419/strings.xml index 8988e18d1c..a9303902af 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -176,6 +176,8 @@ %1$s con FEX Este programa está hecho para PC %1$s y se ejecuta con FEX, que aún no está listo. Abre Steam una vez con tu sesión iniciada: DroidDeck hará que descargue FEX y el Steam Linux Runtime que necesita, y después se abrirá. Este programa + No se pudo descargar el cliente de Steam. Es posible que tu red o VPN esté bloqueando los servidores de Steam; revisa la conexión e inténtalo de nuevo. + No se pudo configurar el cliente de Steam. Revisa la conexión y el espacio libre, y vuelve a intentarlo. %1$s está hecho para PC x86 y se ejecuta con FEX, que aún no está instalado. Abre Steam una vez con tu sesión iniciada y deja que descargue FEX y el Steam Linux Runtime; después vuelve a iniciarlo. Un ID de app de Flathub o su página en Flathub. Flatpak se configura primero si aún no lo está. Archivo diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index d48d3a0cab..aba51d5590 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -176,6 +176,8 @@ %1$s през FEX Тази програма е компилирана за %1$s компютри и се стартира през FEX, който още не е настроен. Отворете Steam веднъж, докато сте влезли: DroidDeck ще изтегли FEX и необходимата Steam Linux Runtime, след което тя ще се отвори. Тази програма + Клиентът на Steam не можа да бъде изтеглен. Мрежата или VPN връзката ви може да блокира сървърите на Steam; проверете връзката и опитайте отново. + Клиентът на Steam не можа да бъде настроен. Проверете връзката и свободното място, след което опитайте отново. %1$s е компилирана за x86 компютри и се стартира през FEX, който още не е инсталиран. Стартирайте Steam веднъж, докато сте влезли, и го оставете да изтегли FEX и Steam Linux Runtime, след което стартирайте отново. ID на приложение в Flathub или страницата му в Flathub. Flatpak се настройва първо, ако още не е. Файл diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index e3b3bc3c0f..2bef97b92d 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -176,6 +176,8 @@ %1$s přes FEX Tento program je sestaven pro PC %1$s a běží přes FEX, který ještě není nastaven. Jednou spusťte přihlášený Steam: DroidDeck tím stáhne FEX a Steam Linux Runtime, který potřebuje, a pak se tento program otevře. Tento program + Klienta Steam se nepodařilo stáhnout. Vaše síť nebo VPN možná blokuje servery Steamu; zkontrolujte připojení a zkuste to znovu. + Klienta Steam se nepodařilo nastavit. Zkontrolujte připojení a volné místo a zkuste to znovu. %1$s je sestaven pro PC x86 a běží přes FEX, který ještě není nainstalován. Jednou spusťte přihlášený Steam a nechte ho stáhnout FEX a Steam Linux Runtime, pak to spusťte znovu. ID aplikace Flathub nebo její stránka na Flathub. Flatpak se nejprve nastaví, pokud ještě není. Soubor diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 85062308d1..3fe4695cba 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -176,6 +176,8 @@ %1$s via FEX Dette program er bygget til %1$s-pc’er og køres via FEX, som ikke er sat op endnu. Åbn Steam én gang, mens du er logget ind: DroidDeck downloader så FEX og den Steam Linux Runtime, det kræver, hvorefter dette åbner. Dette program + Steam-klienten kunne ikke downloades. Dit netværk eller din VPN blokerer muligvis Steams servere; tjek forbindelsen, og prøv igen. + Steam-klienten kunne ikke konfigureres. Tjek forbindelsen og den ledige lagerplads, og prøv igen. %1$s er bygget til x86-pc’er og køres via FEX, som ikke er installeret endnu. Start Steam én gang, mens du er logget ind, og lad det downloade FEX og Steam Linux Runtime, og start så dette igen. Et Flathub-app-id eller dens Flathub-side. Flatpak sættes op først, hvis det ikke allerede er. Fil diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 18199e20eb..9fe1c0e794 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -176,6 +176,8 @@ %1$s über FEX Dieses Programm ist für %1$s-PCs gebaut und läuft über FEX, das noch nicht eingerichtet ist. Öffne Steam einmal, während du angemeldet bist: DroidDeck lässt es FEX und die nötige Steam Linux Runtime herunterladen, danach lässt sich das Programm öffnen. Dieses Programm + Der Steam-Client konnte nicht heruntergeladen werden. Dein Netzwerk oder VPN blockiert möglicherweise die Server von Steam; prüfe die Verbindung und versuche es erneut. + Der Steam-Client konnte nicht eingerichtet werden. Prüfe die Verbindung und den freien Speicher und versuche es erneut. %1$s ist für x86-PCs gebaut und läuft über FEX, das noch nicht installiert ist. Starte Steam einmal, während du angemeldet bist, und lass es FEX und die Steam Linux Runtime herunterladen. Starte es danach erneut. Eine Flathub-App-ID oder ihre Flathub-Seite. Flatpak wird zuerst eingerichtet, falls noch nicht geschehen. Datei diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 0ff07c465a..14f83431cf 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -176,6 +176,8 @@ %1$s μέσω FEX Αυτό το πρόγραμμα είναι χτισμένο για υπολογιστές %1$s και εκτελείται μέσω FEX, το οποίο δεν έχει ρυθμιστεί ακόμα. Ανοίξτε το Steam μία φορά ενώ είστε συνδεδεμένοι: το DroidDeck κάνει λήψη του FEX και του Steam Linux Runtime που χρειάζεται, και μετά αυτό ανοίγει. Αυτό το πρόγραμμα + Δεν ήταν δυνατή η λήψη του πελάτη Steam. Το δίκτυο ή το VPN σας ίσως αποκλείει τους διακομιστές του Steam· ελέγξτε τη σύνδεση και δοκιμάστε ξανά. + Δεν ήταν δυνατή η ρύθμιση του πελάτη Steam. Ελέγξτε τη σύνδεση και τον ελεύθερο χώρο αποθήκευσης και δοκιμάστε ξανά. Το %1$s είναι χτισμένο για υπολογιστές x86 και εκτελείται μέσω FEX, το οποίο δεν έχει εγκατασταθεί ακόμα. Εκκινήστε το Steam μία φορά ενώ είστε συνδεδεμένοι και αφήστε το να κάνει λήψη του FEX και του Steam Linux Runtime, μετά εκκινήστε αυτό ξανά. Ένα ID εφαρμογής Flathub ή η σελίδα της στο Flathub. Το Flatpak ρυθμίζεται πρώτα, αν δεν έχει ρυθμιστεί ακόμα. Αρχείο diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 0373f7ab33..ea6e05fb38 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -176,6 +176,8 @@ %1$s con FEX Este programa está hecho para PC %1$s y se ejecuta con FEX, que aún no está listo. Abre Steam una vez con tu sesión iniciada: DroidDeck hará que descargue FEX y el Steam Linux Runtime que necesita, y después se abrirá. Este programa + No se ha podido descargar el cliente de Steam. Puede que tu red o VPN esté bloqueando los servidores de Steam; comprueba la conexión y vuelve a intentarlo. + No se ha podido configurar el cliente de Steam. Comprueba la conexión y el espacio libre y vuelve a intentarlo. %1$s está hecho para PC x86 y se ejecuta con FEX, que aún no está instalado. Abre Steam una vez con tu sesión iniciada y deja que descargue FEX y el Steam Linux Runtime; después vuelve a iniciarlo. Un ID de app de Flathub o su página en Flathub. Flatpak se configura primero si aún no lo está. Archivo diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 2a1f62a030..680b9c455c 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -176,6 +176,8 @@ %1$s FEXin kautta Tämä ohjelma on tehty %1$s-tietokoneille ja käynnistyy FEXin kautta, jota ei ole vielä määritetty. Avaa Steam kerran kirjautuneena: DroidDeck lataa sen myötä FEXin ja tarvittavan Steam Linux Runtimen, jonka jälkeen tämä avautuu. Tämä ohjelma + Steam-asiakasohjelmaa ei voitu ladata. Verkkosi tai VPN saattaa estää Steamin palvelimet; tarkista yhteys ja yritä uudelleen. + Steam-asiakasohjelmaa ei voitu ottaa käyttöön. Tarkista yhteys ja vapaa tallennustila ja yritä uudelleen. %1$s on tehty x86-tietokoneille ja käynnistyy FEXin kautta, jota ei ole vielä asennettu. Käynnistä Steam kerran kirjautuneena ja anna sen ladata FEX ja Steam Linux Runtime, sitten käynnistä tämä uudelleen. Flathub-sovellustunnus tai sen Flathub-sivu. Flatpak otetaan käyttöön ensin, jos sitä ei ole vielä otettu. Tiedosto diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index d151596fb3..1072156283 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -176,6 +176,8 @@ %1$s via FEX Ce programme est conçu pour les PC %1$s et s\'exécute via FEX, qui n\'est pas encore configuré. Ouvrez Steam une fois en étant connecté : DroidDeck lui fait télécharger FEX et le Steam Linux Runtime nécessaires, puis ce programme s\'ouvre. Ce programme + Impossible de télécharger le client Steam. Votre réseau ou votre VPN bloque peut-être les serveurs de Steam ; vérifiez la connexion et réessayez. + Impossible de configurer le client Steam. Vérifiez la connexion et l\'espace libre, puis réessayez. %1$s est conçu pour les PC x86 et s\'exécute via FEX, qui n\'est pas encore installé. Lancez Steam une fois en étant connecté et laissez-le télécharger FEX et le Steam Linux Runtime, puis relancez ce programme. ID d\'application Flathub ou sa page Flathub. Si Flatpak n\'est pas encore configuré, il le sera d\'abord. Fichier diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index af68d4524f..2a246077fb 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -176,6 +176,8 @@ FEX के ज़रिए %1$s यह प्रोग्राम %1$s पीसी के लिए बना है और FEX के ज़रिए चलता है, जो अभी सेट नहीं है। साइन इन रहते हुए Steam एक बार खोलें: DroidDeck इससे FEX और ज़रूरी Steam Linux Runtime डाउनलोड करवा लेगा, फिर यह खुल जाएगा। यह प्रोग्राम + Steam क्लाइंट डाउनलोड नहीं हो सका। हो सकता है आपका नेटवर्क या VPN Steam के सर्वर ब्लॉक कर रहा हो; कनेक्शन जांचें और फिर से कोशिश करें। + Steam क्लाइंट सेट अप नहीं हो सका। कनेक्शन और खाली स्टोरेज जांचें, फिर से कोशिश करें। %1$s x86 पीसी के लिए बना है और FEX के ज़रिए चलता है, जो अभी इंस्टॉल नहीं है। साइन इन रहते हुए Steam एक बार शुरू करें और इसे FEX और Steam Linux Runtime डाउनलोड करने दें, फिर इसे फिर से शुरू करें। एक Flathub ऐप ID या उसका Flathub पेज। अगर Flatpak अभी सेट नहीं है, तो पहले वह सेट होगा। फ़ाइल diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 67f33c54d3..ab5bbef494 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -176,6 +176,8 @@ %1$s a FEX-en keresztül Ez a program %1$s PC-khez készült, és a FEX-en keresztül fut, amely még nincs beállítva. Nyissa meg egyszer a Steamet bejelentkezve: a DroidDeck ekkor letölti a FEX-et és a szükséges Steam Linux Runtime-ot, majd ez megnyílik. Ez a program + A Steam-klienst nem sikerült letölteni. Lehet, hogy a hálózat vagy a VPN blokkolja a Steam szervereit; ellenőrizd a kapcsolatot, és próbáld újra. + A Steam-klienst nem sikerült beállítani. Ellenőrizd a kapcsolatot és a szabad tárhelyet, majd próbáld újra. A %1$s x86 PC-khez készült, és a FEX-en keresztül fut, amely még nincs telepítve. Indítsa el egyszer a Steamet bejelentkezve, és hagyja letölteni a FEX-et és a Steam Linux Runtime-ot, majd indítsa el ezt újra. Egy Flathub-alkalmazásazonosító vagy a Flathub-oldala. A Flatpak előbb beállításra kerül, ha még nincs beállítva. Fájl diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 6a0371282f..0bd3c783ff 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -176,6 +176,8 @@ %1$s melalui FEX Program ini dibuat untuk PC %1$s dan berjalan melalui FEX, yang belum disiapkan. Buka Steam sekali saat masuk: DroidDeck akan mengunduh FEX dan Steam Linux Runtime yang diperlukan, lalu ini akan terbuka. Program ini + Tidak dapat mengunduh klien Steam. Jaringan atau VPN Anda mungkin memblokir server Steam; periksa koneksi lalu coba lagi. + Tidak dapat menyiapkan klien Steam. Periksa koneksi dan ruang penyimpanan kosong, lalu coba lagi. %1$s dibuat untuk PC x86 dan berjalan melalui FEX, yang belum terinstal. Mulai Steam sekali saat masuk dan biarkan FEX serta Steam Linux Runtime diunduh, lalu mulai lagi. ID aplikasi Flathub atau halaman Flathub-nya. Flatpak disiapkan dahulu jika belum. File diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 6cf24b19d3..a2c2c3c4c5 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -176,6 +176,8 @@ %1$s tramite FEX Questo programma è compilato per PC %1$s e viene eseguito tramite FEX, che non è ancora configurato. Apri Steam una volta dopo aver eseguito l\'accesso: DroidDeck gli farà scaricare FEX e lo Steam Linux Runtime necessario, poi il programma si aprirà. Questo programma + Impossibile scaricare il client Steam. La rete o la VPN potrebbe bloccare i server di Steam; controlla la connessione e riprova. + Impossibile configurare il client Steam. Controlla la connessione e lo spazio libero, poi riprova. %1$s è compilato per PC x86 e viene eseguito tramite FEX, che non è ancora installato. Avvia Steam una volta dopo aver eseguito l\'accesso e lascia che scarichi FEX e lo Steam Linux Runtime, poi riavvia il programma. Un ID app di Flathub o la sua pagina su Flathub. Se manca, Flatpak viene prima configurato. File diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index a1f640853b..213144bea4 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -176,6 +176,8 @@ %1$s(FEX経由) このプログラムは%1$s PC向けにビルドされており、FEX経由で実行されますが、FEXはまだセットアップされていません。ログインした状態で一度Steamを開いてください。DroidDeckがFEXと必要なSteam Linux Runtimeをダウンロードした後、このプログラムが開きます。 このプログラム + Steamクライアントをダウンロードできませんでした。ネットワークまたはVPNがSteamのサーバーをブロックしている可能性があります。接続を確認して、もう一度お試しください。 + Steamクライアントをセットアップできませんでした。接続と空き容量を確認して、もう一度お試しください。 %1$sはx86 PC向けにビルドされており、FEX経由で実行されますが、FEXはまだインストールされていません。ログインした状態で一度Steamを起動し、FEXとSteam Linux Runtimeをダウンロードしてから、もう一度起動してください。 FlathubアプリIDまたはそのFlathubページ。Flatpakがまだセットアップされていない場合は、先にセットアップします。 ファイル diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index ffd0d5a7a3..4fc869f78f 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -176,6 +176,8 @@ FEX로 실행되는 %1$s 이 프로그램은 %1$s PC용으로 빌드되어 FEX를 통해 실행되지만, FEX가 아직 설정되지 않았습니다. 로그인한 상태로 Steam을 한 번 열면 DroidDeck이 FEX와 필요한 Steam Linux Runtime을 다운로드한 후 이 프로그램을 엽니다. 이 프로그램 + Steam 클라이언트를 다운로드할 수 없습니다. 네트워크나 VPN이 Steam 서버를 차단하고 있을 수 있습니다. 연결을 확인하고 다시 시도하세요. + Steam 클라이언트를 설정할 수 없습니다. 연결과 남은 저장 공간을 확인한 뒤 다시 시도하세요. %1$s은(는) x86 PC용으로 빌드되어 FEX를 통해 실행되지만, FEX가 아직 설치되지 않았습니다. 로그인한 상태로 Steam을 한 번 시작하여 FEX와 Steam Linux Runtime을 다운로드한 후 다시 시작하세요. Flathub 앱 ID 또는 해당 Flathub 페이지입니다. Flatpak이 아직 설정되지 않은 경우 먼저 설정합니다. 파일 diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 42d9888b70..599ff582f9 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -176,6 +176,8 @@ %1$s melalui FEX Program ini dibina untuk PC %1$s dan berjalan melalui FEX, yang belum disediakan lagi. Buka Steam sekali semasa anda log masuk: DroidDeck akan memuat turun FEX dan Steam Linux Runtime yang diperlukan, kemudian ini akan dibuka. Program ini + Tidak dapat memuat turun klien Steam. Rangkaian atau VPN anda mungkin menyekat pelayan Steam; semak sambungan dan cuba lagi. + Tidak dapat menyediakan klien Steam. Semak sambungan dan ruang storan kosong, kemudian cuba lagi. %1$s dibina untuk PC x86 dan berjalan melalui FEX, yang belum dipasang lagi. Mulakan Steam sekali semasa anda log masuk dan biarkan ia memuat turun FEX dan Steam Linux Runtime, kemudian mulakan ini semula. ID apl Flathub atau halaman Flathubnya. Flatpak akan disediakan dahulu jika belum lagi. Fail diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 133d053781..68dcfc185a 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -176,6 +176,8 @@ %1$s via FEX Dette programmet er bygget for %1$s-PC-er og kjører via FEX, som ikke er satt opp ennå. Åpne Steam én gang mens du er innlogget: DroidDeck lar den laste ned FEX og Steam Linux Runtime den trenger, og så åpnes dette. Dette programmet + Kunne ikke laste ned Steam-klienten. Nettverket eller VPN-en din blokkerer kanskje Steams servere; sjekk tilkoblingen og prøv igjen. + Kunne ikke sette opp Steam-klienten. Sjekk tilkoblingen og ledig lagringsplass, og prøv igjen. %1$s er bygget for x86-PC-er og kjører via FEX, som ikke er installert ennå. Start Steam én gang mens du er innlogget, og la den laste ned FEX og Steam Linux Runtime, og start dette på nytt. En Flathub-app-ID eller dens Flathub-side. Flatpak settes opp først hvis det ikke allerede er gjort. Fil diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index f37c875827..267afcb69c 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -176,6 +176,8 @@ %1$s via FEX Dit programma is gemaakt voor %1$s-pc’s en draait via FEX, dat nog niet is ingesteld. Open Steam één keer terwijl je bent ingelogd: DroidDeck laat het dan FEX en de benodigde Steam Linux Runtime downloaden. Daarna opent dit. Dit programma + De Steam-client kon niet worden gedownload. Je netwerk of VPN blokkeert mogelijk de servers van Steam; controleer de verbinding en probeer het opnieuw. + De Steam-client kon niet worden ingesteld. Controleer de verbinding en de vrije opslag en probeer het opnieuw. %1$s is gemaakt voor x86-pc’s en draait via FEX, dat nog niet is geïnstalleerd. Start Steam één keer terwijl je bent ingelogd en laat het FEX en de Steam Linux Runtime downloaden. Start dit daarna opnieuw. Een Flathub-app-ID of de Flathub-pagina ervan. Flatpak wordt eerst ingesteld als dat nog niet is gebeurd. Bestand diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index de29734d21..fc7bb39b1a 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -176,6 +176,8 @@ %1$s przez FEX Ten program jest zbudowany dla komputerów %1$s i działa przez FEX, który nie jest jeszcze skonfigurowany. Otwórz raz Steam po zalogowaniu: DroidDeck pobierze wtedy FEX i potrzebne Steam Linux Runtime, a potem program się otworzy. Ten program + Nie udało się pobrać klienta Steam. Twoja sieć lub VPN może blokować serwery Steam; sprawdź połączenie i spróbuj ponownie. + Nie udało się skonfigurować klienta Steam. Sprawdź połączenie i wolne miejsce, a potem spróbuj ponownie. %1$s jest zbudowany dla komputerów x86 i działa przez FEX, który nie jest jeszcze zainstalowany. Uruchom raz Steam po zalogowaniu i pozwól mu pobrać FEX oraz Steam Linux Runtime, a potem uruchom program ponownie. ID aplikacji z Flathub lub jej strona na Flathub. Jeśli Flatpak nie jest jeszcze skonfigurowany, zostanie skonfigurowany najpierw. Plik diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index edffdf14a9..8c51b09c9e 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -176,6 +176,8 @@ %1$s através do FEX Este programa foi compilado para PCs %1$s e é executado através do FEX, que ainda não está configurado. Abra o Steam uma vez com a sessão iniciada: o DroidDeck transfere o FEX e o Steam Linux Runtime necessários e, depois, este programa abre. Este programa + Não foi possível transferir o cliente Steam. A sua rede ou VPN pode estar a bloquear os servidores da Steam; verifique a ligação e tente novamente. + Não foi possível configurar o cliente Steam. Verifique a ligação e o espaço livre e tente novamente. %1$s foi compilado para PCs x86 e é executado através do FEX, que ainda não está instalado. Abra o Steam uma vez com a sessão iniciada e deixe-o transferir o FEX e o Steam Linux Runtime; depois, volte a iniciá-lo. Um ID de app do Flathub ou a respetiva página no Flathub. O Flatpak é configurado primeiro, se ainda não estiver. Ficheiro diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index a4d96ea940..7c6f7f9661 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -176,6 +176,8 @@ %1$s pelo FEX Este programa é feito para PCs %1$s e roda pelo FEX, que ainda não está configurado. Abra a Steam uma vez com a sessão iniciada: o DroidDeck faz com que ela baixe o FEX e o Steam Linux Runtime necessários, e então isto abre. Este programa + Não foi possível baixar o cliente Steam. Sua rede ou VPN pode estar bloqueando os servidores da Steam; verifique a conexão e tente novamente. + Não foi possível configurar o cliente Steam. Verifique a conexão e o espaço livre e tente novamente. %1$s é feito para PCs x86 e roda pelo FEX, que ainda não está instalado. Abra a Steam uma vez com a sessão iniciada e deixe-a baixar o FEX e o Steam Linux Runtime; depois, abra isto de novo. Um ID de app do Flathub ou a página dele no Flathub. O Flatpak é configurado antes, se ainda não estiver. Arquivo diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index d97af4aed0..c9e753866f 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -176,6 +176,8 @@ %1$s prin FEX Acest program este compilat pentru PC-uri %1$s și rulează prin FEX, care nu este încă configurat. Deschide Steam o dată, fiind autentificat: DroidDeck îl pune să descarce FEX și Steam Linux Runtime de care are nevoie, apoi acesta se deschide. Acest program + Clientul Steam nu a putut fi descărcat. Rețeaua sau VPN-ul tău poate bloca serverele Steam; verifică conexiunea și încearcă din nou. + Clientul Steam nu a putut fi configurat. Verifică conexiunea și spațiul liber, apoi încearcă din nou. %1$s este compilat pentru PC-uri x86 și rulează prin FEX, care nu este încă instalat. Pornește Steam o dată, fiind autentificat, și lasă-l să descarce FEX și Steam Linux Runtime, apoi pornește din nou acesta. Un ID de aplicație Flathub sau pagina sa Flathub. Flatpak este configurat mai întâi, dacă nu este deja. Fișier diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 1388738db6..4af87d354a 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -176,6 +176,8 @@ %1$s через FEX Эта программа собрана для ПК на %1$s и работает через FEX, который еще не настроен. Откройте Steam один раз, войдя в аккаунт: DroidDeck скачает через него FEX и нужную Steam Linux Runtime, после чего программа откроется. Эта программа + Не удалось скачать клиент Steam. Возможно, ваша сеть или VPN блокирует серверы Steam; проверьте подключение и повторите попытку. + Не удалось настроить клиент Steam. Проверьте подключение и свободное место, затем повторите попытку. %1$s — сборка для x86-ПК, которая работает через FEX, а он еще не установлен. Запустите Steam один раз, войдя в аккаунт, и дайте ему скачать FEX и Steam Linux Runtime, затем запустите программу снова. ID приложения Flathub или ссылка на его страницу. Если Flatpak еще не настроен, сначала будет выполнена его настройка. Файл diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index caf787c3a7..e740f9cb9b 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -176,6 +176,8 @@ %1$s via FEX Programmet är byggt för %1$s-datorer och körs via FEX, som inte har konfigurerats än. Öppna Steam en gång medan du är inloggad: DroidDeck låter Steam ladda ned FEX och den Steam Linux Runtime som behövs, sedan öppnas detta. Det här programmet + Det gick inte att ladda ned Steam-klienten. Ditt nätverk eller din VPN kanske blockerar Steams servrar; kontrollera anslutningen och försök igen. + Det gick inte att konfigurera Steam-klienten. Kontrollera anslutningen och det lediga lagringsutrymmet och försök igen. %1$s är byggt för x86-datorer och körs via FEX, som inte är installerat än. Starta Steam en gång medan du är inloggad och låt det ladda ned FEX och Steam Linux Runtime. Starta sedan detta igen. Ett app-ID från Flathub eller appens Flathub-sida. Flatpak konfigureras först om det inte redan är gjort. Fil diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 1107a67779..3a9157bb74 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -176,6 +176,8 @@ %1$s ผ่าน FEX โปรแกรมนี้สร้างมาสำหรับพีซี %1$s และรันผ่าน FEX ซึ่งยังไม่ได้ตั้งค่า เปิด Steam สักครั้งขณะลงชื่อเข้าใช้: DroidDeck จะดาวน์โหลด FEX และ Steam Linux Runtime ที่จำเป็น จากนั้นโปรแกรมนี้จะเปิดขึ้น โปรแกรมนี้ + ดาวน์โหลดไคลเอนต์ Steam ไม่ได้ เครือข่ายหรือ VPN ของคุณอาจบล็อกเซิร์ฟเวอร์ของ Steam ตรวจสอบการเชื่อมต่อแล้วลองอีกครั้ง + ตั้งค่าไคลเอนต์ Steam ไม่ได้ ตรวจสอบการเชื่อมต่อและพื้นที่ว่าง แล้วลองอีกครั้ง %1$s สร้างมาสำหรับพีซี x86 และรันผ่าน FEX ซึ่งยังไม่ได้ติดตั้ง เริ่ม Steam สักครั้งขณะลงชื่อเข้าใช้และให้ดาวน์โหลด FEX และ Steam Linux Runtime จากนั้นเริ่มโปรแกรมนี้อีกครั้ง รหัสแอป Flathub หรือหน้า Flathub ของมัน จะตั้งค่า Flatpak ก่อนหากยังไม่ได้ตั้งค่า ไฟล์ diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 05cd0192b9..9e6b9ab15d 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -176,6 +176,8 @@ FEX ile %1$s Bu program %1$s PC\'ler için derlenmiş ve FEX ile çalışır, ancak FEX henüz kurulmadı. Oturum açmışken Steam\'i bir kez açın: DroidDeck, FEX\'i ve gereken Steam Linux Runtime\'ı indirtir, ardından bu program açılır. Bu program + Steam istemcisi indirilemedi. Ağınız veya VPN\'iniz Steam sunucularını engelliyor olabilir; bağlantıyı kontrol edip yeniden deneyin. + Steam istemcisi kurulamadı. Bağlantınızı ve boş depolama alanını kontrol edip yeniden deneyin. %1$s x86 PC\'ler için derlenmiş ve FEX ile çalışır, ancak FEX henüz yüklü değil. Oturum açmışken Steam\'i bir kez başlatıp FEX\'i ve Steam Linux Runtime\'ı indirmesini bekleyin, ardından bunu yeniden başlatın. Bir Flathub uygulama kimliği veya Flathub sayfası. Flatpak henüz kurulu değilse önce o kurulur. Dosya diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index cf16a09384..931caa8ade 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -176,6 +176,8 @@ %1$s через FEX Цю програму зібрано для ПК з архітектурою %1$s, і вона працює через FEX, який ще не налаштовано. Один раз відкрийте Steam, увійшовши в обліковий запис: DroidDeck завантажить FEX і потрібний йому Steam Linux Runtime, після чого програма відкриється. Ця програма + Не вдалося завантажити клієнт Steam. Можливо, ваша мережа або VPN блокує сервери Steam; перевірте з’єднання та спробуйте ще раз. + Не вдалося налаштувати клієнт Steam. Перевірте з’єднання та вільне місце, потім спробуйте ще раз. %1$s зібрано для ПК x86; для запуску потрібен FEX, який ще не встановлено. Один раз запустіть Steam, увійшовши в обліковий запис, дайте йому завантажити FEX і Steam Linux Runtime, а потім запустіть це знову. ID додатка Flathub або його сторінка на Flathub. Якщо Flatpak ще не налаштовано, його буде налаштовано спочатку. Файл diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 785e8d57f3..d636a67ead 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -176,6 +176,8 @@ %1$s qua FEX Chương trình này được build cho PC %1$s và chạy qua FEX, hiện chưa được thiết lập. Mở Steam một lần khi đã đăng nhập: DroidDeck sẽ tải FEX và Steam Linux Runtime cần thiết, sau đó ứng dụng này sẽ mở. Chương trình này + Không thể tải xuống client Steam. Mạng hoặc VPN của bạn có thể đang chặn máy chủ Steam; hãy kiểm tra kết nối rồi thử lại. + Không thể thiết lập client Steam. Hãy kiểm tra kết nối và dung lượng trống rồi thử lại. %1$s được build cho PC x86 và chạy qua FEX, hiện chưa được cài. Khởi động Steam một lần khi đã đăng nhập và để nó tải FEX cùng Steam Linux Runtime, sau đó khởi động lại ứng dụng này. Một app ID Flathub hoặc trang Flathub của nó. Flatpak sẽ được thiết lập trước nếu chưa có. Tệp diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 174e671587..f513e51a9f 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -176,6 +176,8 @@ %1$s 经由 FEX 此程序面向 %1$s PC 构建,需经由 FEX 运行,而 FEX 尚未配置。请在登录状态下打开一次 Steam:DroidDeck 会让其下载 FEX 及所需的 Steam Linux Runtime,之后即可打开。 此程序 + 无法下载 Steam 客户端。你的网络或 VPN 可能屏蔽了 Steam 的服务器;请检查网络连接后重试。 + 无法设置 Steam 客户端。请检查网络连接和可用存储空间,然后重试。 %1$s 面向 x86 PC 构建,需经由 FEX 运行,而 FEX 尚未安装。请在登录状态下启动一次 Steam,让其下载 FEX 与 Steam Linux Runtime,然后重新启动。 一个 Flathub 应用 ID 或其 Flathub 页面。若尚未配置 Flatpak 会先进行配置。 文件 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 97d53634ea..10cc860e71 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -176,6 +176,8 @@ %1$s,透過 FEX 此程式是為 %1$s 電腦而設,需透過 FEX 執行,但 FEX 尚未設定。請在登入狀態下開啟一次 Steam:DroidDeck 會讓它下載 FEX 及所需的 Steam Linux Runtime,之後便會開啟此程式。 此程式 + 無法下載 Steam 用戶端。你的網絡或 VPN 可能封鎖了 Steam 的伺服器;請檢查連線後再試。 + 無法設定 Steam 用戶端。請檢查連線和可用儲存空間,然後再試。 %1$s 是為 x86 電腦而設,需透過 FEX 執行,但 FEX 尚未安裝。請在登入狀態下啟動一次 Steam,讓它下載 FEX 和 Steam Linux Runtime,然後再啟動此程式。 Flathub 應用程式 ID 或其 Flathub 頁面。如尚未設定 Flatpak,會先進行設定。 檔案 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 2d09faba03..e11242c246 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -176,6 +176,8 @@ 透過 FEX 執行 %1$s 此程式是為 %1$s 電腦組建的,需透過 FEX 執行,但 FEX 尚未設定。請在登入狀態下開啟一次 Steam:DroidDeck 會讓它下載 FEX 和所需的 Steam Linux Runtime,之後就能開啟此程式。 此程式 + 無法下載 Steam 用戶端。你的網路或 VPN 可能封鎖了 Steam 的伺服器;請檢查連線後再試一次。 + 無法設定 Steam 用戶端。請檢查連線和可用儲存空間,然後再試一次。 %1$s 是為 x86 電腦組建的,需透過 FEX 執行,但 FEX 尚未安裝。請在登入狀態下啟動一次 Steam,讓它下載 FEX 和 Steam Linux Runtime,然後再重新啟動此程式。 Flathub 應用程式 ID 或其 Flathub 頁面。如果尚未設定 Flatpak,會先進行設定。 檔案 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 830e66378c..ebef852975 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -181,6 +181,8 @@ %1$s through FEX This program is built for %1$s PCs and runs through FEX, which is not set up yet. Open Steam once while signed in: DroidDeck has it download FEX and the Steam Linux Runtime it needs, then this opens. This program + Couldn\'t download the Steam client. Your network or VPN may be blocking Steam\'s servers; check the connection and try again. + Couldn\'t set up the Steam client. Check your connection and free storage, then try again. %1$s is built for x86 PCs and runs through FEX, which is not installed yet. Start Steam once while signed in and let it download FEX and the Steam Linux Runtime, then start this again. A Flathub app ID or its Flathub page. Flatpak is set up first if it is not yet. File diff --git a/app/src/test/java/com/droiddeck/launcher/session/SteamClientSetupFailureTest.kt b/app/src/test/java/com/droiddeck/launcher/session/SteamClientSetupFailureTest.kt new file mode 100644 index 0000000000..fd6400c60c --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/SteamClientSetupFailureTest.kt @@ -0,0 +1,72 @@ +package com.droiddeck.launcher.session + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertNull +import org.junit.Assert.assertTrue +import org.junit.Test + +class SteamClientSetupFailureTest { + private fun find(vararg lines: String) = SteamClientSetupFailure.find(lines.asSequence()) + + @Test fun aBlockedDownloadCarriesTheLastCurlError() { + val failure = find( + "== STEP 12:35:22 checking the Steam client (first run downloads it, ~1-2 min with nothing on screen)", + "curl: (7) Failed to connect to client-update.steamstatic.com:443 after 3 ms: Could not connect to server", + "curl: (35) Recv failure: Connection reset by peer", + "droiddeck-steam-install: no Steam client CDN answered for steam_client_steamdeck_publicbeta_linuxarm64", + "== steam: the Steam client could not be set up (status 1)", + "[gamescope] [Info] launch: Primary child shut down!", + )!! + assertTrue(failure.download) + assertEquals("curl: (35) Recv failure: Connection reset by peer", failure.curlError) + } + + @Test fun aFailureWithoutCurlErrorIsNotCalledADownloadProblem() { + val failure = find( + "== STEP 12:35:22 checking the Steam client (a first run downloads it)", + "== STEP 12:35:30 downloading Steam: bins_linuxarm64_linuxarm64 (2/17)", + "error: cannot create /root/.local/share/Steam/ubuntu12_32/steam-runtime.tar.xz", + "== steam: the Steam client could not be set up (status 50)", + )!! + assertFalse(failure.download) + assertNull(failure.curlError) + } + + @Test fun aReadyClientIsNoFailure() { + assertNull(find( + "== STEP 12:35:22 checking the Steam client (first run downloads it, ~1-2 min with nothing on screen)", + "curl: (35) Recv failure: Connection reset by peer", + "== STEP 12:35:40 Steam client ready", + )) + } + + @Test fun onlyTheLatestCheckCounts() { + assertNull(find( + "== STEP 10:00:00 checking the Steam client (first run downloads it, ~1-2 min with nothing on screen)", + "curl: (6) Could not resolve host: client-update.steamstatic.com", + "== steam: the Steam client could not be set up (status 1)", + "== STEP 10:05:00 checking the Steam client (first run downloads it, ~1-2 min with nothing on screen)", + "== STEP 10:06:00 Steam client ready", + )) + val failure = find( + "== STEP 10:00:00 checking the Steam client (first run downloads it, ~1-2 min with nothing on screen)", + "curl: (6) Could not resolve host: client-update.steamstatic.com", + "== steam: the Steam client could not be set up (status 1)", + "== STEP 10:05:00 checking the Steam client (first run downloads it, ~1-2 min with nothing on screen)", + "== steam: the Steam client could not be set up (status 9)", + )!! + assertNull(failure.curlError) + } + + @Test fun anArm64SyncErrorIsNotBlamedForTheX64Client() { + val failure = find( + "== STEP 10:00:00 checking the Steam client's arm64 parts (first run downloads them, ~1-2 min)", + "curl: (6) Could not resolve host: client-update.steamstatic.com", + "== STEP 10:00:05 could not update the arm64 client's parts; the x86-64 client keeps its own web helper", + "== STEP 10:00:05 checking the x86-64 Steam client (FEX, experimental; the first run downloads ~2 GB)", + "== steam: the Steam client could not be set up (status 3)", + )!! + assertNull(failure.curlError) + } +} diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session index e99f444095..9240aa1505 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session @@ -4,6 +4,11 @@ export HOME=${HOME:-/root} mode=${1:-desktop} shift || true step() { echo "== STEP $(date -u +%H:%M:%S) $*"; } +steam_setup_failed() { + echo "== steam: the Steam client could not be set up (status $1)" + [ -z "${BL_STEAM_EXIT_FILE:-}" ] || printf '%s\n' "$1" > "$BL_STEAM_EXIT_FILE" + exit "$1" +} if [ -n "${BL_LOG:-}" ] && [ -z "${BL_INSIDE:-}" ]; then mkdir -p "$(dirname "$BL_LOG")" 2>/dev/null if [ "$(stat -c %s "$BL_LOG" 2>/dev/null || echo 0)" -gt 8388608 ]; then @@ -361,10 +366,10 @@ case $mode in # droiddeck-steam-install removes the repair request: read it first so Repair Steam covers both clients. _bl_x64_repair=0 [ -e "$HOME/.bl-steam-repair" ] && _bl_x64_repair=1 - droiddeck-steam-install || exit $? + droiddeck-steam-install || steam_setup_failed $? droiddeck-steam-install --sync steamdeck_publicbeta || step "could not update the arm64 client's parts; the x86-64 client keeps its own web helper" step "checking the x86-64 Steam client (FEX, experimental; the first run downloads ~2 GB)" - BL_X64_REPAIR=$_bl_x64_repair droiddeck-steam-x64 --prepare || exit $? + BL_X64_REPAIR=$_bl_x64_repair droiddeck-steam-x64 --prepare || steam_setup_failed $? step "x86-64 Steam client ready" steam_root=${BL_X64_HOME:-$HOME/.droiddeck-x64}/.local/share/Steam steam_client=(droiddeck-steam-x64 --exec) @@ -374,7 +379,7 @@ case $mode in fi else step "checking the Steam client (first run downloads it, ~1-2 min with nothing on screen)" - droiddeck-steam-install || exit $? + droiddeck-steam-install || steam_setup_failed $? step "Steam client ready" steam_root=$XDG_DATA_HOME/Steam if [ -f "${BL_X64_HOME:-$HOME/.droiddeck-x64}/.local/share/Steam/local.vdf" ]; then diff --git a/tools/tests/test_steam_client_setup_failure.py b/tools/tests/test_steam_client_setup_failure.py new file mode 100644 index 0000000000..774e14aa4a --- /dev/null +++ b/tools/tests/test_steam_client_setup_failure.py @@ -0,0 +1,82 @@ +import os +from pathlib import Path +import re +import subprocess +import tempfile +import textwrap +import unittest + + +SESSION = Path(__file__).resolve().parents[1] / 'linuxfs/overlay/usr/local/bin/droiddeck-session' +SOURCE = SESSION.read_text() +ARM64_BRANCH = SOURCE.index(' else\n step "checking the Steam client (first run') +START = SOURCE.index(' droiddeck-steam-install || steam_setup_failed $?\n', ARM64_BRANCH) +END = SOURCE.index(' step "Steam client ready"\n', START) +HELPER = re.search(r'^steam_setup_failed\(\) \{\n.*?^\}\n', SOURCE, re.M | re.S).group() +INSTALL_BLOCK = HELPER + textwrap.dedent(SOURCE[START:END]) +RUN_GAMESCOPE = re.search(r'^run_gamescope\(\) \(\n.*?^\)\n', SOURCE, re.M | re.S).group() +MARKER = '== steam: the Steam client could not be set up' + + +class SteamClientSetupFailureTest(unittest.TestCase): + def setUp(self): + self.temp = tempfile.TemporaryDirectory() + self.addCleanup(self.temp.cleanup) + self.root = Path(self.temp.name) + + def installer(self, status): + script = self.root / 'droiddeck-steam-install' + script.write_text('#!/bin/bash\n' + 'echo "curl: (35) Recv failure: Connection reset by peer" >&2\n' + 'exit ' + str(status) + '\n') + script.chmod(0o755) + + def env(self, **extra): + base = {k: v for k, v in os.environ.items() if k != 'BL_STEAM_EXIT_FILE'} + return dict(base, PATH=str(self.root) + os.pathsep + os.environ['PATH'], + XDG_RUNTIME_DIR=str(self.root), **extra) + + def run_block(self, status, exit_file=None): + self.installer(status) + extra = {'BL_STEAM_EXIT_FILE': str(exit_file)} if exit_file else {} + return subprocess.run(['bash', '-c', INSTALL_BLOCK + 'echo continued\n'], env=self.env(**extra), + capture_output=True, text=True, timeout=10) + + def test_failed_install_reports_its_status_in_the_exit_file(self): + exit_file = self.root / 'exit' + result = self.run_block(1, exit_file) + self.assertEqual(1, result.returncode) + self.assertIn(MARKER + ' (status 1)', result.stdout) + self.assertNotIn('continued', result.stdout) + self.assertEqual('1\n', exit_file.read_text()) + + def test_failed_install_outside_gamescope_still_exits_with_its_status(self): + result = self.run_block(50) + self.assertEqual(50, result.returncode) + self.assertIn(MARKER + ' (status 50)', result.stdout) + + def test_ready_client_continues_without_a_report(self): + exit_file = self.root / 'exit' + result = self.run_block(0, exit_file) + self.assertEqual(0, result.returncode) + self.assertIn('continued', result.stdout) + self.assertNotIn(MARKER, result.stdout) + self.assertFalse(exit_file.exists()) + + def test_failed_install_survives_successful_compositor_shutdown(self): + self.installer(1) + compositor = self.root / 'gamescope' + compositor.write_text('#!/bin/bash\n"$@"\nexit 0\n') + compositor.chmod(0o755) + child = self.root / 'session-child' + child.write_text('#!/bin/bash\n' + INSTALL_BLOCK + 'exit 0\n') + child.chmod(0o755) + result = subprocess.run(['bash', '-c', RUN_GAMESCOPE + '\nrun_gamescope "$@"', 'session', str(child)], + env=self.env(), capture_output=True, text=True, timeout=10) + self.assertEqual(1, result.returncode) + self.assertIn(MARKER, result.stdout) + self.assertEqual(list(self.root.glob('droiddeck-steam-exit.??????')), []) + + +if __name__ == '__main__': + unittest.main() From 20577ec0450b7f46657861a8ee2500ce5c004d4f Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Wed, 21 Oct 2026 01:04:03 -0400 Subject: [PATCH 06/44] fix: a failing image or script on a store sign-in page no longer replaces the page with an SSL error (#1238) --- .../droiddeck/launcher/stores/StoreLoginActivity.kt | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoreLoginActivity.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoreLoginActivity.kt index 1951ffd470..b1f8da0b48 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoreLoginActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreLoginActivity.kt @@ -264,6 +264,8 @@ class StoreLoginActivity : ComponentActivity() { } private inner class Client(private val isPopup: Boolean) : WebViewClient() { + private var mainFrameUrl: String? = null + override fun onPageStarted(view: WebView?, url: String?, favicon: android.graphics.Bitmap?) { Log.d(TAG, "page[popup=$isPopup]: ${StoreLog.redactUrl(url)}") if (url != null && view != null && flow?.isRedirect(url) == true && flow?.readsPage != true) complete(view, url) @@ -286,10 +288,14 @@ class StoreLoginActivity : ComponentActivity() { override fun onReceivedSslError(view: WebView?, handler: SslErrorHandler?, error: SslError?) { handler?.cancel() - showError(getString(R.string.stores_login_error_ssl)) + val url = error?.url + if (url == null || url == view?.url || url == mainFrameUrl) showError(getString(R.string.stores_login_error_ssl)) } - override fun shouldOverrideUrlLoading(view: WebView, request: WebResourceRequest): Boolean = route(view, request.url) + override fun shouldOverrideUrlLoading(view: WebView, request: WebResourceRequest): Boolean { + if (request.isForMainFrame) mainFrameUrl = request.url.toString() + return route(view, request.url) + } @Suppress("DEPRECATION") override fun shouldOverrideUrlLoading(view: WebView, url: String): Boolean = route(view, Uri.parse(url)) From 11674b711bef0b84b2c500070ab52ee004b42377 Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Wed, 21 Oct 2026 02:02:18 -0400 Subject: [PATCH 07/44] fix: browsers added as non-Steam games show their window and load pages in Gaming Mode (#1243) --- .../overlay/usr/local/bin/droiddeck-session | 6 ++++++ tools/tests/test_session_run_display.py | 21 +++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session index 9240aa1505..adfa3ba866 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session @@ -358,6 +358,12 @@ case $mode in esac ;; steam) + if [ -n "${GAMESCOPE_WAYLAND_DISPLAY:-}" ]; then + export WAYLAND_DISPLAY= XDG_SESSION_TYPE=x11 + fi + export MOZ_DISABLE_CONTENT_SANDBOX=1 MOZ_DISABLE_GMP_SANDBOX=1 MOZ_DISABLE_RDD_SANDBOX=1 + export MOZ_DISABLE_SOCKET_PROCESS_SANDBOX=1 MOZ_DISABLE_UTILITY_SANDBOX=1 + export MOZ_SHM_NO_SEALS=1 steam_x64=0 [ "${BL_STEAM_CLIENT_ARCH:-}" = x86_64 ] && steam_x64=1 steam_cef_gpu=1 diff --git a/tools/tests/test_session_run_display.py b/tools/tests/test_session_run_display.py index 5cf48817be..430a6a1373 100644 --- a/tools/tests/test_session_run_display.py +++ b/tools/tests/test_session_run_display.py @@ -13,6 +13,10 @@ def run_case(): return re.search(r"^ run\)\n.*?^ ;;\n", SESSION.read_text(), re.M | re.S).group(0) +def steam_display(): + return re.search(r"^ steam\)\n(.*?)^ steam_x64=0\n", SESSION.read_text(), re.M | re.S).group(1) + + class SessionRunDisplayTest(unittest.TestCase): def setUp(self): self.dir = Path(tempfile.mkdtemp()) @@ -41,6 +45,23 @@ class SessionRunDisplayTest(unittest.TestCase): def test_without_gamescope_the_display_is_left_alone(self): self.assertEqual(["wayland-0", "wayland"], self.display(WAYLAND_DISPLAY="wayland-0", XDG_SESSION_TYPE="wayland")) + def steam_env(self, **env): + base = {k: v for k, v in os.environ.items() + if k not in ("GAMESCOPE_WAYLAND_DISPLAY", "WAYLAND_DISPLAY", "XDG_SESSION_TYPE")} + script = steam_display() + ('printf "%s\\n" "${WAYLAND_DISPLAY-unset}" "${XDG_SESSION_TYPE-unset}"' + ' "${MOZ_SHM_NO_SEALS-unset}" "${MOZ_DISABLE_CONTENT_SANDBOX-unset}"\n') + run = subprocess.run(["bash", "-c", script], env={**base, **env}, capture_output=True, text=True, timeout=30) + self.assertEqual(0, run.returncode, run.stderr) + return run.stdout.splitlines() + + def test_steam_games_under_gamescope_cannot_reach_a_wayland_server(self): + self.assertEqual(["", "x11", "1", "1"], self.steam_env(GAMESCOPE_WAYLAND_DISPLAY="gamescope-0", + WAYLAND_DISPLAY="gamescope-0", XDG_SESSION_TYPE="wayland")) + + def test_steam_without_gamescope_keeps_the_display(self): + self.assertEqual(["wayland-0", "wayland", "1", "1"], + self.steam_env(WAYLAND_DISPLAY="wayland-0", XDG_SESSION_TYPE="wayland")) + if __name__ == "__main__": unittest.main() From 093a986b8891ca2e179d1c3f9b316a6dd01b3a7c Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Wed, 21 Oct 2026 05:42:41 -0400 Subject: [PATCH 08/44] fix: Google sign-in from a store shows the real device instead of a Galaxy S23 Ultra (#1252) --- .../launcher/stores/StoreLoginActivity.kt | 16 +++++++---- .../launcher/stores/epic/EpicClient.kt | 4 +-- .../stores/StoreLoginUserAgentTest.kt | 27 +++++++++++++++++++ 3 files changed, 40 insertions(+), 7 deletions(-) create mode 100644 app/src/test/java/com/droiddeck/launcher/stores/StoreLoginUserAgentTest.kt diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoreLoginActivity.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoreLoginActivity.kt index b1f8da0b48..1b5c6ccdd7 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoreLoginActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreLoginActivity.kt @@ -5,6 +5,7 @@ import android.content.res.Configuration import android.graphics.Color import android.net.Uri import android.net.http.SslError +import android.os.Build import android.os.Bundle import android.os.Message import android.util.Log @@ -18,6 +19,7 @@ import android.webkit.WebChromeClient import android.webkit.WebResourceError import android.webkit.WebResourceRequest import android.webkit.WebResourceResponse +import android.webkit.WebSettings import android.webkit.WebView import android.webkit.WebViewClient import android.widget.Button @@ -40,7 +42,10 @@ class StoreLoginActivity : ComponentActivity() { private const val KEY_STATE = "oauth_state" private const val KEY_SIGN_IN_CLEARED = "sign_in_cleared" @Volatile internal var floodColor: Int? = null - internal const val CHROME_UA = "Mozilla/5.0 (Linux; Android 14; SM-S918B) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/127.0.6533.103 Mobile Safari/537.36" + internal fun chromeUserAgent(webView: String?): String = + webView?.replace(Regex(" Build/[^;)]*"), "")?.replace("; wv)", ")")?.replace(" Version/4.0", "") + ?.takeIf { "Chrome/" in it } + ?: "Mozilla/5.0 (Linux; Android ${Build.VERSION.RELEASE}; ${Build.MODEL}) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/127.0.6533.103 Mobile Safari/537.36" fun generateState(): String { val bytes = ByteArray(24) @@ -76,6 +81,7 @@ class StoreLoginActivity : ComponentActivity() { private var oauthState: String? = null private val captured = AtomicBoolean(false) private var flooded = false + private val chromeUa by lazy { chromeUserAgent(runCatching { WebSettings.getDefaultUserAgent(this) }.getOrNull()) } private var signInCleared = false private fun dp(value: Int): Int = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, value.toFloat(), resources.displayMetrics).toInt() @@ -123,7 +129,7 @@ class StoreLoginActivity : ComponentActivity() { private fun newFlow(state: String): Flow? { val url = clientUrl - if (url != null) return com.droiddeck.launcher.stores.epic.EpicClient.loginFlow(url) + if (url != null) return com.droiddeck.launcher.stores.epic.EpicClient.loginFlow(url, chromeUa) return store?.let { LoginFlows.forStore(it, state) } } @@ -234,7 +240,7 @@ class StoreLoginActivity : ComponentActivity() { override fun onCreateWindow(view: WebView?, isDialog: Boolean, isUserGesture: Boolean, resultMsg: Message?): Boolean { if (resultMsg == null) return false dismissPopup() - val child = newWebView(CHROME_UA, isPopup = true) + val child = newWebView(chromeUa, isPopup = true) popupWebView = child popupHost.addView(child, FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)) popupHost.visibility = View.VISIBLE @@ -306,8 +312,8 @@ class StoreLoginActivity : ComponentActivity() { if (f.isRedirect(url) && !f.readsPage) { complete(view, url); return true } if (!isPopup && store == Store.GOG) { if (GogAuth.isGogHost(uri.host) && view.settings.userAgentString != f.userAgent) { view.settings.userAgentString = f.userAgent; return false } - if (GogAuth.isIdentityProviderHost(uri.host) && view.settings.userAgentString != CHROME_UA) { - view.settings.userAgentString = CHROME_UA + if (GogAuth.isIdentityProviderHost(uri.host) && view.settings.userAgentString != chromeUa) { + view.settings.userAgentString = chromeUa CookieManager.getInstance().setAcceptThirdPartyCookies(view, true) view.loadUrl(url) return true diff --git a/app/src/main/java/com/droiddeck/launcher/stores/epic/EpicClient.kt b/app/src/main/java/com/droiddeck/launcher/stores/epic/EpicClient.kt index 1f8a6ba9d0..7f0e86b14b 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/epic/EpicClient.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/epic/EpicClient.kt @@ -392,10 +392,10 @@ object EpicClient { } } - internal fun loginFlow(url: String): StoreLoginActivity.Flow? { + internal fun loginFlow(url: String, browserAgent: String): StoreLoginActivity.Flow? { val redirect = redirectOf(url) ?: return null val agent = runCatching { EpicNative.call("auth.config")?.optString("webViewUserAgent") }.getOrNull()?.ifEmpty { null } - return ClientLogin(url, redirect, agent ?: StoreLoginActivity.CHROME_UA) + return ClientLogin(url, redirect, agent ?: browserAgent) } private class ClientLogin( diff --git a/app/src/test/java/com/droiddeck/launcher/stores/StoreLoginUserAgentTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/StoreLoginUserAgentTest.kt new file mode 100644 index 0000000000..bf0c264f2f --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/stores/StoreLoginUserAgentTest.kt @@ -0,0 +1,27 @@ +package com.droiddeck.launcher.stores + +import android.os.Build +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Test + +class StoreLoginUserAgentTest { + @Test fun theDevicesWebViewAgentIsSentAsChrome() { + assertEquals( + "Mozilla/5.0 (Linux; Android 16; NP06J) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/141.0.7390.122 Mobile Safari/537.36", + StoreLoginActivity.chromeUserAgent( + "Mozilla/5.0 (Linux; Android 16; NP06J Build/BP2A.250605.031.A3; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/141.0.7390.122 Mobile Safari/537.36", + ), + ) + } + + @Test fun noWebViewAgentFallsBackToChromeWithoutAnotherDevicesModel() { + for (agent in listOf(null, "", "Dalvik/2.1.0 (Linux; U; Android 16)")) { + val ua = StoreLoginActivity.chromeUserAgent(agent) + assertTrue(ua, "Chrome/" in ua) + assertFalse(ua, "SM-S918B" in ua) + assertTrue(ua, "Android ${Build.VERSION.RELEASE}; ${Build.MODEL})" in ua) + } + } +} From 3eb0400df855717f024ef3ec4f7941ae996eb655 Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Wed, 21 Oct 2026 06:07:16 -0400 Subject: [PATCH 09/44] fix: clearing a game's compatibility tool in Steam keeps the Linux build (#1250) --- .../usr/local/bin/droiddeck-steam-compat | 9 ++- .../overlay/usr/local/bin/steam-compatibility | 13 ++++ tools/tests/test_steam_compat_live.py | 64 +++++++++++++++++++ 3 files changed, 83 insertions(+), 3 deletions(-) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-compat b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-compat index d0190fb027..7ed1eb71eb 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-compat +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-compat @@ -561,6 +561,8 @@ class Helper: # "native" from earlier builds also lists dual-platform games nobody chose to run natively. prior_native = state.get("native_choices", ()) native_choices = set(prior_native if isinstance(prior_native, (list, tuple, set)) else ()) + picked = COMPAT["picked_apps"](state) + runnable = {t["name"].lower() for t in live} apps = sorted(set(installed) | set(picks) | set(prior_auto) | native_choices, key=COMPAT["app_order"]) overrides = COMPAT["requested_games"]( COMPAT["game_requests"](), catalog, [t["name"] for t in live]) @@ -585,7 +587,7 @@ class Helper: for app in native_choices: current[app] = "" for app in set(native) - native_choices: - if not current.get(app): + if not current.get(app) and app not in picked: current.pop(app, None) else: for app in set(native) | native_choices: @@ -593,7 +595,8 @@ class Helper: # The client shows an explicit native choice as the tool it inherits, and writes config.vdf late. if raw_mapping[app] == "" or current.get(app) not in self.known: current[app] = raw_mapping[app] - elif app in prior_auto or app in native_choices: + elif app in prior_auto or app in native_choices or app in picked and ( + not current.get(app) or COMPAT["unrunnable"](current[app], runnable)): current[app] = "" elif not current.get(app): current.pop(app, None) @@ -608,7 +611,7 @@ class Helper: state.update( auto={app: tool for app, tool in auto.items() if tool is not COMPAT["NATIVE_CHOICE"]}, native_choices=sorted(refused_native | {app for app, tool in auto.items() if tool is COMPAT["NATIVE_CHOICE"]}), - tools=catalog, live=True) + picked=COMPAT["picked_after"](current, changes), tools=catalog, live=True) state.pop("native", None) if waiting: state["pending"] = wanted diff --git a/tools/linuxfs/overlay/usr/local/bin/steam-compatibility b/tools/linuxfs/overlay/usr/local/bin/steam-compatibility index 67a33b424c..51bf2c287b 100755 --- a/tools/linuxfs/overlay/usr/local/bin/steam-compatibility +++ b/tools/linuxfs/overlay/usr/local/bin/steam-compatibility @@ -1042,6 +1042,16 @@ def plan_mapping(current, installed, runnable, default, auto, native=None, picks return changes, kept +def picked_apps(state): + picked = state.get("picked", ()) + return {app for app in picked if isinstance(app, str)} if isinstance(picked, list) else set() + + +def picked_after(current, changes): + return sorted(({app for app, tool in current.items() if tool} - set(changes) | + {app for app, tool in changes.items() if tool}) - {"0"}, key=app_order) + + def followers(state, current): if "auto" in state: return state["auto"] @@ -1287,6 +1297,8 @@ def register_default(config_path, apps=(), protect=(), default=None, catalog=Non native = native_targets(steam_root, set(apps) | set(picks) | set(managed) | set(native_choices)) if linux_tool != FEX_TOOL: native = {app: linux_tool if tool == FEX_TOOL else tool for app, tool in native.items()} + for app in picked_apps(state) & set(native): + current.setdefault(app, "") changes, auto = plan_mapping( current, apps, names, default, followers(state, current), native, picks, overrides, managed, native_choices) @@ -1297,6 +1309,7 @@ def register_default(config_path, apps=(), protect=(), default=None, catalog=Non write_changed(config_path, text) state["auto"] = {app: tool for app, tool in auto.items() if tool is not NATIVE_CHOICE} state["native_choices"] = sorted(app for app, tool in auto.items() if tool is NATIVE_CHOICE) + state["picked"] = picked_after(current, changes) state.pop("native", None) state["tools"] = catalog state.setdefault("default", default) diff --git a/tools/tests/test_steam_compat_live.py b/tools/tests/test_steam_compat_live.py index 0a24d55968..3cf27824b4 100644 --- a/tools/tests/test_steam_compat_live.py +++ b/tools/tests/test_steam_compat_live.py @@ -509,6 +509,70 @@ class ReconcileTest(unittest.TestCase): self.assertEqual(page.sets, []) self.assertEqual(state["native_choices"], [app]) + def test_clearing_a_tool_picked_in_steam_keeps_the_native_build(self): + app, page = self.dual_platform_game({"default": TOOL, "auto": {"10": TOOL, "11": TOOL}}) + page.known.append(COMPAT["FEX_TOOL"]) + page.mapping[app] = COMPAT["FEX_TOOL"] + config = self.steam / "config/config.vdf" + config.write_text( + '"InstallConfigStore" { "Software" { "Valve" { "Steam" { ' + '"CompatToolMapping" { "0" { "name" "%s" } "%s" { "name" "%s" } } } } } }' % (TOOL, app, COMPAT["FEX_TOOL"])) + state = self.reconcile(page) + self.assertEqual(page.sets, []) + self.assertNotIn(app, state["auto"]) + + page.mapping[app] = "" + state = self.reconcile(page) + self.assertEqual(page.sets, []) + config.write_text( + '"InstallConfigStore" { "Software" { "Valve" { "Steam" { ' + '"CompatToolMapping" { "0" { "name" "%s" } } } } } }' % TOOL) + state = self.reconcile(page) + self.assertEqual(page.sets, []) + self.assertEqual(state["native_choices"], [app]) + + restarted = LIVE["Helper"](str(self.steam), 1) + restarted.page = page + restarted.reconcile() + self.assertEqual(page.sets, []) + + def test_a_new_tool_for_a_picked_game_is_kept_before_the_client_writes_its_config(self): + app, page = self.dual_platform_game({"default": TOOL, "auto": {"10": TOOL, "11": TOOL}, "picked": ["892970"]}) + page.mapping[app] = TOOL_11 + with mock.patch.dict(COMPAT, {"native_targets": lambda _root, apps: {app: COMPAT["FEX_TOOL"]} if app in apps else {}}): + state = self.reconcile(page) + self.assertEqual(page.sets, []) + self.assertEqual(page.mapping[app], TOOL_11) + self.assertIn(app, state["picked"]) + + def test_a_cleared_picked_game_showing_a_stale_inherited_tool_stays_native(self): + app, page = self.dual_platform_game({"default": TOOL, "auto": {"10": TOOL, "11": TOOL}, "picked": ["892970"]}) + page.mapping[app] = "proton" + state = self.reconcile(page) + self.assertEqual(page.sets, []) + self.assertEqual(state["native_choices"], [app]) + + def test_a_clear_saved_after_the_helper_stopped_is_kept_at_the_next_start(self): + app, page = self.dual_platform_game({"default": TOOL, "auto": {"10": TOOL, "11": TOOL}}) + page.known.append(COMPAT["FEX_TOOL"]) + page.mapping[app] = COMPAT["FEX_TOOL"] + config = self.steam / "config/config.vdf" + config.write_text( + '"InstallConfigStore" { "Software" { "Valve" { "Steam" { ' + '"CompatToolMapping" { "0" { "name" "%s" } "%s" { "name" "%s" } } } } } }' % (TOOL, app, COMPAT["FEX_TOOL"])) + state = self.reconcile(page) + self.assertIn(app, state["picked"]) + + config.write_text( + '"InstallConfigStore" { "Software" { "Valve" { "Steam" { ' + '"CompatToolMapping" { "0" { "name" "%s" } } } } } }' % TOOL) + with mock.patch.dict(COMPAT["register_default"].__globals__, {"native_targets": COMPAT["native_targets"]}): + COMPAT["register_default"](str(config), ["10", "11", app], settle=True, directory=str(self.state)) + self.assertNotIn(app, COMPAT["read_config_mapping"](str(config))) + state = json.loads((self.state / "state.json").read_text()) + self.assertEqual(state["native_choices"], [app]) + self.assertNotIn(app, state["picked"]) + def test_unmapped_dual_platform_game_gets_the_default_without_a_readable_config(self): app, page = self.dual_platform_game({"default": TOOL, "auto": {"10": TOOL}, "native_choices": ["11"]}) (self.steam / "config/config.vdf").unlink() From daeef1995f9196b8bb1c08262e6fd26c5269f431 Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Wed, 21 Oct 2026 06:36:30 -0400 Subject: [PATCH 10/44] fix: moving a mouse no longer recomposes the whole session overlay (#1253) --- app/src/main/java/com/droiddeck/launcher/SessionActivity.kt | 2 +- app/src/main/java/com/droiddeck/launcher/ui/CursorOverlay.kt | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 8bddc2a0cb..eab2ea02bc 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -636,7 +636,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } } else { com.droiddeck.launcher.ui.FocusGlideHost(androidx.compose.ui.Modifier.fillMaxSize()) { - CursorOverlay(cursorPos, cursorVisible, resources.displayMetrics.density, + CursorOverlay({ cursorPos }, cursorVisible, resources.displayMetrics.density, cursorImage, cursorHotX, cursorHotY, cursorImageScale) if (hud.text.isNotEmpty()) HudText(hud.text) if (glassesOutputActive && !loading.visible) com.droiddeck.launcher.ui.GlassesPlayingHint(glasses.model) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/CursorOverlay.kt b/app/src/main/java/com/droiddeck/launcher/ui/CursorOverlay.kt index 8f883c24c4..075b7c2ba7 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/CursorOverlay.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/CursorOverlay.kt @@ -13,11 +13,12 @@ import androidx.compose.ui.graphics.drawscope.Stroke @Composable fun CursorOverlay( - position: Offset, visible: Boolean, scale: Float, + positionOf: () -> Offset, visible: Boolean, scale: Float, image: ImageBitmap? = null, hotX: Int = 0, hotY: Int = 0, imageScale: Float = 1f, ) { if (!visible) return Canvas(modifier = Modifier.fillMaxSize()) { + val position = positionOf() if (image != null) { val w = (image.width * imageScale).toInt().coerceAtLeast(1) val h = (image.height * imageScale).toInt().coerceAtLeast(1) From bd76b39b84c330971816fc1374603bb066088cc7 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Wed, 21 Oct 2026 11:45:39 -0400 Subject: [PATCH 11/44] fix: keep Steam downloads running across suspend with Manual policy (#1262) --- .../launcher/session/SessionService.kt | 12 ++++++++---- .../launcher/session/SteamDownloadMonitor.kt | 18 ++++++++++++++---- .../session/SteamDownloadMonitorTest.kt | 19 +++++++++++++++++++ 3 files changed, 41 insertions(+), 8 deletions(-) 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 da3e5b5063..f8602dba3f 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt @@ -71,6 +71,7 @@ class SessionService : Service() { private val steamDownloadMonitor = SteamDownloadMonitor() private var downloadMonitorTask: Runnable? = null private var downloadActive = false + @Volatile private var steamLibraryMounts = emptyMap() private var suspendDownloadNow = false private var suspendPolicy = SessionPrefs.SUSPEND_MANUAL private var steamDownloadsInBackground = false @@ -802,6 +803,7 @@ class SessionService : Service() { File(home, "Storage").mkdirs() binds.add(Environment.getExternalStorageDirectory().path + ":/root/Storage") val library = GameStorage.effective(this) + steamLibraryMounts = emptyMap() var storageDiagnosticLibrary: File? = null if (library != null) { val problem = GameStorage.prepare(this, library.path) @@ -813,6 +815,7 @@ class SessionService : Service() { val content = SecondaryLibrary.contentPath(configured) binds.addAll(SecondaryLibrary.binds(filesDir, configured, content = content)) storageDiagnosticLibrary = content + steamLibraryMounts = SecondaryLibrary.CARD_GUESTS.associateWith { content } val route = if (content === configured) "configured" else "verified-native" Log.i(TAG, "game storage: ${content.path} ($route) -> /mnt/droiddeck-sd (\"${library.label}\"); prefixes and native tools private") } catch (e: Exception) { @@ -1271,13 +1274,13 @@ class SessionService : Service() { private fun updateSuspendPolicy() { if (!SessionState.running) return - if (suspendPolicy == SessionPrefs.SUSPEND_MANUAL && !hasVisibleSurface) { - manualPauseRequested = true - } - val controller = suspendController ?: return val hidden = !hasVisibleSurface val downloadsBlockingSuspend = steamDownloadsInBackground && SessionState.mode == MODE_STEAM && suspendPolicy != SessionPrefs.SUSPEND_NEVER && hidden && downloadActive && !suspendDownloadNow + if (suspendPolicy == SessionPrefs.SUSPEND_MANUAL && hidden && !downloadsBlockingSuspend) { + manualPauseRequested = true + } + val controller = suspendController ?: return if (downloadsBlockingSuspend) acquireLocks() val steamPause = SessionState.mode == MODE_STEAM && !downloadsBlockingSuspend && when (suspendPolicy) { SessionPrefs.SUSPEND_AUTO, SessionPrefs.SUSPEND_NATIVE -> hidden @@ -1712,6 +1715,7 @@ class SessionService : Service() { LinuxRuntime.rootDir(this@SessionService), receivedBytes = TrafficStats.getUidRxBytes(android.os.Process.myUid()), client = SessionState.steamClientArch, + mounts = steamLibraryMounts, ) if (wasActive != downloadActive) refreshNotification() updateSuspendPolicy() diff --git a/app/src/main/java/com/droiddeck/launcher/session/SteamDownloadMonitor.kt b/app/src/main/java/com/droiddeck/launcher/session/SteamDownloadMonitor.kt index 2558bfe945..37f7c1fb90 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SteamDownloadMonitor.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SteamDownloadMonitor.kt @@ -18,8 +18,9 @@ internal class SteamDownloadMonitor { private var lastReceivedBytes = -1L private var lastReceivedAt = 0L - fun poll(runtimeRoot: File, now: Long = System.currentTimeMillis(), receivedBytes: Long = -1L, client: String? = null): Boolean { - val current = manifests(runtimeRoot).associate { it.path to read(it) } + fun poll(runtimeRoot: File, now: Long = System.currentTimeMillis(), receivedBytes: Long = -1L, client: String? = null, + mounts: Map = emptyMap()): Boolean { + val current = manifests(runtimeRoot, mounts).associate { it.path to read(it) } val progressed = current.any { (path, state) -> state.incomplete && state.bytesDownloaded > (previous[path]?.bytesDownloaded ?: state.bytesDownloaded) } @@ -98,7 +99,7 @@ internal class SteamDownloadMonitor { now - lastContentActivityAt <= CONTENT_ACTIVITY_GRACE_MS } - private fun manifests(runtimeRoot: File): List { + private fun manifests(runtimeRoot: File, mounts: Map): List { val steamRoots = linkedSetOf() for (home in STEAM_HOMES) { val primary = File(runtimeRoot, home) @@ -106,7 +107,7 @@ internal class SteamDownloadMonitor { val libraryFolders = File(primary, "steamapps/libraryfolders.vdf") runCatching { PATH.findAll(libraryFolders.readText()).forEach { match -> - steamRoots += File(runtimeRoot, match.groupValues[1].removePrefix("/")) + steamRoots += hostPath(runtimeRoot, match.groupValues[1], mounts) } } } @@ -117,6 +118,15 @@ internal class SteamDownloadMonitor { } } + private fun hostPath(runtimeRoot: File, guest: String, mounts: Map): File { + val path = guest.trimEnd('/') + for ((mount, host) in mounts) { + if (path == mount) return host + if (path.startsWith("$mount/")) return File(host, path.removePrefix("$mount/")) + } + return File(runtimeRoot, path.removePrefix("/")) + } + private fun read(file: File): ManifestState { val text = runCatching { file.readText() }.getOrDefault("") val flags = value(text, "StateFlags")?.toLongOrNull() ?: 0L diff --git a/app/src/test/java/com/droiddeck/launcher/session/SteamDownloadMonitorTest.kt b/app/src/test/java/com/droiddeck/launcher/session/SteamDownloadMonitorTest.kt index c392107376..e60c6dcd9f 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/SteamDownloadMonitorTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/SteamDownloadMonitorTest.kt @@ -57,6 +57,25 @@ class SteamDownloadMonitorTest { } } + @Test fun readsBoundCardLibrariesFromTheirHostPath() { + val root = Files.createTempDirectory("droiddeck-steam-download-").toFile() + try { + val card = File(root, "card").apply { mkdirs() } + File(root, "root/.local/share/Steam/steamapps").apply { mkdirs() } + .resolve("libraryfolders.vdf") + .writeText("\"libraryfolders\" { \"1\" { \"path\" \"/mnt/droiddeck-sd\" } }") + val manifest = manifest(card, "44", downloaded = 10, total = 100, flags = 6) + val monitor = SteamDownloadMonitor() + val mounts = mapOf("/mnt/droiddeck-sd" to card) + + assertFalse(monitor.poll(root, now = 1_000L, mounts = mounts)) + manifest.writeText(appManifest(downloaded = 20, total = 100, flags = 6)) + assertTrue(monitor.poll(root, now = 3_000L, mounts = mounts)) + } finally { + root.deleteRecursively() + } + } + @Test fun followsSteamContentActivityWhenManifestProgressIsNotFlushed() { val root = Files.createTempDirectory("droiddeck-steam-download-").toFile() try { From 5d8fd3f5f069862d2b27ed67320cde521d8fa968 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Wed, 21 Oct 2026 12:47:10 -0400 Subject: [PATCH 12/44] feat: warn before installing a Decky plugin ZIP (#1263) --- .../java/com/droiddeck/launcher/DeckyMenu.kt | 12 ++++++++ .../com/droiddeck/launcher/MainActivity.kt | 3 ++ .../launcher/session/SessionPrefs.kt | 7 +++++ .../launcher/ui/ModeSettingsDialog.kt | 30 +++++++++++++++++++ app/src/main/res/values/strings.xml | 7 +++++ 5 files changed, 59 insertions(+) diff --git a/app/src/main/java/com/droiddeck/launcher/DeckyMenu.kt b/app/src/main/java/com/droiddeck/launcher/DeckyMenu.kt index 9f8a27f9f7..03e7812479 100644 --- a/app/src/main/java/com/droiddeck/launcher/DeckyMenu.kt +++ b/app/src/main/java/com/droiddeck/launcher/DeckyMenu.kt @@ -17,6 +17,7 @@ internal class DeckyMenu(private val activity: android.app.Activity, private val var deckyPercent by mutableIntStateOf(-1) var deckyDownloadingBinary by mutableStateOf(false) var deckySupervisor by mutableStateOf(false) + var deckyPendingZip by mutableStateOf(null) var deckyReleaseRequest = 0 fun refreshDecky() { @@ -49,6 +50,17 @@ internal class DeckyMenu(private val activity: android.app.Activity, private val } fun importPluginZip(archive: File) { + if (deckyStage != null || SessionState.running || deckyInstalled == null) return + deckyPendingZip = archive + } + + fun cancelPluginZip() { + deckyPendingZip = null + } + + fun confirmPluginZip() { + val archive = deckyPendingZip ?: return + deckyPendingZip = null if (deckyStage != null || SessionState.running || deckyInstalled == null) return deckyStage = activity.getString(R.string.decky_plugin_starting); deckyPercent = -1 Thread({ diff --git a/app/src/main/java/com/droiddeck/launcher/MainActivity.kt b/app/src/main/java/com/droiddeck/launcher/MainActivity.kt index 66b43bc347..4735d19dc5 100644 --- a/app/src/main/java/com/droiddeck/launcher/MainActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/MainActivity.kt @@ -768,6 +768,9 @@ class MainActivity : ComponentActivity() { setContent { DroidDeckTheme(theme, appScale = appScale) { com.droiddeck.launcher.ui.FocusGlideHost(androidx.compose.ui.Modifier.fillMaxSize().exposeTestTags()) { + if (decky.deckyPendingZip != null) com.droiddeck.launcher.ui.DeckyZipWarningDialog( + onConfirm = { decky.confirmPluginZip() }, onCancel = { decky.cancelPluginZip() }, + ) val page: (@Composable () -> Unit)? = when { showPerformance -> { { PerformanceHost() } } showComponents -> { { ComponentsHost() } } diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt index e7556e97a5..e7b810c238 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -21,6 +21,7 @@ object SessionPrefs { const val SUSPEND_NEVER = "never" private const val LEGACY_SUSPEND_DOWNLOADS = "downloads" private const val STEAM_DOWNLOADS_IN_BACKGROUND = "steamDownloadsInBackground" + private const val DECKY_ZIP_WARNING_SEEN = "deckyZipWarningSeen" const val CONTROLLER_DECK = "deck" const val CONTROLLER_XBOX360 = "xbox360" @@ -953,6 +954,12 @@ object SessionPrefs { }.apply() } + fun deckyZipWarningSeen(context: Context): Boolean = prefs(context).getBoolean(DECKY_ZIP_WARNING_SEEN, false) + + fun setDeckyZipWarningSeen(context: Context) { + prefs(context).edit().putBoolean(DECKY_ZIP_WARNING_SEEN, true).apply() + } + fun steamDownloadsInBackground(context: Context): Boolean { val prefs = prefs(context) return prefs.getBoolean(STEAM_DOWNLOADS_IN_BACKGROUND, false) || diff --git a/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt b/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt index d90747aca4..e096058199 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt @@ -14,6 +14,7 @@ import androidx.compose.material3.LinearProgressIndicator import androidx.compose.material3.TextButton import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableIntStateOf import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.setValue @@ -529,6 +530,35 @@ internal fun ProtonOptions( GameEnvironmentRow() } +@Composable +internal fun DeckyZipWarningDialog(onConfirm: () -> Unit, onCancel: () -> Unit) { + val context = androidx.compose.ui.platform.LocalContext.current + var left by remember { mutableIntStateOf(if (SessionPrefs.deckyZipWarningSeen(context)) 0 else DECKY_ZIP_WARNING_SECONDS) } + androidx.compose.runtime.LaunchedEffect(Unit) { + while (left > 0) { + kotlinx.coroutines.delay(1000L) + left-- + } + SessionPrefs.setDeckyZipWarningSeen(context) + } + AlertDialog( + onDismissRequest = onCancel, + title = { Text(stringResource(R.string.decky_zip_warning_title)) }, + text = { Text(stringResource(R.string.decky_zip_warning_text)) }, + confirmButton = { + androidx.compose.material3.TextButton(onClick = onConfirm, enabled = left == 0) { + Text( + if (left > 0) androidx.compose.ui.res.pluralStringResource(R.plurals.decky_zip_warning_wait, left, left) + else stringResource(R.string.decky_zip_warning_continue), + ) + } + }, + dismissButton = { androidx.compose.material3.TextButton(onClick = onCancel) { Text(stringResource(R.string.common_cancel)) } }, + ) +} + +private const val DECKY_ZIP_WARNING_SECONDS = 5 + @Composable private fun DeckyUninstall(enabled: Boolean, onUninstall: () -> Unit) { val colors = MaterialTheme.colorScheme diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ebef852975..026229b8d8 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1404,6 +1404,13 @@ Install a plugin ZIP for the next Steam session. Downloading… Install from ZIP + Third-Party Plugin Installation + The Decky Loader team has not reviewed this plugin. It may contain malware, such as software to steal your Steam account or harm your device. By installing this plugin, you agree you have assumed all risks to your device. + Continue + + Please wait %1$d second + Please wait %1$d seconds + Games Audio & Video Graphics From cf17f583d4b17ac6cdf10272c968d8f04a121f70 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Wed, 21 Oct 2026 13:08:46 -0400 Subject: [PATCH 13/44] feat: Decky Loader update channel selector (#1264) --- .../java/com/droiddeck/launcher/DeckyMenu.kt | 20 ++++++++- .../com/droiddeck/launcher/MainActivity.kt | 4 +- .../launcher/runtime/DeckyManager.kt | 42 +++++++++++++++---- .../launcher/ui/ModeSettingsDialog.kt | 15 +++++++ app/src/main/res/values/strings.xml | 6 +++ .../launcher/runtime/DeckyChannelTest.kt | 32 ++++++++++++++ 6 files changed, 108 insertions(+), 11 deletions(-) create mode 100644 app/src/test/java/com/droiddeck/launcher/runtime/DeckyChannelTest.kt diff --git a/app/src/main/java/com/droiddeck/launcher/DeckyMenu.kt b/app/src/main/java/com/droiddeck/launcher/DeckyMenu.kt index 03e7812479..240202daec 100644 --- a/app/src/main/java/com/droiddeck/launcher/DeckyMenu.kt +++ b/app/src/main/java/com/droiddeck/launcher/DeckyMenu.kt @@ -11,7 +11,9 @@ import java.io.File internal class DeckyMenu(private val activity: android.app.Activity, private val ui: android.os.Handler) { var deckyInstalled by mutableStateOf(null) - var deckyReleases by mutableStateOf>(emptyList()) + var deckyLatest by mutableStateOf(null) + var deckyBranch by mutableIntStateOf(DeckyManager.BRANCH_STABLE) + private var deckyChannels = DeckyManager.ReleaseChannels(emptyList(), emptyList()) var deckyChecking by mutableStateOf(false) var deckyStage by mutableStateOf(null) var deckyPercent by mutableIntStateOf(-1) @@ -22,19 +24,33 @@ internal class DeckyMenu(private val activity: android.app.Activity, private val fun refreshDecky() { val request = ++deckyReleaseRequest + deckyBranch = DeckyManager.branch(activity) deckyChecking = true Thread({ val channels = runCatching { DeckyManager.releaseChannels(activity) } .getOrElse { DeckyManager.ReleaseChannels(emptyList(), emptyList()) } ui.post { if (request == deckyReleaseRequest) { - deckyReleases = channels.stable.ifEmpty { channels.prerelease } + deckyChannels = channels + deckyLatest = DeckyManager.latest(channels, deckyBranch) deckyChecking = false } } }, "decky-releases").start() } + fun switchDeckyBranch(branch: Int) { + if (branch == deckyBranch || deckyStage != null || SessionState.running) return + val saved = runCatching { DeckyManager.setBranch(activity, branch) } + if (saved.isFailure) { + android.widget.Toast.makeText(activity, R.string.decky_channel_failed, android.widget.Toast.LENGTH_LONG).show() + return + } + deckyBranch = branch + deckyLatest = DeckyManager.latest(deckyChannels, branch) + refreshDecky() + } + fun installDecky(release: DeckyManager.Release) { if (deckyStage != null || SessionState.running) return deckyStage = activity.getString(R.string.store_starting); deckyPercent = -1 diff --git a/app/src/main/java/com/droiddeck/launcher/MainActivity.kt b/app/src/main/java/com/droiddeck/launcher/MainActivity.kt index 4735d19dc5..16893e62c9 100644 --- a/app/src/main/java/com/droiddeck/launcher/MainActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/MainActivity.kt @@ -1649,7 +1649,8 @@ class MainActivity : ComponentActivity() { wifiDiscoveryAsked = wifiDiscoveryAsked, wifiDiscoveryBlocked = wifiDiscoveryBlocked, deckyInstalled = if (mode == SessionService.MODE_STEAM) decky.deckyInstalled else null, - deckyLatestRelease = if (mode == SessionService.MODE_STEAM) decky.deckyReleases.firstOrNull() else null, + deckyLatestRelease = if (mode == SessionService.MODE_STEAM) decky.deckyLatest else null, + deckyBranch = decky.deckyBranch, deckyChecking = decky.deckyChecking, deckyStage = decky.deckyStage, deckyPercent = decky.deckyPercent, deckyDownloadingBinary = decky.deckyDownloadingBinary, deckyEnabled = decky.deckySupervisor, deckySessionRunning = SessionState.running, @@ -1732,6 +1733,7 @@ class MainActivity : ComponentActivity() { onBootMovieChanged = { loadBootMovie() }, onDeckyInstall = { release -> decky.installDecky(release) }, onDeckyCheck = { decky.refreshDecky() }, + onDeckyBranch = { branch -> decky.switchDeckyBranch(branch) }, onDeckyEnabled = { enabled -> DeckyManager.setSupervisorEnabled(this, enabled); decky.deckySupervisor = enabled }, onDeckyUninstall = { DeckyManager.uninstall(this, wipeData = false) diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/DeckyManager.kt b/app/src/main/java/com/droiddeck/launcher/runtime/DeckyManager.kt index ba454af7a7..5c5687c967 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/DeckyManager.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/DeckyManager.kt @@ -22,6 +22,7 @@ object DeckyManager { private const val RELEASES = "https://api.github.com/repos/$REPOSITORY/releases?per_page=30" private const val PATH = "root/homebrew/services/PluginLoader" private const val VERSION = "root/homebrew/services/.droiddeck-decky-version" + private const val SETTINGS = "root/homebrew/settings/loader.json" // droiddeck-session reads the marker from the root of the client it runs. private val CEF_REMOTE_DEBUG_MARKERS = listOf( "root/.local/share/Steam/.cef-enable-remote-debugging", @@ -32,7 +33,34 @@ object DeckyManager { private set data class Release(val tag: String, val prerelease: Boolean, val asset: String, val url: String, val digest: String?, val shaUrl: String?, val size: Long, val machine: Int) - data class ReleaseChannels(val stable: List, val prerelease: List) + data class ReleaseChannels(val stable: List, val prerelease: List, val all: List = stable + prerelease) + + const val BRANCH_STABLE = 0 + const val BRANCH_PRERELEASE = 1 + const val BRANCH_TESTING = 2 + + private fun settingsFile(context: Context) = File(LinuxRuntime.rootDir(context), SETTINGS) + + fun branch(context: Context): Int { + val saved = runCatching { JSONObject(settingsFile(context).readText()).optInt("branch", -1) }.getOrDefault(-1) + if (saved >= 0) return saved + val version = File(LinuxRuntime.rootDir(context), VERSION).takeIf { it.isFile }?.readText()?.trim().orEmpty() + return if (version.startsWith("v") && "-pre" in version) BRANCH_PRERELEASE else BRANCH_STABLE + } + + fun setBranch(context: Context, branch: Int) { + val file = settingsFile(context) + val settings = runCatching { JSONObject(file.readText()) }.getOrDefault(JSONObject()) + settings.put("branch", branch) + file.parentFile?.mkdirs() + val staged = File(file.parentFile, "${file.name}.tmp") + staged.writeText(settings.toString(4)) + check(staged.renameTo(file)) { "cannot write ${file.path}" } + } + + // Mirrors Decky's updater: Stable takes the newest non-prerelease tag, Prerelease the newest tag of either kind. + fun latest(channels: ReleaseChannels, branch: Int): Release? = + if (branch == BRANCH_STABLE) channels.stable.firstOrNull() else channels.all.firstOrNull() fun installed(context: Context): String? { val loader = loader(context) @@ -74,17 +102,13 @@ object DeckyManager { } } - fun releases(context: Context, prerelease: Boolean): List { - val channels = releaseChannels(context) - return if (prerelease) channels.prerelease else channels.stable - } - fun releaseChannels(context: Context): ReleaseChannels { val body = Downloader.downloadString(RELEASES) ?: return ReleaseChannels(emptyList(), emptyList()) return try { val array = JSONArray(body) val stable = mutableListOf() val prerelease = mutableListOf() + val all = mutableListOf() for (i in 0 until array.length()) { val release = array.getJSONObject(i) if (release.optBoolean("draft", false)) continue @@ -105,9 +129,11 @@ object DeckyManager { val size = binary.optLong("size", 0) if (size <= 0) continue val row = Release(release.optString("tag_name", "unknown"), isPrerelease, name, url, digest, checksum, size, if (name == "PluginLoader-arm64") 183 else 62) - (if (isPrerelease) prerelease else stable).add(row) + if (!row.tag.startsWith("v")) continue + all.add(row) + (if (isPrerelease || "-pre" in row.tag) prerelease else stable).add(row) } - ReleaseChannels(stable, prerelease) + ReleaseChannels(stable, prerelease, all) } catch (e: Exception) { Log.w(TAG, "release metadata", e); ReleaseChannels(emptyList(), emptyList()) } } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt b/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt index e096058199..f5d6490253 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt @@ -99,6 +99,7 @@ class ModeSettings( val wifiDiscoveryBlocked: Boolean = false, val deckyInstalled: String? = null, val deckyLatestRelease: DeckyManager.Release? = null, + val deckyBranch: Int = DeckyManager.BRANCH_STABLE, val deckyChecking: Boolean = false, val deckyStage: String? = null, val deckyPercent: Int = -1, @@ -145,6 +146,7 @@ class ModeSettingsActions( val onWifiDiscoverySettings: () -> Unit = {}, val onDeckyInstall: (DeckyManager.Release) -> Unit = {}, val onDeckyCheck: () -> Unit = {}, + val onDeckyBranch: (Int) -> Unit = {}, val onDeckyEnabled: (Boolean) -> Unit = {}, val onDeckyUninstall: () -> Unit = {}, val onPickDeckyPluginZip: () -> Unit = {}, @@ -424,6 +426,19 @@ fun ModeSheetRows(s: ModeSettings, a: ModeSettingsActions, tab: String, extras: if (s.deckyInstalled != null) DeckyUninstall(enabled = s.deckyStage == null && !s.deckySessionRunning, onUninstall = a.onDeckyUninstall) } } + ChoiceRow( + host, "decky-channel", stringResource(R.string.decky_channel), + stringResource(R.string.decky_channel_hint), + listOf( + DeckyManager.BRANCH_STABLE to stringResource(R.string.decky_channel_stable), + DeckyManager.BRANCH_PRERELEASE to stringResource(R.string.decky_channel_prerelease), + ) + if (s.deckyBranch == DeckyManager.BRANCH_TESTING) listOf( + DeckyManager.BRANCH_TESTING to stringResource(R.string.decky_channel_testing), + ) else emptyList(), + s.deckyBranch, + enabled = s.deckyStage == null && !s.deckySessionRunning, + onPick = a.onDeckyBranch, + ) if (s.deckyInstalled != null) ToggleRow( host, "decky-enabled", stringResource(R.string.mode_decky), if (s.deckyEnabled) stringResource(R.string.mode_decky_on) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 026229b8d8..a11bc727ed 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -308,6 +308,12 @@ Up to date · %1$s Loader Install latest + Update Channel + Which Decky Loader releases to install. Decky\'s own updater uses the same channel. + Stable + Prerelease + Testing + Could not save the Decky update channel Starts with Steam. While on, other apps on this device may be able to control Steam. Off. Steam\'s remote debugging port stays closed. Uninstall Decky Loader? diff --git a/app/src/test/java/com/droiddeck/launcher/runtime/DeckyChannelTest.kt b/app/src/test/java/com/droiddeck/launcher/runtime/DeckyChannelTest.kt new file mode 100644 index 0000000000..025fc6379a --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/runtime/DeckyChannelTest.kt @@ -0,0 +1,32 @@ +package com.droiddeck.launcher.runtime + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull +import org.junit.Test + +class DeckyChannelTest { + private fun release(tag: String, prerelease: Boolean) = + DeckyManager.Release(tag, prerelease, "PluginLoader-arm64", "https://example.invalid/$tag", null, null, 1, 183) + + @Test fun stableSkipsPrereleasesAndPrereleaseTakesTheNewestTag() { + val pre = release("v3.4.0-pre1", true) + val stable = release("v3.3.0", false) + val channels = DeckyManager.ReleaseChannels(listOf(stable), listOf(pre), listOf(pre, stable)) + + assertEquals("v3.3.0", DeckyManager.latest(channels, DeckyManager.BRANCH_STABLE)?.tag) + assertEquals("v3.4.0-pre1", DeckyManager.latest(channels, DeckyManager.BRANCH_PRERELEASE)?.tag) + } + + @Test fun prereleaseFollowsAStableThatShippedAfterTheLastPrerelease() { + val stable = release("v3.3.0", false) + val pre = release("v3.3.0-pre1", true) + val channels = DeckyManager.ReleaseChannels(listOf(stable), listOf(pre), listOf(stable, pre)) + + assertEquals("v3.3.0", DeckyManager.latest(channels, DeckyManager.BRANCH_PRERELEASE)?.tag) + } + + @Test fun stableHasNothingWhenOnlyPrereleasesExist() { + val pre = release("v3.4.0-pre1", true) + assertNull(DeckyManager.latest(DeckyManager.ReleaseChannels(emptyList(), listOf(pre), listOf(pre)), DeckyManager.BRANCH_STABLE)) + } +} From 83b2164e4a8392cace33cd9f83d9a33421d7ca75 Mon Sep 17 00:00:00 2001 From: 0x1Nawaf <73679429+0x1Nawaf@users.noreply.github.com> Date: Wed, 21 Oct 2026 20:12:23 +0300 Subject: [PATCH 14/44] feat: the performance HUD adds a colored frame-time graph, battery temperature, and opacity controls (#1256) --- .../com/droiddeck/launcher/SessionActivity.kt | 22 +++- .../com/droiddeck/launcher/session/PerfHud.kt | 101 ++++++++++++++++-- .../launcher/session/SessionPrefs.kt | 37 +++++++ .../launcher/session/SettingsReset.kt | 2 +- .../droiddeck/launcher/ui/SessionLoading.kt | 93 ++++++++++++++-- .../droiddeck/launcher/ui/SessionOverlay.kt | 34 ++++++ app/src/main/res/values-ar/strings.xml | 10 ++ app/src/main/res/values-b+es+419/strings.xml | 10 ++ app/src/main/res/values-bg/strings.xml | 10 ++ app/src/main/res/values-cs/strings.xml | 10 ++ app/src/main/res/values-da/strings.xml | 10 ++ app/src/main/res/values-de/strings.xml | 10 ++ app/src/main/res/values-el/strings.xml | 10 ++ app/src/main/res/values-es/strings.xml | 10 ++ app/src/main/res/values-fi/strings.xml | 10 ++ app/src/main/res/values-fr/strings.xml | 10 ++ app/src/main/res/values-hi/strings.xml | 10 ++ app/src/main/res/values-hu/strings.xml | 10 ++ app/src/main/res/values-in/strings.xml | 10 ++ app/src/main/res/values-it/strings.xml | 10 ++ app/src/main/res/values-ja/strings.xml | 10 ++ app/src/main/res/values-ko/strings.xml | 10 ++ app/src/main/res/values-ms/strings.xml | 10 ++ app/src/main/res/values-nb/strings.xml | 10 ++ app/src/main/res/values-nl/strings.xml | 10 ++ app/src/main/res/values-pl/strings.xml | 10 ++ app/src/main/res/values-pt-rPT/strings.xml | 10 ++ app/src/main/res/values-pt/strings.xml | 10 ++ app/src/main/res/values-ro/strings.xml | 10 ++ app/src/main/res/values-ru/strings.xml | 10 ++ app/src/main/res/values-sv/strings.xml | 10 ++ app/src/main/res/values-th/strings.xml | 10 ++ app/src/main/res/values-tr/strings.xml | 10 ++ app/src/main/res/values-uk/strings.xml | 10 ++ app/src/main/res/values-vi/strings.xml | 10 ++ app/src/main/res/values-zh-rCN/strings.xml | 10 ++ app/src/main/res/values-zh-rHK/strings.xml | 10 ++ app/src/main/res/values-zh-rTW/strings.xml | 10 ++ app/src/main/res/values/strings.xml | 10 ++ .../launcher/session/SettingsResetTest.kt | 12 +++ 40 files changed, 614 insertions(+), 17 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index eab2ea02bc..9488cf62fd 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -306,6 +306,11 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private var achievementsInFront by mutableStateOf(null) private var achievementsOpen by mutableStateOf(false) private var hudOn by mutableStateOf(true) + private var hudFps by mutableStateOf(true) + private var hudBattery by mutableStateOf(true) + private var hudGraph by mutableStateOf(true) + private var hudColor by mutableStateOf(SessionPrefs.HUD_COLOR_MINT) + private var hudOpacity by mutableStateOf(SessionPrefs.HUD_OPACITY_DEFAULT) private var upscaler by mutableStateOf(0) private var upscaleSharpness by mutableStateOf(75) private var effects by mutableStateOf(ScreenEffects.OFF) @@ -638,7 +643,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { com.droiddeck.launcher.ui.FocusGlideHost(androidx.compose.ui.Modifier.fillMaxSize()) { CursorOverlay({ cursorPos }, cursorVisible, resources.displayMetrics.density, cursorImage, cursorHotX, cursorHotY, cursorImageScale) - if (hud.text.isNotEmpty()) HudText(hud.text) + if (hud.text.isNotEmpty() || hud.graph.size >= 2) HudText(hud.text, hud.graph, hudColor, hudOpacity) if (glassesOutputActive && !loading.visible) com.droiddeck.launcher.ui.GlassesPlayingHint(glasses.model) if (trackingRecovery != null && !drawerOpen && !pcKeyboardOpen && !loading.visible) { androidx.compose.ui.viewinterop.AndroidView( @@ -752,6 +757,11 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { isHomeApp = isHomeApp, androidApps = androidApps, hudOn = hudOn, + hudFps = hudFps, + hudBattery = hudBattery, + hudGraph = hudGraph, + hudColor = hudColor, + hudOpacity = hudOpacity, upscaler = upscaler, upscaleSharpness = upscaleSharpness, effects = effects, cardboard = cardboard, @@ -779,6 +789,11 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { secondScreenDisplays = secondScreenDisplays, selectedSecondScreenDisplay = selectedSecondScreenDisplay, onHud = { on -> SessionPrefs.setHudEnabled(this@SessionActivity, on); hudOn = on; hud.refresh() }, + onHudFps = { on -> SessionPrefs.setHudShowFps(this@SessionActivity, on); hudFps = on; hud.refresh() }, + onHudBattery = { on -> SessionPrefs.setHudShowBattery(this@SessionActivity, on); hudBattery = on; hud.refresh() }, + onHudGraph = { on -> SessionPrefs.setHudShowGraph(this@SessionActivity, on); hudGraph = on; hud.refresh() }, + onHudColor = { color -> SessionPrefs.setHudColor(this@SessionActivity, color); hudColor = color }, + onHudOpacity = { percent -> SessionPrefs.setHudOpacity(this@SessionActivity, percent); hudOpacity = percent }, onUpscaler = { m -> SessionPrefs.setUpscaler(this@SessionActivity, m); upscaler = m WaylandCompositor.nativeSetUpscaler(m) @@ -1343,6 +1358,11 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { unfoldedControls = SessionPrefs.unfoldedControls(this) picturePosition = SessionPrefs.picturePosition(this) hudOn = SessionPrefs.hudEnabled(this) + hudFps = SessionPrefs.hudShowFps(this) + hudBattery = SessionPrefs.hudShowBattery(this) + hudGraph = SessionPrefs.hudShowGraph(this) + hudColor = SessionPrefs.hudColor(this) + hudOpacity = SessionPrefs.hudOpacity(this) upscaler = SessionPrefs.upscaler(this) upscaleSharpness = SessionPrefs.upscaleSharpness(this) effects = SessionPrefs.screenEffects(this) diff --git a/app/src/main/java/com/droiddeck/launcher/session/PerfHud.kt b/app/src/main/java/com/droiddeck/launcher/session/PerfHud.kt index 55ab3f7faf..3829d9a258 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/PerfHud.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/PerfHud.kt @@ -1,6 +1,9 @@ package com.droiddeck.launcher.session import android.content.Context +import android.content.Intent +import android.content.IntentFilter +import android.os.BatteryManager import android.os.Environment import android.os.Handler import android.os.Looper @@ -15,21 +18,35 @@ import com.droiddeck.launcher.wayland.WaylandCompositor import java.io.File import java.util.Locale import java.util.concurrent.atomic.AtomicInteger +import java.util.concurrent.atomic.AtomicLong class PerfHud(context: Context) { var text by mutableStateOf("") private set + var graph by mutableStateOf(FloatArray(0)) + private set private val context = context.applicationContext private val frames = AtomicInteger() private var lastTick = 0L + private var lastFps = 0f private var running = false private val handler = Handler(Looper.getMainLooper()) + private val intervals = FloatArray(GRAPH) + private val graphWrite = AtomicInteger() + private val lastFrameNs = AtomicLong() + + @Volatile private var showFps = true + @Volatile private var showBattery = true + @Volatile private var showGraph = true private val enabled: Boolean get() = SessionPrefs.hudEnabled(context) && !File(Environment.getExternalStorageDirectory(), "Download/droiddeck-no-hud").exists() + private val anyPart: Boolean + get() = showFps || showBattery || showGraph + var onPresentingWindowChanged: (() -> Unit)? = null private var lastWindow: String? = null @@ -40,7 +57,17 @@ class PerfHud(context: Context) { handler.post { onPresentingWindowChanged?.invoke() } } } - override fun onGameFrame() { frames.incrementAndGet() } + override fun onGameFrame() { + frames.incrementAndGet() + if (!showGraph) return + val now = System.nanoTime() + val previous = lastFrameNs.getAndSet(now) + if (previous == 0L) return + val ms = ((now - previous) / 1_000_000f).coerceIn(0f, 50f) + val slot = graphWrite.get() + intervals[slot and (GRAPH - 1)] = ms + graphWrite.compareAndSet(slot, slot + 1) + } } private val tick = object : Runnable { @@ -49,28 +76,82 @@ class PerfHud(context: Context) { val now = SystemClock.elapsedRealtime() val dt = (now - lastTick).coerceAtLeast(1L) / 1000f lastTick = now - text = line(frames.getAndSet(0) / dt) - handler.postDelayed(this, 1000) + lastFps = frames.getAndSet(0) / dt + text = readout(lastFps) + if (showGraph) publishGraph() else clearGraph() + handler.postDelayed(this, TICK_MS) } } fun refresh() { - if (enabled) start() else stop() + readOptions() + if (!enabled || !anyPart) { + stop() + return + } + if (!running) start() else { + if (!showGraph) clearGraph() else publishGraph() + text = readout(lastFps) + } } fun start() { - if (!enabled || running) return + readOptions() + if (!enabled || !anyPart || running) return running = true lastTick = SystemClock.elapsedRealtime() + lastFrameNs.set(0L) frames.set(0) + graphWrite.set(0) WaylandCompositor.setGameListener(listener) - handler.post(tick) + handler.postDelayed(tick, TICK_MS) } fun stop() { running = false + handler.removeCallbacks(tick) WaylandCompositor.clearGameListener(listener) text = "" + graph = FloatArray(0) + } + + private fun readOptions() { + showFps = SessionPrefs.hudShowFps(context) + showBattery = SessionPrefs.hudShowBattery(context) + showGraph = SessionPrefs.hudShowGraph(context) + } + + private fun readout(fpsValue: Float): String { + val parts = ArrayList(2) + if (showFps) parts.add(line(fpsValue)) + if (showBattery) batteryCelsius(readBatteryDeci())?.let { parts.add(it) } + return parts.joinToString("\n") + } + + private fun readBatteryDeci(): Int { + val sticky = runCatching { + context.registerReceiver(null, IntentFilter(Intent.ACTION_BATTERY_CHANGED)) + }.getOrNull() ?: return 0 + return sticky.getIntExtra(BatteryManager.EXTRA_TEMPERATURE, 0) + } + + private fun clearGraph() { + lastFrameNs.set(0L) + graphWrite.set(0) + if (graph.isNotEmpty()) graph = FloatArray(0) + } + + private fun publishGraph() { + val count = graphWrite.get() + val shown = minOf(count, GRAPH) + if (shown < 2) { + graph = FloatArray(0) + return + } + val out = FloatArray(shown) + val start = count - shown + for (i in 0 until shown) out[i] = intervals[(start + i) and (GRAPH - 1)] + graph = out } private fun line(base: Float): String { @@ -91,4 +172,12 @@ class PerfHud(context: Context) { } private fun fps(value: Float) = String.format(Locale.US, "%.0f fps", value) + + companion object { + private const val TICK_MS = 1_000L + private const val GRAPH = 128 + + internal fun batteryCelsius(deci: Int): String? = + if (deci <= 0) null else String.format(Locale.US, "%.1f°C", deci / 10f) + } } diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt index e7b810c238..54d81f27bc 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -157,6 +157,43 @@ object SessionPrefs { prefs(context).edit().putBoolean(hudKey(context), on).apply() } + fun hudShowFps(context: Context): Boolean = prefs(context).getBoolean("hudFps", true) + + fun setHudShowFps(context: Context, on: Boolean) { + prefs(context).edit().putBoolean("hudFps", on).apply() + } + + fun hudShowBattery(context: Context): Boolean = prefs(context).getBoolean("hudBattery", true) + + fun setHudShowBattery(context: Context, on: Boolean) { + prefs(context).edit().putBoolean("hudBattery", on).apply() + } + + fun hudShowGraph(context: Context): Boolean = prefs(context).getBoolean("hudGraph", true) + + fun setHudShowGraph(context: Context, on: Boolean) { + prefs(context).edit().putBoolean("hudGraph", on).apply() + } + + fun hudColor(context: Context): String = + prefs(context).getString("hudColor", HUD_COLOR_MINT)?.takeIf { it in HUD_COLORS } ?: HUD_COLOR_MINT + + fun setHudColor(context: Context, color: String) { + if (color in HUD_COLORS) prefs(context).edit().putString("hudColor", color).apply() + } + + fun hudOpacity(context: Context): Int = + prefs(context).getInt("hudOpacity", HUD_OPACITY_DEFAULT).takeIf { it in HUD_OPACITY_RANGE } ?: HUD_OPACITY_DEFAULT + + fun setHudOpacity(context: Context, percent: Int) { + prefs(context).edit().putInt("hudOpacity", percent.coerceIn(HUD_OPACITY_RANGE)).apply() + } + + const val HUD_COLOR_MINT = "mint" + val HUD_COLORS = listOf(HUD_COLOR_MINT, "white", "sky", "amber", "violet") + val HUD_OPACITY_RANGE = 30..100 + const val HUD_OPACITY_DEFAULT = 70 + private fun hudKey(context: Context) = if (mangoappSession(context)) "hudDeck" else "hud" private fun mangoappSession(context: Context) = diff --git a/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt b/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt index 78bbc89cd6..221eb6b695 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt @@ -13,7 +13,7 @@ object SettingsReset { internal val SESSION_KEYS = setOf( "orientation", "launcherFullscreen", "animations", "theme", "runSteamAtStartup", "addedGamesArt", "gameStoresEnabled", "gameStoresSpeedTier", "gameStoresParallel", "storesOpenTab", "storesShowMature", - "hud", "hudDeck", "backActionsInverted", "touch", "osc", "shape", "steamController", + "hud", "hudDeck", "hudFps", "hudBattery", "hudGraph", "hudColor", "hudOpacity", "backActionsInverted", "touch", "osc", "shape", "steamController", "gamepadLeft", "gamepadRight", "pipAutoEnter", "unfoldedControls", "stretch16x9", "picturePosition", "gpuDriverMode", "androidDriver", "linuxDriver", "linuxDriver.steam", "linuxDriver.desktop", "tuSysmem", "glThread", "noGlError", "zinkLazy", "mangoapp", "gpuClockPin", "gamescopeRealtime", 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 bf41dcf0b8..38bbb76cf9 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionLoading.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionLoading.kt @@ -27,6 +27,7 @@ import androidx.compose.foundation.layout.heightIn import androidx.compose.material.icons.filled.Pause import androidx.compose.foundation.rememberScrollState import androidx.compose.material3.Icon +import androidx.compose.foundation.Canvas import androidx.compose.foundation.background import androidx.compose.foundation.clickable import androidx.compose.foundation.interaction.MutableInteractionSource @@ -68,6 +69,8 @@ import androidx.compose.ui.draw.clip import androidx.compose.ui.focus.FocusRequester import androidx.compose.ui.focus.focusRequester import androidx.compose.ui.graphics.Brush +import androidx.compose.ui.graphics.Path +import androidx.compose.ui.graphics.StrokeCap import androidx.compose.ui.semantics.contentDescription import androidx.compose.ui.semantics.semantics import androidx.compose.ui.text.font.FontWeight @@ -78,21 +81,93 @@ import androidx.compose.ui.text.style.TextOverflow @Composable -fun HudText(text: String) { +fun HudText(text: String, graph: FloatArray = FloatArray(0), color: String = "mint", opacity: Int = 70) { + if (text.isEmpty() && graph.size < 2) return + val accent = hudInk(color) + val wash = (opacity.coerceIn(30, 100) / 100f) + val ink = accent.copy(alpha = (0.5f + wash * 0.5f).coerceIn(0.62f, 1f)) Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.TopEnd) { - Text( - text, - fontFamily = FontFamily.Monospace, - fontSize = 12.sp, - color = Color.White, + Column( + horizontalAlignment = Alignment.End, modifier = Modifier .padding(12.dp) - .background(Color(0x8C000000)) - .padding(horizontal = 8.dp, vertical = 3.dp), - ) + .background( + Brush.verticalGradient( + listOf(accent.copy(alpha = wash * 0.28f), Color.Black.copy(alpha = wash * 0.72f)), + ), + RoundedCornerShape(8.dp), + ) + .padding(horizontal = 8.dp, vertical = 5.dp), + ) { + if (text.isNotEmpty()) Text( + text, + fontFamily = FontFamily.Monospace, + fontSize = 12.sp, + color = ink, + textAlign = TextAlign.End, + ) + if (graph.size >= 2) { + if (text.isNotEmpty()) Spacer(Modifier.height(4.dp)) + HudGraph(graph, accent, wash) + } + } } } +@Composable +private fun HudGraph(samples: FloatArray, accent: Color, wash: Float) { + Canvas(Modifier.width(148.dp).height(44.dp)) { + val maxMs = (samples.maxOrNull() ?: 16.7f).coerceAtLeast(16.7f) + val step = size.width / (samples.size - 1) + fun yOf(ms: Float) = size.height * (1f - (ms / maxMs).coerceIn(0f, 1f)) + val fillAlpha = wash * 0.5f + val fill = Path().apply { + moveTo(0f, size.height) + samples.forEachIndexed { i, ms -> lineTo(i * step, yOf(ms)) } + lineTo(size.width, size.height) + close() + } + drawPath( + fill, + Brush.verticalGradient(listOf(HUD_SLOW.copy(alpha = fillAlpha), accent.copy(alpha = fillAlpha * 0.45f))), + ) + val guide = yOf(16.7f) + drawLine(Color.White.copy(alpha = 0.32f), Offset(0f, guide), Offset(size.width, guide), strokeWidth = 1f) + for (i in 0 until samples.lastIndex) { + val tone = ((samples[i] - 8f) / 25f).coerceIn(0f, 1f) + drawLine( + mix(accent, HUD_SLOW, tone).copy(alpha = 0.55f + wash * 0.4f), + Offset(i * step, yOf(samples[i])), + Offset((i + 1) * step, yOf(samples[i + 1])), + strokeWidth = 2.5f, + cap = StrokeCap.Round, + ) + } + } +} + +private fun hudInk(color: String): Color = Color( + when (color) { + "white" -> 0xFFF2F5F8 + "sky" -> 0xFF66C0F4 + "amber" -> 0xFFFFB74D + "violet" -> 0xFFD0A2FF + else -> 0xFF3DDC84 + }.toInt(), +) + +private fun mix(from: Color, to: Color, t: Float): Color { + val u = t.coerceIn(0f, 1f) + return Color( + red = from.red + (to.red - from.red) * u, + green = from.green + (to.green - from.green) * u, + blue = from.blue + (to.blue - from.blue) * u, + alpha = 1f, + ) +} + +private val HUD_SLOW = Color(0xFFFF5C6C.toInt()) + private class LoadStage(@androidx.annotation.StringRes val label: Int, @androidx.annotation.StringRes val detail: Int) private fun loadStages(steam: Boolean): List = if (steam) listOf( 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 6fa4cba7b6..82425814c2 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt @@ -195,6 +195,11 @@ class DrawerActions( val isHomeApp: Boolean, val androidApps: List, val hudOn: Boolean, + val hudFps: Boolean = true, + val hudBattery: Boolean = true, + val hudGraph: Boolean = true, + val hudColor: String = SessionPrefs.HUD_COLOR_MINT, + val hudOpacity: Int = SessionPrefs.HUD_OPACITY_DEFAULT, val frameGen: FrameGen.Mode, val lossless: Lossless.State, val oscMode: String, @@ -222,6 +227,11 @@ class DrawerActions( val secondScreenDisplays: List, val selectedSecondScreenDisplay: Int, val onHud: (Boolean) -> Unit, + val onHudFps: (Boolean) -> Unit = {}, + val onHudBattery: (Boolean) -> Unit = {}, + val onHudGraph: (Boolean) -> Unit = {}, + val onHudColor: (String) -> Unit = {}, + val onHudOpacity: (Int) -> Unit = {}, val onFrameGenPick: (FrameGen.Mode) -> Unit, val onImportLossless: () -> Unit, val onKeyboard: () -> Unit, @@ -462,6 +472,30 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont SettingsGroup(stringResource(R.string.drawer_page_display)) { ToggleRow(host, "hud", stringResource(R.string.drawer_hud), null, a.hudOn, chipModifier = focus.track(page, "hud"), onChange = a.onHud) + if (a.hudOn) { + ToggleRow(host, "hud-fps", stringResource(R.string.drawer_hud_fps), null, a.hudFps, + chipModifier = focus.track(page, "hud-fps"), onChange = a.onHudFps) + ToggleRow(host, "hud-battery", stringResource(R.string.drawer_hud_battery), null, a.hudBattery, + chipModifier = focus.track(page, "hud-battery"), onChange = a.onHudBattery) + ToggleRow(host, "hud-graph", stringResource(R.string.drawer_hud_graph), null, a.hudGraph, + chipModifier = focus.track(page, "hud-graph"), onChange = a.onHudGraph) + ChoiceRow( + host, "hud-color", stringResource(R.string.drawer_hud_color), null, + listOf( + SessionPrefs.HUD_COLOR_MINT to stringResource(R.string.drawer_hud_color_mint), + "white" to stringResource(R.string.drawer_hud_color_white), + "sky" to stringResource(R.string.drawer_hud_color_sky), + "amber" to stringResource(R.string.drawer_hud_color_amber), + "violet" to stringResource(R.string.drawer_hud_color_violet), + ), + a.hudColor, chipModifier = focus.track(page, "hud-color"), onPick = a.onHudColor, + ) + SliderRow( + stringResource(R.string.drawer_hud_opacity), null, a.hudOpacity, + SessionPrefs.HUD_OPACITY_RANGE, step = 10, format = { "$it%" }, + modifier = focus.track(page, "hud-opacity"), onChange = a.onHudOpacity, + ) + } val fgOpen = host.open == "fg" val fgLabel = FrameGen.label(LocalContext.current, a.frameGen) SettingsRow(stringResource(R.string.frame_gen_title), null, highlighted = fgOpen) { diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index c8fd949fbe..df1ed3e76b 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -590,6 +590,16 @@ الصفحة السابقة الصفحة التالية واجهة الأداء + معدل الإطارات + درجة حرارة البطارية + مخطط الأداء + اللون + نعناعي + أبيض + سماوي + كهرماني + بنفسجي + العتامة وضع التحجيم حدة التحجيم مؤثرات الشاشة diff --git a/app/src/main/res/values-b+es+419/strings.xml b/app/src/main/res/values-b+es+419/strings.xml index a9303902af..8c6856fc68 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -577,6 +577,16 @@ Página anterior Página siguiente HUD de rendimiento + Tasa de fotogramas + Temperatura de la batería + Gráfico de rendimiento + Color + Menta + Blanco + Celeste + Ámbar + Violeta + Opacidad Modo de escalado Nitidez del escalado Efectos de pantalla diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index aba51d5590..9d8a813846 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -582,6 +582,16 @@ Предишна страница Следваща страница HUD за производителност + Честота на кадрите + Температура на батерията + Графика на производителността + Цвят + Мента + Бяло + Небесно + Кехлибарено + Виолетово + Прозрачност Режим на мащабиране Острота на мащабиране Ефекти на екрана diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 2bef97b92d..87e03f749c 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -586,6 +586,16 @@ Předchozí stránka Další stránka HUD výkonu + Snímková frekvence + Teplota baterie + Graf výkonu + Barva + Máta + Bílá + Nebeská + Ambrová + Fialová + Průhlednost Režim škálování Ostrost škálování Efekty obrazovky diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 3fe4695cba..a5da9e3ef0 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -582,6 +582,16 @@ Forrige side Næste side Ydelses-HUD + Billedhastighed + Batteritemperatur + Ydelsesgraf + Farve + Mint + Hvid + Himmelblå + Ravgul + Violet + Gennemsigtighed Skaleringstilstand Skaleringsskarphed Skærmeffekter diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 9fe1c0e794..a477da4760 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -579,6 +579,16 @@ Vorherige Seite Nächste Seite Leistungs-HUD + Bildrate + Akkutemperatur + Leistungsdiagramm + Farbe + Minze + Weiß + Himmelblau + Bernstein + Violett + Deckkraft Skalierungsmodus Skalierungsschärfe Bildschirmeffekte diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 14f83431cf..49fbc0dae2 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -582,6 +582,16 @@ Προηγούμενη σελίδα Επόμενη σελίδα HUD απόδοσης + Ρυθμός καρέ + Θερμοκρασία μπαταρίας + Γράφημα απόδοσης + Χρώμα + Μέντα + Λευκό + Γαλάζιο + Κεχριμπαρί + Βιολετί + Διαφάνεια Λειτουργία κλιμάκωσης Οξύτητα κλιμάκωσης Εφέ οθόνης diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index ea6e05fb38..f4b00b45a6 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -581,6 +581,16 @@ Página anterior Página siguiente HUD de rendimiento + Tasa de fotogramas + Temperatura de la batería + Gráfico de rendimiento + Color + Menta + Blanco + Celeste + Ámbar + Violeta + Opacidad Modo de escalado Nitidez del escalado Efectos de pantalla diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 680b9c455c..bd93642848 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -582,6 +582,16 @@ Edellinen sivu Seuraava sivu Suorituskyky-HUD + Kuvataajuus + Akun lämpötila + Suorituskykykäyrä + Väri + Minttu + Valkoinen + Taivaansininen + Meripihka + Violetti + Peittävyys Skaalaustila Skaalauksen terävyys Näyttötehosteet diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 1072156283..42856242d1 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -581,6 +581,16 @@ Page précédente Page suivante HUD de performance + Fréquence d\'images + Température de la batterie + Graphique de performance + Couleur + Menthe + Blanc + Ciel + Ambre + Violet + Opacité Mode de mise à l\'échelle Netteté de la mise à l\'échelle Effets d\'écran diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 2a246077fb..38e9854439 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -582,6 +582,16 @@ पिछला पेज अगला पेज परफ़ॉर्मेंस HUD + फ़्रेम दर + बैटरी तापमान + परफ़ॉर्मेंस ग्राफ़ + रंग + मिंट + सफ़ेद + स्काई + एम्बर + वायलेट + ओपैसिटी स्केलिंग मोड स्केलिंग शार्पनेस स्क्रीन इफ़ेक्ट diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index ab5bbef494..5c49ae3b46 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -582,6 +582,16 @@ Előző oldal Következő oldal Teljesítmény HUD + Képkockasebesség + Akkuhőmérséklet + Teljesítménygrafikon + Szín + Menta + Fehér + Égszínkék + Borostyán + Lila + Átlátszatlanság Méretezési mód Méretezési élesség Képernyőeffektek diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 0bd3c783ff..46ee60053d 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -580,6 +580,16 @@ Halaman sebelumnya Halaman berikutnya HUD performa + Laju bingkai + Suhu baterai + Grafik performa + Warna + Mint + Putih + Langit + Ambar + Ungu + Opasitas Mode penskalaan Ketajaman penskalaan Efek layar diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index a2c2c3c4c5..c29d4964d6 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -581,6 +581,16 @@ Pagina precedente Pagina successiva HUD prestazioni + Frequenza fotogrammi + Temperatura batteria + Grafico prestazioni + Colore + Menta + Bianco + Cielo + Ambra + Viola + Opacità Modalità di ridimensionamento Nitidezza del ridimensionamento Effetti schermo diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 213144bea4..7f77f84b42 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -580,6 +580,16 @@ 前のページ 次のページ パフォーマンスHUD + フレームレート + バッテリー温度 + パフォーマンスグラフ + 色 + ミント + ホワイト + スカイ + アンバー + バイオレット + 不透明度 スケーリングモード スケーリングのシャープネス 画面エフェクト diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 4fc869f78f..1df2c7fa1a 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -580,6 +580,16 @@ 이전 페이지 다음 페이지 성능 HUD + 프레임 속도 + 배터리 온도 + 성능 그래프 + 색상 + 민트 + 흰색 + 하늘색 + 호박색 + 보라색 + 불투명도 스케일링 모드 스케일링 선명도 화면 효과 diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 599ff582f9..9423492810 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -580,6 +580,16 @@ Halaman sebelumnya Halaman seterusnya HUD prestasi + Kadar bingkai + Suhu bateri + Graf prestasi + Warna + Pudina + Putih + Langit + Ambar + Ungu + Kelegapan Mod penskalaan Ketajaman penskalaan Kesan skrin diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 68dcfc185a..1ae9854564 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -582,6 +582,16 @@ Forrige side Neste side Ytelses-HUD + Bildefrekvens + Batteritemperatur + Ytelsesgraf + Farge + Mint + Hvit + Himmel + Amber + Fiolett + Opasitet Skaleringsmodus Skaleringsskarphet Skjermeffekter diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 267afcb69c..a31b6227c4 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -582,6 +582,16 @@ Vorige pagina Volgende pagina Prestatie-HUD + Beeldsnelheid + Accutemperatuur + Prestatiegrafiek + Kleur + Mint + Wit + Hemelsblauw + Amber + Violet + Transparantie Schaalmodus Schaalscherpte Schermeffecten diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index fc7bb39b1a..4c5d60c66a 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -586,6 +586,16 @@ Poprzednia strona Następna strona HUD wydajności + Liczba klatek + Temperatura baterii + Wykres wydajności + Kolor + Mięta + Biały + Błękitny + Bursztynowy + Fioletowy + Przezroczystość Tryb skalowania Ostrość skalowania Efekty ekranowe diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 8c51b09c9e..2e1f6425ff 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -581,6 +581,16 @@ Página anterior Página seguinte HUD de desempenho + Taxa de fotogramas + Temperatura da bateria + Gráfico de desempenho + Cor + Menta + Branco + Céu + Âmbar + Violeta + Opacidade Modo de escala Nitidez da escala Efeitos de ecrã diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 7c6f7f9661..73d6239a3f 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -581,6 +581,16 @@ Página anterior Próxima página HUD de desempenho + Taxa de quadros + Temperatura da bateria + Gráfico de desempenho + Cor + Menta + Branco + Céu + Âmbar + Violeta + Opacidade Modo de escala Nitidez da escala Efeitos de tela diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index c9e753866f..e02c7b2490 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -584,6 +584,16 @@ Pagina anterioară Pagina următoare HUD de performanță + Rată de cadre + Temperatură baterie + Grafic de performanță + Culoare + Mentă + Alb + Cer + Chihlimbariu + Violet + Opacitate Mod de scalare Claritatea scalării Efecte de ecran diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 4af87d354a..71da72cf7a 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -583,6 +583,16 @@ Предыдущая страница Следующая страница HUD производительности + Частота кадров + Температура батареи + График производительности + Цвет + Мята + Белый + Небесный + Янтарный + Фиолетовый + Непрозрачность Режим масштабирования Резкость масштабирования Экранные эффекты diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index e740f9cb9b..0f84b8f48a 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -582,6 +582,16 @@ Föregående sida Nästa sida Prestanda-HUD + Bildfrekvens + Batteritemperatur + Prestandagraf + Färg + Mint + Vit + Himmelsblå + Amber + Lila + Opacitet Skalningsläge Skalningsskärpa Skärmeffekter diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 3a9157bb74..7dceea5bfb 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -580,6 +580,16 @@ หน้าก่อนหน้า หน้าถัดไป HUD ประสิทธิภาพ + อัตราเฟรม + อุณหภูมิแบตเตอรี่ + กราฟประสิทธิภาพ + สี + มิ้นต์ + ขาว + ฟ้าสดใส + อำพัน + ม่วง + ความโปร่งใส โหมดการปรับขนาด ความคมชัดของการปรับขนาด เอฟเฟกต์หน้าจอ diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 9e6b9ab15d..ba7d16b0d5 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -579,6 +579,16 @@ Önceki sayfa Sonraki sayfa Performans HUD\'u + Kare hızı + Pil sıcaklığı + Performans grafiği + Renk + Nane + Beyaz + Gök mavisi + Kehribar + Mor + Opaklık Ölçekleme modu Ölçekleme keskinliği Ekran efektleri diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 931caa8ade..a3938e2901 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -586,6 +586,16 @@ Попередня сторінка Наступна сторінка HUD продуктивності + Частота кадрів + Температура батареї + Графік продуктивності + Колір + М\'ята + Білий + Небесний + Бурштиновий + Фіолетовий + Непрозорість Режим масштабування Чіткість масштабування Ефекти екрана diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index d636a67ead..a8e738e09d 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -580,6 +580,16 @@ Trang trước Trang sau HUD hiệu năng + Tốc độ khung hình + Nhiệt độ pin + Biểu đồ hiệu năng + Màu + Bạc hà + Trắng + Xanh da trời + Hổ phách + Tím + Độ mờ Chế độ chia tỷ lệ Độ sắc nét khi chia tỷ lệ Hiệu ứng màn hình diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index f513e51a9f..ebad970f53 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -580,6 +580,16 @@ 上一页 下一页 性能 HUD + 帧率 + 电池温度 + 性能图表 + 颜色 + 薄荷绿 + 白色 + 天蓝 + 琥珀 + 紫罗兰 + 不透明度 缩放模式 缩放锐度 屏幕效果 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 10cc860e71..b512870a5e 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -580,6 +580,16 @@ 上一頁 下一頁 效能 HUD + 幀率 + 電池溫度 + 效能圖表 + 顏色 + 薄荷綠 + 白色 + 天藍 + 琥珀色 + 紫羅蘭 + 不透明度 縮放模式 縮放銳利度 畫面效果 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index e11242c246..26b6d88219 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -580,6 +580,16 @@ 上一頁 下一頁 效能 HUD + 幀率 + 電池溫度 + 效能圖表 + 顏色 + 薄荷綠 + 白色 + 天藍 + 琥珀 + 紫羅蘭 + 不透明度 縮放模式 縮放銳利度 畫面效果 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a11bc727ed..e8f5d77f4e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -593,6 +593,16 @@ Previous page Next page Performance HUD + Frame rate + Battery temperature + Performance graph + Color + Mint + White + Sky + Amber + Violet + Opacity Scaling mode Scaling sharpness Screen effects diff --git a/app/src/test/java/com/droiddeck/launcher/session/SettingsResetTest.kt b/app/src/test/java/com/droiddeck/launcher/session/SettingsResetTest.kt index 81ace45da4..3f3fbf07f8 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/SettingsResetTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/SettingsResetTest.kt @@ -32,6 +32,11 @@ class SettingsResetTest { SessionPrefs.setHdr(app, SessionService.MODE_DESKTOP, true) SessionPrefs.setResolutionChoice(app, SessionService.MODE_STEAM, "1280x800") SessionPrefs.setGuestHostname(app, "MyDeck") + SessionPrefs.setHudShowFps(app, false) + SessionPrefs.setHudShowBattery(app, false) + SessionPrefs.setHudShowGraph(app, false) + SessionPrefs.setHudColor(app, "amber") + SessionPrefs.setHudOpacity(app, 40) ControllerPrefs.setOpacity(app, 40) AppUiPrefs.setScale(app, 150) FrameGen.set(app, FrameGen.Mode(FrameGen.ENGINE_DDFG, 3)) @@ -45,6 +50,13 @@ class SettingsResetTest { assertFalse(SessionPrefs.hdr(app, SessionService.MODE_DESKTOP)) assertFalse(SessionPrefs.resolutionChosen(app, SessionService.MODE_STEAM)) assertEquals(SessionPrefs.DEFAULT_GUEST_HOSTNAME, SessionPrefs.guestHostname(app)) + assertTrue(SessionPrefs.hudShowFps(app)) + assertTrue(SessionPrefs.hudShowBattery(app)) + assertTrue(SessionPrefs.hudShowGraph(app)) + assertEquals(SessionPrefs.HUD_COLOR_MINT, SessionPrefs.hudColor(app)) + assertEquals(SessionPrefs.HUD_OPACITY_DEFAULT, SessionPrefs.hudOpacity(app)) + assertEquals("32.4°C", PerfHud.batteryCelsius(324)) + assertNull(PerfHud.batteryCelsius(0)) assertEquals(100, ControllerPrefs.read(app).opacity) assertEquals(AppUiPrefs.DEFAULT_SCALE, AppUiPrefs.scale(app)) assertEquals(FrameGen.Mode.OFF.engine, FrameGen.engine(app)) From ff4a7943f5f80ad584fcc029af0c42c065610a37 Mon Sep 17 00:00:00 2001 From: kingokksa <47888451+kingokksa@users.noreply.github.com> Date: Thu, 22 Oct 2026 01:12:49 +0800 Subject: [PATCH 15/44] fix: store dots stay dim when signed out and stores open on the first arranged tab (#1236) --- app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt index 4251212203..02897f2507 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt @@ -201,12 +201,12 @@ internal fun StoresPage(s: FrontEndState, a: FrontEndActions, modifier: Modifier val colors = MaterialTheme.colorScheme val narrow = LocalNarrowPane.current val padH = if (narrow) 14.dp else 22.dp - var chip by rememberSaveable { mutableStateOf(Store.GOG.id) } val tabs = remember { androidx.compose.runtime.mutableStateListOf().apply { addAll(arrangeStoreTabs(SessionPrefs.storesTabOrder(ctx), SessionPrefs.storesTabHidden(ctx))) } } + var chip by rememberSaveable { mutableStateOf(tabs.firstOrNull { it.shown }?.store?.id ?: Store.GOG.id) } var arranging by remember { mutableStateOf(false) } val shownStores = tabs.filter { it.shown }.map { it.store } fun commitTabs() { @@ -638,8 +638,9 @@ private fun StoreDot(store: Store, signedIn: Boolean) { Box( Modifier.size(12.dp) .onGloballyPositioned { StoresMotion.dots[store] = it.boundsInRoot() } - .pulseRing(StoresMotion.pulses[store] ?: 0, c.dot), - ) { Box(Modifier.matchParentSize().clip(CircleShape).background(c.dot).alpha(if (signedIn) 1f else 0.35f)) } + .pulseRing(StoresMotion.pulses[store] ?: 0, c.dot) + .background(c.dot.copy(alpha = if (signedIn) 1f else 0.35f), CircleShape), + ) } @Composable From 7bb66de192eebae47fc1f8ee078a8be15530f8f5 Mon Sep 17 00:00:00 2001 From: FX1922 <120828496+FX192@users.noreply.github.com> Date: Wed, 21 Oct 2026 20:13:31 +0300 Subject: [PATCH 16/44] fix: keep controller focus after installing a boot movie; Xbox and itch artwork covered (#1229) --- .../droiddeck/launcher/ui/AddedGameEditor.kt | 31 +++++++++++---- .../droiddeck/launcher/ui/BootMovieSection.kt | 38 +++++++++++++++---- .../launcher/ui/LogoPositionDialog.kt | 12 ++++-- .../launcher/ui/StoresInstallDialog.kt | 2 +- .../launcher/frontend/StoreGameArtTest.kt | 2 +- docs/development/added-games.md | 2 +- 6 files changed, 65 insertions(+), 22 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/AddedGameEditor.kt b/app/src/main/java/com/droiddeck/launcher/ui/AddedGameEditor.kt index cec6c7a426..3d86510f70 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/AddedGameEditor.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/AddedGameEditor.kt @@ -40,6 +40,12 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.focus.FocusRequester import androidx.compose.ui.focus.focusRequester +import androidx.compose.foundation.gestures.detectTapGestures +import androidx.compose.ui.input.pointer.pointerInput +import androidx.compose.ui.platform.LocalSoftwareKeyboardController +import androidx.compose.ui.platform.LocalFocusManager +import androidx.compose.ui.platform.LocalInputModeManager +import androidx.compose.ui.input.InputMode import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.platform.LocalConfiguration import android.content.Context @@ -502,7 +508,7 @@ private fun ArtChooserDialog( sgdb = found?.sgdb ?: SteamGridDb.Status.SERVER } val first = remember { FocusRequester() } - LaunchedEffect(Unit) { focusWithinFrames({ false }) { first } } + LaunchedEffect(options != null) { focusWithinFrames({ false }) { first } } val apply: (AddedGameArt.Option) -> Unit = { option -> scope.launch { val saved = withContext(Dispatchers.IO) { target.set(app, slot, option) } @@ -624,14 +630,23 @@ private fun SgdbSearchDialog( } } LaunchedEffect(Unit) { search() } - AppDialog(shown, back, "sgdbSearch", wide = false, maxWidth = 460.dp) { + val firstItem = remember { FocusRequester() } + val focusManager = LocalFocusManager.current + val keyboardController = LocalSoftwareKeyboardController.current + val leaveField = { focusManager.clearFocus(); keyboardController?.hide() } + val keyboard = LocalInputModeManager.current.inputMode == InputMode.Keyboard + LaunchedEffect(picked?.id, matches?.size, images.size, busy) { + val ready = if (picked != null) images.isNotEmpty() else !matches.isNullOrEmpty() + if (keyboard && !busy && ready) focusSoon { firstItem } + } + AppDialog(shown, back, "sgdbSearch", wide = false, maxWidth = 460.dp, modifier = Modifier.pointerInput(Unit) { detectTapGestures { leaveField() } }) { DialogTitleRow(stringResource(R.string.art_sgdb_title, slotName), onClose = { onCloseAll() }, leading = { SmallIconButton(Icons.AutoMirrored.Filled.ArrowBack, stringResource(R.string.common_back), colors.onBackground, onClick = back) }) androidx.compose.material3.OutlinedTextField( query, { query = it }, singleLine = true, modifier = Modifier.fillMaxWidth(), label = { Text(stringResource(R.string.art_sgdb_search_label)) }, - keyboardActions = androidx.compose.foundation.text.KeyboardActions(onSearch = { search() }), + keyboardActions = androidx.compose.foundation.text.KeyboardActions(onSearch = { leaveField(); search() }), keyboardOptions = androidx.compose.foundation.text.KeyboardOptions(imeAction = androidx.compose.ui.text.input.ImeAction.Search), ) val maxHeight = (LocalConfiguration.current.screenHeightDp * 0.6f).dp @@ -643,24 +658,24 @@ private fun SgdbSearchDialog( val chosenGame = picked val list = matches.orEmpty() if (chosenGame == null) { - for (match in list) key(match.id) { PickerRow(null, match.name, null) { showImages(match) } } + list.forEachIndexed { i, match -> key(match.id) { PickerRow(null, match.name, null, focus = if (i == 0) firstItem else null) { leaveField(); showImages(match) } } } if (matches != null && list.isEmpty() && !busy && status == SteamGridDb.Status.OK) { Text(stringResource(R.string.art_sgdb_none), fontSize = 12.sp, color = colors.onSurfaceVariant, modifier = Modifier.padding(start = 2.dp, top = 4.dp)) } } else { Text(chosenGame.name, fontSize = 12.sp, color = colors.onSurfaceVariant, modifier = Modifier.padding(start = 2.dp, top = 4.dp)) FlowRow(horizontalArrangement = Arrangement.spacedBy(8.dp), verticalArrangement = Arrangement.spacedBy(8.dp)) { - for (option in images) key(option.full) { + images.forEachIndexed { i, option -> key(option.full) { ArtOption( - slot, option, selected = current?.chosen == true && option.full == chosenRef, focus = null, + slot, option, selected = current?.chosen == true && option.full == chosenRef, focus = if (i == 0) firstItem else null, description = "${artSourceLabel(AddedGameArt.SGDB)} $slotName", ) { onPick(option) } - } + } } } if (images.isEmpty() && !busy && status == SteamGridDb.Status.OK) { Text(stringResource(R.string.art_sgdb_none), fontSize = 12.sp, color = colors.onSurfaceVariant, modifier = Modifier.padding(start = 2.dp, top = 4.dp)) } - if (list.size > 1) PickerRow(null, stringResource(R.string.art_sgdb_other_games), null) { picked = null } + if (list.size > 1) PickerRow(null, stringResource(R.string.art_sgdb_other_games), null) { leaveField(); picked = null } } if (busy) androidx.compose.material3.LinearProgressIndicator(Modifier.fillMaxWidth().padding(vertical = 8.dp)) } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/BootMovieSection.kt b/app/src/main/java/com/droiddeck/launcher/ui/BootMovieSection.kt index 3878d274b6..a4227d4c28 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/BootMovieSection.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/BootMovieSection.kt @@ -69,6 +69,7 @@ import androidx.compose.runtime.DisposableEffect import androidx.compose.runtime.mutableFloatStateOf import androidx.compose.ui.focus.FocusRequester import androidx.compose.ui.focus.focusRequester +import androidx.compose.ui.focus.onFocusChanged import androidx.compose.ui.input.InputMode import androidx.compose.ui.platform.LocalConfiguration import androidx.compose.ui.platform.LocalInputModeManager @@ -558,13 +559,37 @@ private fun repoInfo(post: SteamDeckRepo.Post): String = listOf(post.author, "♥ ${post.likes}", "⇩ ${post.downloads}", if (post.seconds > 0) stringResource(R.string.boot_movie_seconds, post.seconds) else "") .filter { it.isNotEmpty() }.joinToString(" · ") +private const val AFTER_OPEN = 3 +private const val AFTER_INSTALL = 1 +private const val AFTER_USE = 2 + +/** Install and Use are different buttons in turn, and the button is disabled while installing; it takes focus back for the controller. */ @Composable -private fun RepoAction(installed: Boolean, inUse: Boolean, percent: Int?, busy: Boolean, modifier: Modifier, onInstall: () -> Unit, onUse: () -> Unit) { - if (inUse) SecondaryButton(stringResource(R.string.boot_movie_in_use), compact = true, modifier = modifier, onClick = {}) - else if (installed) SecondaryButton(stringResource(R.string.boot_movie_repo_use), compact = true, modifier = modifier, onClick = onUse) +private fun RepoAction( + installed: Boolean, inUse: Boolean, percent: Int?, busy: Boolean, modifier: Modifier, onInstall: () -> Unit, onUse: () -> Unit, + takeFocus: Boolean = false, +) { + val requester = remember { FocusRequester() } + val focused = remember { booleanArrayOf(false) } + var pending by remember { mutableIntStateOf(if (takeFocus) AFTER_OPEN else 0) } + val inputMode = LocalInputModeManager.current + LaunchedEffect(installed, inUse, busy, percent != null, pending) { + if (pending == 0) return@LaunchedEffect + if (inputMode.inputMode != InputMode.Keyboard) { pending = 0; return@LaunchedEffect } + focusWithinFrames({ focused[0] }) { requester } + when (pending) { + AFTER_OPEN -> pending = 0 + AFTER_INSTALL -> if (installed && focused[0]) pending = 0 + AFTER_USE -> if (inUse && focused[0]) pending = 0 + else -> Unit + } + } + val m = modifier.focusRequester(requester).onFocusChanged { focused[0] = it.hasFocus || it.isFocused } + if (inUse) SecondaryButton(stringResource(R.string.boot_movie_in_use), compact = true, modifier = m, onClick = {}) + else if (installed) SecondaryButton(stringResource(R.string.boot_movie_repo_use), compact = true, modifier = m, onClick = { pending = AFTER_USE; onUse() }) else SecondaryButton( if (percent != null) stringResource(R.string.boot_movie_converting, percent) else stringResource(R.string.boot_movie_repo_install), - enabled = !busy, compact = true, modifier = modifier, onClick = onInstall, + enabled = !busy, compact = true, modifier = m, onClick = { pending = AFTER_INSTALL; onInstall() }, ) } @@ -576,9 +601,6 @@ private fun PreviewDialog( ) { val shown = rememberShown(onDismiss) val close = { shown.targetState = false } - val action = remember { FocusRequester() } - val inputMode = LocalInputModeManager.current - LaunchedEffect(Unit) { if (inputMode.inputMode == InputMode.Keyboard) focusSoon { action } } val maxVideoHeight = (LocalConfiguration.current.screenHeightDp - 200).coerceAtLeast(120).dp AppDialog(shown, close, "boot-movie-preview", wide = false, maxWidth = 620.dp) { DialogTitleRow(post.title, close) @@ -586,7 +608,7 @@ private fun PreviewDialog( MoviePreview(post.video, Modifier.heightIn(max = maxVideoHeight).aspectRatio(16f / 9f)) } Text(repoInfo(post), fontSize = 12.sp, color = MaterialTheme.colorScheme.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis) - RepoAction(installed, inUse, percent, busy, Modifier.fillMaxWidth().focusRequester(action), onInstall, onUse) + RepoAction(installed, inUse, percent, busy, Modifier.fillMaxWidth(), onInstall, onUse, takeFocus = true) } } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/LogoPositionDialog.kt b/app/src/main/java/com/droiddeck/launcher/ui/LogoPositionDialog.kt index 7e42aab512..2ddbdbe287 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/LogoPositionDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/LogoPositionDialog.kt @@ -3,6 +3,9 @@ package com.droiddeck.launcher.ui import androidx.compose.foundation.background import androidx.compose.foundation.border import androidx.compose.foundation.clickable +import androidx.compose.ui.focus.focusRequester +import androidx.compose.ui.focus.FocusRequester +import androidx.compose.runtime.LaunchedEffect import androidx.compose.foundation.hoverable import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.layout.Arrangement @@ -105,7 +108,7 @@ private fun LogoPreview(hero: File?, logo: File?, value: LogoPosition.Value) { } @Composable -private fun PinChip(label: String, selected: Boolean, onClick: () -> Unit) { +private fun PinChip(label: String, selected: Boolean, focus: FocusRequester?, onClick: () -> Unit) { val pal = LocalPalette.current val colors = MaterialTheme.colorScheme val src = remember { MutableInteractionSource() } @@ -113,7 +116,7 @@ private fun PinChip(label: String, selected: Boolean, onClick: () -> Unit) { val shape = RoundedCornerShape(8.dp) Box( contentAlignment = Alignment.Center, - modifier = Modifier.clip(shape) + modifier = Modifier.then(if (focus != null) Modifier.focusRequester(focus) else Modifier).clip(shape) .background(if (selected) pal.signal.copy(alpha = 0.14f) else Color.White.copy(alpha = 0.03f)) .border(if (selected) 2.dp else 1.dp, if (selected) pal.signal else pal.line, shape) .glideBorder(hot, shape, pal.signal) @@ -140,6 +143,9 @@ internal fun LogoPositionDialog( val shown = rememberShown(onBack) val back = { shown.targetState = false } var value by remember { mutableStateOf(start ?: LogoPosition.DEFAULT) } + val startPin = remember { value.pin } + val first = remember { FocusRequester() } + LaunchedEffect(Unit) { focusSoon { first } } var failed by remember { mutableStateOf(false) } var busy by remember { mutableStateOf(false) } val save: (LogoPosition.Value?) -> Unit = { next -> @@ -172,7 +178,7 @@ internal fun LogoPositionDialog( ) Text(stringResource(R.string.logo_pos_position), fontSize = 12.sp, color = colors.onSurfaceVariant, modifier = Modifier.padding(start = 2.dp, top = 2.dp)) FlowRow(horizontalArrangement = Arrangement.spacedBy(8.dp), verticalArrangement = Arrangement.spacedBy(8.dp)) { - for (pin in LogoPosition.Pin.values()) PinChip(pin.label(), pin == value.pin) { value = value.copy(pin = pin) } + for (pin in LogoPosition.Pin.values()) PinChip(pin.label(), pin == value.pin, if (pin == startPin) first else null) { value = value.copy(pin = pin) } } ValueSlider( value.widthPct, LogoPosition.MIN_PCT..LogoPosition.MAX_PCT, step = 1, enabled = true, label = stringResource(R.string.logo_pos_size), diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StoresInstallDialog.kt b/app/src/main/java/com/droiddeck/launcher/ui/StoresInstallDialog.kt index 565b5cc9a1..435cf09576 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoresInstallDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoresInstallDialog.kt @@ -65,7 +65,7 @@ internal fun InstallWhereDialog(item: CatalogItem, onDismiss: () -> Unit) { ) Text( stringResource(R.string.common_cancel), fontSize = 13.sp, fontWeight = FontWeight.SemiBold, color = colors.onSurfaceVariant, - modifier = Modifier.clip(Shape12).clickable(role = Role.Button, onClick = close).padding(horizontal = 10.dp, vertical = 6.dp), + modifier = Modifier.clip(Shape12).clickable(role = Role.Button, onClick = close).controllerConfirm(onClick = close).padding(horizontal = 10.dp, vertical = 6.dp), ) } } diff --git a/app/src/test/java/com/droiddeck/launcher/frontend/StoreGameArtTest.kt b/app/src/test/java/com/droiddeck/launcher/frontend/StoreGameArtTest.kt index a0e84775d8..448cca6a88 100644 --- a/app/src/test/java/com/droiddeck/launcher/frontend/StoreGameArtTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/frontend/StoreGameArtTest.kt @@ -36,7 +36,7 @@ class StoreGameArtTest { } @Test fun anArtChoiceOnAStoreGameIsKeptShownAndResetsWithoutTouchingItsTitle() { - for ((store, id, title) in listOf(Triple(Store.GOG, "1207658924", "Heroes III"), Triple(Store.EPIC, "abc", "Celeste"), Triple(Store.AMAZON, "amzn1.x", "Yakuza 0"))) { + for ((store, id, title) in listOf(Triple(Store.GOG, "1207658924", "Heroes III"), Triple(Store.EPIC, "abc", "Celeste"), Triple(Store.AMAZON, "amzn1.x", "Yakuza 0"), Triple(Store.XBOX, "9NBLGGH4X1", "Forza Horizon"), Triple(Store.ITCH, "12345", "Night in the Woods"))) { val folder = install(store, id, title) val image = File(tmp.root, "$id.png").apply { writeBytes(ByteArray(9) { 1 }) } val option = AddedGameArt.Option(AddedGameArt.FILE, image.path, image.path) diff --git a/docs/development/added-games.md b/docs/development/added-games.md index 9e1566dd43..c39ae8d144 100644 --- a/docs/development/added-games.md +++ b/docs/development/added-games.md @@ -95,7 +95,7 @@ scan (`Library.launchableGames`) compares the folder with what was last written (`grid-` in the game's art folder): a file Steam changed becomes the choice (source Steam), a file removed in Steam drops it, and files the shortcuts writer placed itself (`.droiddeck-art.json`) are not mistaken for choices. A chosen image is stored as -`chosen--